summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoe Wilm <jwilm@users.noreply.github.com>2017-01-06 08:31:29 -0800
committerGitHub <noreply@github.com>2017-01-06 08:31:29 -0800
commit41f7fae34a7428d19d89263a765af0b2dadeebf2 (patch)
tree9f9c5684c2bcf40c90e8bce799a41876344a1ec6 /src
parent5f6dedd7d3056dd7d282dc6e50a61d8bf036bb9a (diff)
parentcf3e56980057fa36d01e051ab273e037115c3b0d (diff)
downloadalacritty-41f7fae34a7428d19d89263a765af0b2dadeebf2.tar.gz
alacritty-41f7fae34a7428d19d89263a765af0b2dadeebf2.zip
Merge pull request #60 from MagaTailor/master
Fix compilation on ARM/AARCH64
Diffstat (limited to 'src')
-rw-r--r--src/renderer/mod.rs2
-rw-r--r--src/tty.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/renderer/mod.rs b/src/renderer/mod.rs
index 81ac7fd4..10d3d838 100644
--- a/src/renderer/mod.rs
+++ b/src/renderer/mod.rs
@@ -1039,7 +1039,7 @@ impl ShaderProgram {
let shader = unsafe {
let shader = gl::CreateShader(kind);
- gl::ShaderSource(shader, 1, &(source.as_ptr() as *const i8), len.as_ptr());
+ gl::ShaderSource(shader, 1, &(source.as_ptr() as *const _), len.as_ptr());
gl::CompileShader(shader);
shader
};
diff --git a/src/tty.rs b/src/tty.rs
index b98d2210..9a4d4237 100644
--- a/src/tty.rs
+++ b/src/tty.rs
@@ -171,7 +171,7 @@ fn get_pw_entry(buf: &mut [i8; 1024]) -> Passwd {
// Try and read the pw file.
let uid = unsafe { libc::getuid() };
let status = unsafe {
- libc::getpwuid_r(uid, &mut entry, buf.as_mut_ptr(), buf.len(), &mut res)
+ libc::getpwuid_r(uid, &mut entry, buf.as_mut_ptr() as *mut _, buf.len(), &mut res)
};
if status < 0 {