From 68195c1dd4b6ce1a05282afc59b01709dd2b70f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ant=C3=B4nio=20Cardoso?= Date: Tue, 23 Jun 2020 15:21:17 -0300 Subject: [PATCH 1/3] Fix missing EAPI --- src/lib/evil/evil_dlfcn.c | 10 +++++----- src/lib/evil/evil_fcntl.c | 3 ++- src/lib/evil/evil_langinfo.c | 2 +- src/lib/evil/evil_locale.c | 3 ++- src/lib/evil/evil_mman.c | 6 +++--- src/lib/evil/evil_stdio.c | 4 ++-- src/lib/evil/evil_stdlib.c | 8 ++++---- src/lib/evil/evil_string.c | 4 ++-- src/lib/evil/evil_strings.c | 2 +- src/lib/evil/evil_strings.h | 2 +- src/lib/evil/evil_time.c | 2 +- src/lib/evil/evil_unistd.c | 10 +++++----- src/lib/evil/evil_util.c | 14 +++++++------- 13 files changed, 36 insertions(+), 34 deletions(-) diff --git a/src/lib/evil/evil_dlfcn.c b/src/lib/evil/evil_dlfcn.c index ef161cc782..f75398ea54 100644 --- a/src/lib/evil/evil_dlfcn.c +++ b/src/lib/evil/evil_dlfcn.c @@ -39,7 +39,7 @@ _dl_get_last_error(char *desc) _dl_err_viewed = 0; } -void * +EAPI void * dlopen(const char* path, int mode EVIL_UNUSED) { HMODULE module = NULL; @@ -95,7 +95,7 @@ dlopen(const char* path, int mode EVIL_UNUSED) return module; } -int +EAPI int dlclose(void* handle) { if (FreeLibrary(handle)) @@ -107,7 +107,7 @@ dlclose(void* handle) } } -void * +EAPI void * dlsym(void *handle, const char *symbol) { FARPROC fp = NULL; @@ -157,7 +157,7 @@ dlsym(void *handle, const char *symbol) return fp; } -char * +EAPI char * dlerror (void) { if (!_dl_err_viewed) @@ -184,7 +184,7 @@ _dladdr_comp(const void *p1, const void *p2) return ( *(int *)p1 - *(int *)p2); } -int +EAPI int dladdr (const void *addr, Dl_info *info) { TCHAR tpath[PATH_MAX]; diff --git a/src/lib/evil/evil_fcntl.c b/src/lib/evil/evil_fcntl.c index d6d7223003..1add9c9ce3 100644 --- a/src/lib/evil/evil_fcntl.c +++ b/src/lib/evil/evil_fcntl.c @@ -32,7 +32,8 @@ _is_socket(SOCKET s) * */ -int fcntl(int fd, int cmd, ...) +EAPI int +fcntl(int fd, int cmd, ...) { va_list va; int res = -1; diff --git a/src/lib/evil/evil_langinfo.c b/src/lib/evil/evil_langinfo.c index 5e0a344404..ee2b81259b 100644 --- a/src/lib/evil/evil_langinfo.c +++ b/src/lib/evil/evil_langinfo.c @@ -19,7 +19,7 @@ replace(char *prev, char *value) return strdup (value); } -char * +EAPI char * nl_langinfo(nl_item index) { static char *result = NULL; diff --git a/src/lib/evil/evil_locale.c b/src/lib/evil/evil_locale.c index 1799a37d90..4daf83188f 100644 --- a/src/lib/evil/evil_locale.c +++ b/src/lib/evil/evil_locale.c @@ -17,7 +17,8 @@ static char _evil_locale_buf[18]; #undef setlocale -char *evil_setlocale(int category, const char *locale) +EAPI char * +evil_setlocale(int category, const char *locale) { char buf[9]; int l1; diff --git a/src/lib/evil/evil_mman.c b/src/lib/evil/evil_mman.c index a99470b493..5587ac6d9c 100644 --- a/src/lib/evil/evil_mman.c +++ b/src/lib/evil/evil_mman.c @@ -50,7 +50,7 @@ _evil_mmap_protection_get(int prot) /***** API *****/ -void * +EAPI void * mmap(void *addr EVIL_UNUSED, size_t len, int prot, @@ -138,7 +138,7 @@ mmap(void *addr EVIL_UNUSED, return data; } -int +EAPI int munmap(void *addr, size_t len EVIL_UNUSED) { @@ -152,7 +152,7 @@ munmap(void *addr, return (res == 0) ? -1 : 0; } -int +EAPI int mprotect(void *addr, size_t len, int prot) { DWORD old; diff --git a/src/lib/evil/evil_stdio.c b/src/lib/evil/evil_stdio.c index d4879c8b4b..ac348005da 100644 --- a/src/lib/evil/evil_stdio.c +++ b/src/lib/evil/evil_stdio.c @@ -8,7 +8,7 @@ #undef rename -int +EAPI int evil_rename(const char *src, const char* dst) { DWORD res; @@ -23,7 +23,7 @@ evil_rename(const char *src, const char* dst) return MoveFileEx(src, dst, MOVEFILE_REPLACE_EXISTING) ? 0 : -1; } -int +EAPI int evil_mkdir(const char *dirname, mode_t mode EVIL_UNUSED) { return _mkdir(dirname); diff --git a/src/lib/evil/evil_stdlib.c b/src/lib/evil/evil_stdlib.c index d6de5a4fcd..afe47a9c10 100644 --- a/src/lib/evil/evil_stdlib.c +++ b/src/lib/evil/evil_stdlib.c @@ -22,7 +22,7 @@ * */ -int +EAPI int setenv(const char *name, const char *value, int overwrite) @@ -65,7 +65,7 @@ setenv(const char *name, return res; } -int +EAPI int unsetenv(const char *name) { return setenv(name, NULL, 1); @@ -157,7 +157,7 @@ mkdtemp(char *__template) return NULL; } -int +EAPI int mkstemps(char *__template, int suffixlen) { char *suffix; @@ -186,7 +186,7 @@ mkstemps(char *__template, int suffixlen) return -1; } -char * +EAPI char * realpath(const char *file_name, char *resolved_name) { char *retname = NULL; /* we will return this, if we fail */ diff --git a/src/lib/evil/evil_string.c b/src/lib/evil/evil_string.c index d135454338..9e840560cf 100644 --- a/src/lib/evil/evil_string.c +++ b/src/lib/evil/evil_string.c @@ -14,7 +14,7 @@ * */ -char *strcasestr(const char *haystack, const char *needle) +EAPI char *strcasestr(const char *haystack, const char *needle) { size_t length_needle; size_t length_haystack; @@ -50,7 +50,7 @@ char *strcasestr(const char *haystack, const char *needle) return NULL; } -char * +EAPI char * strsep (char **stringp, const char *delim) { char *begin, *end; diff --git a/src/lib/evil/evil_strings.c b/src/lib/evil/evil_strings.c index b4d263eaa7..edc4287b03 100644 --- a/src/lib/evil/evil_strings.c +++ b/src/lib/evil/evil_strings.c @@ -1,6 +1,6 @@ #include "evil_strings.h" -int +EAPI int ffs(int i) { for (int j = 0; j < sizeof(i)*8; j++) diff --git a/src/lib/evil/evil_strings.h b/src/lib/evil/evil_strings.h index 1d55e17225..ae746fd59a 100644 --- a/src/lib/evil/evil_strings.h +++ b/src/lib/evil/evil_strings.h @@ -18,6 +18,6 @@ #define strncasecmp_l _strnicmp_l #define strcasecmp_l _strncmp_l -int ffs(int i); +EAPI int ffs(int i); #endif diff --git a/src/lib/evil/evil_time.c b/src/lib/evil/evil_time.c index 4092d8d2e3..40c575c7da 100644 --- a/src/lib/evil/evil_time.c +++ b/src/lib/evil/evil_time.c @@ -130,7 +130,7 @@ conv_num(const unsigned char *buf, int *dest, unsigned int llim, unsigned int ul return buf; } -char * +EAPI char * strptime(const char *buf, const char *fmt, struct tm *tm) { unsigned char c; diff --git a/src/lib/evil/evil_unistd.c b/src/lib/evil/evil_unistd.c index d238638c7f..e402b35a06 100644 --- a/src/lib/evil/evil_unistd.c +++ b/src/lib/evil/evil_unistd.c @@ -51,7 +51,7 @@ _evil_systemtime_to_time(SYSTEMTIME st) } -int +EAPI int execvp(const char *file, char *const argv[]) { return _execvp(file, (const char *const *)argv); @@ -63,7 +63,7 @@ execvp(const char *file, char *const argv[]) * */ -double +EAPI double evil_time_get(void) { LARGE_INTEGER count; @@ -79,7 +79,7 @@ evil_time_get(void) * */ -int +EAPI int evil_sockets_init(void) { WSADATA wsa_data; @@ -101,7 +101,7 @@ evil_sockets_init(void) return 0; } -void +EAPI void evil_sockets_shutdown(void) { WSACleanup(); @@ -111,7 +111,7 @@ evil_sockets_shutdown(void) * The code of the following functions has been kindly offered * by Tor Lillqvist. */ -int +EAPI int evil_pipe(int *fds) { struct sockaddr_in saddr; diff --git a/src/lib/evil/evil_util.c b/src/lib/evil/evil_util.c index 19ab64ac5d..a458dcebb9 100644 --- a/src/lib/evil/evil_util.c +++ b/src/lib/evil/evil_util.c @@ -15,7 +15,7 @@ DWORD _evil_tls_index; /* static void _evil_error_display(const char *fct, LONG res); */ static void _evil_last_error_display(const char *fct); -wchar_t * +EAPI wchar_t * evil_char_to_wchar(const char *text) { wchar_t *wtext; @@ -44,7 +44,7 @@ evil_char_to_wchar(const char *text) return wtext; } -char * +EAPI char * evil_wchar_to_char(const wchar_t *text) { char *atext; @@ -74,7 +74,7 @@ evil_wchar_to_char(const wchar_t *text) return atext; } -char * +EAPI char * evil_utf16_to_utf8(const wchar_t *text16) { char *text8; @@ -107,7 +107,7 @@ evil_utf16_to_utf8(const wchar_t *text16) return text8; } -wchar_t * +EAPI wchar_t * evil_utf8_to_utf16(const char *text) { wchar_t *text16; @@ -135,7 +135,7 @@ evil_utf8_to_utf16(const char *text) return text16; } -const char * +EAPI const char * evil_format_message(long err) { char *buf; @@ -174,7 +174,7 @@ evil_format_message(long err) return (const char *)buf; } -const char * +EAPI const char * evil_last_error_get(void) { DWORD err; @@ -189,7 +189,7 @@ _evil_last_error_display(const char *fct) fprintf(stderr, "[Evil] [%s] ERROR: %s\n", fct, evil_last_error_get()); } -int +EAPI int evil_path_is_absolute(const char *path) { size_t length; From 54fd66f5a382eac337bab80d2a37c666566e1e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ant=C3=B4nio=20Cardoso?= Date: Tue, 23 Jun 2020 15:59:31 -0300 Subject: [PATCH 2/3] Renaming EAPI to EVIL_API --- src/lib/evil/evil_api.h | 14 +++++++------- src/lib/evil/evil_basename.c | 2 +- src/lib/evil/evil_basename.h | 2 +- src/lib/evil/evil_dlfcn.c | 10 +++++----- src/lib/evil/evil_dlfcn.h | 10 +++++----- src/lib/evil/evil_fcntl.c | 2 +- src/lib/evil/evil_fcntl.h | 2 +- src/lib/evil/evil_langinfo.c | 2 +- src/lib/evil/evil_langinfo.h | 2 +- src/lib/evil/evil_locale.c | 2 +- src/lib/evil/evil_locale.h | 2 +- src/lib/evil/evil_main.h | 4 ++-- src/lib/evil/evil_mman.c | 6 +++--- src/lib/evil/evil_mman.h | 6 +++--- src/lib/evil/evil_stdio.c | 4 ++-- src/lib/evil/evil_stdio.h | 4 ++-- src/lib/evil/evil_stdlib.c | 10 +++++----- src/lib/evil/evil_stdlib.h | 10 +++++----- src/lib/evil/evil_string.c | 4 ++-- src/lib/evil/evil_string.h | 4 ++-- src/lib/evil/evil_strings.c | 2 +- src/lib/evil/evil_strings.h | 2 +- src/lib/evil/evil_time.c | 2 +- src/lib/evil/evil_time.h | 2 +- src/lib/evil/evil_unistd.c | 10 +++++----- src/lib/evil/evil_unistd.h | 10 +++++----- src/lib/evil/evil_util.c | 14 +++++++------- src/lib/evil/evil_util.h | 14 +++++++------- 28 files changed, 79 insertions(+), 79 deletions(-) diff --git a/src/lib/evil/evil_api.h b/src/lib/evil/evil_api.h index 3a3ee0cfd2..e59094ac44 100644 --- a/src/lib/evil/evil_api.h +++ b/src/lib/evil/evil_api.h @@ -1,25 +1,25 @@ #ifndef EVIL_API_H #define EVIL_API_H -#ifdef EAPI -#undef EAPI +#ifdef EVIL_API +#undef EVIL_API #endif #ifdef _WIN32 # ifdef EFL_BUILD # ifdef DLL_EXPORT -# define EAPI __declspec(dllexport) +# define EVIL_API __declspec(dllexport) # else -# define EAPI +# define EVIL_API # endif # else -# define EAPI __declspec(dllimport) +# define EVIL_API __declspec(dllimport) # endif #else # if __GNUC__ >= 4 -# define EAPI __attribute__ ((visibility("default"))) +# define EVIL_API __attribute__ ((visibility("default"))) # else -# define EAPI +# define EVIL_API # endif #endif diff --git a/src/lib/evil/evil_basename.c b/src/lib/evil/evil_basename.c index 858e856db0..8e51910749 100644 --- a/src/lib/evil/evil_basename.c +++ b/src/lib/evil/evil_basename.c @@ -8,7 +8,7 @@ #include -EAPI char* basename (char* path) +EVIL_API char* basename (char* path) { static char base[MAX_PATH]; _splitpath_s (path, NULL, 0, NULL, 0, base, MAX_PATH, NULL, 0); diff --git a/src/lib/evil/evil_basename.h b/src/lib/evil/evil_basename.h index 4ddec3c444..a92c5d35dd 100644 --- a/src/lib/evil/evil_basename.h +++ b/src/lib/evil/evil_basename.h @@ -3,7 +3,7 @@ #include -EAPI char* basename (char* path); +EVIL_API char* basename (char* path); #endif diff --git a/src/lib/evil/evil_dlfcn.c b/src/lib/evil/evil_dlfcn.c index f75398ea54..a6ee3e1c9c 100644 --- a/src/lib/evil/evil_dlfcn.c +++ b/src/lib/evil/evil_dlfcn.c @@ -39,7 +39,7 @@ _dl_get_last_error(char *desc) _dl_err_viewed = 0; } -EAPI void * +EVIL_API void * dlopen(const char* path, int mode EVIL_UNUSED) { HMODULE module = NULL; @@ -95,7 +95,7 @@ dlopen(const char* path, int mode EVIL_UNUSED) return module; } -EAPI int +EVIL_API int dlclose(void* handle) { if (FreeLibrary(handle)) @@ -107,7 +107,7 @@ dlclose(void* handle) } } -EAPI void * +EVIL_API void * dlsym(void *handle, const char *symbol) { FARPROC fp = NULL; @@ -157,7 +157,7 @@ dlsym(void *handle, const char *symbol) return fp; } -EAPI char * +EVIL_API char * dlerror (void) { if (!_dl_err_viewed) @@ -184,7 +184,7 @@ _dladdr_comp(const void *p1, const void *p2) return ( *(int *)p1 - *(int *)p2); } -EAPI int +EVIL_API int dladdr (const void *addr, Dl_info *info) { TCHAR tpath[PATH_MAX]; diff --git a/src/lib/evil/evil_dlfcn.h b/src/lib/evil/evil_dlfcn.h index b48a0d097a..a55d591443 100644 --- a/src/lib/evil/evil_dlfcn.h +++ b/src/lib/evil/evil_dlfcn.h @@ -143,7 +143,7 @@ struct Dl_info * * @ingroup Evil_Dlfcn */ -EAPI void *dlopen(const char* path, int mode); +EVIL_API void *dlopen(const char* path, int mode); #ifndef HAVE_DLOPEN # define HAVE_DLOPEN 1 @@ -170,7 +170,7 @@ EAPI void *dlopen(const char* path, int mode); * * @ingroup Evil_Dlfcn */ -EAPI int dlclose(void* handle); +EVIL_API int dlclose(void* handle); /** * @brief Get the address of a symbol. @@ -194,7 +194,7 @@ EAPI int dlclose(void* handle); * * @ingroup Evil_Dlfcn */ -EAPI void *dlsym(void* handle, const char* symbol); +EVIL_API void *dlsym(void* handle, const char* symbol); #ifndef HAVE_DLSYM #define HAVE_DLSYM 1 @@ -224,7 +224,7 @@ EAPI void *dlsym(void* handle, const char* symbol); * * @ingroup Evil_Dlfcn */ -EAPI int dladdr(const void *addr, Dl_info *info); +EVIL_API int dladdr(const void *addr, Dl_info *info); #ifndef HAVE_DLADDR #define HAVE_DLADDR 1 @@ -252,7 +252,7 @@ EAPI int dladdr(const void *addr, Dl_info *info); * * @ingroup Evil_Dlfcn */ -EAPI char *dlerror(void); +EVIL_API char *dlerror(void); #endif /* __EVIL_DLFCN_H__ */ diff --git a/src/lib/evil/evil_fcntl.c b/src/lib/evil/evil_fcntl.c index 1add9c9ce3..7801b627ee 100644 --- a/src/lib/evil/evil_fcntl.c +++ b/src/lib/evil/evil_fcntl.c @@ -32,7 +32,7 @@ _is_socket(SOCKET s) * */ -EAPI int +EVIL_API int fcntl(int fd, int cmd, ...) { va_list va; diff --git a/src/lib/evil/evil_fcntl.h b/src/lib/evil/evil_fcntl.h index acb86c836d..00d648e62e 100644 --- a/src/lib/evil/evil_fcntl.h +++ b/src/lib/evil/evil_fcntl.h @@ -108,7 +108,7 @@ struct flock * * @ingroup Evil */ -EAPI int fcntl(int fd, int cmd, ...); +EVIL_API int fcntl(int fd, int cmd, ...); #endif /* __EVIL_FCNTL_H__ */ diff --git a/src/lib/evil/evil_langinfo.c b/src/lib/evil/evil_langinfo.c index ee2b81259b..11b534dc5f 100644 --- a/src/lib/evil/evil_langinfo.c +++ b/src/lib/evil/evil_langinfo.c @@ -19,7 +19,7 @@ replace(char *prev, char *value) return strdup (value); } -EAPI char * +EVIL_API char * nl_langinfo(nl_item index) { static char *result = NULL; diff --git a/src/lib/evil/evil_langinfo.h b/src/lib/evil/evil_langinfo.h index 72e0f6f372..c6fde2e47f 100644 --- a/src/lib/evil/evil_langinfo.h +++ b/src/lib/evil/evil_langinfo.h @@ -40,7 +40,7 @@ enum { # define CODESET _NL_CTYPE_CODESET # define RADIXCHAR _NL_NUMERIC_RADIXCHAR -EAPI char *nl_langinfo(nl_item index); +EVIL_API char *nl_langinfo(nl_item index); #endif /*__EVIL_LANGINFO_H__ */ diff --git a/src/lib/evil/evil_locale.c b/src/lib/evil/evil_locale.c index 4daf83188f..a4c925470f 100644 --- a/src/lib/evil/evil_locale.c +++ b/src/lib/evil/evil_locale.c @@ -17,7 +17,7 @@ static char _evil_locale_buf[18]; #undef setlocale -EAPI char * +EVIL_API char * evil_setlocale(int category, const char *locale) { char buf[9]; diff --git a/src/lib/evil/evil_locale.h b/src/lib/evil/evil_locale.h index ddedb41b0c..12b3987d25 100644 --- a/src/lib/evil/evil_locale.h +++ b/src/lib/evil/evil_locale.h @@ -49,7 +49,7 @@ * * @since 1.16 */ -EAPI char *evil_setlocale(int category, const char *locale); +EVIL_API char *evil_setlocale(int category, const char *locale); /** diff --git a/src/lib/evil/evil_main.h b/src/lib/evil/evil_main.h index dcc10f5241..5f0b414b2e 100644 --- a/src/lib/evil/evil_main.h +++ b/src/lib/evil/evil_main.h @@ -102,7 +102,7 @@ * When Evil is not used anymore, call evil_shutdown() to shut down * the Evil library. */ -EAPI int evil_init(void); +EVIL_API int evil_init(void); /** * @brief Shut down the Evil library. @@ -118,7 +118,7 @@ EAPI int evil_init(void); * documentation anymore . You must call evil_init() again to use these * functions again. */ -EAPI int evil_shutdown(void); +EVIL_API int evil_shutdown(void); /** diff --git a/src/lib/evil/evil_mman.c b/src/lib/evil/evil_mman.c index 5587ac6d9c..2bc5d47740 100644 --- a/src/lib/evil/evil_mman.c +++ b/src/lib/evil/evil_mman.c @@ -50,7 +50,7 @@ _evil_mmap_protection_get(int prot) /***** API *****/ -EAPI void * +EVIL_API void * mmap(void *addr EVIL_UNUSED, size_t len, int prot, @@ -138,7 +138,7 @@ mmap(void *addr EVIL_UNUSED, return data; } -EAPI int +EVIL_API int munmap(void *addr, size_t len EVIL_UNUSED) { @@ -152,7 +152,7 @@ munmap(void *addr, return (res == 0) ? -1 : 0; } -EAPI int +EVIL_API int mprotect(void *addr, size_t len, int prot) { DWORD old; diff --git a/src/lib/evil/evil_mman.h b/src/lib/evil/evil_mman.h index 0cf7af763a..ca81ea4546 100644 --- a/src/lib/evil/evil_mman.h +++ b/src/lib/evil/evil_mman.h @@ -109,7 +109,7 @@ * * @ingroup Evil_Mman */ -EAPI void *mmap(void *addr, +EVIL_API void *mmap(void *addr, size_t len, int prot, int flags, @@ -140,7 +140,7 @@ EAPI void *mmap(void *addr, * * @ingroup Evil_Mman */ -EAPI int munmap(void *addr, +EVIL_API int munmap(void *addr, size_t len); /** @@ -161,7 +161,7 @@ EAPI int munmap(void *addr, * * @ingroup Evil_Mman */ -EAPI int mprotect(void *addr, size_t len, int prot); +EVIL_API int mprotect(void *addr, size_t len, int prot); #endif /* __EVIL_SYS_MMAN_H__ */ diff --git a/src/lib/evil/evil_stdio.c b/src/lib/evil/evil_stdio.c index ac348005da..93086f1526 100644 --- a/src/lib/evil/evil_stdio.c +++ b/src/lib/evil/evil_stdio.c @@ -8,7 +8,7 @@ #undef rename -EAPI int +EVIL_API int evil_rename(const char *src, const char* dst) { DWORD res; @@ -23,7 +23,7 @@ evil_rename(const char *src, const char* dst) return MoveFileEx(src, dst, MOVEFILE_REPLACE_EXISTING) ? 0 : -1; } -EAPI int +EVIL_API int evil_mkdir(const char *dirname, mode_t mode EVIL_UNUSED) { return _mkdir(dirname); diff --git a/src/lib/evil/evil_stdio.h b/src/lib/evil/evil_stdio.h index 2a3a6eb01b..dae2385e1f 100644 --- a/src/lib/evil/evil_stdio.h +++ b/src/lib/evil/evil_stdio.h @@ -47,7 +47,7 @@ typedef int mode_t; * * @since 1.8 */ -EAPI int evil_rename(const char *src, const char *dst); +EVIL_API int evil_rename(const char *src, const char *dst); /** * @brief Wrap the _mkdir() function on Windows. @@ -60,7 +60,7 @@ EAPI int evil_rename(const char *src, const char *dst); * * @since 1.15 */ -EAPI int evil_mkdir(const char *dirname, mode_t mode); +EVIL_API int evil_mkdir(const char *dirname, mode_t mode); /** * @} diff --git a/src/lib/evil/evil_stdlib.c b/src/lib/evil/evil_stdlib.c index afe47a9c10..0ea1d17298 100644 --- a/src/lib/evil/evil_stdlib.c +++ b/src/lib/evil/evil_stdlib.c @@ -22,7 +22,7 @@ * */ -EAPI int +EVIL_API int setenv(const char *name, const char *value, int overwrite) @@ -65,7 +65,7 @@ setenv(const char *name, return res; } -EAPI int +EVIL_API int unsetenv(const char *name) { return setenv(name, NULL, 1); @@ -119,7 +119,7 @@ _mkstemp(char *suffix, int val) return val; } -EAPI char * +EVIL_API char * mkdtemp(char *__template) { char *suffix; @@ -157,7 +157,7 @@ mkdtemp(char *__template) return NULL; } -EAPI int +EVIL_API int mkstemps(char *__template, int suffixlen) { char *suffix; @@ -186,7 +186,7 @@ mkstemps(char *__template, int suffixlen) return -1; } -EAPI char * +EVIL_API char * realpath(const char *file_name, char *resolved_name) { char *retname = NULL; /* we will return this, if we fail */ diff --git a/src/lib/evil/evil_stdlib.h b/src/lib/evil/evil_stdlib.h index e89ad11071..1cddb3b3eb 100644 --- a/src/lib/evil/evil_stdlib.h +++ b/src/lib/evil/evil_stdlib.h @@ -41,7 +41,7 @@ * * Supported OS: Windows XP. */ -EAPI int setenv(const char *name, +EVIL_API int setenv(const char *name, const char *value, int overwrite); @@ -60,7 +60,7 @@ EAPI int setenv(const char *name, * * Supported OS: Windows XP. */ -EAPI int unsetenv(const char *name); +EVIL_API int unsetenv(const char *name); /* @@ -73,7 +73,7 @@ EAPI int unsetenv(const char *name); * * @since 1.8.0 */ -EAPI char *mkdtemp(char *__template); +EVIL_API char *mkdtemp(char *__template); /** * @brief Create a unique temporary file name. @@ -94,7 +94,7 @@ EAPI char *mkdtemp(char *__template); * * @since 1.10.0 */ -EAPI int mkstemps(char *__template, int suffixlen); +EVIL_API int mkstemps(char *__template, int suffixlen); /** * @brief Return an absolute or full path name for a specified relative path name. @@ -125,7 +125,7 @@ EAPI int mkstemps(char *__template, int suffixlen); * * Supported OS: Windows XP. */ -EAPI char *realpath(const char *file_name, char *resolved_name); +EVIL_API char *realpath(const char *file_name, char *resolved_name); #ifndef HAVE_REALPATH # define HAVE_REALPATH 1 #endif diff --git a/src/lib/evil/evil_string.c b/src/lib/evil/evil_string.c index 9e840560cf..59b517d88a 100644 --- a/src/lib/evil/evil_string.c +++ b/src/lib/evil/evil_string.c @@ -14,7 +14,7 @@ * */ -EAPI char *strcasestr(const char *haystack, const char *needle) +EVIL_API char *strcasestr(const char *haystack, const char *needle) { size_t length_needle; size_t length_haystack; @@ -50,7 +50,7 @@ EAPI char *strcasestr(const char *haystack, const char *needle) return NULL; } -EAPI char * +EVIL_API char * strsep (char **stringp, const char *delim) { char *begin, *end; diff --git a/src/lib/evil/evil_string.h b/src/lib/evil/evil_string.h index 43eca6b742..408974c81e 100644 --- a/src/lib/evil/evil_string.h +++ b/src/lib/evil/evil_string.h @@ -38,7 +38,7 @@ * * Supported OS: Windows XP. */ -EAPI char *strcasestr(const char *haystack, const char *needle); +EVIL_API char *strcasestr(const char *haystack, const char *needle); /** * @brief Implements the strsep function which is used to separate strings. @@ -64,7 +64,7 @@ EAPI char *strcasestr(const char *haystack, const char *needle); * @since 1.8 * */ -EAPI char *strsep(char **stringp, const char *delim); +EVIL_API char *strsep(char **stringp, const char *delim); /** * @} diff --git a/src/lib/evil/evil_strings.c b/src/lib/evil/evil_strings.c index edc4287b03..0a364d5109 100644 --- a/src/lib/evil/evil_strings.c +++ b/src/lib/evil/evil_strings.c @@ -1,6 +1,6 @@ #include "evil_strings.h" -EAPI int +EVIL_API int ffs(int i) { for (int j = 0; j < sizeof(i)*8; j++) diff --git a/src/lib/evil/evil_strings.h b/src/lib/evil/evil_strings.h index ae746fd59a..86773fa115 100644 --- a/src/lib/evil/evil_strings.h +++ b/src/lib/evil/evil_strings.h @@ -18,6 +18,6 @@ #define strncasecmp_l _strnicmp_l #define strcasecmp_l _strncmp_l -EAPI int ffs(int i); +EVIL_API int ffs(int i); #endif diff --git a/src/lib/evil/evil_time.c b/src/lib/evil/evil_time.c index 40c575c7da..ea6cc7b61a 100644 --- a/src/lib/evil/evil_time.c +++ b/src/lib/evil/evil_time.c @@ -130,7 +130,7 @@ conv_num(const unsigned char *buf, int *dest, unsigned int llim, unsigned int ul return buf; } -EAPI char * +EVIL_API char * strptime(const char *buf, const char *fmt, struct tm *tm) { unsigned char c; diff --git a/src/lib/evil/evil_time.h b/src/lib/evil/evil_time.h index 03d41a044d..0d2951f7b4 100644 --- a/src/lib/evil/evil_time.h +++ b/src/lib/evil/evil_time.h @@ -35,7 +35,7 @@ * * Supported OS: Windows XP. */ -EAPI char *strptime(const char *buf, const char *fmt, struct tm *tm); +EVIL_API char *strptime(const char *buf, const char *fmt, struct tm *tm); /** diff --git a/src/lib/evil/evil_unistd.c b/src/lib/evil/evil_unistd.c index e402b35a06..372a96c5b5 100644 --- a/src/lib/evil/evil_unistd.c +++ b/src/lib/evil/evil_unistd.c @@ -51,7 +51,7 @@ _evil_systemtime_to_time(SYSTEMTIME st) } -EAPI int +EVIL_API int execvp(const char *file, char *const argv[]) { return _execvp(file, (const char *const *)argv); @@ -63,7 +63,7 @@ execvp(const char *file, char *const argv[]) * */ -EAPI double +EVIL_API double evil_time_get(void) { LARGE_INTEGER count; @@ -79,7 +79,7 @@ evil_time_get(void) * */ -EAPI int +EVIL_API int evil_sockets_init(void) { WSADATA wsa_data; @@ -101,7 +101,7 @@ evil_sockets_init(void) return 0; } -EAPI void +EVIL_API void evil_sockets_shutdown(void) { WSACleanup(); @@ -111,7 +111,7 @@ evil_sockets_shutdown(void) * The code of the following functions has been kindly offered * by Tor Lillqvist. */ -EAPI int +EVIL_API int evil_pipe(int *fds) { struct sockaddr_in saddr; diff --git a/src/lib/evil/evil_unistd.h b/src/lib/evil/evil_unistd.h index 6a88d726b9..c191629e94 100644 --- a/src/lib/evil/evil_unistd.h +++ b/src/lib/evil/evil_unistd.h @@ -21,7 +21,7 @@ #define execvp _ucrt_execvp // overriding execvp below #include // for _execvp (but not execvp), getpid #undef execvp -EAPI int execvp(const char *file, char *const argv[]); +EVIL_API int execvp(const char *file, char *const argv[]); /* Values for the second argument to access. These may be OR'd together. */ #define R_OK 4 /* Test for read permission. */ @@ -52,7 +52,7 @@ EAPI int execvp(const char *file, char *const argv[]); * * Supported OS: Windows XP. */ -EAPI double evil_time_get(void); +EVIL_API double evil_time_get(void); /* * Sockets and pipe related functions @@ -71,7 +71,7 @@ EAPI double evil_time_get(void); * * Supported OS: Windows XP. */ -EAPI int evil_sockets_init(void); +EVIL_API int evil_sockets_init(void); /** * @brief Shutdown the Windows socket system. @@ -82,7 +82,7 @@ EAPI int evil_sockets_init(void); * * Supported OS: Windows XP. */ -EAPI void evil_sockets_shutdown(void); +EVIL_API void evil_sockets_shutdown(void); /** * @brief Create a pair of sockets. @@ -98,7 +98,7 @@ EAPI void evil_sockets_shutdown(void); * * Supported OS: Windows XP. */ -EAPI int evil_pipe(int *fds); +EVIL_API int evil_pipe(int *fds); /** diff --git a/src/lib/evil/evil_util.c b/src/lib/evil/evil_util.c index a458dcebb9..2223a27cc1 100644 --- a/src/lib/evil/evil_util.c +++ b/src/lib/evil/evil_util.c @@ -15,7 +15,7 @@ DWORD _evil_tls_index; /* static void _evil_error_display(const char *fct, LONG res); */ static void _evil_last_error_display(const char *fct); -EAPI wchar_t * +EVIL_API wchar_t * evil_char_to_wchar(const char *text) { wchar_t *wtext; @@ -44,7 +44,7 @@ evil_char_to_wchar(const char *text) return wtext; } -EAPI char * +EVIL_API char * evil_wchar_to_char(const wchar_t *text) { char *atext; @@ -74,7 +74,7 @@ evil_wchar_to_char(const wchar_t *text) return atext; } -EAPI char * +EVIL_API char * evil_utf16_to_utf8(const wchar_t *text16) { char *text8; @@ -107,7 +107,7 @@ evil_utf16_to_utf8(const wchar_t *text16) return text8; } -EAPI wchar_t * +EVIL_API wchar_t * evil_utf8_to_utf16(const char *text) { wchar_t *text16; @@ -135,7 +135,7 @@ evil_utf8_to_utf16(const char *text) return text16; } -EAPI const char * +EVIL_API const char * evil_format_message(long err) { char *buf; @@ -174,7 +174,7 @@ evil_format_message(long err) return (const char *)buf; } -EAPI const char * +EVIL_API const char * evil_last_error_get(void) { DWORD err; @@ -189,7 +189,7 @@ _evil_last_error_display(const char *fct) fprintf(stderr, "[Evil] [%s] ERROR: %s\n", fct, evil_last_error_get()); } -EAPI int +EVIL_API int evil_path_is_absolute(const char *path) { size_t length; diff --git a/src/lib/evil/evil_util.h b/src/lib/evil/evil_util.h index 831386de24..06ad58fd10 100644 --- a/src/lib/evil/evil_util.h +++ b/src/lib/evil/evil_util.h @@ -20,7 +20,7 @@ * * @ingroup Evil */ -EAPI wchar_t *evil_char_to_wchar(const char *text); +EVIL_API wchar_t *evil_char_to_wchar(const char *text); /** * @brief Convert a string from wchar_t * to char *. @@ -39,7 +39,7 @@ EAPI wchar_t *evil_char_to_wchar(const char *text); * * @ingroup Evil */ -EAPI char *evil_wchar_to_char(const wchar_t *text); +EVIL_API char *evil_wchar_to_char(const wchar_t *text); /** * @brief Convert a string from UTF-16 to UTF-8. @@ -58,7 +58,7 @@ EAPI char *evil_wchar_to_char(const wchar_t *text); * * @ingroup Evil */ -EAPI char *evil_utf16_to_utf8(const wchar_t *text); +EVIL_API char *evil_utf16_to_utf8(const wchar_t *text); /** * @brief Convert a string from UTF-8 to UTF-16. @@ -76,11 +76,11 @@ EAPI char *evil_utf16_to_utf8(const wchar_t *text); * * @ingroup Evil */ -EAPI wchar_t *evil_utf8_to_utf16(const char *text); +EVIL_API wchar_t *evil_utf8_to_utf16(const char *text); -EAPI const char *evil_format_message(long err); +EVIL_API const char *evil_format_message(long err); -EAPI const char *evil_last_error_get(void); +EVIL_API const char *evil_last_error_get(void); /** * @brief check if the given path is absolute. @@ -103,6 +103,6 @@ EAPI const char *evil_last_error_get(void); * * @ingroup Evil */ -EAPI int evil_path_is_absolute(const char *path); +EVIL_API int evil_path_is_absolute(const char *path); #endif /* __EVIL_UTIL_H__ */ From 0cffb1956b7be8445c0505544a4ec9776bb40cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ant=C3=B4nio=20Cardoso?= Date: Wed, 24 Jun 2020 09:26:08 -0300 Subject: [PATCH 3/3] Modified to use EVIL_BUILD --- src/lib/evil/evil_api.h | 34 ++++++++++++++++++++++++++-------- src/lib/evil/meson.build | 2 +- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/lib/evil/evil_api.h b/src/lib/evil/evil_api.h index e59094ac44..17d95408dc 100644 --- a/src/lib/evil/evil_api.h +++ b/src/lib/evil/evil_api.h @@ -2,25 +2,43 @@ #define EVIL_API_H #ifdef EVIL_API -#undef EVIL_API +#error EVIL_API should not be already defined #endif #ifdef _WIN32 -# ifdef EFL_BUILD -# ifdef DLL_EXPORT +# ifndef EVIL_STATIC +# ifdef EVIL_BUILD # define EVIL_API __declspec(dllexport) # else -# define EVIL_API +# define EVIL_API __declspec(dllimport) # endif # else -# define EVIL_API __declspec(dllimport) +# define EVIL_API # endif +# define EVIL_API_WEAK #else -# if __GNUC__ >= 4 -# define EVIL_API __attribute__ ((visibility("default"))) +# ifdef __GNUC__ +# if __GNUC__ >= 4 +# define EVIL_API __attribute__ ((visibility("default"))) +# define EVIL_API_WEAK __attribute__ ((weak)) +# else +# define EVIL_API +# define EVIL_API_WEAK +# endif # else +/** + * @def EVIL_API + * @brief Used to export functions (by changing visibility). + */ # define EVIL_API +/** + * @def EINA_API_WEAK + * @brief Weak symbol, primarily useful in defining library functions which + * can be overridden in user code. + * Note: Not supported on all platforms. + */ +# define EINA_API_WEAK # endif #endif -#endif +#endif // EVIL_API_H diff --git a/src/lib/evil/meson.build b/src/lib/evil/meson.build index f41d4b4961..8c12015bb8 100644 --- a/src/lib/evil/meson.build +++ b/src/lib/evil/meson.build @@ -37,7 +37,7 @@ if target_machine.system() == 'windows' evil_ext_deps += [psapi, ole32, ws2_32, secur32, uuid] evil_lib = library('evil', evil_src, - c_args : package_c_args, + c_args : [package_c_args, '-DEVIL_BUILD'], dependencies : evil_ext_deps, include_directories : [config_dir], install: true,