b=20668

[fs/lustre-release.git] / libsysio / drivers / sockets / sockets.c

diff --git a/libsysio/drivers/sockets/sockets.c b/libsysio/drivers/sockets/sockets.c
index 3ac7894..8dec0a7 100644 (file)
--- 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>
@@ -65,8 +65,8 @@
 #include <sys/uio.h>
 #include <sys/queue.h>
 
-#include "xtio.h"
 #include "sysio.h"
+#include "xtio.h"
 #include "native.h"
 #include "fs.h"
 #include "inode.h"
@@ -387,7 +387,7 @@ _sysio_sockets_inew()
 }
 
 int
-socket(int domain, int type, int protocol)
+SYSIO_INTERFACE_NAME(socket)(int domain, int type, int protocol)
 {
        int     err;
        struct inode *ino;
@@ -445,7 +445,7 @@ error:
 }
 
 int
-accept(int s, struct sockaddr *addr, socklen_t *addrlen)
+SYSIO_INTERFACE_NAME(accept)(int s, struct sockaddr *addr, socklen_t *addrlen)
 {
        int     err;
        struct inode *ino;
@@ -517,11 +517,15 @@ error:
 }
 
 int
-bind(int sockfd, const struct sockaddr *my_addr, socklen_t addrlen)
+SYSIO_INTERFACE_NAME(bind)(int sockfd,
+                          const struct sockaddr *my_addr,
+                          socklen_t addrlen)
 {
        int     err;
        struct file *fil;
+#ifdef SYSIO_SYS_socketcall
        unsigned long avec[3];
+#endif
 
        err = 0;
 
@@ -553,11 +557,13 @@ out:
 }
 
 int
-listen(int s, int backlog)
+SYSIO_INTERFACE_NAME(listen)(int s, int backlog)
 {
        int     err;
        struct file *fil;
+#ifdef SYSIO_SYS_socketcall
        unsigned long avec[2];
+#endif
 
        err = 0;
 
@@ -587,11 +593,15 @@ out:
 }
 
 int
-connect(int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen)
+SYSIO_INTERFACE_NAME(connect)(int sockfd,
+                             const struct sockaddr *serv_addr,
+                             socklen_t addrlen)
 {
        int     err;
        struct file *fil;
+#ifdef SYSIO_SYS_socketcall
        unsigned long avec[3];
+#endif
 
        err = 0;