1999-06-23  Zack Weinberg  <zack@rabi.columbia.edu>

	* libio/stdio.h: Define stdin, stdout, stderr as macros.
	* math/complex.h: Don't define
	CX_LIMITED_RANGE_{ON,OFF,DEFAULT}.  These are *pragmas* not
	macros.
	* wcsmbs/wchar.h: Fix comment.

	* grp/grp.h: Use __foo_t_defined convention to typedef things
	only once.
	* io/sys/stat.h: Likewise.
	* libio/stdio.h: Likewise.
	* posix/unistd.h: Likewise.
	* posix/sys/types.h: Likewise.
	* posix/sys/wait.h: Likewise.
	* pwd/pwd.h: Likewise.
	* signal/signal.h: Likewise.
	* sysdeps/generic/stdint.h: Likewise.
	* sysdeps/gnu/utmpx.h: Likewise.
	* termios/termios.h: Likewise.
This commit is contained in:
Ulrich Drepper 1999-06-23 11:04:09 +00:00
parent 1cc2b04ed7
commit 7df789e059
14 changed files with 100 additions and 84 deletions

View File

@ -1,3 +1,24 @@
1999-06-23 Zack Weinberg <zack@rabi.columbia.edu>
* libio/stdio.h: Define stdin, stdout, stderr as macros.
* math/complex.h: Don't define
CX_LIMITED_RANGE_{ON,OFF,DEFAULT}. These are *pragmas* not
macros.
* wcsmbs/wchar.h: Fix comment.
* grp/grp.h: Use __foo_t_defined convention to typedef things
only once.
* io/sys/stat.h: Likewise.
* libio/stdio.h: Likewise.
* posix/unistd.h: Likewise.
* posix/sys/types.h: Likewise.
* posix/sys/wait.h: Likewise.
* pwd/pwd.h: Likewise.
* signal/signal.h: Likewise.
* sysdeps/generic/stdint.h: Likewise.
* sysdeps/gnu/utmpx.h: Likewise.
* termios/termios.h: Likewise.
1999-06-23 Ulrich Drepper <drepper@cygnus.com> 1999-06-23 Ulrich Drepper <drepper@cygnus.com>
* stdio/fputc.c: Don't define alias if fputc is defined as a * stdio/fputc.c: Don't define alias if fputc is defined as a

View File

@ -34,9 +34,9 @@ __BEGIN_DECLS
/* For the Single Unix specification we must define this type here. */ /* For the Single Unix specification we must define this type here. */
#if defined __USE_XOPEN && !defined gid_t #if defined __USE_XOPEN && !defined __gid_t_defined
typedef __gid_t gid_t; typedef __gid_t gid_t;
# define gid_t gid_t # define __gid_t_defined
#endif #endif
/* The group structure. */ /* The group structure. */

View File

@ -33,54 +33,54 @@
/* The Single Unix specification says that some more types are /* The Single Unix specification says that some more types are
available here. */ available here. */
# ifndef dev_t # ifndef __dev_t_defined
typedef __dev_t dev_t; typedef __dev_t dev_t;
# define dev_t dev_t # define __dev_t_defined
# endif # endif
# ifndef gid_t # ifndef __gid_t_defined
typedef __gid_t gid_t; typedef __gid_t gid_t;
# define gid_t gid_t # define __gid_t_defined
# endif # endif
# ifndef ino_t # ifndef __ino_t_defined
# ifndef __USE_FILE_OFFSET64 # ifndef __USE_FILE_OFFSET64
typedef __ino_t ino_t; typedef __ino_t ino_t;
# else # else
typedef __ino64_t ino_t; typedef __ino64_t ino_t;
# endif # endif
# define ino_t ino_t # define __ino_t_defined
# endif # endif
# ifndef mode_t # ifndef __mode_t_defined
typedef __mode_t mode_t; typedef __mode_t mode_t;
# define mode_t mode_t # define __mode_t_defined
# endif # endif
# ifndef nlink_t # ifndef __nlink_t_defined
typedef __nlink_t nlink_t; typedef __nlink_t nlink_t;
# define nlink_t nlink_t # define __nlink_t_defined
# endif # endif
# ifndef off_t # ifndef __off_t_defined
# ifndef __USE_FILE_OFFSET64 # ifndef __USE_FILE_OFFSET64
typedef __off_t off_t; typedef __off_t off_t;
# else # else
typedef __off64_t off_t; typedef __off64_t off_t;
# endif # endif
# define off_t off_t # define __off_t_defined
# endif # endif
# ifndef uid_t # ifndef __uid_t_defined
typedef __uid_t uid_t; typedef __uid_t uid_t;
# define uid_t uid_t # define __uid_t_defined
# endif # endif
#endif /* X/Open */ #endif /* X/Open */
#ifdef __USE_UNIX98 #ifdef __USE_UNIX98
# ifndef pid_t # ifndef __pid_t_defined
typedef __pid_t pid_t; typedef __pid_t pid_t;
# define pid_t pid_t # define __pid_t_defined
# endif # endif
#endif /* Unix98 */ #endif /* Unix98 */

