diff options
119 files changed, 9224 insertions, 7767 deletions
diff --git a/include/stdio.h b/include/stdio.h index bc8e40b2c..979e4eeb2 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -42,7 +42,7 @@ __BEGIN_DECLS #if !defined __FILE_defined && defined __need_FILE /* The opaque type of streams. This is the definition used elsewhere. */ -typedef struct _UC_FILE FILE; +typedef struct __STDIO_FILE_STRUCT FILE; # define __FILE_defined 1 #endif /* FILE not defined. */ @@ -52,7 +52,7 @@ typedef struct _UC_FILE FILE; #if !defined ____FILE_defined && defined __need___FILE /* The opaque type of streams. This is the definition used elsewhere. */ -typedef struct _UC_FILE __FILE; +typedef struct __STDIO_FILE_STRUCT __FILE; # define ____FILE_defined 1 #endif /* __FILE not defined. */ @@ -62,8 +62,6 @@ typedef struct _UC_FILE __FILE; #ifdef _STDIO_H #undef _STDIO_USES_IOSTREAM -#include <sys/types.h> - #include <bits/uClibc_stdio.h> /* This define avoids name pollution if we're using GNU stdarg.h */ @@ -72,23 +70,23 @@ typedef struct _UC_FILE __FILE; /* The type of the second argument to `fgetpos' and `fsetpos'. */ #ifndef __USE_FILE_OFFSET64 -typedef _UC_fpos_t fpos_t; +typedef __STDIO_fpos_t fpos_t; #else -typedef _UC_fpos64_t fpos_t; +typedef __STDIO_fpos64_t fpos_t; #endif #ifdef __USE_LARGEFILE64 -typedef _UC_fpos64_t fpos64_t; +typedef __STDIO_fpos64_t fpos64_t; #endif /* The possibilities for the third argument to `setvbuf'. */ -#define _IOFBF _UC_IOFBF /* Fully buffered. */ -#define _IOLBF _UC_IOLBF /* Line buffered. */ -#define _IONBF _UC_IONBF /* No buffering. */ +#define _IOFBF __STDIO_IOFBF /* Fully buffered. */ +#define _IOLBF __STDIO_IOLBF /* Line buffered. */ +#define _IONBF __STDIO_IONBF /* No buffering. */ /* Default buffer size. */ #ifndef BUFSIZ -# define BUFSIZ _UC_BUFSIZ +# define BUFSIZ __STDIO_BUFSIZ #endif @@ -125,9 +123,9 @@ typedef _UC_fpos64_t fpos64_t; |