summaryrefslogtreecommitdiff
path: root/src/lib/evil
diff options
context:
space:
mode:
authorVincent Torri <vincent dot torri at gmail dot com>2015-12-28 14:22:29 +0100
committerJean-Philippe Andre <jp.andre@samsung.com>2015-12-29 22:13:58 +0900
commit47ed848a8795c1b044f8be0dc6fb455f8bc13706 (patch)
tree758f9d41dbe0a4fb69a544d4bc1cea31421f6c38 /src/lib/evil
parent2ac9e788c689f2ca850d373a19a9e85237198573 (diff)
Evil: integrate the dlfcn code into Evil
This will remove some incompatibilities with other packages, especially for win-builds
Diffstat (limited to 'src/lib/evil')
-rw-r--r--src/lib/evil/Evil.h1
-rw-r--r--src/lib/evil/evil_dlfcn.c (renamed from src/lib/evil/dlfcn.c)3
-rw-r--r--src/lib/evil/evil_dlfcn.h (renamed from src/lib/evil/dlfcn.h)31
-rw-r--r--src/lib/evil/evil_stdio.h1
4 files changed, 4 insertions, 32 deletions
diff --git a/src/lib/evil/Evil.h b/src/lib/evil/Evil.h
index c4ee0a11cc..837803cebb 100644
--- a/src/lib/evil/Evil.h
+++ b/src/lib/evil/Evil.h
@@ -108,6 +108,7 @@ typedef unsigned long gid_t;
108 108
109 109
110#include "evil_macro.h" 110#include "evil_macro.h"
111#include "evil_dlfcn.h"
111#include "evil_fcntl.h" 112#include "evil_fcntl.h"
112#include "evil_inet.h" 113#include "evil_inet.h"
113#include "evil_langinfo.h" 114#include "evil_langinfo.h"
diff --git a/src/lib/evil/dlfcn.c b/src/lib/evil/evil_dlfcn.c
index 76fbf852fd..8dc07df9cf 100644
--- a/src/lib/evil/dlfcn.c
+++ b/src/lib/evil/evil_dlfcn.c
@@ -14,10 +14,9 @@
14 14
15#include "evil_macro.h" 15#include "evil_macro.h"
16#include "evil_util.h" 16#include "evil_util.h"
17#include "evil_dlfcn.h"
17#include "evil_private.h" 18#include "evil_private.h"
18 19
19#include "dlfcn.h"
20
21 20
22static char *_dl_err = NULL; 21static char *_dl_err = NULL;
23static int _dl_err_viewed = 0; 22static int _dl_err_viewed = 0;
diff --git a/src/lib/evil/dlfcn.h b/src/lib/evil/evil_dlfcn.h
index 349a9b4356..96fd30af80 100644
--- a/src/lib/evil/dlfcn.h
+++ b/src/lib/evil/evil_dlfcn.h
@@ -5,30 +5,8 @@
5#include <limits.h> 5#include <limits.h>
6 6
7 7
8#ifdef EAPI
9# undef EAPI
10#endif /* EAPI */
11
12#ifdef _WIN32
13# ifdef EFL_EVIL_DLFCN_BUILD
14# ifdef DLL_EXPORT
15# define EAPI __declspec(dllexport)
16# else
17# define EAPI
18# endif /* ! DLL_EXPORT */
19# else
20# define EAPI __declspec(dllimport)
21# endif /* ! EFL_EVIL_DLFCN_BUILD */
22#endif /* _WIN32 */
23
24
25#ifdef __cplusplus
26extern "C" {
27#endif
28
29
30/** 8/**
31 * @file dlfcn.h 9 * @file evil_dlfcn.h
32 * @brief The file that provides functions to manage dynamic-link libraries 10 * @brief The file that provides functions to manage dynamic-link libraries
33 * @defgroup Evil_Dlfcn Functions that manage dynamic-link libraries. 11 * @defgroup Evil_Dlfcn Functions that manage dynamic-link libraries.
34 * @ingroup Evil 12 * @ingroup Evil
@@ -181,7 +159,7 @@ EAPI void *dlopen(const char* path, int mode);
181 * 159 *
182 * @ingroup Evil_Dlfcn 160 * @ingroup Evil_Dlfcn
183 */ 161 */
184EAPI int dlclose(void* handle); 162EAPI int dlclose(void* handle);
185 163
186/** 164/**
187 * @brief Get the address of a symbol. 165 * @brief Get the address of a symbol.
@@ -260,9 +238,4 @@ EAPI int dladdr (const void *addr, Dl_info *info);
260EAPI char *dlerror (void); 238EAPI char *dlerror (void);
261 239
262 240
263#ifdef __cplusplus
264}
265#endif
266
267
268#endif /* __EVIL_DLFCN_H__ */ 241#endif /* __EVIL_DLFCN_H__ */
diff --git a/src/lib/evil/evil_stdio.h b/src/lib/evil/evil_stdio.h
index 1f65609ba2..7b61a33b57 100644
--- a/src/lib/evil/evil_stdio.h
+++ b/src/lib/evil/evil_stdio.h
@@ -10,7 +10,6 @@
10 * 10 *
11 * This header provides functions ported from Unix in stdio.h. 11 * This header provides functions ported from Unix in stdio.h.
12 * 12 *
13 *
14 */ 13 */
15 14
16#define EVIL_PATH_SEP_SWAP(p, s1, s2) \ 15#define EVIL_PATH_SEP_SWAP(p, s1, s2) \