summaryrefslogtreecommitdiff
path: root/src/lib/elementary/Elementary.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/elementary/Elementary.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 '')
-rw-r--r--src/lib/elementary/Elementary.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index 6d0a33a643..a64406de43 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -88,9 +88,6 @@
88#ifdef EAPI_WEAK 88#ifdef EAPI_WEAK
89# undef EAPI_WEAK 89# undef EAPI_WEAK
90#endif 90#endif
91#ifdef EOAPI
92# undef EOAPI
93#endif
94 91
95#ifdef _WIN32 92#ifdef _WIN32
96# ifdef EFL_BUILD 93# ifdef EFL_BUILD
@@ -119,7 +116,7 @@
119#endif 116#endif
120 117
121#define EWAPI EAPI EAPI_WEAK 118#define EWAPI EAPI EAPI_WEAK
122#define EOAPI EAPI 119
123 120
124/* allow usage from c++ */ 121/* allow usage from c++ */
125#ifdef __cplusplus 122#ifdef __cplusplus