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

4 files changed, 8 insertions, 3 deletions

diff --git a/include/sys/socket.h b/include/sys/socket.h
index 78c93056..4005eb6d 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -11,6 +11,7 @@ extern "C" {
 #define __NEED_uid_t
 #define __NEED_pid_t
 #define __NEED_gid_t
+#define __NEED_struct_iovec
 
 #include <bits/alltypes.h>
 
diff --git a/include/sys/stat.h b/include/sys/stat.h
index 36575b0e..627890f4 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -14,11 +14,16 @@ extern "C" {
 #define __NEED_time_t
 #define __NEED_blksize_t
 #define __NEED_blkcnt_t
+#define __NEED_struct_timespec
 
 #include <bits/alltypes.h>
 
 #include <bits/stat.h>
 
+#define st_atime st_atim.tv_sec
+#define st_mtime st_mtim.tv_sec
+#define st_ctime st_ctim.tv_sec
+
 #define S_IFMT  0170000
 
 #define S_IFDIR 0040000
diff --git a/include/sys/time.h b/include/sys/time.h
index 9b3bfb99..edaf6af6 100644
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -9,7 +9,7 @@ extern "C" {
 
 #define __NEED_time_t
 #define __NEED_suseconds_t
-#define __NEED_timeval
+#define __NEED_struct_timeval
 
 #include <bits/alltypes.h>
 
diff --git a/include/sys/uio.h b/include/sys/uio.h
index 7b068c0c..11b6bd27 100644
--- a/include/sys/uio.h
+++ b/include/sys/uio.h
@@ -3,11 +3,10 @@
 
 #define __NEED_size_t
 #define __NEED_ssize_t
+#define __NEED_struct_iovec
 
 #include <bits/alltypes.h>
 
-#include <bits/uio.h>
-
 ssize_t readv (int, const struct iovec *, int);
 ssize_t writev (int, const struct iovec *, int);