summaryrefslogtreecommitdiff
path: root/src/lib/ecore
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 /src/lib/ecore
parent7db24851936e7fe654ba77cbad47316577cce5f7 (diff)
EFL For WIN32: Replace HAVE_EVIL define with _WIN32
Diffstat (limited to 'src/lib/ecore')
-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
6 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index ec733b20c6..35967d6a00 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 a2e9cd1fb3..ec420c6154 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 967ee721fd..fe34371e06 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 e1d732d9d7..d85d0bf54f 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 91e6aacfa7..480aa1ce80 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 2c871e29d0..1fafd62179 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);