Remove use of INTDEF/INTUSE in libio

1 files changed, 15 insertions, 20 deletions

diff --git a/libio/iolibio.h b/libio/iolibio.h
index 00a4f56c50..f215fcef01 100644
--- a/libio/iolibio.h
+++ b/libio/iolibio.h
@@ -11,9 +11,11 @@ extern int _IO_fclose (_IO_FILE*);
 extern int _IO_new_fclose (_IO_FILE*);
 extern int _IO_old_fclose (_IO_FILE*);
 extern _IO_FILE *_IO_fdopen (int, const char*) __THROW;
+libc_hidden_proto (_IO_fdopen)
 extern _IO_FILE *_IO_old_fdopen (int, const char*) __THROW;
 extern _IO_FILE *_IO_new_fdopen (int, const char*) __THROW;
 extern int _IO_fflush (_IO_FILE*);
+libc_hidden_proto (_IO_fflush)
 extern int _IO_fgetpos (_IO_FILE*, _IO_fpos_t*);
 extern int _IO_fgetpos64 (_IO_FILE*, _IO_fpos64_t*);
 extern char* _IO_fgets (char*, int, _IO_FILE*);
@@ -29,20 +31,26 @@ libc_hidden_proto (_IO_fputs)
 extern int _IO_fsetpos (_IO_FILE*, const _IO_fpos_t *);
 extern int _IO_fsetpos64 (_IO_FILE*, const _IO_fpos64_t *);
 extern long int _IO_ftell (_IO_FILE*);
+libc_hidden_proto (_IO_ftell)
 extern _IO_size_t _IO_fread (void*, _IO_size_t, _IO_size_t, _IO_FILE*);
+libc_hidden_proto (_IO_fread)
 extern _IO_size_t _IO_fwrite (const void*, _IO_size_t, _IO_size_t, _IO_FILE*);
+libc_hidden_proto (_IO_fwrite)
 extern char* _IO_gets (char*);
 extern void _IO_perror (const char*) __THROW;
 extern int _IO_printf (const char*, ...);
 extern int _IO_puts (const char*);
 extern int _IO_scanf (const char*, ...);
 extern void _IO_setbuffer (_IO_FILE *, char*, _IO_size_t) __THROW;
+libc_hidden_proto (_IO_setbuffer)
 extern int _IO_setvbuf (_IO_FILE*, char*, int, _IO_size_t) __THROW;
+libc_hidden_proto (_IO_setvbuf)
 extern int _IO_sscanf (const char*, const char*, ...) __THROW;
 extern int _IO_sprintf (char *, const char*, ...) __THROW;
 extern int _IO_ungetc (int, _IO_FILE*) __THROW;
 extern int _IO_vsscanf (const char *, const char *, _IO_va_list) __THROW;
 extern int _IO_vsprintf (char*, const char*, _IO_va_list) __THROW;
+libc_hidden_proto (_IO_vsprintf)
 extern int _IO_vswprintf (wchar_t*, _IO_size_t, const wchar_t*, _IO_va_list)
        __THROW;
 
@@ -60,15 +68,15 @@ extern int _IO_obstack_printf (struct obstack *, const char *, ...) __THROW;
 #define _IO_rewind(FILE) \
   (void) _IO_seekoff_unlocked (FILE, 0, 0, _IOS_INPUT|_IOS_OUTPUT)
 #define _IO_vprintf(FORMAT, ARGS) \
-  INTUSE(_IO_vfprintf) (_IO_stdout, FORMAT, ARGS)
+  _IO_vfprintf (_IO_stdout, FORMAT, ARGS)
 #define _IO_freopen(FILENAME, MODE, FP) \
-  (INTUSE(_IO_file_close_it)(FP), \
-   INTUSE(_IO_file_fopen)(FP, FILENAME, MODE, 1))
+  (_IO_file_close_it (FP), \
+   _IO_file_fopen (FP, FILENAME, MODE, 1))
 #define _IO_old_freopen(FILENAME, MODE, FP) \
   (_IO_old_file_close_it (FP), _IO_old_file_fopen(FP, FILENAME, MODE))
 #define _IO_freopen64(FILENAME, MODE, FP) \
-  (INTUSE(_IO_file_close_it)(FP), \
-   INTUSE(_IO_file_fopen)(FP, FILENAME, MODE, 0))
+  (_IO_file_close_it (FP), \
+   _IO_file_fopen (FP, FILENAME, MODE, 0))
 #define _IO_fileno(FP) ((FP)->_fileno)
 extern _IO_FILE* _IO_popen (const char*, const char*) __THROW;
 extern _IO_FILE* _IO_new_popen (const char*, const char*) __THROW;
@@ -76,25 +84,12 @@ extern _IO_FILE* _IO_old_popen (const char*, const char*) __THROW;
 extern int __new_pclose (_IO_FILE *) __THROW;
 extern int __old_pclose (_IO_FILE *) __THROW;
 #define _IO_pclose _IO_fclose
-#define _IO_setbuf(_FP, _BUF) INTUSE(_IO_setbuffer)(_FP, _BUF, _IO_BUFSIZ)
-#define _IO_setlinebuf(_FP) INTUSE(_IO_setvbuf)(_FP, NULL, 1, 0)
+#define _IO_setbuf(_FP, _BUF) _IO_setbuffer (_FP, _BUF, _IO_BUFSIZ)
+#define _IO_setlinebuf(_FP) _IO_setvbuf (_FP, NULL, 1, 0)
 
 _IO_FILE *__new_freopen (const char *, const char *, _IO_FILE *) __THROW;
 _IO_FILE *__old_freopen (const char *, const char *, _IO_FILE *) __THROW;
 
-/* Prototype for functions with alternative entry point.  */
-extern void _IO_setbuffer_internal (_IO_FILE *, char*, _IO_size_t) __THROW;
-extern _IO_size_t _IO_fread_internal (void*, _IO_size_t, _IO_size_t, _IO_FILE*)
-       __THROW;
-extern _IO_FILE *_IO_fdopen_internal (int, const char*) __THROW;
-extern int _IO_vsprintf_internal (char*, const char*, _IO_va_list) __THROW;
-extern int _IO_fflush_internal (_IO_FILE*);
-extern _IO_size_t _IO_fwrite_internal (const void*, _IO_size_t,
-				       _IO_size_t, _IO_FILE*);
-extern long int _IO_ftell_internal (_IO_FILE*);
-extern int _IO_fputs_internal (const char*, _IO_FILE*);
-extern int _IO_setvbuf_internal (_IO_FILE*, char*, int, _IO_size_t) __THROW;
-
 #ifdef __cplusplus
 }
 #endif