eina: Fix evil and Windows #include's

26 files changed, 121 insertions, 33 deletions

diff --git a/src/lib/eina/eina_bezier.c b/src/lib/eina/eina_bezier.c
index 43dbe33578..e4536d2722 100644
--- a/src/lib/eina/eina_bezier.c
+++ b/src/lib/eina/eina_bezier.c
@@ -15,6 +15,10 @@
  * License along with this library;
  * if not, see <http://www.gnu.org/licenses/>.
  */
+#ifdef _WIN32
+# include <evil_private.h>
+#endif
+
 #include <math.h>
 #include <float.h>
 #include <stdio.h>
diff --git a/src/lib/eina/eina_cpu.c b/src/lib/eina/eina_cpu.c
index 119b8d098d..b7ddc8b635 100644
--- a/src/lib/eina/eina_cpu.c
+++ b/src/lib/eina/eina_cpu.c
@@ -22,8 +22,7 @@
 
 #ifdef EFL_HAVE_THREADS
 # ifdef _WIN32
-#  define WIN32_LEAN_AND_MEAN
-#  include <windows.h>
+#  include <evil_private.h>
 # elif defined (__sun) || defined(__GNU__) || defined(__CYGWIN__)
 #  include <unistd.h>
 # elif defined (__FreeBSD__) || defined (__OpenBSD__) || \
@@ -44,7 +43,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <unistd.h>
 
 #include "eina_log.h"
 #include "eina_cpu.h"
diff --git a/src/lib/eina/eina_debug.c b/src/lib/eina/eina_debug.c
index 00e90ab995..51f804d559 100644
--- a/src/lib/eina/eina_debug.c
+++ b/src/lib/eina/eina_debug.c
@@ -28,11 +28,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <unistd.h>
 #ifdef HAVE_SYS_EPOLL_H
 # include <sys/epoll.h>
 #endif
-#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <pthread.h>
@@ -59,6 +57,12 @@
 # include <evil_private.h> /* fcntl */
 #endif
 
+#ifndef _MSC_VER
+# include <fcntl.h>
+# include <sys/time.h>
+# include <unistd.h>
+#endif
+
 #include "eina_alloca.h"
 #include "eina_debug.h"
 #include "eina_cpu.h"
diff --git a/src/lib/eina/eina_debug_bt_file.c b/src/lib/eina/eina_debug_bt_file.c
index 672b3fe20d..f5dfb9ce60 100644
--- a/src/lib/eina/eina_debug_bt_file.c
+++ b/src/lib/eina/eina_debug_bt_file.c
@@ -19,12 +19,15 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 
 #ifdef _WIN32
 #include <evil_private.h> /* realpath */
 #endif
 
+#ifndef _MSC_VER
+# include <unistd.h>
+#endif
+
 #include "eina_debug_private.h"
 
 extern Eina_Spinlock _eina_debug_lock;
diff --git a/src/lib/eina/eina_debug_cpu.c b/src/lib/eina/eina_debug_cpu.c
index 931139f5c0..efadb774fc 100644
--- a/src/lib/eina/eina_debug_cpu.c
+++ b/src/lib/eina/eina_debug_cpu.c
@@ -6,8 +6,10 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <unistd.h>
-#include <pthread.h>
+#ifndef _MSC_VER
+# include <unistd.h>
+# include <pthread.h>
+#endif
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/lib/eina/eina_debug_timer.c b/src/lib/eina/eina_debug_timer.c
index 667304d71b..fe3128f19f 100644
--- a/src/lib/eina/eina_debug_timer.c
+++ b/src/lib/eina/eina_debug_timer.c
@@ -28,11 +28,14 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <unistd.h>
+#ifndef _MSC_VER
+# include <unistd.h>
+# include <sys/time.h>
+# include <pthread.h>
+#endif
 #ifdef HAVE_SYS_EPOLL_H
 # include <sys/epoll.h>
 #endif
-#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <pthread.h>
@@ -40,6 +43,15 @@
 #include <time.h>
 #include <fcntl.h>
 
