From bb89bdd00e494baa11ceb67bf40cc28b0104b642 Mon Sep 17 00:00:00 2001
From: "Nicholas J. Kain" <njkain@gmail.com>
Date: Tue, 15 Feb 2011 08:02:33 -0500
Subject: Update x86_64 bits to mirror (modulo platform differences) the latest
 changes to i386.

---
 arch/x86_64/bits/alltypes.h.sh |  8 ++++----
 arch/x86_64/bits/signal.h      | 14 +++++++++++---
 arch/x86_64/bits/socket.h      |  2 --
 arch/x86_64/bits/stat.h        |  9 +++------
 arch/x86_64/bits/wait.h        |  2 ++
 5 files changed, 20 insertions(+), 15 deletions(-)

(limited to 'arch/x86_64')

diff --git a/arch/x86_64/bits/alltypes.h.sh b/arch/x86_64/bits/alltypes.h.sh
index ce0b8ff1..2f5cf5d2 100755
--- a/arch/x86_64/bits/alltypes.h.sh
+++ b/arch/x86_64/bits/alltypes.h.sh
@@ -68,10 +68,10 @@ TYPEDEF long long          intmax_t;
 TYPEDEF unsigned long long uintmax_t;
 
 TYPEDEF long time_t;
-TYPEDEF unsigned int useconds_t;
+TYPEDEF long useconds_t;
 TYPEDEF long suseconds_t;
-STRUCT timeval { time_t tv_sec; long tv_usec; };
-STRUCT timespec { time_t tv_sec; long tv_nsec; };
+STRUCT timeval { time_t tv_sec; int tv_usec; };
+STRUCT timespec { time_t tv_sec; unsigned long tv_nsec; };
 
 TYPEDEF int pid_t;
 TYPEDEF int id_t;
@@ -96,7 +96,7 @@ TYPEDEF long timer_t;
 TYPEDEF int clockid_t;
 TYPEDEF long clock_t;
 
-TYPEDEF struct { unsigned long __bits[1024/sizeof(long)]; } sigset_t;
+TYPEDEF struct { unsigned long __bits[128/sizeof(long)]; } sigset_t;
 TYPEDEF struct __siginfo siginfo_t;
 
 TYPEDEF unsigned int socklen_t;
diff --git a/arch/x86_64/bits/signal.h b/arch/x86_64/bits/signal.h
index 02c54d5a..a9690488 100644
--- a/arch/x86_64/bits/signal.h
+++ b/arch/x86_64/bits/signal.h
@@ -1,3 +1,6 @@
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
+
 struct __siginfo
 {
 	int si_signo;
@@ -65,12 +68,17 @@ struct __siginfo
 #define SIG_UNBLOCK   1
 #define SIG_SETMASK   2
 
-#define SIG_ERR  ((void (*)(int))-1)
-#define SIG_DFL  ((void (*)(int)) 0)
-#define SIG_IGN  ((void (*)(int)) 1)
 #define SIG_HOLD ((void (*)(int)) 2)
 
+#endif
+
+#ifdef _GNU_SOURCE
 #define NSIG      64
+#endif
+
+#define SIG_ERR  ((void (*)(int))-1)
+#define SIG_DFL  ((void (*)(int)) 0)
+#define SIG_IGN  ((void (*)(int)) 1)
 
 #define SIGHUP    1
 #define SIGINT    2
diff --git a/arch/x86_64/bits/socket.h b/arch/x86_64/bits/socket.h
index cec01729..b3230625 100644
--- a/arch/x86_64/bits/socket.h
+++ b/arch/x86_64/bits/socket.h
@@ -1,5 +1,3 @@
-struct iovec;
-
 struct msghdr
 {
 	void *msg_name;
diff --git a/arch/x86_64/bits/stat.h b/arch/x86_64/bits/stat.h
index 84a4179a..21457961 100644
--- a/arch/x86_64/bits/stat.h
+++ b/arch/x86_64/bits/stat.h
@@ -15,11 +15,8 @@ struct stat {
 	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;
 	long __unused[3];
 };
diff --git a/arch/x86_64/bits/wait.h b/arch/x86_64/bits/wait.h
index ca9b57e0..ae3f1012 100644
--- a/arch/x86_64/bits/wait.h
+++ b/arch/x86_64/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