aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/_strerror.c7
-rw-r--r--sysdeps/generic/printf_fphex.c4
-rw-r--r--sysdeps/generic/tmpfile.c4
-rw-r--r--sysdeps/gnu/errlist.awk2
-rw-r--r--sysdeps/gnu/errlist.c2
5 files changed, 12 insertions, 7 deletions
diff --git a/sysdeps/generic/_strerror.c b/sysdeps/generic/_strerror.c
index 766d88e..c8f2a9c 100644
--- a/sysdeps/generic/_strerror.c
+++ b/sysdeps/generic/_strerror.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 93, 95, 96, 97, 98, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991,93,95,96,97,98,2000,2002 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
@@ -40,7 +40,8 @@
char *
__strerror_r (int errnum, char *buf, size_t buflen)
{
- if (errnum < 0 || errnum >= _sys_nerr || _sys_errlist[errnum] == NULL)
+ if (errnum < 0 || errnum >= INTUSE(_sys_nerr)
+ || INTUSE(_sys_errlist)[errnum] == NULL)
{
/* Buffer we use to print the number in. For a maximum size for
`int' of 8 bytes we never need more than 20 digits. */
@@ -65,6 +66,6 @@ __strerror_r (int errnum, char *buf, size_t buflen)
return buf;
}
- return (char *) _(_sys_errlist[errnum]);
+ return (char *) _(INTUSE(_sys_errlist)[errnum]);
}
weak_alias (__strerror_r, strerror_r)
diff --git a/sysdeps/generic/printf_fphex.c b/sysdeps/generic/printf_fphex.c
index 5505d13..7dfb116 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 C99.
- Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1997,1998,1999,2000,2001,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -38,7 +38,7 @@
#ifdef USE_IN_LIBIO
# include <libioP.h>
# define PUT(f, s, n) _IO_sputn (f, s, n)
-# define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : _IO_padn (f, c, n))
+# define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : INTUSE(_IO_padn) (f, c, n))
/* We use this file GNU C library and GNU I/O library. So make
names equal. */
# undef putc
diff --git a/sysdeps/generic/tmpfile.c b/sysdeps/generic/tmpfile.c
index 6d341d6..9b60dbb 100644
--- a/sysdeps/generic/tmpfile.c
+++ b/sysdeps/generic/tmpfile.c
@@ -1,5 +1,5 @@
/* Open a stdio stream on an anonymous temporary file. Generic/POSIX version.
- Copyright (C) 1991,93,96,97,98,99,2000 Free Software Foundation, Inc.
+ Copyright (C) 1991,93,96,97,98,99,2000,2002 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
@@ -22,7 +22,7 @@
#ifdef USE_IN_LIBIO
# include <iolibio.h>
-# define __fdopen _IO_fdopen
+# define __fdopen INTUSE(_IO_fdopen)
# define tmpfile __new_tmpfile
#endif
diff --git a/sysdeps/gnu/errlist.awk b/sysdeps/gnu/errlist.awk
index 92828a9..07d00c4 100644
--- a/sysdeps/gnu/errlist.awk
+++ b/sysdeps/gnu/errlist.awk
@@ -106,4 +106,6 @@ END {
print "#ifdef SYS_NERR_ALIAS";
print "weak_alias (_sys_nerr, SYS_NERR_ALIAS)";
print "#endif";
+ print "INTDEF2(SYS_ERRLIST, _sys_errlist)";
+ print "INTDEF2(SYS_NERR, _sys_nerr)";
}
diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c
index 1b15c5e..65b36dd 100644
--- a/sysdeps/gnu/errlist.c
+++ b/sysdeps/gnu/errlist.c
@@ -845,3 +845,5 @@ weak_alias (_sys_errlist, SYS_ERRLIST_ALIAS)
#ifdef SYS_NERR_ALIAS
weak_alias (_sys_nerr, SYS_NERR_ALIAS)
#endif
+INTDEF2(SYS_ERRLIST, _sys_errlist)
+INTDEF2(SYS_NERR, _sys_nerr)