From 7df789e05906a883d03ed2cb2c400356350767cc Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 23 Jun 1999 11:04:09 +0000
Subject: 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.
---
 posix/sys/types.h | 40 ++++++++++++++++++++--------------------
 posix/sys/wait.h  |  4 ++--
 2 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'posix/sys')

diff --git a/posix/sys/types.h b/posix/sys/types.h
index 362d547c08..61d46f27dc 100644
--- a/posix/sys/types.h
+++ b/posix/sys/types.h
@@ -41,68 +41,68 @@ typedef __fsid_t fsid_t;
 
 typedef __loff_t loff_t;
 
-#ifndef ino_t
+#ifndef __ino_t_defined
 # ifndef __USE_FILE_OFFSET64
 typedef __ino_t ino_t;
 # else
 typedef __ino64_t ino_t;
 # endif
-# define ino_t ino_t
+# define __ino_t_defined
 #endif
 #ifdef __USE_LARGEFILE64
 typedef __ino64_t ino64_t;
 #endif
 
-#ifndef dev_t
+#ifndef __dev_t_defined
 typedef __dev_t dev_t;
-# define dev_t dev_t
+# define __dev_t_defined
 #endif
 
-#ifndef gid_t
+#ifndef __gid_t_defined
 typedef __gid_t gid_t;
-# define gid_t gid_t
+# define __gid_t_defined
 #endif
 
-#ifndef mode_t
+#ifndef __mode_t_defined
 typedef __mode_t mode_t;
-# define mode_t mode_t
+# define __mode_t_defined
 #endif
 
-#ifndef nlink_t
+#ifndef __nlink_t_defined
 typedef __nlink_t nlink_t;
-# define nlink_t nlink_t
+# define __nlink_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
 
 #if defined __USE_SVID || defined __USE_XOPEN
 typedef __id_t id_t;
 #endif
 
-#ifndef ssize_t
+#ifndef __ssize_t_defined
 typedef __ssize_t ssize_t;
-# define ssize_t ssize_t
+# define __ssize_t_defined
 #endif
 
 #ifdef	__USE_BSD
diff --git a/posix/sys/wait.h b/posix/sys/wait.h
index 2ba604de6b..aba0493b0b 100644
--- a/posix/sys/wait.h
+++ b/posix/sys/wait.h
@@ -29,9 +29,9 @@ __BEGIN_DECLS
 
 #include <bits/types.h>
 
-#if defined __USE_XOPEN && !defined pid_t
+#if defined __USE_XOPEN && !defined __pid_t_defined
 typedef __pid_t pid_t;
-# define pid_t pid_t
+# define __pid_t_defined
 #endif
 
 /* This will define the `W*' macros for the flag
-- 
cgit v1.2.3