[svn] gcry - r1162 - trunk/src

[svn author marcus]

Author: marcus
Date: 2006-07-04 14:32:21 +0200 (Tue, 04 Jul 2006)
New Revision: 1162

Modified:
   trunk/src/ChangeLog
   trunk/src/gcrypt.h
Log:
2006-07-04  Marcus Brinkmann  <marcus at 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 at extundo.com>.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2006-07-04 11:56:28 UTC (rev 1161)
+++ trunk/src/ChangeLog	2006-07-04 12:32:21 UTC (rev 1162)
@@ -1,5 +1,10 @@
 2006-07-04  Marcus Brinkmann  <marcus at 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 at 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,

Modified: trunk/src/gcrypt.h
===================================================================
--- trunk/src/gcrypt.h	2006-07-04 11:56:28 UTC (rev 1161)
+++ trunk/src/gcrypt.h	2006-07-04 12:32:21 UTC (rev 1162)
@@ -29,16 +29,12 @@
 
 #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>
+#else
+# include <sys/socket.h>
 #endif
-#endif
 
 #include <sys/time.h>