Merge pull request #60 from MagaTailor/master

Fix compilation on ARM/AARCH64
alacritty · Jan 6, 2017 · 41f7fae · 41f7fae
2 parents 5f6dedd + cf3e569
commit 41f7fae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 {