Browse Source

Change BUFSIZ type to work with cbindgen

jD91mZM2 6 years ago
parent
commit
4f187efc9b
3 changed files with 4 additions and 4 deletions
  1. 2 2
      src/header/stdio/constants.rs
  2. 1 1
      src/header/stdio/default.rs
  3. 1 1
      src/header/stdio/mod.rs

+ 2 - 2
src/header/stdio/constants.rs

@@ -1,9 +1,9 @@
 use platform::types::*;
 
 pub const EOF: c_int = -1;
-pub const BUFSIZ: size_t = 1024;
+pub const BUFSIZ: c_int = 1024;
 
-pub const UNGET: size_t = 8;
+pub const UNGET: c_int = 8;
 
 pub const FILENAME_MAX: c_int = 4096;
 

+ 1 - 1
src/header/stdio/default.rs

@@ -17,7 +17,7 @@ impl GlobalFile {
 
             file,
             flags: constants::F_PERM | flags,
-            read_buf: Buffer::Owned(vec![0; BUFSIZ]),
+            read_buf: Buffer::Owned(vec![0; BUFSIZ as usize]),
             read_pos: 0,
             read_size: 0,
             unget: None,

+ 1 - 1
src/header/stdio/mod.rs

@@ -709,7 +709,7 @@ pub extern "C" fn setvbuf(stream: *mut FILE, buf: *mut c_char, mode: c_int, mut
     // Set a buffer of size `size` if no buffer is given
     stream.read_buf = if buf.is_null() || size == 0 {
         if size == 0 {
-            size = BUFSIZ;
+            size = BUFSIZ as usize;
         }
         // TODO: Make it unbuffered if _IONBF
         // if mode == _IONBF {