aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog61
-rw-r--r--INTERFACE280
-rw-r--r--PROJECTS2
-rw-r--r--bits/mathdef.h6
-rw-r--r--include/features.h22
-rw-r--r--libio/stdio.h4
-rw-r--r--manual/arith.texi36
-rw-r--r--manual/charset.texi2
-rw-r--r--manual/math.texi28
-rw-r--r--manual/startup.texi2
-rw-r--r--manual/stdio.texi18
-rw-r--r--manual/string.texi2
-rw-r--r--manual/time.texi2
-rw-r--r--math/bits/mathcalls.h24
-rw-r--r--math/libm-test.inc4
-rw-r--r--math/math.h22
-rw-r--r--math/test-fenv.c2
-rw-r--r--math/w_lgamma.c2
-rw-r--r--math/w_lgammaf.c2
-rw-r--r--math/w_lgammal.c2
-rw-r--r--stdio/stdio.h4
-rw-r--r--stdlib/stdlib.h28
-rw-r--r--sysdeps/alpha/fpu/bits/mathdef.h6
-rw-r--r--sysdeps/alpha/fpu/bits/mathinline.h6
-rw-r--r--sysdeps/arm/bits/huge_val.h6
-rw-r--r--sysdeps/generic/bits/mathdef.h6
-rw-r--r--sysdeps/generic/printf_fphex.c2
-rw-r--r--sysdeps/i386/bits/huge_val.h6
-rw-r--r--sysdeps/i386/fpu/bits/mathdef.h6
-rw-r--r--sysdeps/i386/fpu/bits/mathinline.h14
-rw-r--r--sysdeps/ieee754/bits/huge_val.h6
-rw-r--r--sysdeps/ieee754/ldbl-128/printf_fphex.c2
-rw-r--r--sysdeps/ieee754/ldbl-96/printf_fphex.c2
-rw-r--r--sysdeps/m68k/bits/huge_val.h6
-rw-r--r--sysdeps/m68k/fpu/bits/mathdef.h6
-rw-r--r--sysdeps/m68k/fpu/bits/mathinline.h32
-rw-r--r--sysdeps/powerpc/bits/mathdef.h6
-rw-r--r--sysdeps/powerpc/bits/mathinline.h10
-rw-r--r--sysdeps/powerpc/fpu/bits/mathdef.h88
-rw-r--r--sysdeps/powerpc/fpu/bits/mathinline.h88
-rw-r--r--sysdeps/sparc/fpu/bits/mathdef.h4
-rw-r--r--sysdeps/sparc/fpu/bits/mathinline.h10
-rw-r--r--sysdeps/sparc/sparc32/fpu/bits/huge_val.h6
-rw-r--r--wcsmbs/wchar.h8
44 files changed, 560 insertions, 321 deletions
diff --git a/ChangeLog b/ChangeLog
index c31c10c..0b79564 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,64 @@
+1999-10-31 Ulrich Drepper <drepper@cygnus.com>
+
+ * includes/features.h: Replace __USE_ISOC9X by __USE_ISOC99 and also
+ recognize _ISOC99_SOURCE.
+ * libio/stdio.h: Likewise.
+ * math/math.h: Likewise.
+ * math/bits/mathcalls.h: Likewise.
+ * math/stdio.h: Likewise.
+ * stdlib/stdlib.h: Likewise.
+ * sysdeps/alpha/fpu/bits/mathdef.h: Likewise.
+ * sysdeps/alpha/fpu/bits/mathinline.h: Likewise.
+ * sysdeps/arm/bits/huge_val.h: Likewise.
+ * sysdeps/generic/bits/mathdef.h: Likewise.
+ * sysdeps/i386/bits/huge_val.h: Likewise.
+ * sysdeps/i386/fpu/bits/mathdef.h: Likewise.
+ * sysdeps/i386/fpu/bits/mathinline.h: Likewise.
+ * sysdeps/ieee754/bits/huge_val.h: Likewise.
+ * sysdeps/m68k/bits/huge_val.h: Likewise.
+ * sysdeps/m68k/fpu/bits/mathdef.h: Likewise.
+ * sysdeps/m68k/fpu/bits/mathinline.h: Likewise.
+ * sysdeps/powerpc/bits/mathdef.h: Likewise.
+ * sysdeps/powerpc/bits/mathinline.h: Likewise.
+ * sysdeps/sparc/fpu/bits/mathdef.h: Likewise.
+ * sysdeps/sparc/fpu/bits/mathinline.h: Likewise.
+ * sysdeps/sparc/sparc32/fpu/bits/huge_val.h: Likewise.
+ * wcsmbs/wchar.h: Likewise.
+
+ * sysdeps/powerpc/bits/mathdef.h: Moved to...
+ * sysdeps/powerpc/fpu/bits/mathdef.h: ...here.
+ * sysdeps/powerpc/bits/mathinline.h: Moved to...
+ * sysdeps/powerpc/fpu/bits/mathinline.h: ...here.
+
+1999-10-31 Andreas Jaeger <aj@suse.de>
+
+ * manual/math.texi (Errors in Math Functions): Correct TeX code.
+
+1999-10-31 Andreas Jaeger <aj@suse.de>
+
+ * math/libm-test.inc: Change comments to use ISO C99 instead of
+ ISO C9x.
+ * math/w_lgamma.c: Likewise.
+ * math/w_lgammaf.c: Likewise.
+ * math/w_lgammal.c: Likewise.
+ * math/test-fenv.c: Likewise.
+ * sysdeps/ieee754/ldbl-96/printf_fphex.c: Likewise.
+ * sysdeps/ieee754/ldbl-128/printf_fphex.c: Likewise.
+ * sysdeps/generic/printf_fphex.c: Likewise.
+
+1999-10-31 Andreas Jaeger <aj@suse.de>
+
+ * manual/arith.texi (Parsing of Floats): Remove C from ISO C comment.
+
+ * manual/math.texi: Change ISO C9x to ISO C99.
+ * manual/startup.texi: Likewise.
+ * manual/stdio.texi: Likewise.
+
+1999-10-31 Andreas Jaeger <aj@suse.de>
+
+ * manual/arith.texi: Change ISO C9x to ISO C99.
+ * manual/time.texi (Low-Level Time String Parsing): Likewise.
+
1999-10-30 Ulrich Drepper <drepper@cygnus.com>
* socket/Makefile (distribute): Add ifreq.h.
diff --git a/INTERFACE b/INTERFACE
index 7607d78..82302c1 100644
--- a/INTERFACE
+++ b/INTERFACE
@@ -90,32 +90,32 @@ bzero bzero
cabs cabs
cabsf cabsf
cabsl cabsl
- > cacos NEW: ISO C 9x
- > cacosf NEW: ISO C 9x
- > cacosh NEW: ISO C 9x
- > cacoshf NEW: ISO C 9x
- > cacoshl NEW: ISO C 9x
- > cacosl NEW: ISO C 9x
+ > cacos NEW: ISO C99
+ > cacosf NEW: ISO C99
+ > cacosh NEW: ISO C99
+ > cacoshf NEW: ISO C99
+ > cacoshl NEW: ISO C99
+ > cacosl NEW: ISO C99
calloc calloc
callrpc callrpc
canonicalize_file_name canonicalize_file_name
> capget NEW: kernel
> capset NEW: kernel
- > carg NEW: ISO C 9x
- > cargf NEW: ISO C 9x
- > cargl NEW: ISO C 9x
- > casin NEW: ISO C 9x
- > casinf NEW: ISO C 9x
- > casinh NEW: ISO C 9x
- > casinhf NEW: ISO C 9x
- > casinhl NEW: ISO C 9x
- > casinl NEW: ISO C 9x
- > catan NEW: ISO C 9x
- > catanf NEW: ISO C 9x
- > catanh NEW: ISO C 9x
- > catanhf NEW: ISO C 9x
- > catanhl NEW: ISO C 9x
- > catanl NEW: ISO C 9x
+ > carg NEW: ISO C99
+ > cargf NEW: ISO C99
+ > cargl NEW: ISO C99
+ > casin NEW: ISO C99
+ > casinf NEW: ISO C99
+ > casinh NEW: ISO C99
+ > casinhf NEW: ISO C99
+ > casinhl NEW: ISO C99
+ > casinl NEW: ISO C99
+ > catan NEW: ISO C99
+ > catanf NEW: ISO C99
+ > catanh NEW: ISO C99
+ > catanhf NEW: ISO C99
+ > catanhl NEW: ISO C99
+ > catanl NEW: ISO C99
catclose catclose
catgets catgets
catopen catopen
@@ -123,18 +123,18 @@ catopen catopen
cbrt cbrt
cbrtf cbrtf
cbrtl cbrtl
- > ccos NEW: ISO C 9x
- > ccosf NEW: ISO C 9x
- > ccosh NEW: ISO C 9x
- > ccoshf NEW: ISO C 9x
- > ccoshl NEW: ISO C 9x
- > ccosl NEW: ISO C 9x
+ > ccos NEW: ISO C99
+ > ccosf NEW: ISO C99
+ > ccosh NEW: ISO C99
+ > ccoshf NEW: ISO C99
+ > ccoshl NEW: ISO C99
+ > ccosl NEW: ISO C99
ceil ceil
ceilf ceilf
ceill ceill
- > cexp NEW: ISO C 9x
- > cexpf NEW: ISO C 9x
- > cexpl NEW: ISO C 9x
+ > cexp NEW: ISO C99
+ > cexpf NEW: ISO C99
+ > cexpl NEW: ISO C99
cfgetispeed cfgetispeed
cfgetospeed cfgetospeed
cfmakeraw cfmakeraw
@@ -147,9 +147,9 @@ chflags chflags
chmod chmod
chown chown
chroot chroot
- > cimag NEW: ISO C 9x
- > cimagf NEW: ISO C 9x
- > cimagl NEW: ISO C 9x
+ > cimag NEW: ISO C99
+ > cimagf NEW: ISO C99
+ > cimagl NEW: ISO C99
clearenv clearenv
clearerr clearerr
clearerr_locked < REMOVED
@@ -168,20 +168,20 @@ clntudp_bufcreate clntudp_bufcreate
clntudp_create clntudp_create
> clntunix_create NEW: sunrpc ext
clock clock
- > clog NEW: ISO C 9x
- > clog10 NEW: ISO C 9x
- > clog10f NEW: ISO C 9x
- > clog10l NEW: ISO C 9x
- > clogf NEW: ISO C 9x
- > clogl NEW: ISO C 9x
+ > clog NEW: ISO C99
+ > clog10 NEW: ISO C99
+ > clog10f NEW: ISO C99
+ > clog10l NEW: ISO C99
+ > clogf NEW: ISO C99
+ > clogl NEW: ISO C99
clone clone
close close
closedir closedir
closelog closelog
confstr confstr
- > conj NEW: ISO C 9x
- > conjf NEW: ISO C 9x
- > conjl NEW: ISO C 9x
+ > conj NEW: ISO C99
+ > conjf NEW: ISO C99
+ > conjl NEW: ISO C99
connect connect
copysign copysign
copysignf copysignf
@@ -192,33 +192,33 @@ cosh cosh
coshf coshf
coshl coshl
cosl cosl
- > cpow NEW: ISO C 9x
- > cpowf NEW: ISO C 9x
- > cpowl NEW: ISO C 9x
- > cproj NEW: ISO C 9x
- > cprojf NEW: ISO C 9x
- > cprojl NEW: ISO C 9x
- > creal NEW: ISO C 9x
- > crealf NEW: ISO C 9x
- > creall NEW: ISO C 9x
+ > cpow NEW: ISO C99
+ > cpowf NEW: ISO C99
+ > cpowl NEW: ISO C99
+ > cproj NEW: ISO C99
+ > cprojf NEW: ISO C99
+ > cprojl NEW: ISO C99
+ > creal NEW: ISO C99
+ > crealf NEW: ISO C99
+ > creall NEW: ISO C99
creat creat
> creat64 NEW: LFS
create_module create_module
- > csin NEW: ISO C 9x
- > csinf NEW: ISO C 9x
- > csinh NEW: ISO C 9x
- > csinhf NEW: ISO C 9x
- > csinhl NEW: ISO C 9x
- > csinl NEW: ISO C 9x
- > csqrt NEW: ISO C 9x
- > csqrtf NEW: ISO C 9x
- > csqrtl NEW: ISO C 9x
- > ctan NEW: ISO C 9x
- > ctanf NEW: ISO C 9x
- > ctanh NEW: ISO C 9x
- > ctanhf NEW: ISO C 9x
- > ctanhl NEW: ISO C 9x
- > ctanl NEW: ISO C 9x
+ > csin NEW: ISO C99
+ > csinf NEW: ISO C99
+ > csinh NEW: ISO C99
+ > csinhf NEW: ISO C99
+ > csinhl NEW: ISO C99
+ > csinl NEW: ISO C99
+ > csqrt NEW: ISO C99
+ > csqrtf NEW: ISO C99
+ > csqrtl NEW: ISO C99
+ > ctan NEW: ISO C99
+ > ctanf NEW: ISO C99
+ > ctanh NEW: ISO C99
+ > ctanhf NEW: ISO C99
+ > ctanhl NEW: ISO C99
+ > ctanl NEW: ISO C99
ctermid ctermid
ctime ctime
ctime_r ctime_r
@@ -300,12 +300,12 @@ execve execve
execvp execvp
exit exit
exp exp
- > exp10 NEW: ISO C 9x
- > exp10f NEW: ISO C 9x
- > exp10l NEW: ISO C 9x
- > exp2 NEW: ISO C 9x
- > exp2f NEW: ISO C 9x
- > exp2l NEW: ISO C 9x
+ > exp10 NEW: ISO C99
+ > exp10f NEW: ISO C99
+ > exp10l NEW: ISO C99
+ > exp2 NEW: ISO C99
+ > exp2f NEW: ISO C99
+ > exp2l NEW: ISO C99
expf expf
expl expl
expm1 expm1
@@ -326,27 +326,27 @@ fcvt fcvt
fcvt_r fcvt_r
fdatasync fdatasync
> fdetach NEW: STREAMS
- > fdim NEW: ISO C 9x
- > fdimf NEW: ISO C 9x
- > fdiml NEW: ISO C 9x
+ > fdim NEW: ISO C99
+ > fdimf NEW: ISO C99
+ > fdiml NEW: ISO C99
fdopen fdopen
- > feclearexcept NEW: ISO C 9x
- > fegetenv NEW: ISO C 9x
- > fegetexceptflag NEW: ISO C 9x
- > fegetround NEW: ISO C 9x
- > feholdexcept NEW: ISO C 9x
+ > feclearexcept NEW: ISO C99
+ > fegetenv NEW: ISO C99
+ > fegetexceptflag NEW: ISO C99
+ > fegetround NEW: ISO C99
+ > feholdexcept NEW: ISO C99
feof feof
feof_locked < REMOVED
feof_unlocked feof_unlocked
- > feraiseexcept NEW: ISO C 9x
+ > feraiseexcept NEW: ISO C99
ferror ferror
ferror_locked < REMOVED
ferror_unlocked ferror_unlocked
- > fesetenv NEW: ISO C 9x
- > fesetexceptflag NEW: ISO C 9x
- > fesetround NEW: ISO C 9x
- > fetestexcept NEW: ISO C 9x
- > feupdateenv NEW: ISO C 9x
+ > fesetenv NEW: ISO C99
+ > fesetexceptflag NEW: ISO C99
+ > fesetround NEW: ISO C99
+ > fetestexcept NEW: ISO C99
+ > feupdateenv NEW: ISO C99
fexecve fexecve
fflush fflush
fflush_locked < REMOVED
@@ -376,15 +376,15 @@ flockfile flockfile
floor floor
floorf floorf
floorl floorl
- > fma NEW: ISO C 9x
- > fmaf NEW: ISO C 9x
- > fmal NEW: ISO C 9x
- > fmax NEW: ISO C 9x
- > fmaxf NEW: ISO C 9x
- > fmaxl NEW: ISO C 9x
- > fmin NEW: ISO C 9x
- > fminf NEW: ISO C 9x
- > fminl NEW: ISO C 9x
+ > fma NEW: ISO C99
+ > fmaf NEW: ISO C99
+ > fmal NEW: ISO C99
+ > fmax NEW: ISO C99
+ > fmaxf NEW: ISO C99
+ > fmaxl NEW: ISO C99
+ > fmin NEW: ISO C99
+ > fminf NEW: ISO C99
+ > fminl NEW: ISO C99
fmod fmod
fmodf fmodf
fmodl fmodl
@@ -732,12 +732,12 @@ link link
listen listen
llabs llabs
lldiv lldiv
- > llrint NEW: ISO C 9x
- > llrintf NEW: ISO C 9x
- > llrintl NEW: ISO C 9x
- > llround NEW: ISO C 9x
- > llroundf NEW: ISO C 9x
- > llroundl NEW: ISO C 9x
+ > llrint NEW: ISO C99
+ > llrintf NEW: ISO C99
+ > llrintl NEW: ISO C99
+ > llround NEW: ISO C99
+ > llroundf NEW: ISO C99
+ > llroundl NEW: ISO C99
llseek llseek
loc1 loc1
loc2 loc2
@@ -753,9 +753,9 @@ log10l log10l
log1p log1p
log1pf log1pf
log1pl log1pl
- > log2 NEW: ISO C 9x
- > log2f NEW: ISO C 9x
- > log2l NEW: ISO C 9x
+ > log2 NEW: ISO C99
+ > log2f NEW: ISO C99
+ > log2l NEW: ISO C99
logb logb
logbf logbf
logbl logbl
@@ -764,12 +764,12 @@ logl logl
longjmp longjmp
lrand48 lrand48
lrand48_r lrand48_r
- > lrint NEW: ISO C 9x
- > lrintf NEW: ISO C 9x
- > lrintl NEW: ISO C 9x
- > lround NEW: ISO C 9x
- > lroundf NEW: ISO C 9x
- > lroundl NEW: ISO C 9x
+ > lrint NEW: ISO C99
+ > lrintf NEW: ISO C99
+ > lrintl NEW: ISO C99
+ > lround NEW: ISO C99
+ > lroundf NEW: ISO C99
+ > lroundl NEW: ISO C99
lsearch lsearch
lseek lseek
> lseek64 NEW: LFS
@@ -836,21 +836,21 @@ munlock munlock
munlockall munlockall
munmap munmap
muntrace muntrace
- > nan NEW: ISO C 9x
- > nanf NEW: ISO C 9x
- > nanl NEW: ISO C 9x
+ > nan NEW: ISO C99
+ > nanf NEW: ISO C99
+ > nanl NEW: ISO C99
nanosleep nanosleep
- > nearbyint NEW: ISO C 9x
- > nearbyintf NEW: ISO C 9x
- > nearbyintl NEW: ISO C 9x
+ > nearbyint NEW: ISO C99
+ > nearbyintf NEW: ISO C99
+ > nearbyintl NEW: ISO C99
> netname2host NEW: Secure RPC
> netname2user NEW: Secure RPC
nextafter nextafter
nextafterf nextafterf
nextafterl nextafterl
- > nexttoward NEW: ISO C 9x
- > nexttowardf NEW: ISO C 9x
- > nexttowardl NEW: ISO C 9x
+ > nexttoward NEW: ISO C99
+ > nexttowardf NEW: ISO C99
+ > nexttowardl NEW: ISO C99
nfsservctl nfsservctl
> nftw NEW: Unix98
> nftw64 NEW: LFS
@@ -1012,9 +1012,9 @@ remainderf remainderf
remainderl remainderl
remove remove
remque remque
- > remquo NEW: ISO C 9x
- > remquof NEW: ISO C 9x
- > remquol NEW: ISO C 9x
+ > remquo NEW: ISO C99
+ > remquof NEW: ISO C99
+ > remquol NEW: ISO C99
rename rename
res_init res_init
revoke revoke
@@ -1027,9 +1027,9 @@ rint rint
rintf rintf
rintl rintl
rmdir rmdir
- > round NEW: ISO C 9x
- > roundf NEW: ISO C 9x
- > roundl NEW: ISO C 9x
+ > round NEW: ISO C99
+ > roundf NEW: ISO C99
+ > roundl NEW: ISO C99
rpc_createerr rpc_createerr
rpmatch rpmatch
rresvport rresvport
@@ -1040,9 +1040,9 @@ sbrk sbrk
scalb scalb
scalbf scalbf
scalbl scalbl
- > scalbln NEW: ISO C 9x
- > scalblnf NEW: ISO C 9x
- > scalblnl NEW: ISO C 9x
+ > scalbln NEW: ISO C99
+ > scalblnf NEW: ISO C99
+ > scalblnl NEW: ISO C99
scalbn scalbn
scalbnf scalbnf
scalbnl scalbnl
@@ -1227,7 +1227,7 @@ strspn strspn
strstr strstr
strtod strtod
strtof strtof
- > strtoimax NEW: ISO C 9x
+ > strtoimax NEW: ISO C99
strtok strtok
strtok_r strtok_r
strtol strtol
@@ -1236,7 +1236,7 @@ strtoll strtoll
strtoq strtoq
strtoul strtoul
strtoull strtoull
- > strtoumax NEW: ISO C 9x
+ > strtoumax NEW: ISO C99
strtouq strtouq
> strverscmp NEW: GNU ext.
strxfrm strxfrm
@@ -1303,9 +1303,9 @@ telldir telldir
tempnam tempnam
textdomain textdomain
tfind tfind
- > tgamma NEW: ISO C 9x
- > tgammaf NEW: ISO C 9x
- > tgammal NEW: ISO C 9x
+ > tgamma NEW: ISO C99
+ > tgammaf NEW: ISO C99
+ > tgammal NEW: ISO C99
time time
timegm timegm
timelocal timelocal
@@ -1322,11 +1322,11 @@ towctrans towctrans
towlower towlower
towupper towupper
tr_break tr_break
- > trunc NEW: ISO C 9x
+ > trunc NEW: ISO C99
truncate truncate
> truncate64 NEW: LFS
- > truncf NEW: ISO C 9x
- > truncl NEW: ISO C 9x
+ > truncf NEW: ISO C99
+ > truncl NEW: ISO C99
tsearch tsearch
ttyname ttyname
ttyname_r ttyname_r
@@ -1409,16 +1409,16 @@ wcsspn wcsspn
wcsstr wcsstr
wcstod wcstod
wcstof wcstof
- > wcstoimax NEW: ISO C 9x
+ > wcstoimax NEW: ISO C99
wcstok wcstok
wcstol wcstol
wcstold wcstold
- > wcstoll NEW: ISO C 9x
+ > wcstoll NEW: ISO C99
wcstombs wcstombs
wcstoq wcstoq
wcstoul wcstoul
- > wcstoull NEW: ISO C 9x
- > wcstoumax NEW: ISO C 9x
+ > wcstoull NEW: ISO C99
+ > wcstoumax NEW: ISO C99
wcstouq wcstouq
> wcswcs NEW: Unix98
wcswidth wcswidth
diff --git a/PROJECTS b/PROJECTS
index 3da9fa4..1969463 100644
--- a/PROJECTS
+++ b/PROJECTS
@@ -53,7 +53,7 @@ contact <bug-glibc@gnu.org>.
with long double arguments.
Beside this most of the complex math functions which are new in
- ISO C 9X should be improved. Writing some of them in assembler is
+ ISO C99 should be improved. Writing some of them in assembler is
useful to exploit the parallelism which often is available.
diff --git a/bits/mathdef.h b/bits/mathdef.h
index 3708781..d306e54 100644
--- a/bits/mathdef.h
+++ b/bits/mathdef.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
# error "Never use <bits/mathdef.h> directly; include <math.h> instead"
#endif
-#if defined __USE_ISOC9X && defined _MATH_H
+#if defined __USE_ISOC99 && defined _MATH_H
/* Normally, there is no long double type and the `float' and `double'
expressions are evaluated as `double'. */
typedef double float_t; /* `float' expressions are evaluated as
@@ -42,7 +42,7 @@ typedef double double_t; /* `double' expressions are evaluated as
/* Number of decimal digits for the `double' type. */
# define DECIMAL_DIG 15
-#endif /* ISO C 9X */
+#endif /* ISO C99 */
#ifndef __NO_LONG_DOUBLE_MATH
/* Signal that we do not really have a `long double'. The disables the
diff --git a/include/features.h b/include/features.h
index 1189e3e..a3e5c14 100644
--- a/include/features.h
+++ b/include/features.h
@@ -23,7 +23,7 @@
to specify the desired environment:
__STRICT_ANSI__ ISO Standard C.
- _ISOC9X_SOURCE Extensions to ISO C 89 from ISO C 9x.
+ _ISOC99_SOURCE Extensions to ISO C89 from ISO C99.
_POSIX_SOURCE IEEE Std 1003.1.
_POSIX_C_SOURCE If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
if >=199309L, add IEEE Std 1003.1b-1993;
@@ -49,7 +49,7 @@
These are defined by this file and are used by the
header files to decide what to declare or define:
- __USE_ISOC9X Define ISO C 9X things.
+ __USE_ISOC99 Define ISO C99 things.
__USE_POSIX Define IEEE Std 1003.1 things.
__USE_POSIX2 Define IEEE Std 1003.2 things.
__USE_POSIX199309 Define IEEE Std 1003.1, and .1b things.
@@ -79,7 +79,7 @@
/* Undefine everything, so we get a clean slate. */
-#undef __USE_ISOC9X
+#undef __USE_ISOC99
#undef __USE_POSIX
#undef __USE_POSIX2
#undef __USE_POSIX199309
@@ -118,8 +118,8 @@
/* If _GNU_SOURCE was defined by the user, turn on all the other features. */
#ifdef _GNU_SOURCE
-# undef _ISOC9X_SOURCE
-# define _ISOC9X_SOURCE 1
+# undef _ISOC99_SOURCE
+# define _ISOC99_SOURCE 1
# undef _POSIX_SOURCE
# define _POSIX_SOURCE 1
# undef _POSIX_C_SOURCE
@@ -138,7 +138,7 @@
/* If nothing (other than _GNU_SOURCE) is defined,
define _BSD_SOURCE and _SVID_SOURCE. */
-#if (!defined __STRICT_ANSI__ && !defined _ISOC9X_SOURCE && \
+#if (!defined __STRICT_ANSI__ && !defined _ISOC99_SOURCE && \
!defined _POSIX_SOURCE && !defined _POSIX_C_SOURCE && \
!defined _XOPEN_SOURCE && !defined _XOPEN_SOURCE_EXTENDED && \
!defined _BSD_SOURCE && !defined _SVID_SOURCE)
@@ -146,10 +146,12 @@
# define _SVID_SOURCE 1
#endif
-/* This is to enable the ISO C 9x extension. It will go away as soon
- as this standard is officially released. */
-#ifdef _ISOC9X_SOURCE
-# define __USE_ISOC9X 1
+/* This is to enable the ISO C99 extension. Also recognize the old macro
+ which was used prior to the standard acceptance. This macro will
+ eventually go away and the features enabled by default once the ISO C99
+ standard is widely adopted. */
+#if defined _ISOC99_SOURCE || defined _ISOC9X_SOURCE
+# define __USE_ISOC99 1
#endif
/* If none of the ANSI/POSIX macros are defined, use POSIX.1 and POSIX.2
diff --git a/libio/stdio.h b/libio/stdio.h
index 128713b..91004e5 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -265,7 +265,7 @@ extern int vprintf (__const char *__restrict __format, _G_va_list __arg)
extern int vsprintf (char *__restrict __s, __const char *__restrict __format,
_G_va_list __arg) __THROW;
-#if defined __USE_BSD || defined __USE_ISOC9X || defined __USE_UNIX98
+#if defined __USE_BSD || defined __USE_ISOC99 || defined __USE_UNIX98
/* Maximum chars of output to write in MAXLEN. */
extern int snprintf (char *__restrict __s, size_t __maxlen,
__const char *__restrict __format, ...)
@@ -310,7 +310,7 @@ extern int scanf (__const char *__restrict __format, ...) __THROW;
extern int sscanf (__const char *__restrict __s,
__const char *__restrict __format, ...) __THROW;
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
/* Read formatted input from S into argument list ARG. */
extern int vfscanf (FILE *__restrict __s, __const char *__restrict __format,
_G_va_list __arg)
diff --git a/manual/arith.texi b/manual/arith.texi
index 11479d6..0dae46c 100644
--- a/manual/arith.texi
+++ b/manual/arith.texi
@@ -68,7 +68,7 @@ and @dfn{not a number} (NaN).
@cindex classes, floating-point
@pindex math.h
-@w{ISO C 9x} defines macros that let you determine what sort of
+@w{ISO C99} defines macros that let you determine what sort of
floating-point number a variable holds.
@comment math.h
@@ -145,7 +145,7 @@ to
Another set of floating-point classification functions was provided by
BSD. The GNU C library also supports these functions; however, we
-recommend that you use the C9x macros in new code. Those are standard
+recommend that you use the ISO C99 macros in new code. Those are standard
and will be available more widely. Also, since they are macros, you do
not have to worry about the type of their argument.
@@ -174,7 +174,7 @@ This function returns @code{-1} if @var{x} represents negative infinity,
This function returns a nonzero value if @var{x} is a ``not a number''
value, and zero otherwise.
-@strong{Note:} The @code{isnan} macro defined by @w{ISO C 9x} overrides
+@strong{Note:} The @code{isnan} macro defined by @w{ISO C99} overrides
the BSD function. This is normally not a problem, because the two
routines behave identically. However, if you really need to get the BSD
function for some reason, you can write
@@ -407,7 +407,7 @@ You can test whether a floating-point value is infinite by comparing it
to this macro. However, this is not recommended; you should use the
@code{isfinite} macro instead. @xref{Floating Point Classes}.
-This macro was introduced in the @w{ISO C 9X} standard.
+This macro was introduced in the @w{ISO C99} standard.
@end deftypevr
@comment math.h
@@ -434,7 +434,7 @@ calculations, unless you explicitly test the sign bit with
@node Status bit operations
@subsection Examining the FPU status word
-@w{ISO C 9x} defines functions to query and manipulate the
+@w{ISO C99} defines functions to query and manipulate the
floating-point status word. You can use these functions to check for
untrapped exceptions when it's convenient, rather than worrying about
them in the middle of a calculation.
@@ -848,7 +848,7 @@ Most computers use a two's complement integer representation, in which
the absolute value of @code{INT_MIN} (the smallest possible @code{int})
cannot be represented; thus, @w{@code{abs (INT_MIN)}} is not defined.
-@code{llabs} and @code{imaxdiv} are new to @w{ISO C 9x}.
+@code{llabs} and @code{imaxdiv} are new to @w{ISO C99}.
@end deftypefun
@comment math.h
@@ -1271,7 +1271,7 @@ This function is another name for @code{drem}.
@cindex FP arithmetic
There are some operations that are too complicated or expensive to
-perform by hand on floating-point numbers. @w{ISO C 9x} defines
+perform by hand on floating-point numbers. @w{ISO C99} defines
functions to do these operations, which mostly involve changing single
bits.
@@ -1380,7 +1380,7 @@ int v = a < 1.0;
will raise an exception if @var{a} is NaN. (This does @emph{not}
happen with @code{==} and @code{!=}; those merely return false and true,
respectively, when NaN is examined.) Frequently this exception is
-undesirable. @w{ISO C 9x} therefore defines comparison functions that
+undesirable. @w{ISO C99} therefore defines comparison functions that
do not raise exceptions when NaN is examined. All of the functions are
implemented as macros which allow their arguments to be of any
floating-point type. The macros are guaranteed to evaluate their
@@ -1545,7 +1545,7 @@ hardware.
@pindex complex.h
@cindex complex numbers
-@w{ISO C 9x} introduces support for complex numbers in C. This is done
+@w{ISO C99} introduces support for complex numbers in C. This is done
with a new type qualifier, @code{complex}. It is a keyword if and only
if @file{complex.h} has been included. There are three complex types,
corresponding to the three real types: @code{float complex},
@@ -1634,7 +1634,7 @@ clever compiler to get the same results.
@cindex decompose complex numbers
@pindex complex.h
-@w{ISO C 9x} also defines functions that perform basic operations on
+@w{ISO C99} also defines functions that perform basic operations on
complex numbers, such as decomposition and conjugation. The prototypes
for all these functions are in @file{complex.h}. All functions are
available in three variants, one for each of the three complex types.
@@ -1821,7 +1821,7 @@ The @code{lldiv} function is like the @code{div} function, but the
arguments are of type @code{long long int} and the result is returned as
a structure of type @code{lldiv_t}.
-The @code{lldiv} function was added in @w{ISO C 9x}.
+The @code{lldiv} function was added in @w{ISO C99}.
@end deftypefun
@comment inttypes.h
@@ -1849,7 +1849,7 @@ The @code{imaxdiv} function is like the @code{div} function, but the
arguments are of type @code{intmax_t} and the result is returned as
a structure of type @code{imaxdiv_t}.
-The @code{imaxdiv} function was added in @w{ISO C 9x}.
+The @code{imaxdiv} function was added in @w{ISO C99}.
@end deftypefun
@@ -1969,7 +1969,7 @@ representable because of overflow, @code{strtoll} returns either
appropriate for the sign of the value. It also sets @code{errno} to
@code{ERANGE} to indicate there was overflow.
-The @code{strtoll} function was introduced in @w{ISO C 9x}.
+The @code{strtoll} function was introduced in @w{ISO C99}.
@end deftypefun
@comment stdlib.h
@@ -1985,7 +1985,7 @@ The @code{strtoull} function is like @code{strtoul} except that it
returns an @code{unsigned long long int}. The value returned on overflow
is @code{ULONG_LONG_MAX} (@pxref{Range of Type}).
-The @code{strtoull} function was introduced in @w{ISO C 9x}.
+The @code{strtoull} function was introduced in @w{ISO C99}.
@end deftypefun
@comment stdlib.h
@@ -2017,7 +2017,7 @@ instead.
This function is similar to @code{atol}, except it returns a @code{long
long int}.
-The @code{atoll} function was introduced in @w{ISO C 9x}. It too is
+The @code{atoll} function was introduced in @w{ISO C99}. It too is
obsolete (despite having just been added); use @code{strtoll} instead.
@end deftypefun
@@ -2166,10 +2166,10 @@ examining @var{errno} and @var{tailptr}.
@end deftypefun
@comment stdlib.h
-@comment ISO C
+@comment ISO
@deftypefun float strtof (const char *@var{string}, char **@var{tailptr})
@comment stdlib.h
-@comment ISO C
+@comment ISO
@deftypefunx {long double} strtold (const char *@var{string}, char **@var{tailptr})
These functions are analogous to @code{strtod}, but return @code{float}
and @code{long double} values respectively. They report errors in the
@@ -2178,7 +2178,7 @@ than @code{strtod}, but has less precision; conversely, @code{strtold}
can be much slower but has more precision (on systems where @code{long
double} is a separate type).
-These functions have been GNU extensions and are new to @w{ISO C 9x}.
+These functions have been GNU extensions and are new to @w{ISO C99}.
@end deftypefun
@comment stdlib.h
diff --git a/manual/charset.texi b/manual/charset.texi
index 30bc74a..666d0de 100644
--- a/manual/charset.texi
+++ b/manual/charset.texi
@@ -120,7 +120,7 @@ defined as @code{char} the type @code{wint_t} must be defined as
@pindex wchar.h
This type is defined in @file{wchar.h} and got introduced in the second
-amendment to @w{ISO C 89}.
+amendment to @w{ISO C89}.
@end deftp
As there are for the @code{char} data type there also exist macros
diff --git a/manual/math.texi b/manual/math.texi
index c9a4c3a..d834fde 100644
--- a/manual/math.texi
+++ b/manual/math.texi
@@ -42,8 +42,8 @@ these functions have prototypes declared in the header file
All mathematical functions which take a floating-point argument
have three variants, one each for @code{double}, @code{float}, and
@code{long double} arguments. The @code{double} versions are mostly
-defined in @w{ISO C 89}. The @code{float} and @code{long double}
-versions are from the numeric extensions to C included in @w{ISO C 9X}.
+defined in @w{ISO C89}. The @code{float} and @code{long double}
+versions are from the numeric extensions to C included in @w{ISO C99}.
Which of the three versions of a function should be used depends on the
situation. For most calculations, the @code{float} functions are the
@@ -216,11 +216,11 @@ to cope with its absence.
@cindex complex trigonometric functions
-@w{ISO C 9x} defines variants of the trig functions which work on
+@w{ISO C99} defines variants of the trig functions which work on
complex numbers. The GNU C library provides these functions, but they
are only useful if your compiler supports the new complex types defined
by the standard.
-@c Change this when gcc is fixed. -zw
+@c XXX Change this when gcc is fixed. -zw
(As of this writing GCC supports complex numbers, but there are bugs in
the implementation.)
@@ -377,7 +377,7 @@ If both @var{x} and @var{y} are zero, @code{atan2} returns zero.
@end deftypefun
@cindex inverse complex trigonometric functions
-@w{ISO C 9x} defines complex versions of the inverse trig functions.
+@w{ISO C99} defines complex versions of the inverse trig functions.
@comment complex.h
@comment ISO
@@ -575,7 +575,7 @@ number. @file{math.h} defines constants so you can check for this.
@code{ilogb} returns this value if its argument is @code{0}. The
numeric value is either @code{INT_MIN} or @code{-INT_MAX}.
-This macro is defined in @w{ISO C 9X}.
+This macro is defined in @w{ISO C99}.
@end deftypevr
@comment math.h
@@ -584,7 +584,7 @@ This macro is defined in @w{ISO C 9X}.
@code{ilogb} returns this value if its argument is @code{NaN}. The
numeric value is either @code{INT_MIN} or @code{INT_MAX}.
-This macro is defined in @w{ISO C 9X}.
+This macro is defined in @w{ISO C99}.
@end deftypevr
These values are system specific. They might even be the same. The
@@ -707,7 +707,7 @@ near zero.
@cindex complex exponentiation functions
@cindex complex logarithm functions
-@w{ISO C 9X} defines complex variants of some of the exponentiation and
+@w{ISO C99} defines complex variants of some of the exponentiation and
logarithm functions.
@comment complex.h
@@ -1094,17 +1094,17 @@ instead of in the @var{signgam} global. This means it is reentrant.
These functions exist for compatibility reasons. They are equivalent to
@code{lgamma} etc. It is better to use @code{lgamma} since for one the
name reflects better the actual computation, moreover @code{lgamma} is
-standardized in @w{ISO C 9x} while @code{gamma} is not.
+standardized in @w{ISO C99} while @code{gamma} is not.
@end deftypefun
@comment math.h
-@comment XPG
+@comment XPG, ISO
@deftypefun double tgamma (double @var{x})
@comment math.h
-@comment XPG
+@comment XPG, ISO
@deftypefunx float tgammaf (float @var{x})
@comment math.h
-@comment XPG
+@comment XPG, ISO
@deftypefunx {long double} tgammal (long double @var{x})
@code{tgamma} applies the gamma function to @var{x}. The gamma
function is defined as
@@ -1117,7 +1117,7 @@ gamma (x) = integral from 0 to @infinity{} of t^(x-1) e^-t dt
@end smallexample
@end ifnottex
-This function was introduced in @w{ISO C 9x}.
+This function was introduced in @w{ISO C99}.
@end deftypefun
@comment math.h
@@ -1216,7 +1216,7 @@ representation @math{d.d@dots{}d@mul{}2^e} (we assume IEEE
floating-point numbers with base 2) the ULP is represented by
@tex
-$$\frac{|{\mathrm d.d\dots d - (z/2^e)|}{2^{p-1}}$$
+$${|d.d\dots d - (z/2^e)|}\over {2^{p-1}}$$
@end tex
@ifnottex
@smallexample
diff --git a/manual/startup.texi b/manual/startup.texi
index c8a5259..0e45c2e 100644
--- a/manual/startup.texi
+++ b/manual/startup.texi
@@ -792,7 +792,7 @@ The @w{ISO C} committee members were not sure whether the definitions of
@code{_exit} and @code{_Exit} were compatible so they have not used the
POSIX name.
-This function was introduced in @w{ISO C9x} and is declared in
+This function was introduced in @w{ISO C99} and is declared in
@file{stdlib.h}.
@end deftypefun
diff --git a/manual/stdio.texi b/manual/stdio.texi
index ddae15f..882494c 100644
--- a/manual/stdio.texi
+++ b/manual/stdio.texi
@@ -1193,7 +1193,7 @@ char}, as appropriate. A @code{char} argument is converted to an
anyway, but the @samp{h} modifier says to convert it back to a
@code{char} again.
-This modifier was introduced in @w{ISO C 9x}.
+This modifier was introduced in @w{ISO C99}.
@item h
Specifies that the argument is a @code{short int} or @code{unsigned
@@ -1206,7 +1206,7 @@ anyway, but the @samp{h} modifier says to convert it back to a
Specifies that the argument is a @code{intmax_t} or @code{uintmax_t}, as
appropriate.
-This modifier was introduced in @w{ISO C 9x}.
+This modifier was introduced in @w{ISO C99}.
@item l
Specifies that the argument is a @code{long int} or @code{unsigned long
@@ -1227,13 +1227,13 @@ from 4.4 BSD; a @w{@code{long long int}} is sometimes called a ``quad''
@item t
Specifies that the argument is a @code{ptrdiff_t}.
-This modifier was introduced in @w{ISO C 9x}.
+This modifier was introduced in @w{ISO C99}.
@item z
@itemx Z
Specifies that the argument is a @code{size_t}.
-@samp{z} was introduced in @w{ISO C 9x}. @samp{Z} is a GNU extension
+@samp{z} was introduced in @w{ISO C99}. @samp{Z} is a GNU extension
predating this addition and should not be used in new code.
@end table
@@ -1624,7 +1624,7 @@ In practice, it is often easier just to use @code{asprintf}, below.
is the number of characters stored, not including the terminating null.
If this value equals @code{@var{size} - 1}, then there was not enough
space in @var{s} for all the output. This change was necessary with
-the adoption of snprintf by ISO C9x.
+the adoption of snprintf by ISO C99.
@end deftypefun
@node Dynamic Output
@@ -2685,7 +2685,7 @@ specify other sizes of integer:
Specifies that the argument is a @code{signed char *} or @code{unsigned
char *}.
-This modifier was introduced in @w{ISO C 9x}.
+This modifier was introduced in @w{ISO C99}.
@item h
Specifies that the argument is a @code{short int *} or @code{unsigned
@@ -2694,7 +2694,7 @@ short int *}.
@item j
Specifies that the argument is a @code{intmax_t *} or @code{uintmax_t *}.
-This modifier was introduced in @w{ISO C 9x}.
+This modifier was introduced in @w{ISO C99}.
@item l
Specifies that the argument is a @code{long int *} or @code{unsigned
@@ -2715,12 +2715,12 @@ from 4.4 BSD; a @w{@code{long long int}} is sometimes called a ``quad''
@item t
Specifies that the argument is a @code{ptrdiff_t *}.
-This modifier was introduced in @w{ISO C 9x}.
+This modifier was introduced in @w{ISO C99}.
@item z
Specifies that the argument is a @code{size_t *}.
-This modifier was introduced in @w{ISO C 9x}.
+This modifier was introduced in @w{ISO C99}.
@end table
All of the @samp{%e}, @samp{%f}, @samp{%g}, @samp{%E}, and @samp{%G}
diff --git a/manual/string.texi b/manual/string.texi
index 8d2a33e..9ae09b9 100644
--- a/manual/string.texi
+++ b/manual/string.texi
@@ -1041,7 +1041,7 @@ sort_strings_fast (char **array, int nstrings)
@end smallexample
@strong{Compatibility Note:} The string collation functions are a new
-feature of @w{ISO C 89}. Older C dialects have no equivalent feature.
+feature of @w{ISO C89}. Older C dialects have no equivalent feature.
@node Search Functions
@section Search Functions
diff --git a/manual/time.texi b/manual/time.texi
index 8d79a25..6298c6b 100644
--- a/manual/time.texi
+++ b/manual/time.texi
@@ -1141,7 +1141,7 @@ Equivalent to the use of @code{%m/%d/%y} in this place.
Equivalent to the use of @code{%Y-%m-%d} which is the @w{ISO 8601} date
format.
-This is a GNU extension following an @w{ISO C 9X} extension to
+This is a GNU extension following an @w{ISO C99} extension to
@code{strftime}.
@item %g
diff --git a/math/bits/mathcalls.h b/math/bits/mathcalls.h
index 97bda45..93dda96 100644
--- a/math/bits/mathcalls.h
+++ b/math/bits/mathcalls.h
@@ -81,7 +81,7 @@ __MATHCALL (sinh,, (_Mdouble_ __x));
/* Hyperbolic tangent of X. */
__MATHCALL (tanh,, (_Mdouble_ __x));
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC9X
+#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
/* Hyperbolic arc cosine of X. */
__MATHCALL (acosh,, (_Mdouble_ __x));
/* Hyperbolic arc sine of X. */
@@ -117,7 +117,7 @@ __MATHCALL (log10,, (_Mdouble_ __x));
/* Break VALUE into integral and fractional parts. */
__MATHCALL (modf,, (_Mdouble_ __x, _Mdouble_ *__iptr));
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC9X
+#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
/* Return exp(X) - 1. */
__MATHCALL (expm1,, (_Mdouble_ __x));
@@ -128,7 +128,7 @@ __MATHCALL (log1p,, (_Mdouble_ __x));
__MATHCALL (logb,, (_Mdouble_ __x));
#endif
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
/* Compute base-2 exponential of X. */
__MATHCALL (exp2,, (_Mdouble_ __x));
@@ -145,12 +145,12 @@ __MATHCALL (pow,, (_Mdouble_ __x, _Mdouble_ __y));
/* Return the square root of X. */
__MATHCALL (sqrt,, (_Mdouble_ __x));
-#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_ISOC9X
+#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_ISOC99
/* Return `sqrt(X*X + Y*Y)'. */
__MATHCALL (hypot,, (_Mdouble_ __x, _Mdouble_ __y));
#endif
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC9X
+#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
/* Return the cube root of X. */
__MATHCALL (cbrt,, (_Mdouble_ __x));
#endif
@@ -202,12 +202,12 @@ __MATHCALL (drem,, (_Mdouble_ __x, _Mdouble_ __y));
__MATHCALL (significand,, (_Mdouble_ __x));
#endif /* Use misc. */
-#if defined __USE_MISC || defined __USE_ISOC9X
+#if defined __USE_MISC || defined __USE_ISOC99
/* Return X with its signed changed to Y's. */
__MATHCALLX (copysign,, (_Mdouble_ __x, _Mdouble_ __y), (__const__));
#endif
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
/* Return representation of NaN for double type. */
__MATHCALLX (nan,, (__const char *__tagb), (__const__));
#endif
@@ -230,7 +230,7 @@ __MATHCALL (yn,, (int, _Mdouble_));
#endif
-#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_ISOC9X
+#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_ISOC99
/* Error and gamma functions. */
__MATHCALL (erf,, (_Mdouble_));
__MATHCALL (erfc,, (_Mdouble_));
@@ -251,14 +251,14 @@ __MATHCALL (lgamma,_r, (_Mdouble_, int *__signgamp));
#endif
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC9X
+#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
/* Return the integer nearest X in the direction of the
prevailing rounding mode. */
__MATHCALL (rint,, (_Mdouble_ __x));
/* Return X + epsilon if X < Y, X - epsilon if X > Y. */
__MATHCALLX (nextafter,, (_Mdouble_ __x, _Mdouble_ __y), (__const__));
-# ifdef __USE_ISOC9X
+# ifdef __USE_ISOC99
__MATHCALLX (nexttoward,, (_Mdouble_ __x, long double __y), (__const__));
# endif
@@ -277,7 +277,7 @@ __MATHCALL (scalbn,, (_Mdouble_ __x, int __n));
__MATHDECL (int,ilogb,, (_Mdouble_ __x));
#endif
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
/* Return X times (2 to the Nth power). */
__MATHCALL (scalbln,, (_Mdouble_ __x, long int __n));
@@ -333,4 +333,4 @@ __MATHDECL_1 (int, __signbit,, (_Mdouble_ __value))
/* Multiply-add function computed as a ternary operation. */
__MATHCALL (fma,, (_Mdouble_ __x, _Mdouble_ __y, _Mdouble_ __z));
-#endif /* Use ISO C 9X. */
+#endif /* Use ISO C99. */
diff --git a/math/libm-test.inc b/math/libm-test.inc
index d2ceb2f..99e2b5a 100644
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -77,7 +77,7 @@
testing. Handling of specific inputs (e.g. infinity, not-a-number)
is also tested. Correct handling of exceptions is checked
against. These implemented tests should check all cases that are
- specified in ISO C 9X.
+ specified in ISO C99.
Exception testing: At the moment only divide-by-zero and invalid
exceptions are tested. Overflow/underflow and inexact exceptions
@@ -3994,7 +3994,7 @@ main (int argc, char **argv)
check_ulp ();
#endif
- /* Keep the tests a wee bit ordered (according to ISO 9X). */
+ /* Keep the tests a wee bit ordered (according to ISO C99). */
/* Classification macros: */
fpclassify_test ();
isfinite_test ();
diff --git a/math/math.h b/math/math.h
index e76b36a..16dd0a5 100644
--- a/math/math.h
+++ b/math/math.h
@@ -33,10 +33,10 @@ __BEGIN_DECLS
#include <bits/huge_val.h>
/* Get machine-dependent NAN value (returned for some domain errors). */
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
# include <bits/nan.h>
#endif
-/* Get general and ISO C 9X specific information. */
+/* Get general and ISO C99 specific information. */
#include <bits/mathdef.h>
@@ -64,7 +64,7 @@ __BEGIN_DECLS
#undef _Mdouble_
#undef __MATH_PRECNAME
-#if defined __USE_MISC || defined __USE_ISOC9X
+#if defined __USE_MISC || defined __USE_ISOC99
/* Include the file of declarations again, this time using `float'
@@ -102,20 +102,20 @@ __BEGIN_DECLS
# endif /* __STDC__ || __GNUC__ */
-#endif /* Use misc or ISO C 9X. */
+#endif /* Use misc or ISO C99. */
#undef __MATHDECL_1
#undef __MATHDECL
#undef __MATHCALL
-#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_ISOC9X
+#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_ISOC99
/* This variable is used by `gamma' and `lgamma'. */
extern int signgam;
#endif
-/* ISO C 9X defines some generic macros which work on any data type. */
-#if __USE_ISOC9X
+/* ISO C99 defines some generic macros which work on any data type. */
+#if __USE_ISOC99
/* Get the architecture specific values describing the floating-point
evaluation. The following symbols will get defined:
@@ -229,7 +229,7 @@ enum
? __isinf (x) : __isinfl (x))
# endif
-#endif /* Use ISO C 9X. */
+#endif /* Use ISO C99. */
#ifdef __USE_MISC
/* Support for various different standard error handling behaviors. */
@@ -239,7 +239,7 @@ typedef enum
_SVID_, /* According to System V, release 4. */
_XOPEN_, /* Nowadays also Unix98. */
_POSIX_,
- _ISOC_ /* Actually this is ISO C 9X. */
+ _ISOC_ /* Actually this is ISO C99. */
} _LIB_VERSION_TYPE;
/* This variable can be changed at run-time to any of the values above to
@@ -349,8 +349,8 @@ extern int matherr (struct exception *__exc);
#endif
-#if __USE_ISOC9X
-/* ISO C 9X defines some macros to compare number while taking care
+#if __USE_ISOC99
+/* ISO C99 defines some macros to compare number while taking care
for unordered numbers. Since many FPUs provide special
instructions to support these operations and these tests are
defined in <bits/mathinline.h>, we define the generic macros at
diff --git a/math/test-fenv.c b/math/test-fenv.c
index 3a5a7ed..3292f81 100644
--- a/math/test-fenv.c
+++ b/math/test-fenv.c
@@ -18,7 +18,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* Tests for ISO C 9X 7.6: Floating-point environment */
+/* Tests for ISO C99 7.6: Floating-point environment */
#ifndef _GNU_SOURCE
# define _GNU_SOURCE
diff --git a/math/w_lgamma.c b/math/w_lgamma.c
index 0cc62a1..4815db6 100644
--- a/math/w_lgamma.c
+++ b/math/w_lgamma.c
@@ -37,7 +37,7 @@ static char rcsid[] = "$NetBSD: w_lgamma.c,v 1.6 1995/05/10 20:49:24 jtc Exp $";
int local_signgam;
y = __ieee754_lgamma_r(x,&local_signgam);
if (_LIB_VERSION != _ISOC_)
- /* ISO C 9x does not define the global variable. */
+ /* ISO C99 does not define the global variable. */
signgam = local_signgam;
if(_LIB_VERSION == _IEEE_) return y;
if(!__finite(y)&&__finite(x)) {
diff --git a/math/w_lgammaf.c b/math/w_lgammaf.c
index 4c64aa4..a50525a 100644
--- a/math/w_lgammaf.c
+++ b/math/w_lgammaf.c
@@ -34,7 +34,7 @@ static char rcsid[] = "$NetBSD: w_lgammaf.c,v 1.3 1995/05/10 20:49:30 jtc Exp $"
int local_signgam;
y = __ieee754_lgammaf_r(x,&local_signgam);
if (_LIB_VERSION != _ISOC_)
- /* ISO C 9x does not define the global variable. */
+ /* ISO C99 does not define the global variable. */
signgam = local_signgam;
if(_LIB_VERSION == _IEEE_) return y;
if(!__finitef(y)&&__finitef(x)) {
diff --git a/math/w_lgammal.c b/math/w_lgammal.c
index 41104e4..328c94e 100644
--- a/math/w_lgammal.c
+++ b/math/w_lgammal.c
@@ -41,7 +41,7 @@ static char rcsid[] = "$NetBSD: $";
int local_signgam;
y = __ieee754_lgammal_r(x,&local_signgam);
if (_LIB_VERSION != _ISOC_)
- /* ISO C 9x does not define the global variable. */
+ /* ISO C99 does not define the global variable. */
signgam = local_signgam;
if(_LIB_VERSION == _IEEE_) return y;
if(!__finitel(y)&&__finitel(x)) {
diff --git a/stdio/stdio.h b/stdio/stdio.h
index 465a80d..3c6674d 100644
--- a/stdio/stdio.h
+++ b/stdio/stdio.h
@@ -419,7 +419,7 @@ vprintf (const char *__restrict __fmt, __gnuc_va_list __arg) __THROW
}
#endif /* Optimizing. */
-#if defined __USE_BSD || defined __USE_ISOC9X
+#if defined __USE_BSD || defined __USE_ISOC99
/* Maximum chars of output to write in MAXLEN. */
extern int __snprintf (char *__s, size_t __maxlen,
__const char *__format, ...)
@@ -466,7 +466,7 @@ extern int scanf (__const char *__restrict __format, ...) __THROW;
extern int sscanf (__const char *__restrict __s,
__const char *__restrict __format, ...) __THROW;
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
/* Read formatted input from S into argument list ARG. */
extern int __vfscanf (FILE *__s, __const char *__format,
__gnuc_va_list __arg) __THROW;
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 30a1083..ac4baba 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -54,7 +54,7 @@ typedef struct
# define __ldiv_t_defined 1
#endif
-#if defined __USE_ISOC9X && !defined __lldiv_t_defined
+#if defined __USE_ISOC99 && !defined __lldiv_t_defined
/* Returned by `lldiv'. */
__extension__ typedef struct
{
@@ -87,8 +87,8 @@ extern int atoi (__const char *__nptr) __THROW;
/* Convert a string to a long integer. */
extern long int atol (__const char *__nptr) __THROW;
-#if defined __USE_ISOC9X || (defined __GNUC__ && defined __USE_MISC)
-/* These functions will part of the standard C library in ISO C 9X. */
+#if defined __USE_ISOC99 || (defined __GNUC__ && defined __USE_MISC)
+/* These functions will part of the standard C library in ISO C99. */
__extension__ extern long long int atoll (__const char *__nptr) __THROW;
#endif
@@ -96,7 +96,7 @@ __extension__ extern long long int atoll (__const char *__nptr) __THROW;
extern double strtod (__const char *__restrict __nptr,
char **__restrict __endptr) __THROW;
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
/* Likewise for `float' and `long double' sizes of floating-point numbers. */
extern float strtof (__const char *__restrict __nptr,
char **__restrict __endptr) __THROW;
@@ -125,8 +125,8 @@ extern unsigned long long int strtouq (__const char *__restrict __nptr,
__THROW;
#endif /* GCC and use BSD. */
-#if defined __USE_ISOC9X || (defined __GNUC__ && defined __USE_MISC)
-/* These functions will part of the standard C library in ISO C 9X. */
+#if defined __USE_ISOC99 || (defined __GNUC__ && defined __USE_MISC)
+/* These functions will part of the standard C library in ISO C99. */
/* Convert a string to a quadword integer. */
__extension__
@@ -137,7 +137,7 @@ __extension__
extern unsigned long long int strtoull (__const char *__restrict __nptr,
char **__restrict __endptr, int __base)
__THROW;
-#endif /* ISO C 9X or GCC and use MISC. */
+#endif /* ISO C99 or GCC and use MISC. */
#ifdef __USE_GNU
@@ -214,7 +214,7 @@ extern unsigned long int __strtoul_internal (__const char *__restrict __nptr,
int __base, int __group) __THROW;
# define __strtoul_internal_defined 1
#endif
-#if defined __GNUC__ || defined __USE_ISOC9X
+#if defined __GNUC__ || defined __USE_ISOC99
# ifndef __strtoll_internal_defined
__extension__
extern long long int __strtoll_internal (__const char *__restrict __nptr,
@@ -255,7 +255,7 @@ strtoul (__const char *__restrict __nptr, char **__restrict __endptr,
return __strtoul_internal (__nptr, __endptr, __base, 0);
}
-# ifdef __USE_ISOC9X
+# ifdef __USE_ISOC99
extern __inline float
strtof (__const char *__restrict __nptr, char **__restrict __endptr) __THROW
{
@@ -283,7 +283,7 @@ strtouq (__const char *__restrict __nptr, char **__restrict __endptr,
}
# endif
-# if defined __USE_MISC || defined __USE_ISOC9X
+# if defined __USE_MISC || defined __USE_ISOC99
__extension__ extern __inline long long int
strtoll (__const char *__restrict __nptr, char **__restrict __endptr,
int __base) __THROW
@@ -314,7 +314,7 @@ atol (__const char *__nptr) __THROW
return strtol (__nptr, (char **) NULL, 10);
}
-# if defined __USE_MISC || defined __USE_ISOC9X
+# if defined __USE_MISC || defined __USE_ISOC99
__extension__ extern __inline long long int
atoll (__const char *__nptr) __THROW
{
@@ -517,7 +517,7 @@ extern int on_exit (void (*__func) (int __status, void *__arg), void *__arg)
perform stdio cleanup, and terminate program execution with STATUS. */
extern void exit (int __status) __THROW __attribute__ ((__noreturn__));
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
/* Terminate the program with STATUS without calling any of the
functions registered with `atexit' or `on_exit'. */
extern void _Exit (int __status) __THROW __attribute__ ((__noreturn__));
@@ -628,7 +628,7 @@ extern void qsort (void *__base, size_t __nmemb, size_t __size,
/* Return the absolute value of X. */
extern int abs (int __x) __THROW __attribute__ ((__const__));
extern long int labs (long int __x) __THROW __attribute__ ((__const__));
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
__extension__ extern long long int llabs (long long int __x)
__THROW __attribute__ ((__const__));
#endif
@@ -641,7 +641,7 @@ extern div_t div (int __numer, int __denom)
__THROW __attribute__ ((__const__));
extern ldiv_t ldiv (long int __numer, long int __denom)
__THROW __attribute__ ((__const__));
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
__extension__ extern lldiv_t lldiv (long long int __numer,
long long int __denom)
__THROW __attribute__ ((__const__));
diff --git a/sysdeps/alpha/fpu/bits/mathdef.h b/sysdeps/alpha/fpu/bits/mathdef.h
index 5ee9644..f5d5de8 100644
--- a/sysdeps/alpha/fpu/bits/mathdef.h
+++ b/sysdeps/alpha/fpu/bits/mathdef.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
/* FIXME! This file describes properties of the compiler, not the machine;
it should not be part of libc! */
-#if defined __USE_ISOC9X && defined _MATH_H
+#if defined __USE_ISOC99 && defined _MATH_H
# ifdef __GNUC__
# if __STDC__ == 1
@@ -71,7 +71,7 @@ typedef double double_t;
/* Number of decimal digits for the `double' type. */
# define DECIMAL_DIG 15
-#endif /* ISO C 9X */
+#endif /* ISO C99 */
#ifndef __NO_LONG_DOUBLE_MATH
/* Signal that we do not really have a `long double'. The disables the
diff --git a/sysdeps/alpha/fpu/bits/mathinline.h b/sysdeps/alpha/fpu/bits/mathinline.h
index 9207d52..87765d2 100644
--- a/sysdeps/alpha/fpu/bits/mathinline.h
+++ b/sysdeps/alpha/fpu/bits/mathinline.h
@@ -1,5 +1,5 @@
/* Inline math functions for Alpha.
- Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by David Mosberger-Tang.
@@ -28,7 +28,7 @@
# define __MATH_INLINE extern __inline
#endif
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
# define isunordered(x, y) \
(__extension__ \
({ double __r; \
@@ -56,7 +56,7 @@
(__extension__ \
({ __typeof__(x) __x = (x); __typeof__(y) __y = (y); \
!isunordered(__x, __y) && __x != __y; }))
-#endif /* ISOC9X */
+#endif /* ISO C99 */
#define __inline_copysign(NAME, TYPE) \
__MATH_INLINE TYPE \
diff --git a/sysdeps/arm/bits/huge_val.h b/sysdeps/arm/bits/huge_val.h
index 1b236c4..398476c 100644
--- a/sysdeps/arm/bits/huge_val.h
+++ b/sysdeps/arm/bits/huge_val.h
@@ -61,9 +61,9 @@ static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
#endif /* GCC. */
-/* ISO C 9X extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
+/* ISO C99 extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
# ifdef __GNUC__
@@ -101,4 +101,4 @@ static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
same as `double'. */
# define HUGE_VALL HUGE_VAL
-#endif /* __USE_ISOC9X. */
+#endif /* __USE_ISOC99. */
diff --git a/sysdeps/generic/bits/mathdef.h b/sysdeps/generic/bits/mathdef.h
index 3708781..d306e54 100644
--- a/sysdeps/generic/bits/mathdef.h
+++ b/sysdeps/generic/bits/mathdef.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
# error "Never use <bits/mathdef.h> directly; include <math.h> instead"
#endif
-#if defined __USE_ISOC9X && defined _MATH_H
+#if defined __USE_ISOC99 && defined _MATH_H
/* Normally, there is no long double type and the `float' and `double'
expressions are evaluated as `double'. */
typedef double float_t; /* `float' expressions are evaluated as
@@ -42,7 +42,7 @@ typedef double double_t; /* `double' expressions are evaluated as
/* Number of decimal digits for the `double' type. */
# define DECIMAL_DIG 15
-#endif /* ISO C 9X */
+#endif /* ISO C99 */
#ifndef __NO_LONG_DOUBLE_MATH
/* Signal that we do not really have a `long double'. The disables the
diff --git a/sysdeps/generic/printf_fphex.c b/sysdeps/generic/printf_fphex.c
index 53e3254..2042844 100644
--- a/sysdeps/generic/printf_fphex.c
+++ b/sysdeps/generic/printf_fphex.c
@@ -1,5 +1,5 @@
/* Print floating point number in hexadecimal notation according to
- ISO C 9X.
+ ISO C99.
Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
diff --git a/sysdeps/i386/bits/huge_val.h b/sysdeps/i386/bits/huge_val.h
index 65e500b..966cb24 100644
--- a/sysdeps/i386/bits/huge_val.h
+++ b/sysdeps/i386/bits/huge_val.h
@@ -42,9 +42,9 @@ static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
#endif /* GCC 2.95 */
-/* ISO C 9X extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
+/* ISO C99 extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
# if __GNUC_PREREQ(2,95)
@@ -78,4 +78,4 @@ static __huge_vall_t __huge_vall = { __HUGE_VALL_bytes };
# endif /* GCC 2.95 */
-#endif /* __USE_ISOC9X. */
+#endif /* __USE_ISOC99. */
diff --git a/sysdeps/i386/fpu/bits/mathdef.h b/sysdeps/i386/fpu/bits/mathdef.h
index 61d4ef3..ba51298 100644
--- a/sysdeps/i386/fpu/bits/mathdef.h
+++ b/sysdeps/i386/fpu/bits/mathdef.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
# error "Never use <bits/mathdef.h> directly; include <math.h> instead"
#endif
-#if defined __USE_ISOC9X && defined _MATH_H
+#if defined __USE_ISOC99 && defined _MATH_H
/* The ix87 FPUs evaluate all values in the 80 bit floating-point format
which is also available for the user as `long double'. Therefore we
define: */
@@ -42,4 +42,4 @@ typedef long double double_t; /* `double' expressions are evaluated as
/* Number of decimal digits for the `long double' type. */
# define DECIMAL_DIG 18
-#endif /* ISO C 9X */
+#endif /* ISO C99 */
diff --git a/sysdeps/i386/fpu/bits/mathinline.h b/sysdeps/i386/fpu/bits/mathinline.h
index 8545f65..eea2a38 100644
--- a/sysdeps/i386/fpu/bits/mathinline.h
+++ b/sysdeps/i386/fpu/bits/mathinline.h
@@ -29,8 +29,8 @@
#endif
-#if defined __USE_ISOC9X && defined __GNUC__ && __GNUC__ >= 2
-/* ISO C 9X defines some macros to perform unordered comparisons. The
+#if defined __USE_ISOC99 && defined __GNUC__ && __GNUC__ >= 2
+/* ISO C99 defines some macros to perform unordered comparisons. The
ix87 FPU supports this with special opcodes and we should use them.
These must not be inline functions since we have to be able to handle
all floating-point types. */
@@ -148,7 +148,7 @@ __signbitl (long double __x)
be suffixed with f and l for the float and long double version,
respectively). OP is the name of the FPU operation. */
-#if defined __USE_MISC || defined __USE_ISOC9X
+#if defined __USE_MISC || defined __USE_ISOC99
# define __inline_mathop(func, op) \
__inline_mathop_ (double, func, op) \
__inline_mathop_ (float, __CONCAT(func,f), op) \
@@ -162,7 +162,7 @@ __signbitl (long double __x)
__inline_mathop_decl_ (float_type, func, op, "0" (__x))
-#if defined __USE_MISC || defined __USE_ISOC9X
+#if defined __USE_MISC || defined __USE_ISOC99
# define __inline_mathop_decl(func, op, params...) \
__inline_mathop_decl_ (double, func, op, params) \
__inline_mathop_decl_ (float, __CONCAT(func,f), op, params) \
@@ -182,7 +182,7 @@ __signbitl (long double __x)
}
-#if defined __USE_MISC || defined __USE_ISOC9X
+#if defined __USE_MISC || defined __USE_ISOC99
# define __inline_mathcode(func, arg, code) \
__inline_mathcode_ (double, func, arg, code) \
__inline_mathcode_ (float, __CONCAT(func,f), arg, code) \
@@ -514,7 +514,7 @@ ldexp (double __x, int __y)
/* Optimized versions for some non-standardized functions. */
-#if defined __USE_ISOC9X || defined __USE_MISC
+#if defined __USE_ISOC99 || defined __USE_MISC
__inline_mathcode (expm1, __x, __expm1_code)
@@ -561,7 +561,7 @@ __inline_mathcode(logb, __x, \
#endif
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
__inline_mathop_decl (log2, "fld1; fxch; fyl2x", "0" (__x) : "st(1)")
__MATH_INLINE float ldexpf (float __x, int __y);
diff --git a/sysdeps/ieee754/bits/huge_val.h b/sysdeps/ieee754/bits/huge_val.h
index f42cb66..c7575e8 100644
--- a/sysdeps/ieee754/bits/huge_val.h
+++ b/sysdeps/ieee754/bits/huge_val.h
@@ -60,9 +60,9 @@ static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
#endif /* GCC. */
-/* ISO C 9X extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
+/* ISO C99 extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
# ifdef __GNUC__
@@ -100,4 +100,4 @@ static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
same as `double'. */
# define HUGE_VALL HUGE_VAL
-#endif /* __USE_ISOC9X. */
+#endif /* __USE_ISOC99. */
diff --git a/sysdeps/ieee754/ldbl-128/printf_fphex.c b/sysdeps/ieee754/ldbl-128/printf_fphex.c
index e25d668..a6ca7a8 100644
--- a/sysdeps/ieee754/ldbl-128/printf_fphex.c
+++ b/sysdeps/ieee754/ldbl-128/printf_fphex.c
@@ -1,5 +1,5 @@
/* Print floating point number in hexadecimal notation according to
- ISO C 9X.
+ ISO C99.
Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
diff --git a/sysdeps/ieee754/ldbl-96/printf_fphex.c b/sysdeps/ieee754/ldbl-96/printf_fphex.c
index 844addd..1eec1a5 100644
--- a/sysdeps/ieee754/ldbl-96/printf_fphex.c
+++ b/sysdeps/ieee754/ldbl-96/printf_fphex.c
@@ -1,5 +1,5 @@
/* Print floating point number in hexadecimal notation according to
- ISO C 9X.
+ ISO C99.
Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
diff --git a/sysdeps/m68k/bits/huge_val.h b/sysdeps/m68k/bits/huge_val.h
index 14c0855..339f374 100644
--- a/sysdeps/m68k/bits/huge_val.h
+++ b/sysdeps/m68k/bits/huge_val.h
@@ -52,9 +52,9 @@ static union { unsigned char __c[8]; double __d; } __huge_val =
#endif /* GCC. */
-/* ISO C 9X extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
+/* ISO C 99 extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
# if __GNUC_PREREQ(2,95)
@@ -89,4 +89,4 @@ static union { unsigned char __c[12]; long double __ld; } __huge_vall =
# endif /* GCC 2.95. */
-#endif /* __USE_ISOC9X. */
+#endif /* __USE_ISOC99. */
diff --git a/sysdeps/m68k/fpu/bits/mathdef.h b/sysdeps/m68k/fpu/bits/mathdef.h
index 250f0f3..2f650ec 100644
--- a/sysdeps/m68k/fpu/bits/mathdef.h
+++ b/sysdeps/m68k/fpu/bits/mathdef.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
# error "Never use <bits/mathdef.h> directly; include <math.h> instead"
#endif
-#if defined __USE_ISOC9X && defined _MATH_H
+#if defined __USE_ISOC99 && defined _MATH_H
/* The m68k FPUs evaluate all values in the 96 bit floating-point format
which is also available for the user as `long double'. Therefore we
define: */
@@ -42,4 +42,4 @@ typedef long double double_t; /* `double' expressions are evaluated as
/* Number of decimal digits for the `long double' type. */
# define DECIMAL_DIG 18
-#endif /* ISO C 9X */
+#endif /* ISO C99 */
diff --git a/sysdeps/m68k/fpu/bits/mathinline.h b/sysdeps/m68k/fpu/bits/mathinline.h
index c753fae..9dad4c6 100644
--- a/sysdeps/m68k/fpu/bits/mathinline.h
+++ b/sysdeps/m68k/fpu/bits/mathinline.h
@@ -19,9 +19,9 @@
#ifdef __GNUC__
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
-/* ISO C 9X defines some macros to perform unordered comparisons. The
+/* ISO C99 defines some macros to perform unordered comparisons. The
m68k FPU supports this with special opcodes and we should use them.
These must not be inline functions since we have to be able to handle
all floating-point types. */
@@ -98,7 +98,7 @@
suffixed with f and l for the float and long double version, resp). OP
is the name of the fpu operation (without leading f). */
-#if defined __USE_MISC || defined __USE_ISOC9X
+#if defined __USE_MISC || defined __USE_ISOC99
# define __inline_mathop(func, op) \
__inline_mathop1(double, func, op) \
__inline_mathop1(float, __CONCAT(func,f), op) \
@@ -123,7 +123,7 @@ __inline_mathop(__tan, tan)
__inline_mathop(__tanh, tanh)
__inline_mathop(__fabs, abs)
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC9X
+#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
__inline_mathop(__rint, int)
__inline_mathop(__expm1, etoxm1)
__inline_mathop(__log1p, lognp1)
@@ -133,7 +133,7 @@ __inline_mathop(__log1p, lognp1)
__inline_mathop(__significand, getman)
#endif
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
__inline_mathop(__log2, log2)
__inline_mathop(__trunc, intrz)
#endif
@@ -146,7 +146,7 @@ __inline_mathop(sin, sin)
__inline_mathop(tan, tan)
__inline_mathop(tanh, tanh)
-# if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC9X
+# if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
__inline_mathop(rint, int)
__inline_mathop(expm1, etoxm1)
__inline_mathop(log1p, lognp1)
@@ -156,7 +156,7 @@ __inline_mathop(log1p, lognp1)
__inline_mathop(significand, getman)
# endif
-# ifdef __USE_ISOC9X
+# ifdef __USE_ISOC99
__inline_mathop(log2, log2)
__inline_mathop(trunc, intrz)
# endif
@@ -223,7 +223,7 @@ __m81_defun (float_type, __CONCAT(__ceil,s), (float_type __x)) \
}
__inline_functions(double,)
-#if defined __USE_MISC || defined __USE_ISOC9X
+#if defined __USE_MISC || defined __USE_ISOC99
__inline_functions(float,f)
__inline_functions(long double,l)
#endif
@@ -287,7 +287,7 @@ __inline_functions(long double,l)
#endif
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
# define __inline_functions(float_type, s) \
__m81_defun (int, __CONCAT(__signbit,s), (float_type __value)) \
@@ -383,18 +383,18 @@ __inline_forward(double,frexp, (double __value, int *__expptr),
__inline_forward_c(double,floor, (double __x), (__x))
__inline_forward_c(double,ceil, (double __x), (__x))
# ifdef __USE_MISC
-# ifndef __USE_ISOC9X /* Conflict with macro of same name. */
+# ifndef __USE_ISOC99 /* Conflict with macro of same name. */
__inline_forward_c(int,isinf, (double __value), (__value))
# endif
__inline_forward_c(int,finite, (double __value), (__value))
__inline_forward_c(double,scalbn, (double __x, int __n), (__x, __n))
# endif
# if defined __USE_MISC || defined __USE_XOPEN
-# ifndef __USE_ISOC9X /* Conflict with macro of same name. */
+# ifndef __USE_ISOC99 /* Conflict with macro of same name. */
__inline_forward_c(int,isnan, (double __value), (__value))
# endif
# endif
-# ifdef __USE_ISOC9X
+# ifdef __USE_ISOC99
__inline_forward_c(double,scalbln, (double __x, long int __n), (__x, __n))
__inline_forward_c(double,nearbyint, (double __value), (__value))
__inline_forward_c(long int,lrint, (double __value), (__value))
@@ -406,7 +406,7 @@ __inline_forward(void,sincos, (double __x, double *__sinx, double *__cosx),
(__x, __sinx, __cosx))
# endif
-# if defined __USE_MISC || defined __USE_ISOC9X
+# if defined __USE_MISC || defined __USE_ISOC99
__inline_forward(float,frexpf, (float __value, int *__expptr),
(__value, __expptr))
@@ -418,7 +418,7 @@ __inline_forward_c(int,finitef, (float __value), (__value))
__inline_forward_c(float,scalbnf, (float __x, int __n), (__x, __n))
__inline_forward_c(int,isnanf, (float __value), (__value))
# endif
-# ifdef __USE_ISOC9X
+# ifdef __USE_ISOC99
__inline_forward_c(float,scalblnf, (float __x, long int __n), (__x, __n))
__inline_forward_c(float,nearbyintf, (float __value), (__value))
__inline_forward_c(long int,lrintf, (float __value), (__value))
@@ -440,7 +440,7 @@ __inline_forward_c(int,finitel, (long double __value), (__value))
__inline_forward_c(long double,scalbnl, (long double __x, int __n), (__x, __n))
__inline_forward_c(int,isnanl, (long double __value), (__value))
# endif
-# ifdef __USE_ISOC9X
+# ifdef __USE_ISOC99
__inline_forward_c(long double,scalblnl, (long double __x, long int __n),
(__x, __n))
__inline_forward_c(long double,nearbyintl, (long double __value), (__value))
@@ -455,7 +455,7 @@ __inline_forward(void,sincosl,
(__x, __sinx, __cosx))
# endif
-#endif /* Use misc or ISO C9X */
+#endif /* Use misc or ISO C99 */
#undef __inline_forward
#undef __inline_forward_c
diff --git a/sysdeps/powerpc/bits/mathdef.h b/sysdeps/powerpc/bits/mathdef.h
index 1dcd2e7..71378c8 100644
--- a/sysdeps/powerpc/bits/mathdef.h
+++ b/sysdeps/powerpc/bits/mathdef.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
FIXME! This file does not deal with the -fshort-double option of
gcc! */
-#if defined __USE_ISOC9X && defined _MATH_H
+#if defined __USE_ISOC99 && defined _MATH_H
# ifdef __GNUC__
# if __STDC__ == 1
@@ -79,7 +79,7 @@ typedef double double_t;
/* Number of decimal digits for the `double' type. */
# define DECIMAL_DIG 15
-#endif /* ISO C 9X */
+#endif /* ISO C99 */
#ifndef __NO_LONG_DOUBLE_MATH
/* Signal that we do not really have a `long double'. The disables the
diff --git a/sysdeps/powerpc/bits/mathinline.h b/sysdeps/powerpc/bits/mathinline.h
index c689fd0..7798ad3 100644
--- a/sysdeps/powerpc/bits/mathinline.h
+++ b/sysdeps/powerpc/bits/mathinline.h
@@ -1,5 +1,5 @@
/* Inline math functions for powerpc.
- Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
#if defined __GNUC__ && !defined _SOFT_FLOAT
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
# define __unordered_cmp(x, y) \
(__extension__ \
({ __typeof__(x) __x = (x); __typeof__(y) __y = (y); \
@@ -34,7 +34,7 @@
# define islessequal(x, y) ((__unordered_cmp (x, y) & 0xA) != 0)
# define islessgreater(x, y) ((__unordered_cmp (x, y) & 0xC) != 0)
# define isunordered(x, y) (__unordered_cmp (x, y) & 1)
-#endif /* __USE_ISOC9X && !_SOFT_FLOAT */
+#endif /* __USE_ISOC99 && !_SOFT_FLOAT */
#if !defined __NO_MATH_INLINES && defined __OPTIMIZE__
@@ -44,7 +44,7 @@
# define __MATH_INLINE extern __inline
#endif /* __cplusplus */
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
__MATH_INLINE long int lrint (double __x);
__MATH_INLINE long int
lrint (double __x)
@@ -83,6 +83,6 @@ fdimf (float __x, float __y)
return __x < __y ? 0 : __x - __y;
}
-#endif /* __USE_ISOC9X */
+#endif /* __USE_ISOC99 */
#endif /* !__NO_MATH_INLINES && __OPTIMIZE__ */
#endif /* __GNUC__ && !_SOFT_FLOAT */
diff --git a/sysdeps/powerpc/fpu/bits/mathdef.h b/sysdeps/powerpc/fpu/bits/mathdef.h
new file mode 100644
index 0000000..71378c8
--- /dev/null
+++ b/sysdeps/powerpc/fpu/bits/mathdef.h
@@ -0,0 +1,88 @@
+/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#if !defined _MATH_H && !defined _COMPLEX_H
+# error "Never use <bits/mathdef.h> directly; include <math.h> instead"
+#endif
+
+
+/* FIXME! This file describes properties of the compiler, not the machine;
+ it should not be part of libc!
+
+ FIXME! This file does not deal with the -fshort-double option of
+ gcc! */
+
+#if defined __USE_ISOC99 && defined _MATH_H
+# ifdef __GNUC__
+# if __STDC__ == 1
+
+/* In GNU or ANSI mode, gcc leaves `float' expressions as-is. */
+typedef float float_t; /* `float' expressions are evaluated as
+ `float'. */
+typedef double double_t; /* `double' expressions are evaluated as
+ `double'. */
+
+/* Signal that types stay as they were declared. */
+# define FLT_EVAL_METHOD 0
+
+/* Define `INFINITY' as value of type `float'. */
+# define INFINITY HUGE_VALF
+
+# else
+
+/* For `gcc -traditional', `float' expressions are evaluated as `double'. */
+typedef double float_t; /* `float' expressions are evaluated as
+ `double'. */
+typedef double double_t; /* `double' expressions are evaluated as
+ `double'. */
+
+/* Signal that both types are `double'. */
+# define FLT_EVAL_METHOD 1
+
+/* Define `INFINITY' as value of type `float'. */
+# define INFINITY HUGE_VALF
+
+# endif
+# else
+
+/* Wild guess at types for float_t and double_t. */
+typedef double float_t;
+typedef double double_t;
+
+/* Strange compiler, we don't know how it works. */
+# define FLT_EVAL_METHOD -1
+
+/* Define `INFINITY' as value of type `float'. */
+# define INFINITY HUGE_VALF
+
+# endif
+
+/* The values returned by `ilogb' for 0 and NaN respectively. */
+# define FP_ILOGB0 0x80000001
+# define FP_ILOGBNAN 0x7fffffff
+
+/* Number of decimal digits for the `double' type. */
+# define DECIMAL_DIG 15
+
+#endif /* ISO C99 */
+
+#ifndef __NO_LONG_DOUBLE_MATH
+/* Signal that we do not really have a `long double'. The disables the
+ declaration of all the `long double' function variants. */
+# define __NO_LONG_DOUBLE_MATH 1
+#endif
diff --git a/sysdeps/powerpc/fpu/bits/mathinline.h b/sysdeps/powerpc/fpu/bits/mathinline.h
new file mode 100644
index 0000000..7798ad3
--- /dev/null
+++ b/sysdeps/powerpc/fpu/bits/mathinline.h
@@ -0,0 +1,88 @@
+/* Inline math functions for powerpc.
+ Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#if defined __GNUC__ && !defined _SOFT_FLOAT
+
+#ifdef __USE_ISOC99
+# define __unordered_cmp(x, y) \
+ (__extension__ \
+ ({ __typeof__(x) __x = (x); __typeof__(y) __y = (y); \
+ unsigned __r; \
+ __asm__("fcmpu 7,%1,%2 ; mfcr %0" : "=r" (__r) : "f" (__x), "f"(__y) \
+ : "cr7"); \
+ __r; }))
+
+# define isgreater(x, y) (__unordered_cmp (x, y) >> 2 & 1)
+# define isgreaterequal(x, y) ((__unordered_cmp (x, y) & 6) != 0)
+# define isless(x, y) (__unordered_cmp (x, y) >> 3 & 1)
+# define islessequal(x, y) ((__unordered_cmp (x, y) & 0xA) != 0)
+# define islessgreater(x, y) ((__unordered_cmp (x, y) & 0xC) != 0)
+# define isunordered(x, y) (__unordered_cmp (x, y) & 1)
+#endif /* __USE_ISOC99 && !_SOFT_FLOAT */
+
+#if !defined __NO_MATH_INLINES && defined __OPTIMIZE__
+
+#ifdef __cplusplus
+# define __MATH_INLINE __inline
+#else
+# define __MATH_INLINE extern __inline
+#endif /* __cplusplus */
+
+#ifdef __USE_ISOC99
+__MATH_INLINE long int lrint (double __x);
+__MATH_INLINE long int
+lrint (double __x)
+{
+ union {
+ double __d;
+ long int __ll[2];
+ } __u;
+ __asm__ ("fctiw %0,%1" : "=f"(__u.__d) : "f"(__x));
+ return __u.__ll[1];
+}
+
+__MATH_INLINE long int lrintf (float __x);
+__MATH_INLINE long int
+lrintf (float __x)
+{
+ union {
+ double __d;
+ long int __ll[2];
+ } __u;
+ __asm__ ("fctiw %0,%1" : "=f"(__u.__d) : "f"(__x));
+ return __u.__ll[1];
+}
+
+__MATH_INLINE double fdim (double __x, double __y);
+__MATH_INLINE double
+fdim (double __x, double __y)
+{
+ return __x < __y ? 0 : __x - __y;
+}
+
+__MATH_INLINE float fdimf (float __x, float __y);
+__MATH_INLINE float
+fdimf (float __x, float __y)
+{
+ return __x < __y ? 0 : __x - __y;
+}
+
+#endif /* __USE_ISOC99 */
+#endif /* !__NO_MATH_INLINES && __OPTIMIZE__ */
+#endif /* __GNUC__ && !_SOFT_FLOAT */
diff --git a/sysdeps/sparc/fpu/bits/mathdef.h b/sysdeps/sparc/fpu/bits/mathdef.h
index 5294ad4..c58167c 100644
--- a/sysdeps/sparc/fpu/bits/mathdef.h
+++ b/sysdeps/sparc/fpu/bits/mathdef.h
@@ -25,7 +25,7 @@
/* FIXME! This file describes properties of the compiler, not the machine;
it should not be part of libc! */
-#if defined __USE_ISOC9X && defined _MATH_H
+#if defined __USE_ISOC99 && defined _MATH_H
# ifdef __GNUC__
# if __STDC__ == 1
@@ -73,7 +73,7 @@ typedef double double_t;
/* Number of decimal digits for the `double' type. */
# define DECIMAL_DIG 15
-#endif /* ISO C 9X */
+#endif /* ISO C99 */
#ifndef __NO_LONG_DOUBLE_MATH
diff --git a/sysdeps/sparc/fpu/bits/mathinline.h b/sysdeps/sparc/fpu/bits/mathinline.h
index 9017be3..69591fe 100644
--- a/sysdeps/sparc/fpu/bits/mathinline.h
+++ b/sysdeps/sparc/fpu/bits/mathinline.h
@@ -26,7 +26,7 @@
#if defined __GNUC__
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
#if __WORDSIZE == 32
@@ -78,7 +78,7 @@
__r = qop; \
} \
__r; }))
-
+
# define isgreater(x, y) __unordered_v9cmp(x, y, "g", _Qp_cmp (&__x, &__y) == 2)
# define isgreaterequal(x, y) __unordered_v9cmp(x, y, "ge", (_Qp_cmp (&__x, &__y) & 1) == 0)
# define isless(x, y) __unordered_v9cmp(x, y, "l", _Qp_cmp (&__x, &__y) == 1)
@@ -88,7 +88,7 @@
#endif /* sparc64 */
-#endif /* __USE_ISOC9X */
+#endif /* __USE_ISOC99 */
#if (!defined __NO_MATH_INLINES || defined __LIBC_INTERNAL_MATH_INLINES) && defined __OPTIMIZE__
@@ -190,7 +190,7 @@ __ieee754_sqrtl(long double __x)
#endif /* __LIBC_INTERNAL_MATH_INLINES */
#endif /* gcc 2.8+ */
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
__MATH_INLINE double fdim (double __x, double __y);
__MATH_INLINE double
@@ -206,6 +206,6 @@ fdimf (float __x, float __y)
return __x < __y ? 0 : __x - __y;
}
-#endif /* __USE_ISOC9X */
+#endif /* __USE_ISOC99 */
#endif /* !__NO_MATH_INLINES && __OPTIMIZE__ */
#endif /* __GNUC__ */
diff --git a/sysdeps/sparc/sparc32/fpu/bits/huge_val.h b/sysdeps/sparc/sparc32/fpu/bits/huge_val.h
index 40b03df..cdec73f 100644
--- a/sysdeps/sparc/sparc32/fpu/bits/huge_val.h
+++ b/sysdeps/sparc/sparc32/fpu/bits/huge_val.h
@@ -54,9 +54,9 @@ static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
#endif /* GCC. */
-/* ISO C 9X extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
+/* ISO C99 extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
# if __GNUC_PREREQ(2,95)
@@ -114,4 +114,4 @@ static __huge_vall_t __huge_vall = { __HUGE_VALL_bytes };
# endif /* GCC 2.95. */
-#endif /* __USE_ISOC9X. */
+#endif /* __USE_ISOC99. */
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index a12d0fd..0903b55 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -324,7 +324,7 @@ extern int wcswidth (__const wchar_t *__s, size_t __n) __THROW;
extern double wcstod (__const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr) __THROW;
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
/* Likewise for `float' and `long double' sizes of floating-point numbers. */
extern float wcstof (__const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr) __THROW;
@@ -360,7 +360,7 @@ extern unsigned long long int wcstouq (__const wchar_t *__restrict __nptr,
int __base) __THROW;
#endif /* GCC and use GNU. */
-#if defined __USE_ISOC9X || (defined __GNUC__ && defined __USE_GNU)
+#if defined __USE_ISOC99 || (defined __GNUC__ && defined __USE_GNU)
/* Convert initial portion of wide string NPTR to `long int'
representation. */
__extension__
@@ -374,7 +374,7 @@ __extension__
extern unsigned long long int wcstoull (__const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr,
int __base) __THROW;
-#endif /* ISO C 9X or GCC and GNU. */
+#endif /* ISO C99 or GCC and GNU. */
#ifdef __USE_GNU
/* The concept of one static locale per category is not very well
@@ -522,7 +522,7 @@ extern wchar_t *wcpncpy (wchar_t *__dest, __const wchar_t *__src, size_t __n)
/* Wide character I/O functions. */
-#ifdef __USE_ISOC9X
+#ifdef __USE_ISOC99
/* Select orientation for stream. */
extern int fwide (FILE *__fp, int __mode) __THROW;