View File

@ -114,7 +114,10 @@ typedef _G_fpos64_t fpos64_t;
extern FILE *stdin; /* Standard input stream. */ extern FILE *stdin; /* Standard input stream. */
extern FILE *stdout; /* Standard output stream. */ extern FILE *stdout; /* Standard output stream. */
extern FILE *stderr; /* Standard error output stream. */ extern FILE *stderr; /* Standard error output stream. */
/* C89/C9x say they're macros. Make them happy. */
#define stdin stdin
#define stdout stdout
#define stderr stderr
/* Remove file FILENAME. */ /* Remove file FILENAME. */
extern int remove __P ((__const char *__filename)); extern int remove __P ((__const char *__filename));
@ -468,18 +471,18 @@ extern void rewind __P ((FILE *__stream));
are originally defined in the Large File Support API. */ are originally defined in the Large File Support API. */
/* Types needed in these functions. */ /* Types needed in these functions. */
#ifndef off_t #ifndef __off_t_defined
# ifndef __USE_FILE_OFFSET64 # ifndef __USE_FILE_OFFSET64
typedef __off_t off_t; typedef __off_t off_t;
# else # else
typedef __off64_t off_t; typedef __off64_t off_t;
# endif # endif
# define off_t off_t # define __off_t_defined
#endif #endif
#if defined __USE_LARGEFILE64 && !defined off64_t #if defined __USE_LARGEFILE64 && !defined __off64_t_defined
typedef __off64_t off64_t; typedef __off64_t off64_t;
# define off64_t off64_t # define __off64_t_defined
#endif #endif

View File

