r16717: patch from Bjoern Jacke to fix compiler warnings on AIX

metze
(This used to be commit a558abb40d9a0bcce568a336ce7e9f4ae5e066db)

1 files changed, 44 insertions, 0 deletions

diff --git a/source3/include/socket_wrapper.h b/source3/include/socket_wrapper.h
index d8815a2575..3c4a2c01dc 100644
--- a/source3/include/socket_wrapper.h
+++ b/source3/include/socket_wrapper.h
@@ -32,16 +32,60 @@ ssize_t swrap_sendto(int  s,  const  void *buf, size_t len, int flags, const str
 int swrap_close(int);
 
 #ifdef SOCKET_WRAPPER_REPLACE
+
+#ifdef accept
+#undef accept
+#endif
 #define accept(s,addr,addrlen)		swrap_accept(s,addr,addrlen)
+
+#ifdef connect
+#undef connect
+#endif
 #define connect(s,serv_addr,addrlen)	swrap_connect(s,serv_addr,addrlen)
+
+#ifdef bind
+#undef bind
+#endif
 #define bind(s,myaddr,addrlen)		swrap_bind(s,myaddr,addrlen)
+
+#ifdef getpeername
+#undef getpeername
+#endif
 #define getpeername(s,name,addrlen)	swrap_getpeername(s,name,addrlen)
+
+#ifdef getsockname
+#undef getsockname
+#endif
 #define getsockname(s,name,addrlen)	swrap_getsockname(s,name,addrlen)
+
+#ifdef getsockopt
+#undef getsockopt
+#endif
 #define getsockopt(s,level,optname,optval,optlen) swrap_getsockopt(s,level,optname,optval,optlen)
+
+#ifdef setsockopt
+#undef setsockopt
+#endif
 #define setsockopt(s,level,optname,optval,optlen) swrap_setsockopt(s,level,optname,optval,optlen)
+
+#ifdef recvfrom
+#undef recvfrom
+#endif
 #define recvfrom(s,buf,len,flags,from,fromlen) 	  swrap_recvfrom(s,buf,len,flags,from,fromlen)
+
+#ifdef sendto
+#undef sendto
+#endif
 #define sendto(s,buf,len,flags,to,tolen)          swrap_sendto(s,buf,len,flags,to,tolen)
+
+#ifdef socket
+#undef socket
+#endif
 #define socket(domain,type,protocol)	swrap_socket(domain,type,protocol)
+
+#ifdef close
+#undef close
+#endif
 #define close(s)			swrap_close(s)
 #endif