diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-06-21 16:46:16 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-06-21 16:46:16 +0000 |
| commit | f042f18f936c0ebe2ece3dcdeb657a833dba5bb0 (patch) | |
| tree | 6026e179df3233daccb297a8861c654c1ec4d5db /include/features.h | |
| parent | ae8b36f7ec9f3e8f7a6f52154b3e92669e8681a5 (diff) | |
| download | glibc-f042f18f936c0ebe2ece3dcdeb657a833dba5bb0.tar.gz | |
Update.
1999-06-21 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* libio/Makefile (routines): Add putwchar and putwchar_u.
* libio/putwchar.c: Include <wchar.h> instead of "stdio.h".
* libio/putwchar_u.c: Likewise. Use _IO_stdout instead of
stdout. Fix parameter name.
* libio/getchar.c: Consistently use _IO_stdin instead of stdin.
* libio/getchar_u.c: Likewise.
* libio/putchar_u.c: Use _IO_stdout instead of stdout.
1999-06-21 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* include/features.h (__GNUC_PREREQ): Don't generate `defined' via
macro expansion---it's undefined. Properly parenthesize
substituted parameters.
(__GLIBC_PREREQ): Likewise.
Diffstat (limited to 'include/features.h')
| -rw-r--r-- | include/features.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/features.h b/include/features.h index 88be470025..f04184ac12 100644 --- a/include/features.h +++ b/include/features.h @@ -251,10 +251,15 @@ #endif Note - they won't work for gcc1 or glibc1, since the _MINOR macros were not defined then. */ -#define __GNUC_PREREQ(maj,min) (defined __GNUC__ && defined __GNUC_MINOR__ \ - && ((__GNUC__ << 16) + __GNUC_MINOR__) >= ((maj<<16) + min)) -#define __GLIBC_PREREQ(maj,min) (defined __GLIBC__ && defined __GLIBC_MINOR__ \ - && ((__GLIBC__ << 16) + __GLIBC_MINOR__) >= ((maj<<16) + min)) +#if defined __GNUC__ && defined __GNUC_MINOR__ +# define __GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +#else +# define __GNUC_PREREQ(maj, min) 0 +#endif + +#define __GLIBC_PREREQ(maj, min) \ + ((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min)) /* This is here only because every header file already includes this one. */ #ifndef __ASSEMBLER__ |