commit 9e881be5bbfd4563c3dc1d5c80e81d1420f2535e
author Francois Gouget <fgouget@codeweavers.com> Mon Apr 01 21:01:13 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Apr 01 21:01:13 2002 +0000
tree b969c1dcbb1dca7d92d7fd7d7bf40d3b1d433475
parent 37f2c37697291456d6346c7af373599ff10af039

Fix for the unistd.h vs. winsock.h problem in Winelib applications.
Refine the WS_DEFINE_HTONL definition.

include/winsock.h

diff --git a/include/winsock.h b/include/winsock.h
index 6b90bf0..9ed2d0e 100644
--- a/include/winsock.h
+++ b/include/winsock.h
@@ -65,7 +65,7 @@
  * we try to define our own prototypes (different calling convention).
  */
 # include <sys/types.h>
-# ifndef htonl
+# if defined(USE_WS_PREFIX) || !defined(htonl)
 #  define WS_DEFINE_HTONL
 # endif /* htonl */
 #else
@@ -913,7 +913,7 @@
 int WINAPI WS(connect)(SOCKET,const struct WS(sockaddr)*,int);
 struct WS(hostent)* WINAPI WS(gethostbyaddr)(const char*,int,int);
 struct WS(hostent)* WINAPI WS(gethostbyname)(const char*);
-int WINAPI WS(gethostname)(char*,int);
+/* gethostname not defined because of conflicts with unistd.h */
 int WINAPI WS(getpeername)(SOCKET,struct WS(sockaddr)*,int*);
 struct WS(protoent)* WINAPI WS(getprotobyname)(const char*);
 struct WS(protoent)* WINAPI WS(getprotobynumber)(int);