From e59595df1694838b8f32527e0e6806b4730f78d1 Mon Sep 17 00:00:00 2001
From: shadow <shadow>
Date: Fri, 18 Apr 2008 06:53:17 +0000
Subject: [PATCH] use one place for syscall.h sys/syscall.h exist at all os'es
 instead of <syscall.h> which exist only at linux. b=14929 i=nikita

---
 libsysio/drivers/native/fs_native.c       |  2 +-
 libsysio/drivers/sockets/sockets.c        |  2 +-
 libsysio/drivers/yod/fs_yod.c             |  2 +-
 libsysio/src/fcntl.c                      |  2 +-
 lnet/include/libcfs/linux/portals_utils.h |  2 +-
 lnet/libcfs/user-tcpip.c                  |  2 +-
 lnet/ulnds/socklnd/handlers.c             |  2 +-
 lnet/ulnds/socklnd/poll.c                 |  2 +-
 lustre/include/linux/lustre_user.h        | 10 +++++-----
 lustre/liblustre/lutil.c                  |  2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libsysio/drivers/native/fs_native.c b/libsysio/drivers/native/fs_native.c
index 4081dfd..7980f68 100644
--- a/libsysio/drivers/native/fs_native.c
+++ b/libsysio/drivers/native/fs_native.c
@@ -56,7 +56,7 @@
 #endif
 #include <errno.h>
 #include <assert.h>
-#include <syscall.h>
+#include <sys/syscall.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/libsysio/drivers/sockets/sockets.c b/libsysio/drivers/sockets/sockets.c
index d311ae1..8dec0a7 100644
--- a/libsysio/drivers/sockets/sockets.c
+++ b/libsysio/drivers/sockets/sockets.c
@@ -53,7 +53,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <assert.h>
-#include <syscall.h>
+#include <sys/syscall.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/fcntl.h>
diff --git a/libsysio/drivers/yod/fs_yod.c b/libsysio/drivers/yod/fs_yod.c
index 6750ffb..56a9f66 100644
--- a/libsysio/drivers/yod/fs_yod.c
+++ b/libsysio/drivers/yod/fs_yod.c
@@ -53,7 +53,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <assert.h>
-#include <syscall.h>
+#include <sys/syscall.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/fcntl.h>
diff --git a/libsysio/src/fcntl.c b/libsysio/src/fcntl.c
index b779d70..64f6a2c 100644
--- a/libsysio/src/fcntl.c
+++ b/libsysio/src/fcntl.c
@@ -58,7 +58,7 @@
 #include "sysio-symbols.h"
 
 #ifdef HAVE_LUSTRE_HACK
-#include <syscall.h>
+#include <sys/syscall.h>
 #include <native.h>
 #endif
 
diff --git a/lnet/include/libcfs/linux/portals_utils.h b/lnet/include/libcfs/linux/portals_utils.h
index ae319af..4e76856 100644
--- a/lnet/include/libcfs/linux/portals_utils.h
+++ b/lnet/include/libcfs/linux/portals_utils.h
@@ -40,7 +40,7 @@
 #endif /* !HAVE_LINUX_VERSION_H */
 
 #ifndef __CYGWIN__
-# include <syscall.h>
+# include <sys/syscall.h>
 #else /* __CYGWIN__ */
 # include <windows.h>
 # include <windef.h>
diff --git a/lnet/libcfs/user-tcpip.c b/lnet/libcfs/user-tcpip.c
index 5637396..a76edb3 100644
--- a/lnet/libcfs/user-tcpip.c
+++ b/lnet/libcfs/user-tcpip.c
@@ -35,7 +35,7 @@
 #include <sys/sockio.h>
 #endif
 #ifndef __CYGWIN__
-#include <syscall.h>
+#include <sys/syscall.h>
 #endif
 
 #include <libcfs/libcfs.h>
diff --git a/lnet/ulnds/socklnd/handlers.c b/lnet/ulnds/socklnd/handlers.c
index cd84315..63c6d24 100644
--- a/lnet/ulnds/socklnd/handlers.c
+++ b/lnet/ulnds/socklnd/handlers.c
@@ -11,7 +11,7 @@
 
 #include "usocklnd.h"
 #include <unistd.h>
-#include <syscall.h>
+#include <sys/syscall.h>
 
 int
 usocklnd_notifier_handler(int fd)
diff --git a/lnet/ulnds/socklnd/poll.c b/lnet/ulnds/socklnd/poll.c
index 9c346a7..ba08dee 100644
--- a/lnet/ulnds/socklnd/poll.c
+++ b/lnet/ulnds/socklnd/poll.c
@@ -11,7 +11,7 @@
 
 #include "usocklnd.h"
 #include <unistd.h>
-#include <syscall.h>
+#include <sys/syscall.h>
 
 void
 usocklnd_process_stale_list(usock_pollthread_t *pt_data)
diff --git a/lustre/include/linux/lustre_user.h b/lustre/include/linux/lustre_user.h
index bc67a18..d569e5f 100644
--- a/lustre/include/linux/lustre_user.h
+++ b/lustre/include/linux/lustre_user.h
@@ -74,11 +74,11 @@ typedef struct stat64   lstat_t;
 # define LPSZ  "%u"
 # define LPSSZ "%d"
 #elif (_LWORDSIZE == 64)
-# define LPU64 "%lu"
-# define LPD64 "%ld"
-# define LPX64 "%#lx"
-# define LPSZ  "%lu"
-# define LPSSZ "%ld"
+# define LPU64 "%llu"
+# define LPD64 "%lld"
+# define LPX64 "%#llx"
+# define LPSZ  "%llu"
+# define LPSSZ "%lld"
 #endif
 
 #undef _LWORDSIZE
diff --git a/lustre/liblustre/lutil.c b/lustre/liblustre/lutil.c
index 65a1378..71a14d9 100644
--- a/lustre/liblustre/lutil.c
+++ b/lustre/liblustre/lutil.c
@@ -32,7 +32,7 @@
 #ifdef _AIX
 #include "syscall_AIX.h"
 #else
-#include <syscall.h>
+#include <sys/syscall.h>
 #endif
 #include <sys/utsname.h>
 #ifdef HAVE_NETINET_IN_H
-- 
1.8.3.1