+#ifdef _WIN32
+# include <evil_private.h>
+# ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+# endif
+# include <winsock2.h>
+# undef WIN32_LEAN_AND_MEAN
+#endif
+
 #include "eina_debug.h"
 #include "eina_debug_private.h"
 #include "eina_pipe.h"
diff --git a/src/lib/eina/eina_evlog.c b/src/lib/eina/eina_evlog.c
index c0fe64fe22..178c0f6740 100644
--- a/src/lib/eina/eina_evlog.c
+++ b/src/lib/eina/eina_evlog.c
@@ -34,11 +34,11 @@
 #endif
 
 #include <time.h>
-#include <unistd.h>
 
 #ifdef _WIN32
 # include <evil_private.h> /* mmap */
 #else
+# include <unistd.h>
 # include <sys/mman.h>
 #endif
 
diff --git a/src/lib/eina/eina_file.c b/src/lib/eina/eina_file.c
index a4b24be537..2cb7dceebf 100644
--- a/src/lib/eina/eina_file.c
+++ b/src/lib/eina/eina_file.c
@@ -34,7 +34,11 @@
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+
+#ifndef _MSC_VER
+# include <unistd.h>
+#endif
+
 #ifdef HAVE_SYS_MMAN_H
 # include <sys/mman.h>
 #endif
diff --git a/src/lib/eina/eina_file_common.c b/src/lib/eina/eina_file_common.c
index c32708a3ab..6e08275b45 100644
--- a/src/lib/eina/eina_file_common.c
+++ b/src/lib/eina/eina_file_common.c
@@ -23,7 +23,9 @@
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <unistd.h>
+#ifndef _MSC_VER
+# include <unistd.h>
+#endif
 #include <fcntl.h>
 #include <errno.h>
 
diff --git a/src/lib/eina/eina_inline_private.h b/src/lib/eina/eina_inline_private.h
index 846081dd88..5f1e539d78 100644
--- a/src/lib/eina/eina_inline_private.h
+++ b/src/lib/eina/eina_inline_private.h
@@ -20,7 +20,9 @@
 # define EINA_INLINE_PRIVATE_H_
 
 # include <time.h>
+#ifndef _MSC_VER
 # include <sys/time.h>
+#endif
 
 typedef struct timespec Eina_Nano_Time;
 
diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c
index bd362fd9a2..1652332cfb 100644
--- a/src/lib/eina/eina_log.c
+++ b/src/lib/eina/eina_log.c
@@ -24,8 +24,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <fnmatch.h>
 #include <assert.h>
 #include <errno.h>
 
diff --git a/src/lib/eina/eina_main.c b/src/lib/eina/eina_main.c
index 8049881bd0..961d3fe42e 100644
--- a/src/lib/eina/eina_main.c
+++ b/src/lib/eina/eina_main.c
@@ -27,7 +27,9 @@
 # ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>
 # endif
-# include <unistd.h>
+# ifndef _MSC_VER
+#  include <unistd.h>
+# endif
 #endif
 
 #ifdef HAVE_MCHECK_H
diff --git a/src/lib/eina/eina_matrix.c b/src/lib/eina/eina_matrix.c
index 9f77a84b34..3c7b8c28ad 100644
--- a/src/lib/eina/eina_matrix.c
+++ b/src/lib/eina/eina_matrix.c
@@ -22,6 +22,10 @@
 
 #include "eina_private.h"
 
+#ifdef _WIN32
+# define _USE_MATH_DEFINES
+#endif
+
 #include <math.h>
 #include <float.h>
 #include <string.h>
diff --git a/src/lib/eina/eina_module.c b/src/lib/eina/eina_module.c
index 345ae20637..15a81f27fc 100644
--- a/src/lib/eina/eina_module.c
+++ b/src/lib/eina/eina_module.c
@@ -24,8 +24,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <string.h>
-#include <libgen.h>
-#include <unistd.h>
 
 #if defined HAVE_DLOPEN && ! defined _WIN32
 # include <dlfcn.h>
