summaryrefslogtreecommitdiff
path: root/src/lib/ecore/ecore_internal.h
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-05-26 15:44:41 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-05-26 15:46:25 +0100
commit39b48ca430d635a5c7d9c3e1074003b252f8e86b (patch)
treea2dbea9eb07cecb874a171a63db385615d86baa5 /src/lib/ecore/ecore_internal.h
parent26ea0eaac2a55da5417795babc29d2927005e9fc (diff)
Revert "fix warnings about redefinting EWAPI etc. due to windows EAPI changes"
This reverts commit e2d6691d524e15b0b0673d121e81c0544271617b. This reverts commit c02b796fdb0960411b24576f654a03f0e765a842. This reverts commit 6c969f6b7d59e64e8bdf09a5e535de9561d77535. This reverts commit 74204bccd724fe9dee428056d4710f37bbc2cffb. This reverts commit 1304d9571775ef740ac6b8978ea4a2025a52c99a. This reverts commit 7c85be9674eaa0362b88f01c61107aa6e7c383a2. revert the EAPI changes that break cxx bindings build. sorry :( more fixes needed than i thought
Diffstat (limited to 'src/lib/ecore/ecore_internal.h')
-rw-r--r--src/lib/ecore/ecore_internal.h33
1 files changed, 30 insertions, 3 deletions
diff --git a/src/lib/ecore/ecore_internal.h b/src/lib/ecore/ecore_internal.h
index 731456bf5e..9f6e55eb24 100644
--- a/src/lib/ecore/ecore_internal.h
+++ b/src/lib/ecore/ecore_internal.h
@@ -2,10 +2,34 @@
2#ifndef _ECORE_INTERNAL_H 2#ifndef _ECORE_INTERNAL_H
3#define _ECORE_INTERNAL_H 3#define _ECORE_INTERNAL_H
4 4
5#include <ecore_api.h> 5#ifdef EAPI
6# undef EAPI
7#endif
8
9#ifdef _WIN32
10# ifdef EFL_BUILD
11# ifdef DLL_EXPORT
12# define EAPI __declspec(dllexport)
13# else
14# define EAPI
15# endif
16# else
17# define EAPI __declspec(dllimport)
18# endif
19#else
20# ifdef __GNUC__
21# if __GNUC__ >= 4
22# define EAPI __attribute__ ((visibility("default")))
23# else
24# define EAPI
25# endif
26# else
27# define EAPI
28# endif
29#endif
6 30
7ECORE_API void ecore_loop_arguments_send(int argc, const char **argv); 31EAPI void ecore_loop_arguments_send(int argc, const char **argv);
8ECORE_API Eina_Bool efl_loop_message_process(Eo *obj); 32EAPI Eina_Bool efl_loop_message_process(Eo *obj);
9 33
10static inline Eina_Value 34static inline Eina_Value
11efl_model_list_value_get(Eina_List *childrens, 35efl_model_list_value_get(Eina_List *childrens,
@@ -138,4 +162,7 @@ _efl_future_all_repack(Eo *o EINA_UNUSED, void *data EINA_UNUSED, const Eina_Val
138 return eina_value_error_init(EFL_MODEL_ERROR_UNKNOWN); 162 return eina_value_error_init(EFL_MODEL_ERROR_UNKNOWN);
139} 163}
140 164
165#undef EAPI
166#define EAPI
167
141#endif 168#endif