From c1a2c89ac8ea05552f88134da9e66fb1c4a99bd6 Mon Sep 17 00:00:00 2001 From: Ivan Furs Date: Thu, 9 Mar 2017 16:39:42 +0900 Subject: [PATCH] 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 --- src/lib/ecore/Ecore.h | 2 ++ src/lib/ecore/ecore_main.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h index 99e43e1..58b9e3c 100644 --- 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 +# undef WIN32_LEAN_AND_MEAN #elif defined (__FreeBSD__) || defined (__OpenBSD__) # include # include diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c index 125c886..da573cc 100644 --- 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 -# undef WIN32_LEAN_AND_MEAN # ifndef USER_TIMER_MINIMUM # define USER_TIMER_MINIMUM 0x0a # endif -- 2.7.4