@ -48,14 +48,6 @@ __BEGIN_DECLS
#undef I #undef I
#define I _Complex_I #define I _Complex_I
/* Optimization aids. This is not yet implemented in gcc and once it
is this will probably be available in a gcc header. */
#define CX_LIMITED_RANGE_ON
#define CX_LIMITED_RANGE_OFF
#define CX_LIMITED_RANGE_DEFAULT
/* The file <bits/cmathcalls.h> contains the prototypes for all the /* The file <bits/cmathcalls.h> contains the prototypes for all the
actual math functions. These macros are used for those prototypes, actual math functions. These macros are used for those prototypes,
so we can easily declare each function as both `name' and `__name', so we can easily declare each function as both `name' and `__name',

View File

@ -41,68 +41,68 @@ typedef __fsid_t fsid_t;
typedef __loff_t loff_t; typedef __loff_t loff_t;
#ifndef ino_t #ifndef __ino_t_defined
# ifndef __USE_FILE_OFFSET64 # ifndef __USE_FILE_OFFSET64
typedef __ino_t ino_t; typedef __ino_t ino_t;
# else # else
typedef __ino64_t ino_t; typedef __ino64_t ino_t;
# endif # endif
# define ino_t ino_t # define __ino_t_defined
#endif #endif
#ifdef __USE_LARGEFILE64 #ifdef __USE_LARGEFILE64
typedef __ino64_t ino64_t; typedef __ino64_t ino64_t;
#endif #endif
#ifndef dev_t #ifndef __dev_t_defined
typedef __dev_t dev_t; typedef __dev_t dev_t;
# define dev_t dev_t # define __dev_t_defined
#endif #endif
#ifndef gid_t #ifndef __gid_t_defined
typedef __gid_t gid_t; typedef __gid_t gid_t;
# define gid_t gid_t # define __gid_t_defined
#endif #endif
#ifndef mode_t #ifndef __mode_t_defined
typedef __mode_t mode_t; typedef __mode_t mode_t;
# define mode_t mode_t # define __mode_t_defined
#endif #endif
#ifndef nlink_t #ifndef __nlink_t_defined
typedef __nlink_t nlink_t; typedef __nlink_t nlink_t;
# define nlink_t nlink_t # define __nlink_t_defined
#endif #endif
#ifndef uid_t #ifndef __uid_t_defined
typedef __uid_t uid_t; typedef __uid_t uid_t;
# define uid_t uid_t # define __uid_t_defined
#endif #endif
#ifndef off_t #ifndef __off_t_defined
# ifndef __USE_FILE_OFFSET64 # ifndef __USE_FILE_OFFSET64
typedef __off_t off_t; typedef __off_t off_t;
# else # else
typedef __off64_t off_t; typedef __off64_t off_t;
# endif # endif
# define off_t off_t # define __off_t_defined
#endif #endif
#if defined __USE_LARGEFILE64 && !defined off64_t #if defined __USE_LARGEFILE64 && !defined __off64_t_defined
typedef __off64_t off64_t; typedef __off64_t off64_t;
# define off64_t off64_t # define __off64_t_defined
#endif #endif
#ifndef pid_t #ifndef __pid_t_defined
typedef __pid_t pid_t; typedef __pid_t pid_t;
# define pid_t pid_t # define __pid_t_defined
#endif #endif
#if defined __USE_SVID || defined __USE_XOPEN #if defined __USE_SVID || defined __USE_XOPEN
typedef __id_t id_t; typedef __id_t id_t;
#endif #endif
#ifndef ssize_t #ifndef __ssize_t_defined
typedef __ssize_t ssize_t; typedef __ssize_t ssize_t;
# define ssize_t ssize_t # define __ssize_t_defined
#endif #endif
#ifdef __USE_BSD #ifdef __USE_BSD

View File

@ -29,9 +29,9 @@ __BEGIN_DECLS
#include <bits/types.h> #include <bits/types.h>
#if defined __USE_XOPEN && !defined pid_t #if defined __USE_XOPEN && !defined __pid_t_defined
typedef __pid_t pid_t; typedef __pid_t pid_t;
# define pid_t pid_t # define __pid_t_defined
#endif #endif
/* This will define the `W*' macros for the flag /* This will define the `W*' macros for the flag

View File

@ -189,9 +189,9 @@ __BEGIN_DECLS
#include <bits/types.h> #include <bits/types.h>
#ifndef ssize_t #ifndef __ssize_t_defined
typedef __ssize_t ssize_t; typedef __ssize_t ssize_t;
# define ssize_t ssize_t # define __ssize_t_defined
#endif #endif
#define __need_size_t #define __need_size_t
@ -201,39 +201,39 @@ typedef __ssize_t ssize_t;
#ifdef __USE_XOPEN #ifdef __USE_XOPEN
/* The Single Unix specification says that some more types are /* The Single Unix specification says that some more types are
available here. */ available here. */
# ifndef gid_t # ifndef __gid_t_defined
typedef __gid_t gid_t; typedef __gid_t gid_t;
# define gid_t gid_t # define __gid_t_defined
# endif # endif
# ifndef uid_t # ifndef __uid_t_defined
typedef __uid_t uid_t; typedef __uid_t uid_t;
# define uid_t uid_t # define __uid_t_defined
# endif # endif
# ifndef off_t # ifndef __off_t_defined
# ifndef __USE_FILE_OFFSET64 # ifndef __USE_FILE_OFFSET64
typedef __off_t off_t; typedef __off_t off_t;
# else # else
typedef __off64_t off_t; typedef __off64_t off_t;
# endif # endif
# define off_t off_t # define __off_t_defined
# endif # endif
# if defined __USE_LARGEFILE64 && !defined off64_t # if defined __USE_LARGEFILE64 && !defined __off64_t_defined
typedef __off64_t off64_t; typedef __off64_t off64_t;
# define off64_t off64_t # define __off64_t_defined
# endif # endif
# ifndef pid_t # ifndef __pid_t_defined
typedef __pid_t pid_t; typedef __pid_t pid_t;
# define pid_t pid_t # define __pid_t_defined
# endif # endif
#endif /* X/Open */ #endif /* X/Open */
#ifdef __USE_UNIX98 #ifdef __USE_UNIX98
# ifndef intptr_t # ifndef __intptr_t_defined
typedef __intptr_t intptr_t; typedef __intptr_t intptr_t;
# define intptr_t intptr_t # define __intptr_t_defined
# endif # endif
#endif /* Unix98 */ #endif /* Unix98 */

View File

