[Evil] EAPI -> EVIL_API

src/lib/evil/evil_api.h

@@ -1,26 +1,44 @@
 #ifndef EVIL_API_H
 #define EVIL_API_H
 
-#ifdef EAPI
-#undef EAPI
+#ifdef EVIL_API
+#error EVIL_API should not be already defined
 #endif
 
 #ifdef _WIN32
-# ifdef EFL_BUILD
-#  ifdef DLL_EXPORT
-#   define EAPI __declspec(dllexport)
+# ifndef EVIL_STATIC
+#  ifdef EVIL_BUILD
+#   define EVIL_API __declspec(dllexport)
 #  else
-#   define EAPI
+#   define EVIL_API __declspec(dllimport)
 #  endif
 # else
-#  define EAPI __declspec(dllimport)
+#  define EVIL_API
 # endif
+# define EVIL_API_WEAK
 #else
-# if __GNUC__ >= 4
-#  define EAPI __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
-#  define EAPI
+/**
+ * @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

src/lib/evil/evil_basename.c

@@ -8,7 +8,7 @@
 
 #include <evil_windows.h>
 
-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);

src/lib/evil/evil_basename.h

@@ -3,7 +3,7 @@
 
 #include <evil_api.h>
 
-EAPI char* basename (char* path);
+EVIL_API char* basename (char* path);
 
 #endif
 

src/lib/evil/evil_dlfcn.c

@@ -39,7 +39,7 @@ _dl_get_last_error(char *desc)
    _dl_err_viewed = 0;
 }
 
-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;
 }
 
-int
+EVIL_API int
 dlclose(void* handle)
 {
    if (FreeLibrary(handle))
@@ -107,7 +107,7 @@ dlclose(void* handle)
      }
 }
 
-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;
 }
 
-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);
 }
 
-int
+EVIL_API int
 dladdr (const void *addr, Dl_info *info)
 {
    TCHAR tpath[PATH_MAX];

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__ */

src/lib/evil/evil_fcntl.c

@@ -32,7 +32,8 @@ _is_socket(SOCKET s)
  *
  */
 
-int fcntl(int fd, int cmd, ...)
+EVIL_API int
+fcntl(int fd, int cmd, ...)
 {
    va_list va;
    int     res = -1;

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__ */

src/lib/evil/evil_langinfo.c

@@ -19,7 +19,7 @@ replace(char *prev, char *value)
    return strdup (value);
 }
 
-char *
+EVIL_API char *
 nl_langinfo(nl_item index)
 {
    static char *result = NULL;

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__ */

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)
+EVIL_API char *
+evil_setlocale(int category, const char *locale)
 {
    char buf[9];
    int l1;

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);
 
 
 /**

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);
 
 
 /**

src/lib/evil/evil_mman.c

@@ -50,7 +50,7 @@ _evil_mmap_protection_get(int prot)
 /***** API *****/
 
 
-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;
 }
 
-int
+EVIL_API int
 munmap(void  *addr,
        size_t len EVIL_UNUSED)
 {
@@ -152,7 +152,7 @@ munmap(void  *addr,
    return (res == 0) ? -1 : 0;
 }
 
-int
+EVIL_API int
 mprotect(void *addr, size_t len, int prot)
 {
    DWORD old;

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__ */

src/lib/evil/evil_stdio.c

@@ -8,7 +8,7 @@
 
 #undef rename
 
-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;
 }
 
-int
+EVIL_API int
 evil_mkdir(const char *dirname, mode_t mode EVIL_UNUSED)
 {
    return _mkdir(dirname);

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);
 
 /**
  * @}

src/lib/evil/evil_stdlib.c

@@ -22,7 +22,7 @@
  *
  */
 
-int
+EVIL_API int
 setenv(const char *name,
        const char *value,
        int         overwrite)
@@ -65,7 +65,7 @@ setenv(const char *name,
    return res;
 }
 
-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;
 }
 
-int
+EVIL_API int
 mkstemps(char *__template, int suffixlen)
 {
    char      *suffix;
@@ -186,7 +186,7 @@ mkstemps(char *__template, int suffixlen)
    return -1;
 }
 
-char *
+EVIL_API char *
 realpath(const char *file_name, char *resolved_name)
 {
    char *retname = NULL;  /* we will return this, if we fail */