EFL For WIN32: Replace HAVE_EVIL define with _WIN32

This commit is contained in:
Vincent Torri 2017-09-22 05:06:10 -05:00 committed by Stephen 'Okra' Houston
parent 7db2485193
commit 0cdd501246
92 changed files with 116 additions and 116 deletions

View File

@ -10,7 +10,7 @@
#include <unistd.h>
#include <fcntl.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -2,7 +2,7 @@
#include <config.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -11,7 +11,7 @@
#include <ctype.h>
#include <Ecore_Getopt.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -10,7 +10,7 @@
#include <fcntl.h>
#include <ctype.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -6,7 +6,7 @@
# include <sys/wait.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif
#include <Eina.h>

View File

@ -7,9 +7,9 @@
#include <string.h>
#include <unistd.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif /* ifdef HAVE_EVIL */
#endif /* ifdef _WIN32 */
#include <Eet.h>

View File

@ -36,7 +36,7 @@
#include <unistd.h>
#include <sys/stat.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -15,7 +15,7 @@
# include <langinfo.h>
#endif
#if defined(HAVE_SYS_MMAN_H) || defined(HAVE_EVIL)
#if defined(HAVE_SYS_MMAN_H) || defined(_WIN32)
# include <sys/mman.h>
#endif
@ -23,7 +23,7 @@
# include <systemd/sd-daemon.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif
#include <Eina.h>
@ -221,7 +221,7 @@ ecore_init(void)
WRN("Not a utf8 locale!");
}
*/
#ifdef HAVE_EVIL
#ifdef _WIN32
if (!evil_init())
return --_ecore_init_count;
#endif
@ -337,7 +337,7 @@ shutdown_mempool:
shutdown_log_dom:
eina_shutdown();
shutdown_evil:
#ifdef HAVE_EVIL
#ifdef _WIN32
evil_shutdown();
#endif
@ -453,7 +453,7 @@ ecore_shutdown(void)
eina_evlog("<RUN", NULL, 0.0, NULL);
eina_shutdown();
#ifdef HAVE_EVIL
#ifdef _WIN32
evil_shutdown();
#endif

View File

@ -9,7 +9,7 @@
# include <process.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -53,7 +53,7 @@
# endif
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -32,7 +32,7 @@
# endif
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -8,7 +8,7 @@
#include <sys/types.h>
#include <unistd.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -5,7 +5,7 @@
#include <stdlib.h>
#include <sys/time.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif
@ -43,7 +43,7 @@ ecore_time_get(void)
}
return (double)t.tv_sec + (((double)t.tv_nsec) / 1000000000.0);
#elif defined(HAVE_EVIL)
#elif defined(_WIN32)
return evil_time_get();
#elif defined(__APPLE__) && defined(__MACH__)
return _ecore_time_clock_conversion * (double)mach_absolute_time();
@ -110,7 +110,7 @@ _ecore_time_init(void)
"Fallback to unix time.");
}
#else
# ifndef HAVE_EVIL
# ifndef _WIN32
# if defined(__APPLE__) && defined(__MACH__)
mach_timebase_info_data_t info;
kern_return_t err = mach_timebase_info(&info);

View File

@ -42,7 +42,7 @@
# include <ws2tcpip.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif
@ -84,7 +84,7 @@ ecore_con_init(void)
if (++_ecore_con_init_count != 1)
return _ecore_con_init_count;
#ifdef HAVE_EVIL
#ifdef _WIN32
if (!evil_init())
return --_ecore_con_init_count;
#endif
@ -129,7 +129,7 @@ ecore_con_log_error:
ecore_shutdown();
ecore_err:
#ifdef HAVE_EVIL
#ifdef _WIN32
evil_shutdown();
#endif
return --_ecore_con_init_count;
@ -160,7 +160,7 @@ ecore_con_shutdown(void)
*/
ecore_shutdown();
#ifdef HAVE_EVIL
#ifdef _WIN32
evil_shutdown();
#endif

View File