@@ -35,6 +33,11 @@
 # include <evil_private.h>
 #endif
 
+#ifndef _MSC_VER
+# include <libgen.h>
+# include <unistd.h>
+#endif
+
 #include "eina_config.h"
 #include "eina_private.h"
 #include "eina_alloca.h"
diff --git a/src/lib/eina/eina_prefix.c b/src/lib/eina/eina_prefix.c
index 1e7f5ddd80..2336ec050b 100644
--- a/src/lib/eina/eina_prefix.c
+++ b/src/lib/eina/eina_prefix.c
@@ -34,7 +34,6 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <limits.h>
 
 #if defined HAVE_DLADDR && ! defined _WIN32
@@ -46,6 +45,10 @@
 # include <evil_private.h> /* path_is_absolute realpath dladdr */
 #endif
 
+#ifndef _MSC_VER
+# include <unistd.h>
+#endif
+
 #include "eina_config.h"
 #include "eina_private.h"
 #include "eina_alloca.h"
diff --git a/src/lib/eina/eina_str.c b/src/lib/eina/eina_str.c
index 4b7f2c9ce3..ad6f6fd966 100644
--- a/src/lib/eina/eina_str.c
+++ b/src/lib/eina/eina_str.c
@@ -28,6 +28,10 @@
 #include <limits.h>
 #include <ctype.h>
 
+#ifndef _WIN32
+# include <strings.h>
+#endif
+
 #ifdef HAVE_BSD_STRING_H
 # include <bsd/string.h>
 #endif
diff --git a/src/lib/eina/eina_thread_queue.c b/src/lib/eina/eina_thread_queue.c
index cf2b9c8595..5e7e1d83c2 100644
--- a/src/lib/eina/eina_thread_queue.c
+++ b/src/lib/eina/eina_thread_queue.c
@@ -2,13 +2,18 @@
 # include "config.h"
 #endif
 
-#include <unistd.h>
+#ifndef _MSC_VER
+# include <unistd.h>
+#endif
 #include "Eina.h"
 #include "eina_thread_queue.h"
 #include "eina_safety_checks.h"
 #include "eina_log.h"
 
 #include "eina_private.h"
+#ifdef _WIN32
+# include <evil_private.h>
+#endif
 
 #ifdef __ATOMIC_RELAXED
 #define ATOMIC 1
diff --git a/src/lib/eina/eina_util.c b/src/lib/eina/eina_util.c
index a003eb8fdb..b48d0b5d69 100644
--- a/src/lib/eina/eina_util.c
+++ b/src/lib/eina/eina_util.c
@@ -21,13 +21,14 @@
 #endif
 
 #include <stdlib.h>
-#include <unistd.h>
-#ifdef _WIN32
-# include <string.h>
-#else
+#include <string.h>
+
+#ifndef _MSC_VER
+# include <unistd.h>
 # include <sys/types.h>
-# include <pwd.h>
-# include <string.h>
+# ifndef _WIN32
+#  include <pwd.h>
+# endif
 #endif
 
 #include "eina_config.h"
diff --git a/src/lib/eina/eina_value.c b/src/lib/eina/eina_value.c
index 3cf4c06ab2..afc2433525 100644
--- a/src/lib/eina/eina_value.c
+++ b/src/lib/eina/eina_value.c
@@ -22,7 +22,16 @@
 
 #include <stdio.h> /* asprintf() */
 #include <inttypes.h> /* PRId64 and PRIu64 */
-#include <sys/time.h> /* struct timeval */
+
+#ifdef _WIN32
+# ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+# endif
+# include <winsock.h> /* struct timeval */
+# undef WIN32_LEAN_AND_MEAN
+#else
+# include <sys/time.h> /* struct timeval */
+#endif
 
 #include "eina_config.h"
 #include "eina_private.h"
@@ -39,6 +48,10 @@
 #include "eina_safety_checks.h"
 #include "eina_value.h"
 
