From 74eea628cf43355ba2b227f0bb3c31697d637761 Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Mon, 14 Feb 2011 18:41:25 -0500
Subject: extensive header cleanup for standards conformance & correctness

thanks to Peter Mazinger (psm) for pointing many of these issues out
and submitting a patch on which this commit is loosely based
---
 include/bits/alltypes.h.sh | 5 +++--
 include/bits/socket.h      | 2 --
 include/bits/stat.h        | 9 +++------
 include/bits/uio.h         | 4 ----
 include/bits/wait.h        | 2 ++
 5 files changed, 8 insertions(+), 14 deletions(-)
 delete mode 100644 include/bits/uio.h

(limited to 'include/bits')

diff --git a/include/bits/alltypes.h.sh b/include/bits/alltypes.h.sh
index 595bf13e..c909d7b0 100755
--- a/include/bits/alltypes.h.sh
+++ b/include/bits/alltypes.h.sh
@@ -68,9 +68,9 @@ TYPEDEF long long          intmax_t;
 TYPEDEF unsigned long long uintmax_t;
 
 TYPEDEF long time_t;
-TYPEDEF unsigned int useconds_t;
+TYPEDEF unsigned useconds_t;
 TYPEDEF int suseconds_t;
-STRUCT timeval { time_t tv_sec; long tv_usec; };
+STRUCT timeval { time_t tv_sec; int tv_usec; };
 STRUCT timespec { time_t tv_sec; long tv_nsec; };
 
 TYPEDEF int pid_t;
@@ -111,5 +111,6 @@ TYPEDEF int nl_item;
 
 TYPEDEF struct __locale * locale_t;
 
+STRUCT iovec { void *iov_base; size_t iov_len; };
 
 EOF
diff --git a/include/bits/socket.h b/include/bits/socket.h
index 7a51f792..c8bac6b2 100644
--- a/include/bits/socket.h
+++ b/include/bits/socket.h
@@ -1,5 +1,3 @@
-struct iovec;
-
 struct msghdr
 {
 	void *msg_name;
diff --git a/include/bits/stat.h b/include/bits/stat.h
index 1ef34698..bb9314a5 100644
--- a/include/bits/stat.h
+++ b/include/bits/stat.h
@@ -15,11 +15,8 @@ struct stat
 	off_t st_size;
 	blksize_t st_blksize;
 	blkcnt_t st_blocks;
-	time_t st_atime;
-	unsigned long __st_atime_nsec;
-	time_t st_mtime;
-	unsigned long __st_mtime_nsec;
-	time_t st_ctime;
-	unsigned long __st_ctime_nsec;
+	struct timespec st_atim;
+	struct timespec st_mtim;
+	struct timespec st_ctim;
 	ino_t st_ino;
 };
diff --git a/include/bits/uio.h b/include/bits/uio.h
deleted file mode 100644
index 43252653..00000000
--- a/include/bits/uio.h
+++ /dev/null
@@ -1,4 +0,0 @@
-struct iovec {
-	void *iov_base;
-	size_t iov_len;
-};
diff --git a/include/bits/wait.h b/include/bits/wait.h
index ca9b57e0..ae3f1012 100644
--- a/include/bits/wait.h
+++ b/include/bits/wait.h
@@ -6,6 +6,8 @@
 #define WCONTINUED 8
 #define WNOWAIT    0x1000000
 
+#if defined(__XOPEN_SOURCE) || defined(__GNU_SOURCE)
 #define P_ALL  0
 #define P_PID  1
 #define P_PGID 2
+#endif
-- 
cgit v1.2.1