aboutsummaryrefslogtreecommitdiff
path: root/libio
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-08-31 16:30:27 +0000
committerUlrich Drepper <drepper@redhat.com>1998-08-31 16:30:27 +0000
commitbfce746a87e205a682b85e144e056029a8a30d07 (patch)
tree081313643ad086d15559161dc218d203b62f605d /libio
parentac72fbb190675473855c33d79ccd75b0de68c0d1 (diff)
downloadglibc-bfce746a87e205a682b85e144e056029a8a30d07.tar
glibc-bfce746a87e205a682b85e144e056029a8a30d07.tar.gz
glibc-bfce746a87e205a682b85e144e056029a8a30d07.tar.bz2
glibc-bfce746a87e205a682b85e144e056029a8a30d07.zip
Update.
1998-08-31 15:56 Ulrich Drepper <drepper@cygnus.com> * db2/db_int.h: Use <db.h> instead of "db.h" to find header in include. * include/stdio.h: Add __vsscanf. * libio/stdio.h: Make vfscanf, scanf, and vsscanf available if __USE_ISOC9X. Remove __vsscanf declaration. Always declare fgetpos and fsetpos. * math/math.h: Define isinf as macro. * math/bits/mathcalls.h: Change to declare __isinf all the time. Don't declare scalb for ISO C 9x. * math/tgmath.h: Define fma. Rewrite the underlying macros. * stdlib/stdlib.h: Declare strtof and strtold is __USE_ISOC9X. * sysdeps/unix/sysv/linux/bits/sigcontext.h: Allow inclusion from sys/ucontext.h. * sysdeps/wordsize-32/inttypes.h: Define missing PRI* and SCN* macros. 1998-08-31 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/standalone/bits/errno.h (ENOMSG): Remove duplicate. Reported by jreising@frequentis.com [PR libc/767]. 1998-08-31 Andreas Jaeger <aj@arthur.rhein-neckar.de> * io/lockf.c (lockf): Move initilisation of fl.l_whence and fl.l_start at beginning of function. Patch by Geoff. Dash <geoffd@zeta.org.au> [PR libc/769].
Diffstat (limited to 'libio')
-rw-r--r--libio/stdio.h46
1 files changed, 24 insertions, 22 deletions
diff --git a/libio/stdio.h b/libio/stdio.h
index 4d01061b3e..774003b490 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -334,7 +334,7 @@ extern int scanf __P ((__const char *__restrict __format, ...));
extern int sscanf __P ((__const char *__restrict __s,
__const char *__restrict __format, ...));
-#ifdef __USE_GNU
+#ifdef __USE_ISOC9X
/* Read formatted input from S into argument list ARG. */
extern int vfscanf __P ((FILE *__restrict __s,
__const char *__restrict __format,
@@ -346,10 +346,6 @@ extern int vscanf __P ((__const char *__restrict __format, _G_va_list __arg))
__attribute__ ((__format__ (__scanf__, 1, 0)));
/* Read formatted input from S into argument list ARG. */
-extern int __vsscanf __P ((__const char *__restrict __s,
- __const char *__restrict __format,
- _G_va_list __arg))
- __attribute__ ((__format__ (__scanf__, 2, 0)));
extern int vsscanf __P ((__const char *__restrict __s,
__const char *__restrict __format,
_G_va_list __arg))
@@ -541,64 +537,70 @@ extern long int ftell __P ((FILE *__stream));
/* Rewind to the beginning of STREAM. */
extern void rewind __P ((FILE *__stream));
-#if (defined __USE_LARGEFILE || defined __USE_LARGEFILE64 \
- || defined __USE_FILE_OFFSET64)
/* The Single Unix Specification, Version 2, specifies an alternative,
more adequate interface for the two functions above which deal with
file offset. `long int' is not the right type. These definitions
are originally defined in the Large File Support API. */
/* Types needed in these functions. */
-# ifndef off_t
-# ifndef __USE_FILE_OFFSET64
+#ifndef off_t
+# ifndef __USE_FILE_OFFSET64
typedef __off_t off_t;
-# else
+# else
typedef __off64_t off_t;
-# endif
-# define off_t off_t
# endif
+# define off_t off_t
+#endif
-# if defined __USE_LARGEFILE64 && !defined off64_t
+#if defined __USE_LARGEFILE64 && !defined off64_t
typedef __off64_t off64_t;
-# define off64_t off64_t
-# endif
+# define off64_t off64_t
+#endif
-# ifndef __USE_FILE_OFFSET64
+#ifndef __USE_FILE_OFFSET64
+# ifndef __USE_UNIX98
/* Seek to a certain position on STREAM. */
extern int fseeko __P ((FILE *__stream, __off_t __off, int __whence));
/* Return the current position of STREAM. */
extern __off_t ftello __P ((FILE *__stream));
+#endif
+
/* Get STREAM's position. */
extern int fgetpos __P ((FILE *__restrict __stream,
fpos_t *__restrict __pos));
/* Set STREAM's position. */
extern int fsetpos __P ((FILE *__stream, __const fpos_t *__pos));
-# else
+#else
# ifdef __REDIRECT
+# ifndef __USE_UNIX98
extern int __REDIRECT (fseeko,
__P ((FILE *__stream, __off64_t __off, int __whence)),
fseeko64);
extern __off64_t __REDIRECT (ftello, __P ((FILE *__stream)), ftello64);
+# endif
extern int __REDIRECT (fgetpos, __P ((FILE *__restrict __stream,
fpos_t *__restrict __pos)), fgetpos64);
extern int __REDIRECT (fsetpos, __P ((FILE *__stream, __const fpos_t *__pos)),
fsetpos64);
-# else
+# else
+# ifndef __USE_UNIX98
# define fseeko fseeko64
# define ftello ftello64
-# define fgetpos fgetpos64
-# define fsetpos fsetpos64
# endif
+# define fgetpos fgetpos64
+# define fsetpos fsetpos64
# endif
+#endif
-# ifdef __USE_LARGEFILE64
+#ifdef __USE_LARGEFILE64
+# ifndef __USE_UNIX98
extern int fseeko64 __P ((FILE *__stream, __off64_t __off, int __whence));
extern __off64_t ftello64 __P ((FILE *__stream));
+# endif
extern int fgetpos64 __P ((FILE *__restrict __stream,
fpos64_t *__restrict __pos));
extern int fsetpos64 __P ((FILE *__stream, __const fpos64_t *__pos));
-# endif
#endif
/* Clear the error and EOF indicators for STREAM. */