2006-07-04 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Tue, 4 Jul 2006 12:32:21 +0000 (12:32 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Tue, 4 Jul 2006 12:32:21 +0000 (12:32 +0000)
* gcrypt.h: Revert last change, and instead:
[_WIN32 || __WIN32__]: Do not include <sys/socket.h>, but
<winsock2.h> and <ws2tcpip.h>.
Suggested by Simon Josefsson <jas@extundo.com>.

src/ChangeLog
src/gcrypt.h

index 7546214..f437c7b 100644 (file)
@@ -1,5 +1,10 @@
 2006-07-04  Marcus Brinkmann  <marcus@g10code.de>
 
+       * gcrypt.h: Revert last change, and instead:
+       [_WIN32 || __WIN32__]: Do not include <sys/socket.h>, but
+       <winsock2.h> and <ws2tcpip.h>.
+       Suggested by Simon Josefsson <jas@extundo.com>.
+       
        * Makefile.am (install-data-local, uninstall-local, %.lo,
        (install-def-file, uninstall-def-file): New targets.
        (LTRCCOMPILE, gcrypt_res, gcrypt_res_ldflag, no_undefined,
index 9785779..44f4d61 100644 (file)
 
 #include <sys/types.h>
 
-#if HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#else
-#if HAVE_WINSOCK2_H
+#if defined _WIN32 || defined __WIN32__
 # include <winsock2.h>
-#endif
-#if HAVE_WS2TCPIP_H
 # include <ws2tcpip.h>
-#endif
+#else
+# include <sys/socket.h>
 #endif
 
 #include <sys/time.h>