diff options
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/bits/stdio-ldbl.h | 4 | ||||
| -rw-r--r-- | libio/bits/stdio.h | 8 | ||||
| -rw-r--r-- | libio/bits/stdio2.h | 2 | ||||
| -rw-r--r-- | libio/stdio.h | 20 |
4 files changed, 17 insertions, 17 deletions
diff --git a/libio/bits/stdio-ldbl.h b/libio/bits/stdio-ldbl.h index dc8b33c4a9..4cc6c30a30 100644 --- a/libio/bits/stdio-ldbl.h +++ b/libio/bits/stdio-ldbl.h @@ -40,7 +40,7 @@ __LDBL_REDIR_DECL (sscanf) #endif __END_NAMESPACE_STD -#if defined __USE_MISC || defined __USE_ISOC99 || defined __USE_UNIX98 +#if defined __USE_ISOC99 || defined __USE_UNIX98 __BEGIN_NAMESPACE_C99 __LDBL_REDIR_DECL (snprintf) __LDBL_REDIR_DECL (vsnprintf) @@ -78,7 +78,7 @@ __LDBL_REDIR_DECL (obstack_vprintf) #if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function __LDBL_REDIR_DECL (__sprintf_chk) __LDBL_REDIR_DECL (__vsprintf_chk) -# if defined __USE_MISC || defined __USE_ISOC99 || defined __USE_UNIX98 +# if defined __USE_ISOC99 || defined __USE_UNIX98 __LDBL_REDIR_DECL (__snprintf_chk) __LDBL_REDIR_DECL (__vsnprintf_chk) # endif diff --git a/libio/bits/stdio.h b/libio/bits/stdio.h index 4d872e26d1..615ada56dd 100644 --- a/libio/bits/stdio.h +++ b/libio/bits/stdio.h @@ -57,7 +57,7 @@ fgetc_unlocked (FILE *__fp) # endif /* misc */ -# if defined __USE_POSIX || defined __USE_MISC +# ifdef __USE_POSIX /* This is defined in POSIX.1:1996. */ __STDIO_INLINE int getc_unlocked (FILE *__fp) @@ -71,7 +71,7 @@ getchar_unlocked (void) { return _IO_getc_unlocked (stdin); } -# endif /* POSIX || misc */ +# endif /* POSIX */ /* Write a character to stdout. */ @@ -92,7 +92,7 @@ fputc_unlocked (int __c, FILE *__stream) # endif /* misc */ -# if defined __USE_POSIX || defined __USE_MISC +# ifdef __USE_POSIX /* This is defined in POSIX.1:1996. */ __STDIO_INLINE int putc_unlocked (int __c, FILE *__stream) @@ -106,7 +106,7 @@ putchar_unlocked (int __c) { return _IO_putc_unlocked (__c, stdout); } -# endif /* POSIX || misc */ +# endif /* POSIX */ # ifdef __USE_GNU diff --git a/libio/bits/stdio2.h b/libio/bits/stdio2.h index 305620688a..7cb6e51b85 100644 --- a/libio/bits/stdio2.h +++ b/libio/bits/stdio2.h @@ -47,7 +47,7 @@ __NTH (vsprintf (char *__restrict __s, const char *__restrict __fmt, __bos (__s), __fmt, __ap); } -#if defined __USE_MISC || defined __USE_ISOC99 || defined __USE_UNIX98 +#if defined __USE_ISOC99 || defined __USE_UNIX98 extern int __snprintf_chk (char *__restrict __s, size_t __n, int __flag, size_t __slen, const char *__restrict __format, diff --git a/libio/stdio.h b/libio/stdio.h index 90a253f209..d8c0bdbab7 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -47,8 +47,8 @@ __BEGIN_NAMESPACE_STD /* The opaque type of streams. This is the definition used elsewhere. */ typedef struct _IO_FILE FILE; __END_NAMESPACE_STD -#if defined __USE_LARGEFILE64 || defined __USE_MISC || defined __USE_POSIX \ - || defined __USE_MISC || defined __USE_ISOC99 || defined __USE_XOPEN \ +#if defined __USE_LARGEFILE64 || defined __USE_POSIX \ + || defined __USE_ISOC99 || defined __USE_XOPEN \ || defined __USE_POSIX2 __USING_NAMESPACE_STD(FILE) #endif @@ -380,7 +380,7 @@ extern int vsprintf (char *__restrict __s, const char *__restrict __format, _G_va_list __arg) __THROWNL; __END_NAMESPACE_STD -#if defined __USE_MISC || defined __USE_ISOC99 || defined __USE_UNIX98 +#if defined __USE_ISOC99 || defined __USE_UNIX98 __BEGIN_NAMESPACE_C99 /* Maximum chars of output to write in MAXLEN. */ extern int snprintf (char *__restrict __s, size_t __maxlen, @@ -542,14 +542,14 @@ __END_NAMESPACE_STD optimization for it. */ #define getc(_fp) _IO_getc (_fp) -#if defined __USE_POSIX || defined __USE_MISC +#ifdef __USE_POSIX /* These are defined in POSIX.1:1996. These functions are possible cancellation points and therefore not marked with __THROW. */ extern int getc_unlocked (FILE *__stream); extern int getchar_unlocked (void); -#endif /* Use POSIX or MISC. */ +#endif /* Use POSIX. */ #ifdef __USE_MISC /* Faster version when locking is not necessary. @@ -594,14 +594,14 @@ __END_NAMESPACE_STD extern int fputc_unlocked (int __c, FILE *__stream); #endif /* Use MISC. */ -#if defined __USE_POSIX || defined __USE_MISC +#ifdef __USE_POSIX /* These are defined in POSIX.1:1996. These functions are possible cancellation points and therefore not marked with __THROW. */ extern int putc_unlocked (int __c, FILE *__stream); extern int putchar_unlocked (int __c); -#endif /* Use POSIX or MISC. */ +#endif /* Use POSIX. */ #if defined __USE_MISC \ @@ -864,7 +864,7 @@ extern int fileno_unlocked (FILE *__stream) __THROW __wur; #endif -#if defined __USE_POSIX2 || defined __USE_MISC +#ifdef __USE_POSIX2 /* Create a new stream connected to a pipe running the given command. This function is a possible cancellation point and therefore not @@ -905,7 +905,7 @@ extern int obstack_vprintf (struct obstack *__restrict __obstack, #endif /* Use GNU. */ -#if defined __USE_POSIX || defined __USE_MISC +#ifdef __USE_POSIX /* These are defined in POSIX.1:1996. */ /* Acquire ownership of STREAM. */ @@ -917,7 +917,7 @@ extern int ftrylockfile (FILE *__stream) __THROW __wur; /* Relinquish the ownership granted for STREAM. */ extern void funlockfile (FILE *__stream) __THROW; -#endif /* POSIX || misc */ +#endif /* POSIX */ #if defined __USE_XOPEN && !defined __USE_XOPEN2K && !defined __USE_GNU /* The X/Open standard requires some functions and variables to be |