+#ifdef _WIN32
+# include <evil_private.h>
+#endif
+
 EINA_API Eina_Error EINA_ERROR_VALUE_FAILED = 0;
 
 /*============================================================================*
diff --git a/src/lib/eina/eina_xattr.c b/src/lib/eina/eina_xattr.c
index 1d665a7910..4d147c8daf 100644
--- a/src/lib/eina/eina_xattr.c
+++ b/src/lib/eina/eina_xattr.c
@@ -23,9 +23,12 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <string.h>
-#include <unistd.h>
 #include <math.h>
 
+#ifndef _MSC_VER
+# include <unistd.h>
+#endif
+
 #ifdef HAVE_XATTR
 # include <sys/xattr.h>
 #endif
diff --git a/src/tests/efl_check.h b/src/tests/efl_check.h
index 20d2203075..e069907817 100644
--- a/src/tests/efl_check.h
+++ b/src/tests/efl_check.h
@@ -10,7 +10,13 @@
 #include <string.h> /* strcmp */
 #include <unistd.h> /* execvp */
 #include <errno.h> /* errno */
-#include <sys/time.h>
+
+#ifdef _WIN32
+# include <evil_private.h>
+#else
+# include <unistd.h> /* execvp */
+# include <sys/time.h>
+#endif
 
 #ifdef HAVE_FORK
 # ifdef HAVE_SYS_TYPES_H
diff --git a/src/tests/eina/eina_test_barrier.c b/src/tests/eina/eina_test_barrier.c
index 369edc99bd..bd4fc701d3 100644
--- a/src/tests/eina/eina_test_barrier.c
+++ b/src/tests/eina/eina_test_barrier.c
@@ -20,7 +20,9 @@
 # include "config.h"
 #endif
 
-#include <unistd.h>
+#ifndef _WIN32
+# include <unistd.h>
+#endif
 
 #include <Eina.h>
 
diff --git a/src/tests/eina/eina_test_benchmark.c b/src/tests/eina/eina_test_benchmark.c
index 9fb7a568ef..e838329a28 100644
--- a/src/tests/eina/eina_test_benchmark.c
+++ b/src/tests/eina/eina_test_benchmark.c
@@ -20,7 +20,9 @@
 # include "config.h"
 #endif
 
-#include <unistd.h>
+#ifndef _WIN32
+# include <unistd.h>
+#endif
 
 #include "eina_suite.h"
 #include "eina_benchmark.h"
diff --git a/src/tests/eina/eina_test_file.c b/src/tests/eina/eina_test_file.c
index 3d4412bfa2..18a3b93198 100644
--- a/src/tests/eina/eina_test_file.c
+++ b/src/tests/eina/eina_test_file.c
@@ -24,11 +24,12 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include <fcntl.h>
 
 #ifdef _WIN32
 # include <evil_private.h> /* mkdir */
+#else
+# include <unistd.h>
 #endif
 
 #include <Eina.h>
diff --git a/src/tests/eina/eina_test_value.c b/src/tests/eina/eina_test_value.c
index 7d9e27e29a..2b56553622 100644
--- a/src/tests/eina/eina_test_value.c
+++ b/src/tests/eina/eina_test_value.c
@@ -24,6 +24,14 @@
 #include <inttypes.h>
 #include <float.h>
 
+#ifdef _WIN32
+# ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+# endif
+# include <winsock2.h>
+# undef WIN32_LEAN_AND_MEAN
+#endif
+
 #include <Eina.h>
 
 #include "eina_suite.h"
diff --git a/src/tests/eina/eina_test_xattr.c b/src/tests/eina/eina_test_xattr.c
index c3f8aff842..a863ef2363 100644
--- a/src/tests/eina/eina_test_xattr.c
+++ b/src/tests/eina/eina_test_xattr.c
@@ -22,7 +22,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+#ifndef _WIN32
+# include <unistd.h>
+#endif
 #include <fcntl.h>
 
 #include <Eina.h>