From 4f187efc9ba7327d260a8cd58b7165d35d5c6a3c Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Wed, 26 Sep 2018 18:44:04 +0200
Subject: [PATCH] Change BUFSIZ type to work with cbindgen
---
src/header/stdio/constants.rs | 4 ++--
src/header/stdio/default.rs | 2 +-
src/header/stdio/mod.rs | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/header/stdio/constants.rs b/src/header/stdio/constants.rs
index 60f8f354b..2adea1918 100644
--- a/src/header/stdio/constants.rs
+++ b/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;
diff --git a/src/header/stdio/default.rs b/src/header/stdio/default.rs
index 6014a6ccf..315d5f750 100644
--- a/src/header/stdio/default.rs
+++ b/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,
diff --git a/src/header/stdio/mod.rs b/src/header/stdio/mod.rs
index 789aaee96..8c20ba6e0 100644
--- a/src/header/stdio/mod.rs
+++ b/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 {
--
GitLab