@ -35,14 +35,14 @@ __BEGIN_DECLS
#ifdef __USE_XOPEN #ifdef __USE_XOPEN
/* The Single Unix specification says that some more types are /* The Single Unix specification says that some more types are
available here. */ available here. */
# ifndef gid_t # ifndef __gid_t_defined
typedef __gid_t gid_t; typedef __gid_t gid_t;
# define gid_t gid_t # define __gid_t_defined
# endif # endif
# ifndef uid_t # ifndef __uid_t_defined
typedef __uid_t uid_t; typedef __uid_t uid_t;
# define uid_t uid_t # define __uid_t_defined
# endif # endif
#endif #endif

View File

@ -37,7 +37,7 @@ __BEGIN_DECLS
#ifndef __sig_atomic_t_defined #ifndef __sig_atomic_t_defined
# if defined __need_sig_atomic_t || defined _SIGNAL_H # if defined __need_sig_atomic_t || defined _SIGNAL_H
# undef __need_sig_atomic_t # undef __need_sig_atomic_t
# define __sig_atomic_t_defined 1 # define __sig_atomic_t_defined
typedef __sig_atomic_t sig_atomic_t; typedef __sig_atomic_t sig_atomic_t;
# endif # endif
#endif #endif
@ -45,7 +45,7 @@ typedef __sig_atomic_t sig_atomic_t;
#ifndef __sigset_t_defined #ifndef __sigset_t_defined
# if defined __need_sigset_t || (defined _SIGNAL_H && defined __USE_POSIX) # if defined __need_sigset_t || (defined _SIGNAL_H && defined __USE_POSIX)
# undef __need_sigset_t # undef __need_sigset_t
# define __sigset_t_defined 1 # define __sigset_t_defined
typedef __sigset_t sigset_t; typedef __sigset_t sigset_t;
# endif # endif
#endif #endif
@ -55,9 +55,9 @@ typedef __sigset_t sigset_t;
#include <bits/types.h> #include <bits/types.h>
#include <bits/signum.h> #include <bits/signum.h>
#if defined __USE_XOPEN && !defined pid_t #if defined __USE_XOPEN && !defined __pid_t_defined
typedef __pid_t pid_t; typedef __pid_t pid_t;
# define pid_t pid_t # define __pid_t_defined
#endif /* Unix98 */ #endif /* Unix98 */

View File

@ -114,15 +114,15 @@ typedef unsigned long long int uint_fast64_t;
/* Types for `void *' pointers. */ /* Types for `void *' pointers. */
#if __WORDSIZE == 64 #if __WORDSIZE == 64
# ifndef intptr_t # ifndef __intptr_t_defined
typedef long int intptr_t; typedef long int intptr_t;
# define intptr_t intptr_t # define __intptr_t_defined
# endif # endif
typedef unsigned long int uintptr_t; typedef unsigned long int uintptr_t;
#else #else
# ifndef intptr_t # ifndef __intptr_t_defined
typedef int intptr_t; typedef int intptr_t;
# define intptr_t intptr_t # define __intptr_t_defined
# endif # endif
typedef unsigned int uintptr_t; typedef unsigned int uintptr_t;
#endif #endif

View File

@ -23,9 +23,9 @@
#include <sys/time.h> #include <sys/time.h>
/* Required according to Unix98. */ /* Required according to Unix98. */
#ifndef pid_t #ifndef __pid_t_defined
typedef __pid_t pid_t; typedef __pid_t pid_t;
# define pid_t pid_t # define __pid_t_defined
#endif #endif
/* Get system dependent values and data structures. */ /* Get system dependent values and data structures. */

View File

@ -27,9 +27,9 @@
#ifdef __USE_UNIX98 #ifdef __USE_UNIX98
/* We need `pid_t'. */ /* We need `pid_t'. */
# include <bits/types.h> # include <bits/types.h>
# ifndef pid_t # ifndef __pid_t_defined
typedef __pid_t pid_t; typedef __pid_t pid_t;
# define pid_t pid_t # define __pid_t_defined
# endif # endif
#endif #endif

View File

@ -325,7 +325,7 @@ extern float wcstof __P ((__const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr)); wchar_t **__restrict __endptr));
extern __long_double_t wcstold __P ((__const wchar_t *__restrict __nptr, extern __long_double_t wcstold __P ((__const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr)); wchar_t **__restrict __endptr));
#endif /* GNU */ #endif /* C9x */
/* Convert initial portion of wide string NPTR to `long int' /* Convert initial portion of wide string NPTR to `long int'