summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Furs <i.furs@samsung.com>2017-03-09 16:39:42 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-03-09 17:39:39 +0900
commitc1a2c89ac8ea05552f88134da9e66fb1c4a99bd6 (patch)
treec3a54562730a76dfaadd8b4c3e14d3d15cca197e
parent425a04beb375051cc4154fa70c0b3dc55091f786 (diff)
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
-rw-r--r--src/lib/ecore/Ecore.h2
-rw-r--r--src/lib/ecore/ecore_main.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h
index 99e43e1786..58b9e3c719 100644
--- a/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
@@ -307,7 +307,9 @@
307#endif /* ! _WIN32 */ 307#endif /* ! _WIN32 */
308 308
309#ifdef _WIN32 309#ifdef _WIN32
310# define WIN32_LEAN_AND_MEAN
310# include <winsock2.h> 311# include <winsock2.h>
312# undef WIN32_LEAN_AND_MEAN
311#elif defined (__FreeBSD__) || defined (__OpenBSD__) 313#elif defined (__FreeBSD__) || defined (__OpenBSD__)
312# include <sys/select.h> 314# include <sys/select.h>
313# include <signal.h> 315# include <signal.h>
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 125c886e65..da573cc6da 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -5,9 +5,6 @@
5#define EINA_SLSTR_INTERNAL 5#define EINA_SLSTR_INTERNAL
6 6
7#ifdef _WIN32 7#ifdef _WIN32
8# define WIN32_LEAN_AND_MEAN
9# include <winsock2.h>
10# undef WIN32_LEAN_AND_MEAN
11# ifndef USER_TIMER_MINIMUM 8# ifndef USER_TIMER_MINIMUM
12# define USER_TIMER_MINIMUM 0x0a 9# define USER_TIMER_MINIMUM 0x0a
13# endif 10# endif