1998-07-09 13:34 Ulrich Drepper <drepper@cygnus.com>
* grp/grp.h: Define gid_t also for __USE_XOPEN.
* io/fcntl.h: Include <sys/stat.h> also for __USE_XOPEN.
* io/utime.h: Define time_t also for __USE_XOPEN.
* io/sys/stat.h: Define time_t also for __USE_XOPEN.
Define *_t types except for pid_t also for __USE_XOPEN.
Define S_* macros also for __USE_XOPEN.
* locale/langinfo.h: Define CODESET, CRNCYSTR, RADIXCHAR, and
THOUSEP also for __USE_XOPEN.
* math/math.c: Define M_* macros also for __USE_XOPEN.
* math/bits/mathcalls.h: Declare hypot also for __USE_XOPEN.
* posix/fnmatch.h: Define FNM_NOSYS and for if _XOPEN_SOURCE is
defined.
* posix/glob.h: Likewise for GLOB_NOSYS.
* posix/regex.h: Likewise for REG_NOSYS.
* posix/wordexp.h: Likewise for WRDE_NOSYS.
* posix/unistd.h: Define *_t types also for __USE_XOPEN.
* posix/sys/wait.h: Define pid_t for __USE_XOPEN.
* pwd/pwd.h: Define gid_t and pid_t also for __USE_XOPEN.
* signal/signal.h: Define pid_t also fir __USE_XOPEN.
* sysdeps/unix/sysv/linux/bits/fcntl.h: Define _RSYNC and O_DSYNC also
for __USE_POSIX199309.
* sysdeps/unix/sysv/linux/bits/termios.h: Define the various B*
constants also for __USE_XOPEN.
* wcsmbs/wchar.h: For XPG4 include wctype.h.
* intl/dcgettext.c (find_msg): Initialize act to prevent warning.
* locale/setlocale.c (new_composite_name): Likewise for last_len.
* libio/stdio.h: Don't declare fclose_unlocked.
* sysdeps/posix/fpathconf.c: Handle _PC_FILESIZEBITS.
1998-07-08 Mark Kettenis <kettenis@phys.uva.nl>
* stdio/stdio.h: Add prototypes for fflush_unlocked,
getc_unlocked, getchar_unlocked, putc_unlocked, putchar_unlocked,
fgets_unlocked, fread_unlocked, fwrite_unlocked,
clearerr_unlocked, feof_unlocked, ferror_unlocked,
fileno_unlocked, flockfile, ftrylockfile, funlockfile.
[__USE_XOPEN && !__USE_GNU] Declare optarg, optind, opterr. Add
prototype for getopt.
* stdio/clearerr.c (clearerr_unlocked): Weak alias for clearerr.
* stdio/feof.c (feof_unlocked): Weak alias for feof.
* stdio/ferror.c (ferror_unlocked): Weak alias for ferror.
* stdio/fflush.c (fflush_unlocked): Weak alias for fflush.
* stdio/fgets.c (fgets_unlocked): Weak alias for fgets.
* stdio/fileno.c (fileno_unlocked): Weak alias for fileno.
* stdio/fputc.c (fputc_unlocked): Weak alias for fputc.
* stdio/fread.c (fread_unlocked): Weak alias for fread.
* stdio/fwrite.c (fwrite_unlocked): Weak alias for fwrite.
* stdio/getc.c (getchar_unlocked): Weak alias for getc.
* stdio/getchar.c (getchar_unlocked): Weak alias for getchar.
* stdio/putc.c (putc_unlocked): Weak alias for putc.
* stdio/putchar.c (putchar_unlocked): Weak alias for putchar.
* stdio/Versions [GLIBC_2.1]: Add clearerr_unlocked,
feof_unlocked, ferror_unlocked, fflush_unlocked, fgets_unlocked,
fileno_unlocked, fputc_unlocked, fread_unlocked, fwrite_unlocked,
getc_unlocked, getchar_unlocked, putc_unlocked and
putchar_unlocked.
* libio/Versions: Move flockfile, ftrylockfile and funlockfile
from here ...
* stdio-common/Versions: ... to here.
1998-07-09 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* Makerules (versioning): Correct typo.
+1998-07-09 13:34 Ulrich Drepper <drepper@cygnus.com>
+
+ * grp/grp.h: Define gid_t also for __USE_XOPEN.
+ * io/fcntl.h: Include <sys/stat.h> also for __USE_XOPEN.
+ * io/utime.h: Define time_t also for __USE_XOPEN.
+ * io/sys/stat.h: Define time_t also for __USE_XOPEN.
+ Define *_t types except for pid_t also for __USE_XOPEN.
+ Define S_* macros also for __USE_XOPEN.
+ * locale/langinfo.h: Define CODESET, CRNCYSTR, RADIXCHAR, and
+ THOUSEP also for __USE_XOPEN.
+ * math/math.c: Define M_* macros also for __USE_XOPEN.
+ * math/bits/mathcalls.h: Declare hypot also for __USE_XOPEN.
+ * posix/fnmatch.h: Define FNM_NOSYS and for if _XOPEN_SOURCE is
+ defined.
+ * posix/glob.h: Likewise for GLOB_NOSYS.
+ * posix/regex.h: Likewise for REG_NOSYS.
+ * posix/wordexp.h: Likewise for WRDE_NOSYS.
+ * posix/unistd.h: Define *_t types also for __USE_XOPEN.
+ * posix/sys/wait.h: Define pid_t for __USE_XOPEN.
+ * pwd/pwd.h: Define gid_t and pid_t also for __USE_XOPEN.
+ * signal/signal.h: Define pid_t also fir __USE_XOPEN.
+ * sysdeps/unix/sysv/linux/bits/fcntl.h: Define _RSYNC and O_DSYNC also
+ for __USE_POSIX199309.
+ * sysdeps/unix/sysv/linux/bits/termios.h: Define the various B*
+ constants also for __USE_XOPEN.
+ * wcsmbs/wchar.h: For XPG4 include wctype.h.
+
+ * intl/dcgettext.c (find_msg): Initialize act to prevent warning.
+ * locale/setlocale.c (new_composite_name): Likewise for last_len.
+
+ * libio/stdio.h: Don't declare fclose_unlocked.
+
+ * sysdeps/posix/fpathconf.c: Handle _PC_FILESIZEBITS.
+
+1998-07-08 Mark Kettenis <kettenis@phys.uva.nl>
+
+ * stdio/stdio.h: Add prototypes for fflush_unlocked,
+ getc_unlocked, getchar_unlocked, putc_unlocked, putchar_unlocked,
+ fgets_unlocked, fread_unlocked, fwrite_unlocked,
+ clearerr_unlocked, feof_unlocked, ferror_unlocked,
+ fileno_unlocked, flockfile, ftrylockfile, funlockfile.
+ [__USE_XOPEN && !__USE_GNU] Declare optarg, optind, opterr. Add
+ prototype for getopt.
+ * stdio/clearerr.c (clearerr_unlocked): Weak alias for clearerr.
+ * stdio/feof.c (feof_unlocked): Weak alias for feof.
+ * stdio/ferror.c (ferror_unlocked): Weak alias for ferror.
+ * stdio/fflush.c (fflush_unlocked): Weak alias for fflush.
+ * stdio/fgets.c (fgets_unlocked): Weak alias for fgets.
+ * stdio/fileno.c (fileno_unlocked): Weak alias for fileno.
+ * stdio/fputc.c (fputc_unlocked): Weak alias for fputc.
+ * stdio/fread.c (fread_unlocked): Weak alias for fread.
+ * stdio/fwrite.c (fwrite_unlocked): Weak alias for fwrite.
+ * stdio/getc.c (getchar_unlocked): Weak alias for getc.
+ * stdio/getchar.c (getchar_unlocked): Weak alias for getchar.
+ * stdio/putc.c (putc_unlocked): Weak alias for putc.
+ * stdio/putchar.c (putchar_unlocked): Weak alias for putchar.
+ * stdio/Versions [GLIBC_2.1]: Add clearerr_unlocked,
+ feof_unlocked, ferror_unlocked, fflush_unlocked, fgets_unlocked,
+ fileno_unlocked, fputc_unlocked, fread_unlocked, fwrite_unlocked,
+ getc_unlocked, getchar_unlocked, putc_unlocked and
+ putchar_unlocked.
+
+ * libio/Versions: Move flockfile, ftrylockfile and funlockfile
+ from here ...
+ * stdio-common/Versions: ... to here.
+
+1998-07-09 Andreas Jaeger <aj@arthur.rhein-neckar.de>
+
+ * Makerules (versioning): Correct typo.
+
1998-07-08 22:18 Ulrich Drepper <drepper@cygnus.com>
* elf/Versions: Add _dl_mcount_wrapper_check.
* mutex.c: Define __pthread_mutexattr_gettype and
__pthread_mutexattr_settype.
* weak.c: Likewise.
+ * sysdeps/pthread/pthread.h: Declare __pthread_mutexattr_gettype and
+ __pthread_mutexattr_settype.
+ * sysdeps/pthread/bits/libc-lock.h (__libc_lock_init_recursive):
+ Use __pthread_mutexattr_settype.
1998-07-08 22:26 Ulrich Drepper <drepper@cygnus.com>
{ \
pthread_mutexattr_t __attr; \
__pthread_mutexattr_init (&__attr); \
- __pthread_mutexattr_setkind_np (&__attr, PTHREAD_MUTEX_RECURSIVE_NP); \
+ __pthread_mutexattr_settype (&__attr, PTHREAD_MUTEX_RECURSIVE_NP); \
__pthread_mutex_init (&(NAME), &__attr); \
__pthread_mutexattr_destroy (&__attr); \
} \
/* Set the mutex kind attribute in *ATTR to KIND (either PTHREAD_MUTEX_NORMAL,
PTHREAD_MUTEX_RECURSIVE, PTHREAD_MUTEX_ERRORCHECK, or
PTHREAD_MUTEX_DEFAULT). */
+extern int __pthread_mutexattr_settype __P ((pthread_mutexattr_t *__attr,
+ int __kind));
extern int pthread_mutexattr_settype __P ((pthread_mutexattr_t *__attr,
int __kind));
/* Return in *KIND the mutex kind attribute in *ATTR. */
+extern int __pthread_mutexattr_gettype __P ((__const pthread_mutexattr_t *__attr,
+ int *__kind));
extern int pthread_mutexattr_gettype __P ((__const pthread_mutexattr_t *__attr,
int *__kind));
#endif
/* Access to locale-dependent parameters.
- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997, 1998 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
_NL_CTYPE_WIDTH,
_NL_CTYPE_MB_CUR_MAX,
_NL_CTYPE_CODESET_NAME,
-#ifdef __USE_UNIX98
+#ifdef __USE_XOPEN
CODESET = _NL_CTYPE_CODESET_NAME,
#endif
_NL_NUM_LC_CTYPE,
#define INT_CURR_SYMBOL INT_CURR_SYMBOL
CURRENCY_SYMBOL,
#define CURRENCY_SYMBOL CURRENCY_SYMBOL
-#ifdef __USE_UNIX98
+#ifdef __USE_XOPEN
CRNCYSTR = CURRENCY_SYMBOL,
# define CRNCYSTR CRNCYSTR
#endif
These also correspond to members of `struct lconv'; see <locale.h>. */
DECIMAL_POINT = _NL_ITEM (LC_NUMERIC, 0),
#define DECIMAL_POINT DECIMAL_POINT
-#ifdef __USE_UNIX98
+#ifdef __USE_XOPEN
RADIXCHAR = DECIMAL_POINT,
# define RADIXCHAR RADIXCHAR
#endif
THOUSANDS_SEP,
#define THOUSANDS_SEP THOUSANDS_SEP
-#ifdef __USE_UNIX98
+#ifdef __USE_XOPEN
THOUSEP = THOUSANDS_SEP,
#define THOUSANDS_SEP THOUSANDS_SEP
#endif
static inline char *
new_composite_name (int category, const char *newnames[LC_ALL])
{
- size_t last_len;
+ size_t last_len = 0;
size_t cumlen = 0;
int i;
char *new, *p;
/* Return the square root of X. */
__MATHCALL (sqrt,, (_Mdouble_ __x));
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC9X
+#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_ISOC9X
/* Return `sqrt(X*X + Y*Y)'. */
__MATHCALL (hypot,, (_Mdouble_ __x, _Mdouble_ __y));
+#endif
+#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC9X
/* Return the cube root of X. */
__MATHCALL (cbrt,, (_Mdouble_ __x));
#endif
/* Some useful constants. */
-#if defined __USE_BSD || defined __USE_UNIX98
+#if defined __USE_BSD || defined __USE_XOPEN
# define M_E 2.7182818284590452354 /* e */
# define M_LOG2E 1.4426950408889634074 /* log_2 e */
# define M_LOG10E 0.43429448190325182765 /* log_10 e */
-/* Copyright (C) 1991, 1992, 1993, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 96, 97, 98 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
`fnmatch'. Since this is not the case here it will never be
returned but the conformance test suites still require the symbol
to be defined. */
-#if (_XOPEN_SOURCE - 0) == 500
+#ifdef _XOPEN_SOURCE
# define FNM_NOSYS (-1)
#endif
`glob'. Since this is not the case here it will never be
returned but the conformance test suites still require the symbol
to be defined. */
-#if (_XOPEN_SOURCE - 0) == 500
+#ifdef _XOPEN_SOURCE
# define GLOB_NOSYS (-1)
#endif
`re_error_msg' table in regex.c. */
typedef enum
{
-#if (_XOPEN_SOURCE - 0) == 500
+#ifdef _XOPEN_SOURCE
REG_ENOSYS = -1, /* This will never happen for this implementation. */
#endif
-/* Copyright (C) 1991, 92, 93, 94, 96, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 96, 97, 98 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
#include <bits/types.h>
-#if defined __USE_UNIX98 && !defined pid_t
+#if defined __USE_XOPEN && !defined pid_t
typedef __pid_t pid_t;
# define pid_t pid_t
#endif
#define __need_NULL
#include <stddef.h>
-#ifdef __USE_UNIX98
+#ifdef __USE_XOPEN
/* The Single Unix specification says that some more types are
available here. */
# ifndef gid_t
typedef __pid_t pid_t;
# define pid_t pid_t
# endif
+#endif /* X/Open */
+#ifdef __USE_UNIX98
# ifndef intptr_t
typedef __intptr_t intptr_t;
# define intptr_t intptr_t
/* The Single Unix specification, version 2, demands these prototypes
to be here. They are also found in <stdio.h>. */
-#ifdef __USE_UNIX98
+#ifdef __USE_XOPEN
/* Return the name of the controlling terminal. */
extern char *ctermid __P ((char *__s));
used and might go away some time. */
extern char *cuserid __P ((char *__s));
+/* Rename file OLD to NEW. */
+extern int rename __P ((__const char *__old, __const char *__new));
+#endif
+
+#if defined __USE_POSIX199309 || defined __USE_UNIX98
/* This function is only available if the system has POSIX threads. */
/* Install handlers to be called when a new process is created with FORK.
-/* Copyright (C) 1991, 1992, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1996, 1997, 1998 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
/* Possible nonzero return values from `wordexp'. */
enum
{
-#ifdef __USE_UNIX98
+#ifdef __USE_XOPEN
WRDE_NOSYS = -1, /* Never used since we support `wordexp'. */
#endif
WRDE_NOSPACE = 1, /* Ran out of memory. */
-/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 95, 96, 97, 98 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
#define __need_size_t
#include <stddef.h>
-#ifdef __USE_UNIX98
+#ifdef __USE_XOPEN
/* The Single Unix specification says that some more types are
available here. */
# ifndef gid_t
#include <bits/types.h>
#include <bits/sigset.h> /* __sigset_t, __sig_atomic_t. */
-#if defined _SIGNAL_H && defined __USE_UNIX98 && !defined pid_t
+#if defined _SIGNAL_H && defined __USE_XOPEN && !defined pid_t
typedef __pid_t pid_t;
# define pid_t pid_t
#endif /* Unix98 */
dprintf;
# f*
- fprintf; fscanf;
+ flockfile; fprintf; fscanf; ftrylockfile; funlockfile;
# g*
getline; getw;
GLIBC_2.1 {
# functions used in other libraries
__asprintf;
+
+ # c*
+ clearerr_unlocked;
+
+ # f*
+ feof_unlocked; ferror_unlocked; fflush_unlocked; fgets_unlocked;
+ fileno_unlocked; fputc_unlocked; fread_unlocked; fwrite_unlocked;
+
+ # g*
+ getc_unlocked; getchar_unlocked;
+
+ # p*
+ putc_unlocked; putchar_unlocked;
}
}
-/* Copyright (C) 1991, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 1998 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
{
__clearerr (stream);
}
+
+weak_alias (clearerr, clearerr_unlocked)
-/* Copyright (C) 1991, 1995, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1998 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
-/* Copyright (C) 1991, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1998 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
#include <stdio.h>
#undef feof
-
+#undef feof_unlocked
/* Return non-zero if STREAM has its EOF indicator set. */
int
return stream->__eof;
}
+
+weak_alias (feof, feof_unlocked)
-/* Copyright (C) 1991, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 1998 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
#include <stdio.h>
#undef ferror
+#undef ferror_unlocked
/* Return non-zero if STREAM has its error indicator set. */
return stream->__error;
}
+
+weak_alias (ferror, ferror_unlocked)
-/* Copyright (C) 1991, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1998 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
return __flshfp (stream, EOF);
}
+
+weak_alias(fflush, fflush_unlocked)
-/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 95, 96, 97, 98 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
*p = '\0';
return ferror (stream) ? NULL : s;
}
+
+weak_alias (fgets, fgets_unlocked)
-/* Copyright (C) 1991, 1993, 1994, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 93, 94, 96, 97, 98 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
return (*stream->__io_funcs.__fileno) (stream->__cookie);
}
+
+weak_alias(fileno, fileno_unlocked)
-/* Copyright (C) 1991, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 1998 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
return __putc (c, stream);
}
+
+weak_alias (fputc, fputc_unlocked)
-/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 95, 96, 97, 98 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
return (bytes - to_read) / size;
}
+
+weak_alias (fread, fread_unlocked)
-/* Copyright (C) 1991, 92, 93, 94, 96, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 96, 97, 98 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
done:;
return (size_t) written / size;
}
+
+weak_alias (fwrite, fwrite_unlocked)
#undef getc
#define fgetc getc
#include <fgetc.c>
+
+weak_alias (getc, getc_unlocked)
-/* Copyright (C) 1991, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 1998 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
{
return __getc (stdin);
}
+
+weak_alias (getchar, getchar_unlocked)
#include <stdio.h>
#undef putc
#define fputc putc
+#define fputc_unlocked putc_unlocked
#include <fputc.c>
-/* Copyright (C) 1991, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 1998 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
{
return __putc (c, stdout);
}
+
+weak_alias (putchar, putchar_unlocked)
/* Flush STREAM, or all streams if STREAM is NULL. */
extern int fflush __P ((FILE *__stream));
+#ifdef __USE_MISC
+/* Faster versions when locking is not required. */
+extern int fflush_unlocked __P ((FILE *__stream));
+#endif
+
#ifdef __USE_GNU
/* Close all streams. */
extern int __fcloseall __P ((void));
}
#endif /* Optimizing. */
+#if defined __USE_POSIX || defined __USE_MISC
+/* These are defined in POSIX.1:1996. */
+extern int getc_unlocked __P ((FILE *__stream));
+extern int getchar_unlocked __P ((void));
+
+# ifdef __OPTIMIZE__
+extern __inline int
+getc_unlocked (FILE *__stream)
+{
+ return __getc (__stream);
+}
+
+extern __inline int
+getchar_unlocked (void)
+{
+ return __getc (stdin);
+}
+# endif /* Optimizing. */
+#endif /* Use POSIX or MISC. */
+
/* Write a character to STREAM. */
extern int fputc __P ((int __c, FILE *__stream));
}
#endif
+#ifdef __USE_MISC
+/* Faster version when locking is not necessary. */
+extern int fputc_unlocked __P ((int __c, FILE *__stream));
+
+# ifdef __OPTIMIZE__
+extern __inline int
+fputc_unlocked (int __c, FILE *__stream)
+{
+ return __putc (__c, __stream);
+}
+# endif /* Optimizing. */
+#endif /* Use MISC. */
+
+#if defined __USE_POSIX || defined __USE_MISC
+/* These are defined in POSIX.1:1996. */
+extern int putc_unlocked __P ((int __c, FILE *__stream));
+extern int putchar_unlocked __P ((int __c));
+
+# ifdef __OPTIMIZE__
+extern __inline int
+putc_unlocked (int __c, FILE *__stream)
+{
+ return __putc (__c, __stream);
+}
+
+extern __inline int
+putchar_unlocked (int __c)
+{
+ return __putc (__c, stdout);
+}
+# endif /* Optimizing. */
+#endif /* Use POSIX or MISC. */
+
#if defined __USE_SVID || defined __USE_MISC
/* Get a word (int) from STREAM. */
extern char *fgets __P ((char *__restrict __s, int __n,
FILE *__restrict __stream));
+#ifdef __USE_GNU
+/* This function does the same as `fgets' but does not lock the stream. */
+extern char *fgets_unlocked __P ((char *__restrict __s, int __n,
+ FILE *__restrict __stream));
+#endif
+
/* Get a newline-terminated string from stdin, removing the newline.
DO NOT USE THIS FUNCTION!! There is no limit on how much it will read. */
extern char *gets __P ((char *__s));
extern size_t fwrite __P ((__const __ptr_t __restrict __ptr, size_t __size,
size_t __n, FILE *__restrict __s));
+#ifdef __USE_MISC
+/* Faster versions when locking is not necessary. */
+extern size_t fread_unlocked __P ((void *__restrict __ptr, size_t __size,
+ size_t __n, FILE *__restrict __stream));
+extern size_t fwrite_unlocked __P ((__const void *__restrict __ptr,
+ size_t __size, size_t __n,
+ FILE *__restrict __stream));
+#endif
+
/* Seek to a certain position on STREAM. */
extern int fseek __P ((FILE *__stream, long int __off, int __whence));
#define ferror(stream) ((stream)->__error != 0)
#endif /* Optimizing. */
+#ifdef __USE_MISC
+/* Faster versions when locking is not required. */
+extern void clearerr_unlocked __P ((FILE *__stream));
+extern int feof_unlocked __P ((FILE *__stream));
+extern int ferror_unlocked __P ((FILE *__stream));
+
+# ifdef __OPTIMIZE__
+# define feof_unlocked(stream) ((stream)->__eof != 0)
+# define ferror_unlocked(stream) ((stream)->__error != 0)
+# endif /* Optimizing. */
+#endif
/* Print a message describing the meaning of the value of errno. */
extern void perror __P ((__const char *__s));
extern int fileno __P ((FILE *__stream));
#endif /* Use POSIX. */
+#ifdef __USE_MISC
+/* Faster version when locking is not required. */
+extern int fileno_unlocked __P ((FILE *__stream));
+#endif
+
#if (defined __USE_POSIX2 || defined __USE_SVID || defined __USE_BSD || \
defined __USE_MISC)
#endif
+#if defined __USE_POSIX || defined __USE_MISC
+/* These are defined in POSIX.1:1996. */
+
+/* Acquire ownership of STREAM. */
+extern void flockfile __P ((FILE *__stream));
+
+/* Try to acquire ownership of STREAM but do not block if it is not
+ possible. */
+extern int ftrylockfile __P ((FILE *__stream));
+
+/* Relinquish the ownership granted for STREAM. */
+extern void funlockfile __P ((FILE *__stream));
+#endif /* POSIX || misc */
+
+#if defined __USE_XOPEN && !defined __USE_GNU
+/* The X/Open standard requires some functions and variables to be
+ declared here which do not belong into this header. But we have to
+ follow. In GNU mode we don't do this nonsense. */
+
+/* For more information on these symbols look in <getopt.h>. */
+extern char *optarg;
+extern int optind;
+extern int opterr;
+extern int optopt;
+
+extern int getopt __P ((int __argc, char *__const *__argv,
+ __const char *__shortopts));
+#endif
+
__END_DECLS
#endif /* <stdio.h> included. */
-/* Copyright (C) 1991, 1995, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1998 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
#else
return -1;
#endif
+
+ case _PC_FILESIZEBITS:
+#ifdef FILESIZEBITS
+ return FILESIZEBITS;
+#else
+ /* We let platforms with larger file sizes overwrite this value. */
+ return 32;
+#endif
}
}
+#undef __fpathconf
weak_alias (__fpathconf, fpathconf)
/* For now Linux has synchronisity options for data and read operations.
We define the symbols here but let them do the same as O_SYNS since
this is a superset. */
-#ifdef __USE_UNIX98
+#if defined __USE_POSIX199309 || defined __USE_UNIX98
# define O_DSYNC O_SYNC /* Synchronize data. */
# define O_RSYNC O_SYNC /* Synchronize read operations. */
#endif
/* termios type and macro definitions. Linux version.
- Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1993, 94, 95, 96, 97, 98 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
#define ONLRET 0000040
#define OFILL 0000100
#define OFDEL 0000200
-#if defined __USE_MISC || defined __USE_UNIX98
+#if defined __USE_MISC || defined __USE_XOPEN
# define NLDLY 0000400
# define NL0 0000000
# define NL1 0000400
/* c_lflag bits */
#define ISIG 0000001
#define ICANON 0000002
-#if defined __USE_MISC || defined __USE_UNIX98
+#if defined __USE_MISC || defined __USE_XOPEN
# define XCASE 0000004
#endif
#define ECHO 0000010
# define WEOF (0xffffffffu)
#endif
+/* For XPG4 compliance we have to define the stuff from <wctype.h> here
+ as well. */
+#if defined __USE_XOPEN && !defined __USE_UNIX98
+# include <wctype.h>
+#endif
+
/* This incomplete type is defined in <time.h> but needed here because
of `wcsftime'. */
struct tm;
/* Find the first occurrence of NEEDLE in HAYSTACK. */
extern wchar_t *wcsstr __P ((__const wchar_t *__haystack,
__const wchar_t *__needle));
+
+#if defined __USE_XOPEN && !defined __USE_UNIX98
+/* Another name for `wcsstr' from XPG4. */
+extern wchar_t *wcswcs __P ((__const wchar_t *__haystack,
+ __const wchar_t *__needle));
+#endif
+
/* Divide WCS into tokens separated by characters in DELIM. */
extern wchar_t *wcstok __P ((wchar_t *__restrict __s,
__const wchar_t *__restrict __delim,
projects / thirdparty / glibc.git / commitdiff
