win32: removed duplicate winsock2.h and added WIN32_LEAN_AND_MEAN in Ecore.h

Summary: winsock2.h is dublicate in src/lib/ecore/ecore_main.c

Reviewers: NikaWhite, an.kroitor, cedric, raster, rimmed, vtorri

Subscribers: cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D4688

diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h
index 99e43e1..58b9e3c 100644 (file)
--- a/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
@@ -307,7 +307,9 @@
 #endif /* ! _WIN32 */
 
 #ifdef _WIN32
+# define WIN32_LEAN_AND_MEAN
 # include <winsock2.h>
+# undef WIN32_LEAN_AND_MEAN
 #elif defined (__FreeBSD__) || defined (__OpenBSD__)
 # include <sys/select.h>
 # include <signal.h>

diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 125c886..da573cc 100644 (file)
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -5,9 +5,6 @@
 #define EINA_SLSTR_INTERNAL
 
 #ifdef _WIN32
-# define WIN32_LEAN_AND_MEAN
-# include <winsock2.h>
-# undef WIN32_LEAN_AND_MEAN
 # ifndef USER_TIMER_MINIMUM
 #  define USER_TIMER_MINIMUM 0x0a
 # endif