]> granicus.if.org Git - libevent/commitdiff
Make definition of WIN32_LEAN_AND_MEAN in event.h conditional.
authorGilad Benjamini <gilad@altornetworks.com>
Fri, 13 Aug 2010 21:19:18 +0000 (17:19 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 13 Aug 2010 21:19:18 +0000 (17:19 -0400)
(Inclusion order might trigger a warning for redefinition on Windows.)

event.h

diff --git a/event.h b/event.h
index 3f083c860f30e214dd17941accedc027dbba8c94..e75e075628a851860967da42d085691b9d6db86e 100644 (file)
--- a/event.h
+++ b/event.h
@@ -178,7 +178,9 @@ extern "C" {
 #include <evutil.h>
 
 #ifdef WIN32
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <winsock2.h>
 #include <windows.h>
 #undef WIN32_LEAN_AND_MEAN