summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent 'vtorri' Torri <vincent.torri@gmail.com>2017-09-22 05:06:10 -0500
committerStephen 'Okra' Houston <smhouston88@gmail.com>2017-09-22 05:06:10 -0500
commit0cdd50124690ea0d72bef304fff15b4be2adee41 (patch)
treec6cfefef7351a7d0ba4bd32028f9c24e081edefc
parent7db24851936e7fe654ba77cbad47316577cce5f7 (diff)
EFL For WIN32: Replace HAVE_EVIL define with _WIN32
-rw-r--r--src/bin/ecore_con/efl_net_proxy_helper.c2
-rw-r--r--src/bin/ecore_evas/ecore_evas_convert.c2
-rw-r--r--src/bin/edje/edje_pick.c2
-rw-r--r--src/bin/edje/edje_player.c2
-rw-r--r--src/bin/edje/edje_watch.c2
-rw-r--r--src/bin/eet/eet_main.c4
-rw-r--r--src/bin/embryo/embryo_cc_sc1.c2
-rw-r--r--src/lib/ecore/ecore.c10
-rw-r--r--src/lib/ecore/ecore_app.c2
-rw-r--r--src/lib/ecore/ecore_main.c2
-rw-r--r--src/lib/ecore/ecore_pipe.c2
-rw-r--r--src/lib/ecore/ecore_thread.c2
-rw-r--r--src/lib/ecore/ecore_time.c6
-rw-r--r--src/lib/ecore_con/ecore_con.c8
-rw-r--r--src/lib/ecore_con/ecore_con_legacy.c2
-rw-r--r--src/lib/ecore_con/ecore_con_proxy_helper.c2
-rw-r--r--src/lib/ecore_con/ecore_con_socks.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_ssl.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_tcp.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_udp.c2
-rw-r--r--src/lib/ecore_con/efl_net_ip_address.c2
-rw-r--r--src/lib/ecore_con/efl_net_server_fd.c2
-rw-r--r--src/lib/ecore_con/efl_net_server_tcp.c2
-rw-r--r--src/lib/ecore_con/efl_net_server_udp.c2
-rw-r--r--src/lib/ecore_con/efl_net_server_udp_client.c2
-rw-r--r--src/lib/ecore_con/efl_net_socket_fd.c2
-rw-r--r--src/lib/ecore_con/efl_net_socket_tcp.c2
-rw-r--r--src/lib/ecore_con/efl_net_socket_udp.c2
-rw-r--r--src/lib/ecore_con/efl_net_ssl_conn-openssl.c2
-rw-r--r--src/lib/ecore_evas/ecore_evas.c4
-rw-r--r--src/lib/ecore_file/ecore_file_private.h2
-rw-r--r--src/lib/edje/edje_private.h2
-rw-r--r--src/lib/eet/eet_lib.c4
-rw-r--r--src/lib/eet/eet_node.c4
-rw-r--r--src/lib/efreet/efreet_desktop.c6
-rw-r--r--src/lib/efreet/efreet_uri.c2
-rw-r--r--src/lib/eina/eina_benchmark.c2
-rw-r--r--src/lib/eina/eina_binbuf.c2
-rw-r--r--src/lib/eina/eina_convert.c2
-rw-r--r--src/lib/eina/eina_error.c2
-rw-r--r--src/lib/eina/eina_evlog.c4
-rw-r--r--src/lib/eina/eina_file_common.c2
-rw-r--r--src/lib/eina/eina_list.c2
-rw-r--r--src/lib/eina/eina_log.c2
-rw-r--r--src/lib/eina/eina_magic.c2
-rw-r--r--src/lib/eina/eina_matrixsparse.c2
-rw-r--r--src/lib/eina/eina_module.c2
-rw-r--r--src/lib/eina/eina_prefix.c2
-rw-r--r--src/lib/eina/eina_quadtree.c2
-rw-r--r--src/lib/eina/eina_rectangle.c2
-rw-r--r--src/lib/eina/eina_share_common.c2
-rw-r--r--src/lib/eina/eina_simple_xml_parser.c2
-rw-r--r--src/lib/eina/eina_strbuf.c2
-rw-r--r--src/lib/eina/eina_stringshare.c2
-rw-r--r--src/lib/eina/eina_tmpstr.c2
-rw-r--r--src/lib/eina/eina_value.c2
-rw-r--r--src/lib/eina/eina_value_util.c2
-rw-r--r--src/lib/eio/eio_private.h2
-rw-r--r--src/lib/elementary/efl_ui_clock.c10
-rw-r--r--src/lib/elementary/elm_font.c2
-rw-r--r--src/lib/elementary/elm_main.c2
-rw-r--r--src/lib/elua/elua_private.h2
-rw-r--r--src/lib/embryo/embryo_time.c2
-rw-r--r--src/lib/emile/emile_image.c2
-rw-r--r--src/lib/eo/eo.c6
-rw-r--r--src/lib/ephysics/ephysics_private.h2
-rw-r--r--src/lib/ethumb/ethumb.c2
-rw-r--r--src/lib/evas/cache/evas_cache_image.c2
-rw-r--r--src/lib/evas/cache/evas_preload.c2
-rw-r--r--src/lib/evas/cache2/evas_cache2.c2
-rw-r--r--src/lib/evas/canvas/evas_font_dir.c2
-rw-r--r--src/lib/evas/canvas/evas_main.c6
-rw-r--r--src/lib/evas/common/evas_image_scalecache.c2
-rw-r--r--src/lib/evas/common/language/evas_language_utils.c2
-rw-r--r--src/lib/evas/file/evas_path.c2
-rw-r--r--src/lib/evas/include/evas_common_private.h2
-rw-r--r--src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c2
-rw-r--r--src/modules/evas/image_loaders/generic/evas_image_load_generic.c2
-rw-r--r--src/modules/evas/image_loaders/ico/evas_image_load_ico.c2
-rw-r--r--src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c2
-rw-r--r--src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c2
-rw-r--r--src/modules/evas/image_loaders/png/evas_image_load_png.c2
-rw-r--r--src/modules/evas/image_loaders/psd/evas_image_load_psd.c2
-rw-r--r--src/modules/evas/image_loaders/tga/evas_image_load_tga.c2
-rw-r--r--src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c2
-rw-r--r--src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c2
-rw-r--r--src/modules/evas/image_loaders/webp/evas_image_load_webp.c2
-rw-r--r--src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c2
-rw-r--r--src/modules/evas/image_savers/png/evas_image_save_png.c2
-rw-r--r--src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c2
-rw-r--r--src/tests/eina/eina_test_error.c2
-rw-r--r--src/tests/eolian/eolian_generation.c2
92 files changed, 116 insertions, 116 deletions
diff --git a/src/bin/ecore_con/efl_net_proxy_helper.c b/src/bin/ecore_con/efl_net_proxy_helper.c
index 30074d6..1a0255b 100644
--- a/src/bin/ecore_con/efl_net_proxy_helper.c
+++ b/src/bin/ecore_con/efl_net_proxy_helper.c
@@ -10,7 +10,7 @@
10#include <unistd.h> 10#include <unistd.h>
11#include <fcntl.h> 11#include <fcntl.h>
12 12
13#ifdef HAVE_EVIL 13#ifdef _WIN32
14# include <Evil.h> 14# include <Evil.h>
15#endif 15#endif
16 16
diff --git a/src/bin/ecore_evas/ecore_evas_convert.c b/src/bin/ecore_evas/ecore_evas_convert.c
index 0b87cae..e76888d 100644
--- a/src/bin/ecore_evas/ecore_evas_convert.c
+++ b/src/bin/ecore_evas/ecore_evas_convert.c
@@ -2,7 +2,7 @@
2#include <config.h> 2#include <config.h>
3#endif 3#endif
4 4
5#ifdef HAVE_EVIL 5#ifdef _WIN32
6# include <Evil.h> 6# include <Evil.h>
7#endif 7#endif
8 8
diff --git a/src/bin/edje/edje_pick.c b/src/bin/edje/edje_pick.c
index daaaac5..e6971b4 100644
--- a/src/bin/edje/edje_pick.c
+++ b/src/bin/edje/edje_pick.c
@@ -11,7 +11,7 @@
11#include <ctype.h> 11#include <ctype.h>
12#include <Ecore_Getopt.h> 12#include <Ecore_Getopt.h>
13 13
14#ifdef HAVE_EVIL 14#ifdef _WIN32
15# include <Evil.h> 15# include <Evil.h>
16#endif 16#endif
17 17
diff --git a/src/bin/edje/edje_player.c b/src/bin/edje/edje_player.c
index 2277f7e..a246bf2 100644
--- a/src/bin/edje/edje_player.c
+++ b/src/bin/edje/edje_player.c
@@ -10,7 +10,7 @@
10#include <fcntl.h> 10#include <fcntl.h>
11#include <ctype.h> 11#include <ctype.h>
12 12
13#ifdef HAVE_EVIL 13#ifdef _WIN32
14# include <Evil.h> 14# include <Evil.h>
15#endif 15#endif
16 16
diff --git a/src/bin/edje/edje_watch.c b/src/bin/edje/edje_watch.c
index 3156ca5..043d3af 100644
--- a/src/bin/edje/edje_watch.c
+++ b/src/bin/edje/edje_watch.c
@@ -6,7 +6,7 @@
6# include <sys/wait.h> 6# include <sys/wait.h>
7#endif 7#endif
8 8
9#ifdef HAVE_EVIL 9#ifdef _WIN32
10# include <Evil.h> 10# include <Evil.h>
11#endif 11#endif
12#include <Eina.h> 12#include <Eina.h>
diff --git a/src/bin/eet/eet_main.c b/src/bin/eet/eet_main.c
index 9f61bca..7967cc7 100644
--- a/src/bin/eet/eet_main.c
+++ b/src/bin/eet/eet_main.c
@@ -7,9 +7,9 @@
7#include <string.h> 7#include <string.h>
8#include <unistd.h> 8#include <unistd.h>
9 9
10#ifdef HAVE_EVIL 10#ifdef _WIN32
11# include <Evil.h> 11# include <Evil.h>
12#endif /* ifdef HAVE_EVIL */ 12#endif /* ifdef _WIN32 */
13 13
14#include <Eet.h> 14#include <Eet.h>
15 15
diff --git a/src/bin/embryo/embryo_cc_sc1.c b/src/bin/embryo/embryo_cc_sc1.c
index 41ccacd..c3443db 100644
--- a/src/bin/embryo/embryo_cc_sc1.c
+++ b/src/bin/embryo/embryo_cc_sc1.c
@@ -36,7 +36,7 @@
36#include <unistd.h> 36#include <unistd.h>
37#include <sys/stat.h> 37#include <sys/stat.h>
38 38
39#ifdef HAVE_EVIL 39#ifdef _WIN32
40# include <Evil.h> 40# include <Evil.h>
41#endif 41#endif
42 42
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index ec733b2..35967d6 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -15,7 +15,7 @@
15# include <langinfo.h> 15# include <langinfo.h>
16#endif 16#endif
17 17
18#if defined(HAVE_SYS_MMAN_H) || defined(HAVE_EVIL) 18#if defined(HAVE_SYS_MMAN_H) || defined(_WIN32)
19# include <sys/mman.h> 19# include <sys/mman.h>
20#endif 20#endif
21 21
@@ -23,7 +23,7 @@
23# include <systemd/sd-daemon.h> 23# include <systemd/sd-daemon.h>
24#endif 24#endif
25 25
26#ifdef HAVE_EVIL 26#ifdef _WIN32
27# include <Evil.h> 27# include <Evil.h>
28#endif 28#endif
29#include <Eina.h> 29#include <Eina.h>
@@ -221,7 +221,7 @@ ecore_init(void)
221 WRN("Not a utf8 locale!"); 221 WRN("Not a utf8 locale!");
222 } 222 }
223 */ 223 */
224#ifdef HAVE_EVIL 224#ifdef _WIN32
225 if (!evil_init()) 225 if (!evil_init())
226 return --_ecore_init_count; 226 return --_ecore_init_count;
227#endif 227#endif
@@ -337,7 +337,7 @@ shutdown_mempool:
337shutdown_log_dom: 337shutdown_log_dom:
338 eina_shutdown(); 338 eina_shutdown();
339shutdown_evil: 339shutdown_evil:
340#ifdef HAVE_EVIL 340#ifdef _WIN32
341 evil_shutdown(); 341 evil_shutdown();
342#endif 342#endif
343 343
@@ -453,7 +453,7 @@ ecore_shutdown(void)
453 453
454 eina_evlog("<RUN", NULL, 0.0, NULL); 454 eina_evlog("<RUN", NULL, 0.0, NULL);
455 eina_shutdown(); 455 eina_shutdown();
456#ifdef HAVE_EVIL 456#ifdef _WIN32
457 evil_shutdown(); 457 evil_shutdown();
458#endif 458#endif
459 459
diff --git a/src/lib/ecore/ecore_app.c b/src/lib/ecore/ecore_app.c
index a2e9cd1..ec420c6 100644
--- a/src/lib/ecore/ecore_app.c
+++ b/src/lib/ecore/ecore_app.c
@@ -9,7 +9,7 @@
9# include <process.h> 9# include <process.h>
10#endif 10#endif
11 11
12#ifdef HAVE_EVIL 12#ifdef _WIN32
13# include <Evil.h> 13# include <Evil.h>
14#endif 14#endif
15 15
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 967ee72..fe34371 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -53,7 +53,7 @@
53# endif 53# endif
54#endif 54#endif
55 55
56#ifdef HAVE_EVIL 56#ifdef _WIN32
57# include <Evil.h> 57# include <Evil.h>
58#endif 58#endif
59 59
diff --git a/src/lib/ecore/ecore_pipe.c b/src/lib/ecore/ecore_pipe.c
index e1d732d..d85d0bf 100644
--- a/src/lib/ecore/ecore_pipe.c
+++ b/src/lib/ecore/ecore_pipe.c
@@ -32,7 +32,7 @@
32# endif 32# endif
33#endif 33#endif
34 34
35#ifdef HAVE_EVIL 35#ifdef _WIN32
36# include <Evil.h> 36# include <Evil.h>
37#endif 37#endif
38 38
diff --git a/src/lib/ecore/ecore_thread.c b/src/lib/ecore/ecore_thread.c
index 91e6aac..480aa1c 100644
--- a/src/lib/ecore/ecore_thread.c
+++ b/src/lib/ecore/ecore_thread.c
@@ -8,7 +8,7 @@
8#include <sys/types.h> 8#include <sys/types.h>
9#include <unistd.h> 9#include <unistd.h>
10 10
11#ifdef HAVE_EVIL 11#ifdef _WIN32
12# include <Evil.h> 12# include <Evil.h>
13#endif 13#endif
14 14
diff --git a/src/lib/ecore/ecore_time.c b/src/lib/ecore/ecore_time.c
index 2c871e2..1fafd62 100644
--- a/src/lib/ecore/ecore_time.c
+++ b/src/lib/ecore/ecore_time.c
@@ -5,7 +5,7 @@
5#include <stdlib.h> 5#include <stdlib.h>
6#include <sys/time.h> 6#include <sys/time.h>
7 7
8#ifdef HAVE_EVIL 8#ifdef _WIN32
9# include <Evil.h> 9# include <Evil.h>
10#endif 10#endif
11 11
@@ -43,7 +43,7 @@ ecore_time_get(void)
43 } 43 }
44 44
45 return (double)t.tv_sec + (((double)t.tv_nsec) / 1000000000.0); 45 return (double)t.tv_sec + (((double)t.tv_nsec) / 1000000000.0);
46#elif defined(HAVE_EVIL) 46#elif defined(_WIN32)
47 return evil_time_get(); 47 return evil_time_get();
48#elif defined(__APPLE__) && defined(__MACH__) 48#elif defined(__APPLE__) && defined(__MACH__)
49 return _ecore_time_clock_conversion * (double)mach_absolute_time(); 49 return _ecore_time_clock_conversion * (double)mach_absolute_time();
@@ -110,7 +110,7 @@ _ecore_time_init(void)
110 "Fallback to unix time."); 110 "Fallback to unix time.");
111 } 111 }
112#else 112#else
113# ifndef HAVE_EVIL 113# ifndef _WIN32
114# if defined(__APPLE__) && defined(__MACH__) 114# if defined(__APPLE__) && defined(__MACH__)
115 mach_timebase_info_data_t info; 115 mach_timebase_info_data_t info;
116 kern_return_t err = mach_timebase_info(&info); 116 kern_return_t err = mach_timebase_info(&info);
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index ce881fa..418add7 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -42,7 +42,7 @@
42# include <ws2tcpip.h> 42# include <ws2tcpip.h>
43#endif 43#endif
44 44
45#ifdef HAVE_EVIL 45#ifdef _WIN32
46# include <Evil.h> 46# include <Evil.h>
47#endif 47#endif
48 48
@@ -84,7 +84,7 @@ ecore_con_init(void)
84 if (++_ecore_con_init_count != 1) 84 if (++_ecore_con_init_count != 1)
85 return _ecore_con_init_count; 85 return _ecore_con_init_count;
86 86
87#ifdef HAVE_EVIL 87#ifdef _WIN32
88 if (!evil_init()) 88 if (!evil_init())
89 return --_ecore_con_init_count; 89 return --_ecore_con_init_count;
90#endif 90#endif
@@ -129,7 +129,7 @@ ecore_con_log_error:
129 ecore_shutdown(); 129 ecore_shutdown();
130 130
131ecore_err: 131ecore_err:
132#ifdef HAVE_EVIL 132#ifdef _WIN32
133 evil_shutdown(); 133 evil_shutdown();
134#endif 134#endif
135 return --_ecore_con_init_count; 135 return --_ecore_con_init_count;
@@ -160,7 +160,7 @@ ecore_con_shutdown(void)
160 */ 160 */
161 161
162 ecore_shutdown(); 162 ecore_shutdown();
163#ifdef HAVE_EVIL 163#ifdef _WIN32
164 evil_shutdown(); 164 evil_shutdown();
165#endif 165#endif
166 166
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c
index ade01e2..fa71139 100644
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@@ -10,7 +10,7 @@
10# include <sys/socket.h> 10# include <sys/socket.h>
11#endif 11#endif
12 12
13#ifdef HAVE_EVIL 13#ifdef _WIN32
14# include <Evil.h> 14# include <Evil.h>
15#endif 15#endif
16 16
diff --git a/src/lib/ecore_con/ecore_con_proxy_helper.c b/src/lib/ecore_con/ecore_con_proxy_helper.c
index 43feead..ff0253f 100644
--- a/src/lib/ecore_con/ecore_con_proxy_helper.c
+++ b/src/lib/ecore_con/ecore_con_proxy_helper.c
@@ -10,7 +10,7 @@
10#include <unistd.h> 10#include <unistd.h>
11#include <fcntl.h> 11#include <fcntl.h>
12 12
13#ifdef HAVE_EVIL 13#ifdef _WIN32
14# include <Evil.h> 14# include <Evil.h>
15#endif 15#endif
16 16
diff --git a/src/lib/ecore_con/ecore_con_socks.c b/src/lib/ecore_con/ecore_con_socks.c
index a81d375..8138b26 100644
--- a/src/lib/ecore_con/ecore_con_socks.c
+++ b/src/lib/ecore_con/ecore_con_socks.c
@@ -38,7 +38,7 @@
38# include <ws2tcpip.h> 38# include <ws2tcpip.h>
39#endif 39#endif
40 40
41#ifdef HAVE_EVIL 41#ifdef _WIN32
42# include <Evil.h> 42# include <Evil.h>
43#endif 43#endif
44 44
diff --git a/src/lib/ecore_con/efl_net_dialer_ssl.c b/src/lib/ecore_con/efl_net_dialer_ssl.c
index 6bdae46..eb68859 100644
--- a/src/lib/ecore_con/efl_net_dialer_ssl.c
+++ b/src/lib/ecore_con/efl_net_dialer_ssl.c
@@ -24,7 +24,7 @@
24#ifdef HAVE_ARPA_INET_H 24#ifdef HAVE_ARPA_INET_H
25# include <arpa/inet.h> 25# include <arpa/inet.h>
26#endif 26#endif
27#ifdef HAVE_EVIL 27#ifdef _WIN32
28# include <Evil.h> 28# include <Evil.h>
29#endif 29#endif
30 30
diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.c b/src/lib/ecore_con/efl_net_dialer_tcp.c
index a9d87cf..3b45044 100644
--- a/src/lib/ecore_con/efl_net_dialer_tcp.c
+++ b/src/lib/ecore_con/efl_net_dialer_tcp.c
@@ -24,7 +24,7 @@
24#ifdef HAVE_ARPA_INET_H 24#ifdef HAVE_ARPA_INET_H
25# include <arpa/inet.h> 25# include <arpa/inet.h>
26#endif 26#endif
27#ifdef HAVE_EVIL 27#ifdef _WIN32
28# include <Evil.h> 28# include <Evil.h>
29#endif 29#endif
30 30
diff --git a/src/lib/ecore_con/efl_net_dialer_udp.c b/src/lib/ecore_con/efl_net_dialer_udp.c
index bd2bf7e..c7541de 100644
--- a/src/lib/ecore_con/efl_net_dialer_udp.c
+++ b/src/lib/ecore_con/efl_net_dialer_udp.c
@@ -25,7 +25,7 @@
25#ifdef HAVE_ARPA_INET_H 25#ifdef HAVE_ARPA_INET_H
26# include <arpa/inet.h> 26# include <arpa/inet.h>
27#endif 27#endif
28#ifdef HAVE_EVIL 28#ifdef _WIN32
29# include <Evil.h> 29# include <Evil.h>
30#endif 30#endif
31 31
diff --git a/src/lib/ecore_con/efl_net_ip_address.c b/src/lib/ecore_con/efl_net_ip_address.c
index f5500e3..252b6e6 100644
--- a/src/lib/ecore_con/efl_net_ip_address.c
+++ b/src/lib/ecore_con/efl_net_ip_address.c
@@ -8,7 +8,7 @@
8# include <arpa/inet.h> 8# include <arpa/inet.h>
9#endif 9#endif
10 10
11#ifdef HAVE_EVIL 11#ifdef _WIN32
12# include <Evil.h> 12# include <Evil.h>
13#endif 13#endif
14 14
diff --git a/src/lib/ecore_con/efl_net_server_fd.c b/src/lib/ecore_con/efl_net_server_fd.c
index f1ff38b..c04b6c2 100644
--- a/src/lib/ecore_con/efl_net_server_fd.c
+++ b/src/lib/ecore_con/efl_net_server_fd.c
@@ -13,7 +13,7 @@
13#ifdef HAVE_SYS_SOCKET_H 13#ifdef HAVE_SYS_SOCKET_H
14# include <sys/socket.h> 14# include <sys/socket.h>
15#endif 15#endif
16#ifdef HAVE_EVIL 16#ifdef _WIN32
17# include <Evil.h> 17# include <Evil.h>
18#endif 18#endif
19 19
diff --git a/src/lib/ecore_con/efl_net_server_tcp.c b/src/lib/ecore_con/efl_net_server_tcp.c
index f82d57b..de4da81 100644
--- a/src/lib/ecore_con/efl_net_server_tcp.c
+++ b/src/lib/ecore_con/efl_net_server_tcp.c
@@ -23,7 +23,7 @@
23#ifdef HAVE_ARPA_INET_H 23#ifdef HAVE_ARPA_INET_H
24# include <arpa/inet.h> 24# include <arpa/inet.h>
25#endif 25#endif
26#ifdef HAVE_EVIL 26#ifdef _WIN32
27# include <Evil.h> 27# include <Evil.h>
28#endif 28#endif
29 29
diff --git a/src/lib/ecore_con/efl_net_server_udp.c b/src/lib/ecore_con/efl_net_server_udp.c
index f45fd61..9159929 100644
--- a/src/lib/ecore_con/efl_net_server_udp.c
+++ b/src/lib/ecore_con/efl_net_server_udp.c
@@ -25,7 +25,7 @@
25#ifdef HAVE_ARPA_INET_H 25#ifdef HAVE_ARPA_INET_H
26# include <arpa/inet.h> 26# include <arpa/inet.h>
27#endif 27#endif
28#ifdef HAVE_EVIL 28#ifdef _WIN32
29# include <Evil.h> 29# include <Evil.h>
30#endif 30#endif
31 31
diff --git a/src/lib/ecore_con/efl_net_server_udp_client.c b/src/lib/ecore_con/efl_net_server_udp_client.c
index e9ce54c..134a05c 100644
--- a/src/lib/ecore_con/efl_net_server_udp_client.c
+++ b/src/lib/ecore_con/efl_net_server_udp_client.c
@@ -15,7 +15,7 @@
15#ifdef HAVE_SYS_SOCKET_H 15#ifdef HAVE_SYS_SOCKET_H
16# include <sys/socket.h> 16# include <sys/socket.h>
17#endif 17#endif
18#ifdef HAVE_EVIL 18#ifdef _WIN32
19# include <Evil.h> 19# include <Evil.h>
20#endif 20#endif
21 21
diff --git a/src/lib/ecore_con/efl_net_socket_fd.c b/src/lib/ecore_con/efl_net_socket_fd.c
index e0e05d6..d02e586 100644
--- a/src/lib/ecore_con/efl_net_socket_fd.c
+++ b/src/lib/ecore_con/efl_net_socket_fd.c
@@ -20,7 +20,7 @@
20#ifdef HAVE_SYS_SOCKET_H 20#ifdef HAVE_SYS_SOCKET_H
21# include <sys/socket.h> 21# include <sys/socket.h>
22#endif 22#endif
23#ifdef HAVE_EVIL 23#ifdef _WIN32
24# include <Evil.h> 24# include <Evil.h>
25#endif 25#endif
26 26
diff --git a/src/lib/ecore_con/efl_net_socket_tcp.c b/src/lib/ecore_con/efl_net_socket_tcp.c
index 9009618..a6179be 100644
--- a/src/lib/ecore_con/efl_net_socket_tcp.c
+++ b/src/lib/ecore_con/efl_net_socket_tcp.c
@@ -29,7 +29,7 @@
29#ifdef HAVE_ARPA_INET_H 29#ifdef HAVE_ARPA_INET_H
30# include <arpa/inet.h> 30# include <arpa/inet.h>
31#endif 31#endif
32#ifdef HAVE_EVIL 32#ifdef _WIN32
33# include <Evil.h> 33# include <Evil.h>
34#endif 34#endif
35 35
diff --git a/src/lib/ecore_con/efl_net_socket_udp.c b/src/lib/ecore_con/efl_net_socket_udp.c
index f30a57a..c887a96 100644
--- a/src/lib/ecore_con/efl_net_socket_udp.c
+++ b/src/lib/ecore_con/efl_net_socket_udp.c
@@ -29,7 +29,7 @@
29#ifdef HAVE_ARPA_INET_H 29#ifdef HAVE_ARPA_INET_H
30# include <arpa/inet.h> 30# include <arpa/inet.h>
31#endif 31#endif
32#ifdef HAVE_EVIL 32#ifdef _WIN32
33# include <Evil.h> 33# include <Evil.h>
34#endif 34#endif
35 35
diff --git a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
index 88bb3bc..37457e9 100644
--- a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
+++ b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
@@ -17,7 +17,7 @@
17# include <dlfcn.h> 17# include <dlfcn.h>
18#endif 18#endif
19 19
20#ifdef HAVE_EVIL 20#ifdef _WIN32
21# include <Evil.h> 21# include <Evil.h>
22#endif 22#endif
23 23
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 8874c34..d510950 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -16,11 +16,11 @@
16# include <unistd.h> 16# include <unistd.h>
17#endif 17#endif
18 18
19#if defined(HAVE_SYS_MMAN_H) || defined(HAVE_EVIL) 19#if defined(HAVE_SYS_MMAN_H) || defined(_WIN32)
20# include <sys/mman.h> 20# include <sys/mman.h>
21#endif 21#endif
22 22
23#ifdef HAVE_EVIL 23#ifdef _WIN32
24# include <Evil.h> 24# include <Evil.h>
25#endif 25#endif
26 26
diff --git a/src/lib/ecore_file/ecore_file_private.h b/src/lib/ecore_file/ecore_file_private.h
index 7c33ec8..9a02fff 100644
--- a/src/lib/ecore_file/ecore_file_private.h
+++ b/src/lib/ecore_file/ecore_file_private.h
@@ -5,7 +5,7 @@
5# include <features.h> 5# include <features.h>
6#endif 6#endif
7 7
8#ifdef HAVE_EVIL 8#ifdef _WIN32
9# include <Evil.h> 9# include <Evil.h>
10#endif 10#endif
11 11
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 090a79f..19421c0 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -35,7 +35,7 @@
35#include <lauxlib.h> 35#include <lauxlib.h>
36#include <setjmp.h> 36#include <setjmp.h>
37 37
38#ifdef HAVE_EVIL 38#ifdef _WIN32
39# include <Evil.h> 39# include <Evil.h>
40#endif 40#endif
41 41
diff --git a/src/lib/eet/eet_lib.c b/src/lib/eet/eet_lib.c
index e74e5e9..99cd033 100644
--- a/src/lib/eet/eet_lib.c
+++ b/src/lib/eet/eet_lib.c
@@ -20,9 +20,9 @@
20# include <netinet/in.h> 20# include <netinet/in.h>
21#endif 21#endif
22 22
23#ifdef HAVE_EVIL 23#ifdef _WIN32
24# include <Evil.h> 24# include <Evil.h>
25#endif /* ifdef HAVE_EVIL */ 25#endif /* ifdef _WIN32 */
26 26
27#include <Eina.h> 27#include <Eina.h>
28#include <Emile.h> 28#include <Emile.h>
diff --git a/src/lib/eet/eet_node.c b/src/lib/eet/eet_node.c
index 3f1bde4..76c705a 100644
--- a/src/lib/eet/eet_node.c
+++ b/src/lib/eet/eet_node.c
@@ -5,9 +5,9 @@
5#include <string.h> 5#include <string.h>
6#include <stdio.h> 6#include <stdio.h>
7 7
8#ifdef HAVE_EVIL 8#ifdef _WIN32
9# include <Evil.h> 9# include <Evil.h>
10#endif /* ifdef HAVE_EVIL */ 10#endif /* ifdef _WIN32 */
11 11
12#include <Eina.h> 12#include <Eina.h>
13 13
diff --git a/src/lib/efreet/efreet_desktop.c b/src/lib/efreet/efreet_desktop.c
index 4a4f4d1..949fd56 100644
--- a/src/lib/efreet/efreet_desktop.c
+++ b/src/lib/efreet/efreet_desktop.c
@@ -2,7 +2,7 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#ifdef HAVE_EVIL 5#ifdef _WIN32
6# include <Evil.h> 6# include <Evil.h>
7#endif 7#endif
8 8
@@ -91,7 +91,7 @@ efreet_desktop_init(void)
91 return 0; 91 return 0;
92 } 92 }
93 93
94#ifdef HAVE_EVIL 94#ifdef _WIN32
95 if (!evil_sockets_init()) 95 if (!evil_sockets_init())
96 { 96 {
97 ERR("Could not initialize Winsock system"); 97 ERR("Could not initialize Winsock system");
@@ -138,7 +138,7 @@ efreet_desktop_shutdown(void)
138 EINA_LIST_FREE(efreet_desktop_types, info) 138 EINA_LIST_FREE(efreet_desktop_types, info)
139 efreet_desktop_type_info_free(info); 139 efreet_desktop_type_info_free(info);
140 eina_lock_free(&_lock); 140 eina_lock_free(&_lock);
141#ifdef HAVE_EVIL 141#ifdef _WIN32
142 evil_sockets_shutdown(); 142 evil_sockets_shutdown();
143#endif 143#endif
144 eina_log_domain_unregister(_efreet_desktop_log_dom); 144 eina_log_domain_unregister(_efreet_desktop_log_dom);
diff --git a/src/lib/efreet/efreet_uri.c b/src/lib/efreet/efreet_uri.c
index de224a6..36a090f 100644
--- a/src/lib/efreet/efreet_uri.c
+++ b/src/lib/efreet/efreet_uri.c
@@ -8,7 +8,7 @@
8#define _POSIX_HOST_NAME_MAX 255 8#define _POSIX_HOST_NAME_MAX 255
9#endif 9#endif
10 10
11#ifdef HAVE_EVIL 11#ifdef _WIN32
12# include <Evil.h> 12# include <Evil.h>
13#endif 13#endif
14 14
diff --git a/src/lib/eina/eina_benchmark.c b/src/lib/eina/eina_benchmark.c
index 6583e75..faf5e02 100644
--- a/src/lib/eina/eina_benchmark.c
+++ b/src/lib/eina/eina_benchmark.c
@@ -24,7 +24,7 @@
24#include <stdio.h> 24#include <stdio.h>
25#include <string.h> 25#include <string.h>
26 26
27#ifdef HAVE_EVIL 27#ifdef _WIN32
28# include <Evil.h> 28# include <Evil.h>
29#endif 29#endif
30 30
diff --git a/src/lib/eina/eina_binbuf.c b/src/lib/eina/eina_binbuf.c
index ebc6588..c8623a3 100644
--- a/src/lib/eina/eina_binbuf.c
+++ b/src/lib/eina/eina_binbuf.c
@@ -5,7 +5,7 @@
5#include <stdio.h> 5#include <stdio.h>
6#include <string.h> 6#include <string.h>
7 7
8#ifdef HAVE_EVIL 8#ifdef _WIN32
9# include <Evil.h> 9# include <Evil.h>
10#endif 10#endif
11 11
diff --git a/src/lib/eina/eina_convert.c b/src/lib/eina/eina_convert.c
index 800a167..2943b37 100644
--- a/src/lib/eina/eina_convert.c
+++ b/src/lib/eina/eina_convert.c
@@ -25,7 +25,7 @@
25#include <string.h> 25#include <string.h>
26#include <stdio.h> 26#include <stdio.h>
27 27
28#ifdef HAVE_EVIL 28#ifdef _WIN32
29# include <Evil.h> 29# include <Evil.h>
30#endif 30#endif
31 31
diff --git a/src/lib/eina/eina_error.c b/src/lib/eina/eina_error.c
index 779739d..a7faade 100644
--- a/src/lib/eina/eina_error.c
+++ b/src/lib/eina/eina_error.c
@@ -25,7 +25,7 @@
25#include <stdlib.h> 25#include <stdlib.h>
26#include <stdint.h> 26#include <stdint.h>
27 27
28#ifdef HAVE_EVIL 28#ifdef _WIN32
29# include <Evil.h> 29# include <Evil.h>
30#endif 30#endif
31 31
diff --git a/src/lib/eina/eina_evlog.c b/src/lib/eina/eina_evlog.c
index 90af610..9c9cbcc 100644
--- a/src/lib/eina/eina_evlog.c
+++ b/src/lib/eina/eina_evlog.c
@@ -24,7 +24,7 @@
24#include "eina_evlog.h" 24#include "eina_evlog.h"
25#include "eina_debug.h" 25#include "eina_debug.h"
26 26
27#ifdef HAVE_EVIL 27#ifdef _WIN32
28# include <Evil.h> 28# include <Evil.h>
29#endif 29#endif
30 30
@@ -80,7 +80,7 @@ get_time(void)
80 return (double)timev.tv_sec + (((double)timev.tv_usec) / 1000000.0); 80 return (double)timev.tv_sec + (((double)timev.tv_usec) / 1000000.0);
81 } 81 }
82 return (double)t.tv_sec + (((double)t.tv_nsec) / 1000000000.0); 82 return (double)t.tv_sec + (((double)t.tv_nsec) / 1000000000.0);
83#elif defined(HAVE_EVIL) 83#elif defined(_WIN32)
84 return evil_time_get(); 84 return evil_time_get();
85#elif defined(__APPLE__) && defined(__MACH__) 85#elif defined(__APPLE__) && defined(__MACH__)
86 return _eina_evlog_time_clock_conversion * (double)mach_absolute_time(); 86 return _eina_evlog_time_clock_conversion * (double)mach_absolute_time();
diff --git a/src/lib/eina/eina_file_common.c b/src/lib/eina/eina_file_common.c
index 9103639..c5a367d 100644
--- a/src/lib/eina/eina_file_common.c
+++ b/src/lib/eina/eina_file_common.c
@@ -30,7 +30,7 @@
30#include <fcntl.h> 30#include <fcntl.h>
31#include <errno.h> 31#include <errno.h>
32 32
33#ifdef HAVE_EVIL 33#ifdef _WIN32
34# include <Evil.h> 34# include <Evil.h>
35#endif 35#endif
36 36
diff --git a/src/lib/eina/eina_list.c b/src/lib/eina/eina_list.c
index 72dc813..9192b4c 100644
--- a/src/lib/eina/eina_list.c
+++ b/src/lib/eina/eina_list.c
@@ -62,7 +62,7 @@
62#include <string.h> 62#include <string.h>
63#include <time.h> 63#include <time.h>
64 64
65#ifdef HAVE_EVIL 65#ifdef _WIN32
66# include <Evil.h> 66# include <Evil.h>
67#endif 67#endif
68 68
diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c
index 2b2a240..68cb948 100644
--- a/src/lib/eina/eina_log.c
+++ b/src/lib/eina/eina_log.c
@@ -33,7 +33,7 @@
33# include <systemd/sd-journal.h> 33# include <systemd/sd-journal.h>
34#endif 34#endif
35 35
36#ifdef HAVE_EVIL 36#ifdef _WIN32
37# include <Evil.h> 37# include <Evil.h>
38#endif 38#endif
39 39
diff --git a/src/lib/eina/eina_magic.c b/src/lib/eina/eina_magic.c
index 6b26da6..390ed62 100644
--- a/src/lib/eina/eina_magic.c
+++ b/src/lib/eina/eina_magic.c
@@ -23,7 +23,7 @@
23#include <stdlib.h> 23#include <stdlib.h>
24#include <string.h> 24#include <string.h>
25 25
26#ifdef HAVE_EVIL 26#ifdef _WIN32
27# include <Evil.h> 27# include <Evil.h>
28#endif 28#endif
29 29
diff --git a/src/lib/eina/eina_matrixsparse.c b/src/lib/eina/eina_matrixsparse.c
index 47a10ae..eb85dde 100644
--- a/src/lib/eina/eina_matrixsparse.c
+++ b/src/lib/eina/eina_matrixsparse.c
@@ -33,7 +33,7 @@
33#include <string.h> 33#include <string.h>
34#include <assert.h> 34#include <assert.h>
35 35
36#ifdef HAVE_EVIL 36#ifdef _WIN32
37# include <Evil.h> 37# include <Evil.h>
38#endif 38#endif
39 39
diff --git a/src/lib/eina/eina_module.c b/src/lib/eina/eina_module.c
index 15b8210..d670371 100644
--- a/src/lib/eina/eina_module.c
+++ b/src/lib/eina/eina_module.c
@@ -31,7 +31,7 @@
31# include <dlfcn.h> 31# include <dlfcn.h>
32#endif 32#endif
33 33
34#ifdef HAVE_EVIL 34#ifdef _WIN32
35# include <Evil.h> 35# include <Evil.h>
36#endif 36#endif
37 37
diff --git a/src/lib/eina/eina_prefix.c b/src/lib/eina/eina_prefix.c
index 2165d05..26f07f8 100644
--- a/src/lib/eina/eina_prefix.c
+++ b/src/lib/eina/eina_prefix.c
@@ -41,7 +41,7 @@
41# include <dlfcn.h> 41# include <dlfcn.h>
42#endif 42#endif
43 43
44#ifdef HAVE_EVIL 44#ifdef _WIN32
45# include <Evil.h> 45# include <Evil.h>
46#endif 46#endif
47 47
diff --git a/src/lib/eina/eina_quadtree.c b/src/lib/eina/eina_quadtree.c
index 246def7..1f50fd5 100644
--- a/src/lib/eina/eina_quadtree.c
+++ b/src/lib/eina/eina_quadtree.c
@@ -30,7 +30,7 @@
30#include <stdlib.h> 30#include <stdlib.h>
31#include <stdio.h> 31#include <stdio.h>
32 32
33#ifdef HAVE_EVIL 33#ifdef _WIN32
34# include <Evil.h> 34# include <Evil.h>
35#endif 35#endif
36 36
diff --git a/src/lib/eina/eina_rectangle.c b/src/lib/eina/eina_rectangle.c
index a3e8bff..b6eadeb 100644
--- a/src/lib/eina/eina_rectangle.c
+++ b/src/lib/eina/eina_rectangle.c
@@ -23,7 +23,7 @@
23#include <stdio.h> 23#include <stdio.h>
24#include <stdlib.h> 24#include <stdlib.h>
25 25
26#ifdef HAVE_EVIL 26#ifdef _WIN32
27# include <Evil.h> 27# include <Evil.h>
28#endif 28#endif
29 29
diff --git a/src/lib/eina/eina_share_common.c b/src/lib/eina/eina_share_common.c
index 7fb8f90..6ad55b7 100644
--- a/src/lib/eina/eina_share_common.c
+++ b/src/lib/eina/eina_share_common.c
@@ -63,7 +63,7 @@
63#include <string.h> 63#include <string.h>
64#include <stddef.h> 64#include <stddef.h>
65 65
66#ifdef HAVE_EVIL 66#ifdef _WIN32
67# include <Evil.h> 67# include <Evil.h>
68#endif 68#endif
69 69
diff --git a/src/lib/eina/eina_simple_xml_parser.c b/src/lib/eina/eina_simple_xml_parser.c
index 93e1416..3b218da 100644
--- a/src/lib/eina/eina_simple_xml_parser.c
+++ b/src/lib/eina/eina_simple_xml_parser.c
@@ -26,7 +26,7 @@
26#include <string.h> 26#include <string.h>
27#include <ctype.h> 27#include <ctype.h>
28 28
29#ifdef HAVE_EVIL 29#ifdef _WIN32
30# include <Evil.h> 30# include <Evil.h>
31#endif 31#endif
32 32
diff --git a/src/lib/eina/eina_strbuf.c b/src/lib/eina/eina_strbuf.c
index 81ab30a..586bffb 100644
--- a/src/lib/eina/eina_strbuf.c
+++ b/src/lib/eina/eina_strbuf.c
@@ -6,7 +6,7 @@
6#include <string.h> 6#include <string.h>
7#include <ctype.h> 7#include <ctype.h>
8 8
9#ifdef HAVE_EVIL 9#ifdef _WIN32
10# include <Evil.h> 10# include <Evil.h>
11#endif 11#endif
12 12
diff --git a/src/lib/eina/eina_stringshare.c b/src/lib/eina/eina_stringshare.c
index 588865d..f8510de 100644
--- a/src/lib/eina/eina_stringshare.c
+++ b/src/lib/eina/eina_stringshare.c
@@ -30,7 +30,7 @@
30#include <stdio.h> 30#include <stdio.h>
31#include <string.h> 31#include <string.h>
32 32
33#ifdef HAVE_EVIL 33#ifdef _WIN32
34# include <Evil.h> 34# include <Evil.h>
35#endif 35#endif
36 36
diff --git a/src/lib/eina/eina_tmpstr.c b/src/lib/eina/eina_tmpstr.c
index c7d26ee..9dbbe7d 100644
--- a/src/lib/eina/eina_tmpstr.c
+++ b/src/lib/eina/eina_tmpstr.c
@@ -26,7 +26,7 @@
26#include <stdio.h> 26#include <stdio.h>
27#include <string.h> 27#include <string.h>
28 28
29#ifdef HAVE_EVIL 29#ifdef _WIN32
30# include <Evil.h> 30# include <Evil.h>
31#endif 31#endif
32 32
diff --git a/src/lib/eina/eina_value.c b/src/lib/eina/eina_value.c
index f22718b..63c26ce 100644
--- a/src/lib/eina/eina_value.c
+++ b/src/lib/eina/eina_value.c
@@ -24,7 +24,7 @@
24#include <inttypes.h> /* PRId64 and PRIu64 */ 24#include <inttypes.h> /* PRId64 and PRIu64 */
25#include <sys/time.h> /* struct timeval */ 25#include <sys/time.h> /* struct timeval */
26 26
27#ifdef HAVE_EVIL 27#ifdef _WIN32
28# include <Evil.h> 28# include <Evil.h>
29#endif 29#endif
30 30
diff --git a/src/lib/eina/eina_value_util.c b/src/lib/eina/eina_value_util.c
index 73923d8..3d35a47 100644
--- a/src/lib/eina/eina_value_util.c
+++ b/src/lib/eina/eina_value_util.c
@@ -22,7 +22,7 @@
22 22
23#include <time.h> 23#include <time.h>
24 24
25#ifdef HAVE_EVIL 25#ifdef _WIN32
26# include <Evil.h> 26# include <Evil.h>
27#endif 27#endif
28 28
diff --git a/src/lib/eio/eio_private.h b/src/lib/eio/eio_private.h
index a81d94f..62c3fc8 100644
--- a/src/lib/eio/eio_private.h
+++ b/src/lib/eio/eio_private.h
@@ -47,7 +47,7 @@
47# include <features.h> 47# include <features.h>
48#endif 48#endif
49 49
50#ifdef HAVE_EVIL 50#ifdef _WIN32
51# include <Evil.h> 51# include <Evil.h>
52#endif 52#endif
53 53
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index 6f57954..b8927bf 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -144,7 +144,7 @@ _expanded_fmt_str_get(char ch)
144 switch (ch) 144 switch (ch)
145 { 145 {
146 case 'c': 146 case 'c':
147#if defined(HAVE_LANGINFO_H) || defined (HAVE_EVIL) 147#if defined(HAVE_LANGINFO_H) || defined (_WIN32)
148 exp_fmt = nl_langinfo(D_T_FMT); 148 exp_fmt = nl_langinfo(D_T_FMT);
149#else 149#else
150 exp_fmt = ""; 150 exp_fmt = "";
@@ -152,7 +152,7 @@ _expanded_fmt_str_get(char ch)
152 break; 152 break;
153 153
154 case 'x': 154 case 'x':
155#if defined(HAVE_LANGINFO_H) || defined (HAVE_EVIL) 155#if defined(HAVE_LANGINFO_H) || defined (_WIN32)
156 exp_fmt = nl_langinfo(D_FMT); 156 exp_fmt = nl_langinfo(D_FMT);
157#else 157#else
158 exp_fmt = ""; 158 exp_fmt = "";
@@ -160,7 +160,7 @@ _expanded_fmt_str_get(char ch)
160 break; 160 break;
161 161
162 case 'X': 162 case 'X':
163#if defined(HAVE_LANGINFO_H) || defined (HAVE_EVIL) 163#if defined(HAVE_LANGINFO_H) || defined (_WIN32)
164 exp_fmt = nl_langinfo(T_FMT); 164 exp_fmt = nl_langinfo(T_FMT);
165#else 165#else
166 exp_fmt = ""; 166 exp_fmt = "";
@@ -168,7 +168,7 @@ _expanded_fmt_str_get(char ch)
168 break; 168 break;
169 169
170 case 'r': 170 case 'r':
171#if defined(HAVE_LANGINFO_H) || defined (HAVE_EVIL) 171#if defined(HAVE_LANGINFO_H) || defined (_WIN32)
172 exp_fmt = nl_langinfo(T_FMT_AMPM); 172 exp_fmt = nl_langinfo(T_FMT_AMPM);
173#else 173#else
174 exp_fmt = ""; 174 exp_fmt = "";
@@ -347,7 +347,7 @@ _reload_format(Evas_Object *obj)
347 // FIXME: provide nl_langinfo on Windows if possible 347 // FIXME: provide nl_langinfo on Windows if possible
348 // fetch the default format from Libc. 348 // fetch the default format from Libc.
349 if (!sd->user_format) 349 if (!sd->user_format)
350#if defined(HAVE_LANGINFO_H) || defined (HAVE_EVIL) 350#if defined(HAVE_LANGINFO_H) || defined (_WIN32)
351 strncpy(sd->format, nl_langinfo(D_T_FMT), EFL_UI_CLOCK_MAX_FORMAT_LEN); 351 strncpy(sd->format, nl_langinfo(D_T_FMT), EFL_UI_CLOCK_MAX_FORMAT_LEN);
352#else 352#else
353 strncpy(sd->format, "", EFL_UI_CLOCK_MAX_FORMAT_LEN); 353 strncpy(sd->format, "", EFL_UI_CLOCK_MAX_FORMAT_LEN);
diff --git a/src/lib/elementary/elm_font.c b/src/lib/elementary/elm_font.c
index 797ecad..cffaa5a 100644
--- a/src/lib/elementary/elm_font.c
+++ b/src/lib/elementary/elm_font.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#ifdef HAVE_EVIL 5#ifdef _WIN32
6# include <Evil.h> 6# include <Evil.h>
7#endif 7#endif
8 8
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 40903ef..c82050e 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -10,7 +10,7 @@
10# include <crt_externs.h> 10# include <crt_externs.h>
11#endif 11#endif
12 12
13#ifdef HAVE_EVIL 13#ifdef _WIN32
14# include <Evil.h> 14# include <Evil.h>
15#endif 15#endif
16 16
diff --git a/src/lib/elua/elua_private.h b/src/lib/elua/elua_private.h
index 9f62c5f..f4392f6 100644
--- a/src/lib/elua/elua_private.h
+++ b/src/lib/elua/elua_private.h
@@ -20,7 +20,7 @@
20#include <Eina.h> 20#include <Eina.h>
21#include <Ecore.h> 21#include <Ecore.h>
22 22
23#ifdef HAVE_EVIL 23#ifdef _WIN32
24#include <Evil.h> 24#include <Evil.h>
25#endif 25#endif
26 26
diff --git a/src/lib/embryo/embryo_time.c b/src/lib/embryo/embryo_time.c
index ce167cb..1e74816 100644
--- a/src/lib/embryo/embryo_time.c
+++ b/src/lib/embryo/embryo_time.c
@@ -9,7 +9,7 @@
9# include <winsock2.h> 9# include <winsock2.h>
10#endif 10#endif
11 11
12#ifdef HAVE_EVIL 12#ifdef _WIN32
13# include <Evil.h> 13# include <Evil.h>
14#endif 14#endif
15 15
diff --git a/src/lib/emile/emile_image.c b/src/lib/emile/emile_image.c
index bb94f2c..858e790 100644
--- a/src/lib/emile/emile_image.c
+++ b/src/lib/emile/emile_image.c
@@ -25,7 +25,7 @@
25#include <jpeglib.h> 25#include <jpeglib.h>
26#include <jerror.h> 26#include <jerror.h>
27 27
28#ifdef HAVE_EVIL 28#ifdef _WIN32
29#include <Evil.h> 29#include <Evil.h>
30#endif 30#endif
31 31
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index b1e5648..b4bd760 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -8,7 +8,7 @@
8 8
9#include <Eina.h> 9#include <Eina.h>
10 10
11#ifdef HAVE_EVIL 11#ifdef _WIN32
12# include <Evil.h> 12# include <Evil.h>
13#endif 13#endif
14 14
@@ -2560,7 +2560,7 @@ efl_callbacks_cmp(const Efl_Callback_Array_Item *a, const Efl_Callback_Array_Ite
2560static inline double 2560static inline double
2561_eo_log_time_now(void) 2561_eo_log_time_now(void)
2562{ 2562{
2563#ifdef HAVE_EVIL 2563#ifdef _WIN32
2564 return evil_time_get(); 2564 return evil_time_get();
2565#elif defined(__APPLE__) && defined(__MACH__) 2565#elif defined(__APPLE__) && defined(__MACH__)
2566 static double clk_conv = -1.0; 2566 static double clk_conv = -1.0;
@@ -2693,7 +2693,7 @@ _eo_log_obj_entry_show(const Eo_Log_Obj_Entry *entry, int log_level, const char
2693 { 2693 {
2694 const char *fname; 2694 const char *fname;
2695 2695
2696#ifdef HAVE_EVIL 2696#ifdef _WIN32
2697 fname = strrchr(info.dli_fname, '\\'); 2697 fname = strrchr(info.dli_fname, '\\');
2698#else 2698#else
2699 fname = strrchr(info.dli_fname, '/'); 2699 fname = strrchr(info.dli_fname, '/');
diff --git a/src/lib/ephysics/ephysics_private.h b/src/lib/ephysics/ephysics_private.h
index e8aeb20..ded1d14 100644
--- a/src/lib/ephysics/ephysics_private.h
+++ b/src/lib/ephysics/ephysics_private.h
@@ -1,7 +1,7 @@
1#ifndef _EPHYSICS_PRIVATE_H 1#ifndef _EPHYSICS_PRIVATE_H
2#define _EPHYSICS_PRIVATE_H 2#define _EPHYSICS_PRIVATE_H
3 3
4#ifdef HAVE_EVIL 4#ifdef _WIN32
5# include <Evil.h> 5# include <Evil.h>
6#endif 6#endif
7 7
diff --git a/src/lib/ethumb/ethumb.c b/src/lib/ethumb/ethumb.c
index 7737b01..13ee30c 100644
--- a/src/lib/ethumb/ethumb.c
+++ b/src/lib/ethumb/ethumb.c
@@ -52,7 +52,7 @@
52# define PATH_MAX 4096 52# define PATH_MAX 4096
53#endif 53#endif
54 54
55#ifdef HAVE_EVIL 55#ifdef _WIN32
56# include <Evil.h> 56# include <Evil.h>
57#endif 57#endif
58 58
diff --git a/src/lib/evas/cache/evas_cache_image.c b/src/lib/evas/cache/evas_cache_image.c
index 138aff8..859d132 100644
--- a/src/lib/evas/cache/evas_cache_image.c
+++ b/src/lib/evas/cache/evas_cache_image.c
@@ -8,7 +8,7 @@
8#include <sys/stat.h> 8#include <sys/stat.h>
9#include <errno.h> 9#include <errno.h>
10 10
11#ifdef HAVE_EVIL 11#ifdef _WIN32
12# include <Evil.h> 12# include <Evil.h>
13#endif 13#endif
14 14
diff --git a/src/lib/evas/cache/evas_preload.c b/src/lib/evas/cache/evas_preload.c
index 649309d..c71e5ed 100644
--- a/src/lib/evas/cache/evas_preload.c
+++ b/src/lib/evas/cache/evas_preload.c
@@ -1,7 +1,7 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4#ifdef HAVE_EVIL 4#ifdef _WIN32
5# include <Evil.h> 5# include <Evil.h>
6#endif 6#endif
7#ifdef __linux__ 7#ifdef __linux__
diff --git a/src/lib/evas/cache2/evas_cache2.c b/src/lib/evas/cache2/evas_cache2.c
index 996a2a4..c791e99 100644
--- a/src/lib/evas/cache2/evas_cache2.c
+++ b/src/lib/evas/cache2/evas_cache2.c
@@ -8,7 +8,7 @@
8#include <sys/stat.h> 8#include <sys/stat.h>
9#include <errno.h> 9#include <errno.h>
10 10
11#ifdef HAVE_EVIL 11#ifdef _WIN32
12# include <Evil.h> 12# include <Evil.h>
13#endif 13#endif
14 14
diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c
index 361e0fd..80e37fa 100644
--- a/src/lib/evas/canvas/evas_font_dir.c
+++ b/src/lib/evas/canvas/evas_font_dir.c
@@ -2,7 +2,7 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#ifdef HAVE_EVIL 5#ifdef _WIN32
6# include <Evil.h> 6# include <Evil.h>
7#endif 7#endif
8 8
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 246205b..fb73145 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -40,7 +40,7 @@ evas_init(void)
40 } 40 }
41#endif 41#endif
42 42
43#ifdef HAVE_EVIL 43#ifdef _WIN32
44 if (!evil_init()) 44 if (!evil_init())
45 return --_evas_init_count; 45 return --_evas_init_count;
46#endif 46#endif
@@ -118,7 +118,7 @@ evas_init(void)
118 shutdown_eina: 118 shutdown_eina:
119 eina_shutdown(); 119 eina_shutdown();
120 shutdown_evil: 120 shutdown_evil:
121#ifdef HAVE_EVIL 121#ifdef _WIN32
122 evil_shutdown(); 122 evil_shutdown();
123#endif 123#endif
124 124
@@ -185,7 +185,7 @@ evas_shutdown(void)
185 eet_shutdown(); 185 eet_shutdown();
186 186
187 eina_shutdown(); 187 eina_shutdown();
188#ifdef HAVE_EVIL 188#ifdef _WIN32
189 evil_shutdown(); 189 evil_shutdown();
190#endif 190#endif
191 191
diff --git a/src/lib/evas/common/evas_image_scalecache.c b/src/lib/evas/common/evas_image_scalecache.c
index 978a4cb..16f8d1f 100644
--- a/src/lib/evas/common/evas_image_scalecache.c
+++ b/src/lib/evas/common/evas_image_scalecache.c
@@ -2,7 +2,7 @@
2# include "config.h" 2# include "config.h"
3#endif 3#endif
4 4
5#ifdef HAVE_EVIL 5#ifdef _WIN32
6# include <Evil.h> 6# include <Evil.h>
7#endif 7#endif
8 8
diff --git a/src/lib/evas/common/language/evas_language_utils.c b/src/lib/evas/common/language/evas_language_utils.c
index 74dcec7..5a8e173 100644
--- a/src/lib/evas/common/language/evas_language_utils.c
+++ b/src/lib/evas/common/language/evas_language_utils.c
@@ -29,7 +29,7 @@
29# define dgettext(domain, x) (x) 29# define dgettext(domain, x) (x)
30#endif 30#endif
31 31
32#ifdef HAVE_EVIL 32#ifdef _WIN32
33# include <Evil.h> 33# include <Evil.h>
34#endif 34#endif
35 35
diff --git a/src/lib/evas/file/evas_path.c b/src/lib/evas/file/evas_path.c
index 429519e..6144759 100644
--- a/src/lib/evas/file/evas_path.c
+++ b/src/lib/evas/file/evas_path.c
@@ -18,7 +18,7 @@
18# include <sys/param.h> 18# include <sys/param.h>
19#endif 19#endif
20 20
21#ifdef HAVE_EVIL 21#ifdef _WIN32
22# include <Evil.h> 22# include <Evil.h>
23#endif 23#endif
24 24
diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h
index 17be9c8..a4b3ae3 100644
--- a/src/lib/evas/include/evas_common_private.h
+++ b/src/lib/evas/include/evas_common_private.h
@@ -27,7 +27,7 @@
27#include <unistd.h> 27#include <unistd.h>
28#endif 28#endif
29 29
30#ifdef HAVE_EVIL 30#ifdef _WIN32
31# include <Evil.h> 31# include <Evil.h>
32#endif 32#endif
33 33
diff --git a/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c b/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c
index c14cc4b..a003a92 100644
--- a/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c
+++ b/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c
@@ -4,7 +4,7 @@
4 4
5#include <stdio.h> 5#include <stdio.h>
6 6
7#ifdef HAVE_EVIL 7#ifdef _WIN32
8# include <Evil.h> 8# include <Evil.h>
9#endif 9#endif
10 10
diff --git a/src/modules/evas/image_loaders/generic/evas_image_load_generic.c b/src/modules/evas/image_loaders/generic/evas_image_load_generic.c
index 88dedad..594c6b6 100644
--- a/src/modules/evas/image_loaders/generic/evas_image_load_generic.c
+++ b/src/modules/evas/image_loaders/generic/evas_image_load_generic.c
@@ -2,7 +2,7 @@
2# include "config.h" 2# include "config.h"
3#endif 3#endif
4 4
5#ifdef HAVE_EVIL 5#ifdef _WIN32
6# include <Evil.h> 6# include <Evil.h>
7#endif 7#endif
8 8
diff --git a/src/modules/evas/image_loaders/ico/evas_image_load_ico.c b/src/modules/evas/image_loaders/ico/evas_image_load_ico.c
index ef88852..0754ba4 100644
--- a/src/modules/evas/image_loaders/ico/evas_image_load_ico.c
+++ b/src/modules/evas/image_loaders/ico/evas_image_load_ico.c
@@ -4,7 +4,7 @@
4 4
5#include <stdio.h> 5#include <stdio.h>
6 6
7#ifdef HAVE_EVIL 7#ifdef _WIN32
8# include <Evil.h> 8# include <Evil.h>
9#endif 9#endif
10 10
diff --git a/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c b/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c
index fb3fdff..9da73f6 100644
--- a/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c
+++ b/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c
@@ -4,7 +4,7 @@
4 4
5#include <stdio.h> 5#include <stdio.h>
6 6
7#ifdef HAVE_EVIL 7#ifdef _WIN32
8# include <Evil.h> 8# include <Evil.h>
9#endif 9#endif
10 10
diff --git a/src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c b/src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c
index 9c14d75..f70606a 100644
--- a/src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c
+++ b/src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c
@@ -2,7 +2,7 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#ifdef HAVE_EVIL 5#ifdef _WIN32
6# include <Evil.h> 6# include <Evil.h>
7#endif 7#endif
8 8
diff --git a/src/modules/evas/image_loaders/png/evas_image_load_png.c b/src/modules/evas/image_loaders/png/evas_image_load_png.c
index 2d30ef7..2994c8e 100644
--- a/src/modules/evas/image_loaders/png/evas_image_load_png.c
+++ b/src/modules/evas/image_loaders/png/evas_image_load_png.c
@@ -6,7 +6,7 @@
6#include <png.h> 6#include <png.h>
7#include <setjmp.h> 7#include <setjmp.h>
8 8
9#ifdef HAVE_EVIL 9#ifdef _WIN32
10# include <Evil.h> 10# include <Evil.h>
11#endif 11#endif
12 12
diff --git a/src/modules/evas/image_loaders/psd/evas_image_load_psd.c b/src/modules/evas/image_loaders/psd/evas_image_load_psd.c
index 3c0cf5b..c1306b1 100644
--- a/src/modules/evas/image_loaders/psd/evas_image_load_psd.c
+++ b/src/modules/evas/image_loaders/psd/evas_image_load_psd.c
@@ -19,7 +19,7 @@
19# include <netinet/in.h> 19# include <netinet/in.h>
20#endif 20#endif
21 21
22#ifdef HAVE_EVIL 22#ifdef _WIN32
23# include <Evil.h> 23# include <Evil.h>
24#endif 24#endif
25 25
diff --git a/src/modules/evas/image_loaders/tga/evas_image_load_tga.c b/src/modules/evas/image_loaders/tga/evas_image_load_tga.c
index e2f7896..a62c9f0 100644
--- a/src/modules/evas/image_loaders/tga/evas_image_load_tga.c
+++ b/src/modules/evas/image_loaders/tga/evas_image_load_tga.c
@@ -6,7 +6,7 @@
6#include <sys/types.h> 6#include <sys/types.h>
7#include <fcntl.h> 7#include <fcntl.h>
8 8
9#ifdef HAVE_EVIL 9#ifdef _WIN32
10# include <Evil.h> 10# include <Evil.h>
11#endif 11#endif
12 12
diff --git a/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c b/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
index da1157e..d7e564d 100644
--- a/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
+++ b/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
@@ -7,7 +7,7 @@
7#include <unistd.h> 7#include <unistd.h>
8#include <tiffio.h> 8#include <tiffio.h>
9 9
10#ifdef HAVE_EVIL 10#ifdef _WIN32
11# include <Evil.h> 11# include <Evil.h>
12#endif 12#endif
13 13
diff --git a/src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c b/src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c
index 70c5078..633afe9 100644
--- a/src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c
+++ b/src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c
@@ -4,7 +4,7 @@
4 4
5#include <stdio.h> 5#include <stdio.h>
6 6
7#ifdef HAVE_EVIL 7#ifdef _WIN32
8# include <Evil.h> 8# include <Evil.h>
9#endif 9#endif
10 10
diff --git a/src/modules/evas/image_loaders/webp/evas_image_load_webp.c b/src/modules/evas/image_loaders/webp/evas_image_load_webp.c
index 50f52d0..aa0a6ca 100644
--- a/src/modules/evas/image_loaders/webp/evas_image_load_webp.c
+++ b/src/modules/evas/image_loaders/webp/evas_image_load_webp.c
@@ -6,7 +6,7 @@
6#include <string.h> 6#include <string.h>
7#include <webp/decode.h> 7#include <webp/decode.h>
8 8
9#ifdef HAVE_EVIL 9#ifdef _WIN32
10# include <Evil.h> 10# include <Evil.h>
11#endif 11#endif
12 12
diff --git a/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c b/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c
index 54db7ed..0fa150d 100644
--- a/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c
+++ b/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c
@@ -2,7 +2,7 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#ifdef HAVE_EVIL 5#ifdef _WIN32
6# include <Evil.h> 6# include <Evil.h>
7#endif 7#endif
8 8
diff --git a/src/modules/evas/image_savers/png/evas_image_save_png.c b/src/modules/evas/image_savers/png/evas_image_save_png.c
index eca98f8..301c072 100644
--- a/src/modules/evas/image_savers/png/evas_image_save_png.c
+++ b/src/modules/evas/image_savers/png/evas_image_save_png.c
@@ -6,7 +6,7 @@
6#include <png.h> 6#include <png.h>
7#include <setjmp.h> 7#include <setjmp.h>
8 8
9#ifdef HAVE_EVIL 9#ifdef _WIN32
10# include <Evil.h> 10# include <Evil.h>
11#endif 11#endif
12 12
diff --git a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
index 5bb8ddb..42f549b 100644
--- a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
+++ b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
@@ -19,7 +19,7 @@
19# include <arpa/inet.h> 19# include <arpa/inet.h>
20#endif 20#endif
21 21
22#ifdef HAVE_EVIL 22#ifdef _WIN32
23# include <Evil.h> 23# include <Evil.h>
24#endif 24#endif
25 25
diff --git a/src/tests/eina/eina_test_error.c b/src/tests/eina/eina_test_error.c
index b101dc8..a7e68ca 100644
--- a/src/tests/eina/eina_test_error.c
+++ b/src/tests/eina/eina_test_error.c
@@ -24,7 +24,7 @@
24#include <stdio.h> 24#include <stdio.h>
25#include <string.h> 25#include <string.h>
26 26
27#ifdef HAVE_EVIL 27#ifdef _WIN32
28# include <Evil.h> 28# include <Evil.h>
29#endif 29#endif
30 30
diff --git a/src/tests/eolian/eolian_generation.c b/src/tests/eolian/eolian_generation.c
index a6f6301..ee19d22 100644
--- a/src/tests/eolian/eolian_generation.c
+++ b/src/tests/eolian/eolian_generation.c
@@ -5,7 +5,7 @@
5#include <stdlib.h> 5#include <stdlib.h>
6#include <stdio.h> 6#include <stdio.h>
7 7
8#ifdef HAVE_EVIL 8#ifdef _WIN32
9#include "Evil.h" 9#include "Evil.h"
10#endif 10#endif
11 11