@ -10,7 +10,7 @@
# include <sys/socket.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -10,7 +10,7 @@
#include <unistd.h>
#include <fcntl.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -38,7 +38,7 @@
# include <ws2tcpip.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -24,7 +24,7 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -24,7 +24,7 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -25,7 +25,7 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -8,7 +8,7 @@
# include <arpa/inet.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -13,7 +13,7 @@
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -23,7 +23,7 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -25,7 +25,7 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -15,7 +15,7 @@
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -20,7 +20,7 @@
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -29,7 +29,7 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -29,7 +29,7 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -17,7 +17,7 @@
# include <dlfcn.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -16,11 +16,11 @@
# include <unistd.h>
#endif
#if defined(HAVE_SYS_MMAN_H) || defined(HAVE_EVIL)
#if defined(HAVE_SYS_MMAN_H) || defined(_WIN32)
# include <sys/mman.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -5,7 +5,7 @@
# include <features.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -35,7 +35,7 @@
#include <lauxlib.h>
#include <setjmp.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -20,9 +20,9 @@
# include <netinet/in.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif /* ifdef HAVE_EVIL */
#endif /* ifdef _WIN32 */
#include <Eina.h>
#include <Emile.h>

View File

@ -5,9 +5,9 @@
#include <string.h>
#include <stdio.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif /* ifdef HAVE_EVIL */
#endif /* ifdef _WIN32 */
#include <Eina.h>

View File

@ -2,7 +2,7 @@
# include <config.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif
@ -91,7 +91,7 @@ efreet_desktop_init(void)
return 0;
}
#ifdef HAVE_EVIL
#ifdef _WIN32
if (!evil_sockets_init())
{
ERR("Could not initialize Winsock system");
@ -138,7 +138,7 @@ efreet_desktop_shutdown(void)
EINA_LIST_FREE(efreet_desktop_types, info)
efreet_desktop_type_info_free(info);
eina_lock_free(&_lock);
#ifdef HAVE_EVIL
#ifdef _WIN32
evil_sockets_shutdown();
#endif
eina_log_domain_unregister(_efreet_desktop_log_dom);

View File

@ -8,7 +8,7 @@
#define _POSIX_HOST_NAME_MAX 255
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -5,7 +5,7 @@
#include <stdio.h>
#include <string.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -25,7 +25,7 @@
#include <string.h>
#include <stdio.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -25,7 +25,7 @@
#include <stdlib.h>
#include <stdint.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -24,7 +24,7 @@
#include "eina_evlog.h"
#include "eina_debug.h"
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif
@ -80,7 +80,7 @@ get_time(void)
return (double)timev.tv_sec + (((double)timev.tv_usec) / 1000000.0);
}
return (double)t.tv_sec + (((double)t.tv_nsec) / 1000000000.0);
#elif defined(HAVE_EVIL)
#elif defined(_WIN32)
return evil_time_get();
#elif defined(__APPLE__) && defined(__MACH__)
return _eina_evlog_time_clock_conversion * (double)mach_absolute_time();

View File

