about summary refs log tree commit diff
path: root/posix/unistd.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-06-23 11:04:09 +0000
committerUlrich Drepper <drepper@redhat.com>1999-06-23 11:04:09 +0000
commit7df789e05906a883d03ed2cb2c400356350767cc (patch)
treeadd7f546a432615f01f0b1939fa20cc5b02ee67d /posix/unistd.h
parent1cc2b04ed7932364d53baf58d0730acbaa1b4bb7 (diff)
downloadglibc-7df789e05906a883d03ed2cb2c400356350767cc.tar.gz
glibc-7df789e05906a883d03ed2cb2c400356350767cc.tar.xz
glibc-7df789e05906a883d03ed2cb2c400356350767cc.zip
Update.
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.
Diffstat (limited to 'posix/unistd.h')
-rw-r--r--posix/unistd.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/posix/unistd.h b/posix/unistd.h
index 9e8cf6ba02..0a00010ae6 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -189,9 +189,9 @@ __BEGIN_DECLS
 
 #include <bits/types.h>
 
-#ifndef	ssize_t
+#ifndef	__ssize_t_defined
 typedef __ssize_t ssize_t;
-# define ssize_t ssize_t
+# define __ssize_t_defined
 #endif
 
 #define	__need_size_t
@@ -201,39 +201,39 @@ typedef __ssize_t ssize_t;
 #ifdef __USE_XOPEN
 /* The Single Unix specification says that some more types are
    available here.  */
-# ifndef gid_t
+# ifndef __gid_t_defined
 typedef __gid_t gid_t;
-#  define gid_t gid_t
+#  define __gid_t_defined
 # endif
 
-# ifndef uid_t
+# ifndef __uid_t_defined
 typedef __uid_t uid_t;
-#  define uid_t uid_t
+#  define __uid_t_defined
 # endif
 
-# ifndef off_t
+# ifndef __off_t_defined
 #  ifndef __USE_FILE_OFFSET64
 typedef __off_t off_t;
 #  else
 typedef __off64_t off_t;
 #  endif
-#  define off_t off_t
+#  define __off_t_defined
 # endif
-# if defined __USE_LARGEFILE64 && !defined off64_t
+# if defined __USE_LARGEFILE64 && !defined __off64_t_defined
 typedef __off64_t off64_t;
-#  define off64_t off64_t
+#  define __off64_t_defined
 # endif
 
-# ifndef pid_t
+# ifndef __pid_t_defined
 typedef __pid_t pid_t;
-#  define pid_t pid_t
+#  define __pid_t_defined
 # endif
 #endif	/* X/Open */
 
 #ifdef __USE_UNIX98
-# ifndef intptr_t
+# ifndef __intptr_t_defined
 typedef __intptr_t intptr_t;
-#  define intptr_t intptr_t
+#  define __intptr_t_defined
 # endif
 #endif	/* Unix98 */