diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-05-13 16:16:34 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-05-13 16:16:34 +0000 |
| commit | d451ffa80023b406fed8a731840d7d329fc7a434 (patch) | |
| tree | 258e684ccaa271989095d3bda455f6b9e266929c | |
| parent | f0a3b189f4d1f7f44e27a591cde85c33a3bd3b34 (diff) | |
| download | evolution-data-server-d451ffa80023b406fed8a731840d7d329fc7a434.tar.gz | |
Define WIN32_LEAN_AND_MEAN around including <winsock2.h> to reduce the
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.
svn path=/trunk/; revision=8789
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/camel-net-utils.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 51debebdb..d37ef4c7d 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +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. + 2008-05-07 Jeffrey Stedfast <fejj@novell.com> * camel-uid-cache.c (camel_uid_cache_save): Check cache->fd after diff --git a/camel/camel-net-utils.h b/camel/camel-net-utils.h index 6b763d5ed..52032c336 100644 --- a/camel/camel-net-utils.h +++ b/camel/camel-net-utils.h @@ -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 |