@ -30,7 +30,7 @@
#include <fcntl.h>
#include <errno.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -62,7 +62,7 @@
#include <string.h>
#include <time.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -33,7 +33,7 @@
# include <systemd/sd-journal.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -23,7 +23,7 @@
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -33,7 +33,7 @@
#include <string.h>
#include <assert.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -31,7 +31,7 @@
# include <dlfcn.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -41,7 +41,7 @@
# include <dlfcn.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -30,7 +30,7 @@
#include <stdlib.h>
#include <stdio.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -23,7 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -63,7 +63,7 @@
#include <string.h>
#include <stddef.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -26,7 +26,7 @@
#include <string.h>
#include <ctype.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -6,7 +6,7 @@
#include <string.h>
#include <ctype.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -30,7 +30,7 @@
#include <stdio.h>
#include <string.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -26,7 +26,7 @@
#include <stdio.h>
#include <string.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -24,7 +24,7 @@
#include <inttypes.h> /* PRId64 and PRIu64 */
#include <sys/time.h> /* struct timeval */
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -22,7 +22,7 @@
#include <time.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -47,7 +47,7 @@
# include <features.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -144,7 +144,7 @@ _expanded_fmt_str_get(char ch)
switch (ch)
{
case 'c':
#if defined(HAVE_LANGINFO_H) || defined (HAVE_EVIL)
#if defined(HAVE_LANGINFO_H) || defined (_WIN32)
exp_fmt = nl_langinfo(D_T_FMT);
#else
exp_fmt = "";
@ -152,7 +152,7 @@ _expanded_fmt_str_get(char ch)
break;
case 'x':
#if defined(HAVE_LANGINFO_H) || defined (HAVE_EVIL)
#if defined(HAVE_LANGINFO_H) || defined (_WIN32)
exp_fmt = nl_langinfo(D_FMT);
#else
exp_fmt = "";
@ -160,7 +160,7 @@ _expanded_fmt_str_get(char ch)
break;
case 'X':
#if defined(HAVE_LANGINFO_H) || defined (HAVE_EVIL)
#if defined(HAVE_LANGINFO_H) || defined (_WIN32)
exp_fmt = nl_langinfo(T_FMT);
#else
exp_fmt = "";
@ -168,7 +168,7 @@ _expanded_fmt_str_get(char ch)
break;
case 'r':
#if defined(HAVE_LANGINFO_H) || defined (HAVE_EVIL)
#if defined(HAVE_LANGINFO_H) || defined (_WIN32)
exp_fmt = nl_langinfo(T_FMT_AMPM);
#else
exp_fmt = "";
@ -347,7 +347,7 @@ _reload_format(Evas_Object *obj)
// FIXME: provide nl_langinfo on Windows if possible
// fetch the default format from Libc.
if (!sd->user_format)
#if defined(HAVE_LANGINFO_H) || defined (HAVE_EVIL)
#if defined(HAVE_LANGINFO_H) || defined (_WIN32)
strncpy(sd->format, nl_langinfo(D_T_FMT), EFL_UI_CLOCK_MAX_FORMAT_LEN);
#else
strncpy(sd->format, "", EFL_UI_CLOCK_MAX_FORMAT_LEN);

View File

@ -2,7 +2,7 @@
# include "elementary_config.h"
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -10,7 +10,7 @@
# include <crt_externs.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -20,7 +20,7 @@
#include <Eina.h>
#include <Ecore.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
#include <Evil.h>
#endif

View File

@ -9,7 +9,7 @@
# include <winsock2.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -25,7 +25,7 @@
#include <jpeglib.h>
#include <jerror.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
#include <Evil.h>
#endif

View File

@ -8,7 +8,7 @@
#include <Eina.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif
@ -2560,7 +2560,7 @@ efl_callbacks_cmp(const Efl_Callback_Array_Item *a, const Efl_Callback_Array_Ite
static inline double
_eo_log_time_now(void)
{
#ifdef HAVE_EVIL
#ifdef _WIN32
return evil_time_get();
#elif defined(__APPLE__) && defined(__MACH__)
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
{
const char *fname;
#ifdef HAVE_EVIL
#ifdef _WIN32
fname = strrchr(info.dli_fname, '\\');
#else
fname = strrchr(info.dli_fname, '/');

View File

@ -1,7 +1,7 @@
#ifndef _EPHYSICS_PRIVATE_H
#define _EPHYSICS_PRIVATE_H
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -52,7 +52,7 @@
# define PATH_MAX 4096
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -8,7 +8,7 @@
#include <sys/stat.h>
#include <errno.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -1,7 +1,7 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif
#ifdef __linux__

View File

@ -8,7 +8,7 @@
#include <sys/stat.h>
#include <errno.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -2,7 +2,7 @@
# include <config.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -40,7 +40,7 @@ evas_init(void)
}
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
if (!evil_init())
return --_evas_init_count;
#endif
@ -118,7 +118,7 @@ evas_init(void)
shutdown_eina:
eina_shutdown();
shutdown_evil:
#ifdef HAVE_EVIL
#ifdef _WIN32
evil_shutdown();
#endif
@ -185,7 +185,7 @@ evas_shutdown(void)
eet_shutdown();
eina_shutdown();
#ifdef HAVE_EVIL
#ifdef _WIN32
evil_shutdown();
#endif

View File

@ -2,7 +2,7 @@
# include "config.h"
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -29,7 +29,7 @@
# define dgettext(domain, x) (x)
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -18,7 +18,7 @@
# include <sys/param.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -27,7 +27,7 @@
#include <unistd.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -4,7 +4,7 @@
#include <stdio.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -2,7 +2,7 @@
# include "config.h"
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -4,7 +4,7 @@
#include <stdio.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -4,7 +4,7 @@
#include <stdio.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -2,7 +2,7 @@
# include <config.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -6,7 +6,7 @@
#include <png.h>
#include <setjmp.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -19,7 +19,7 @@
# include <netinet/in.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -6,7 +6,7 @@
#include <sys/types.h>
#include <fcntl.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -7,7 +7,7 @@
#include <unistd.h>
#include <tiffio.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -4,7 +4,7 @@
#include <stdio.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -6,7 +6,7 @@
#include <string.h>
#include <webp/decode.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -2,7 +2,7 @@
# include <config.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -6,7 +6,7 @@
#include <png.h>
#include <setjmp.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -19,7 +19,7 @@
# include <arpa/inet.h>
#endif
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
# include <Evil.h>
#endif

View File

@ -5,7 +5,7 @@
#include <stdlib.h>
#include <stdio.h>
#ifdef HAVE_EVIL
#ifdef _WIN32
#include "Evil.h"
#endif