evolution-data-server r8789 - trunk/camel

[tml svn gnome org]

Author: tml
Date: Tue May 13 16:16:34 2008
New Revision: 8789
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8789&view=rev

Log:
2008-05-13  Tor Lillqvist  <tml novell com>

	* camel-net-utils.h [Win32]: Define WIN32_LEAN_AND_MEAN around
	including <winsock2.h> to reduce the namespace pollution,
	especially DATADIR clashes.



Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-net-utils.h

Modified: trunk/camel/camel-net-utils.h
==============================================================================
--- trunk/camel/camel-net-utils.h	(original)
+++ trunk/camel/camel-net-utils.h	Tue May 13 16:16:34 2008
@@ -29,7 +29,9 @@
 #include <sys/socket.h>
 #include <netdb.h>
 #else
+#define WIN32_LEAN_AND_MEAN
 #include <winsock2.h>
+#undef WIN32_LEAN_AND_MEAN
 #include <ws2tcpip.h>
 #endif