summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-11-28 09:59:41 +0100
committerCedric BAIL <cedric.bail@free.fr>2019-12-04 12:21:28 -0800
commitd0f69cf2e2771c2a7895de0a2a437110783cc8dc (patch)
tree1fa7f44e4f01507045e500b45979bbb4b597e7be
parentf86dbae7e3621ce8766a1fc782f4304fde0f45e3 (diff)
downloadefl-d0f69cf2e2771c2a7895de0a2a437110783cc8dc.tar.gz
exotic: remove left-overs from Exotic support
This seems to have been gone a long time ago and only references left that have not been disturbing the build. Time to clean up! Signed-off-by: Stefan Schmidt <s.schmidt@samsung.com> Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D10793
-rw-r--r--header_checks/meson.build1
-rw-r--r--src/bin/ecore_evas/ecore_evas_convert.c2
-rw-r--r--src/lib/ecore/Ecore.h4
-rw-r--r--src/lib/ecore/Ecore_Common.h12
-rw-r--r--src/lib/ecore/Efl_Core.h4
-rw-r--r--src/lib/ecore/ecore.c4
-rw-r--r--src/lib/ecore/ecore_getopt.c4
-rw-r--r--src/lib/ecore/ecore_pipe.c4
-rw-r--r--src/lib/ecore/ecore_private.h2
-rw-r--r--src/lib/ecore/ecore_time.c6
-rw-r--r--src/lib/ecore_con/efl_net_ssl_conn-openssl.c4
-rw-r--r--src/lib/eina/eina_evlog.c6
-rw-r--r--src/lib/eina/eina_module.c4
-rw-r--r--src/lib/elementary/Efl_Ui.h4
-rw-r--r--src/lib/embryo/embryo_amx.c4
-rw-r--r--src/lib/embryo/embryo_str.c4
-rw-r--r--src/lib/embryo/embryo_time.c4
-rw-r--r--src/lib/eo/eo.c2
-rw-r--r--src/lib/evas/include/evas_common_private.h4
19 files changed, 18 insertions, 61 deletions
diff --git a/header_checks/meson.build b/header_checks/meson.build
index c83f48b897..3aaf3776c6 100644
--- a/header_checks/meson.build
+++ b/header_checks/meson.build
@@ -48,7 +48,6 @@ header_checks = [
'sys/resource.h',
'sys/times.h',
'longinfo.h',
- 'exotic.h',
'ieeefp.h',
'node/uv.h',
'sys/timerfd.h',
diff --git a/src/bin/ecore_evas/ecore_evas_convert.c b/src/bin/ecore_evas/ecore_evas_convert.c
index 4ec1cabbf1..8b4f19ab2f 100644
--- a/src/bin/ecore_evas/ecore_evas_convert.c
+++ b/src/bin/ecore_evas/ecore_evas_convert.c
@@ -8,7 +8,7 @@
#include <Ecore_Getopt.h>
#include <Ecore_Evas.h>
-#if defined(_WIN32) || defined(EXOTIC_NO_SIGNAL)
+#if defined(_WIN32)
# define NO_SIGNAL
#else
# include <signal.h>
diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h
index cfc6dd7660..7818faf907 100644
--- a/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
@@ -315,9 +315,7 @@
# include <sys/siginfo.h>
#else
# include <sys/time.h>
-# if !defined (EXOTIC_NO_SIGNAL)
-# include <signal.h>
-# endif
+# include <signal.h>
#endif
#include <sys/types.h>
diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h
index 8f1a99bc04..443a05880c 100644
--- a/src/lib/ecore/Ecore_Common.h
+++ b/src/lib/ecore/Ecore_Common.h
@@ -611,7 +611,7 @@ struct _Ecore_Event_Signal_User
int number; /**< The signal number. Either 1 or 2 */
void *ext_data; /**< Extension data - not used */
-#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL)
+#if !defined (_WIN32) && !defined (__lv2ppu__)
siginfo_t data; /**< Signal info */
#endif
};
@@ -624,7 +624,7 @@ struct _Ecore_Event_Signal_Hup
{
void *ext_data; /**< Extension data - not used */
-#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL)
+#if !defined (_WIN32) && !defined (__lv2ppu__)
siginfo_t data; /**< Signal info */
#endif
};
@@ -640,7 +640,7 @@ struct _Ecore_Event_Signal_Exit
Eina_Bool terminate : 1; /**< Set if the exit request was a terminate signal */
void *ext_data; /**< Extension data - not used */
-#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL)
+#if !defined (_WIN32) && !defined (__lv2ppu__)
siginfo_t data; /**< Signal info */
#endif
};
@@ -653,7 +653,7 @@ struct _Ecore_Event_Signal_Power
{
void *ext_data; /**< Extension data - not used */
-#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL)
+#if !defined (_WIN32) && !defined (__lv2ppu__)
siginfo_t data; /**< Signal info */
#endif
};
@@ -666,7 +666,7 @@ struct _Ecore_Event_Signal_Realtime
{
int num; /**< The realtime signal's number */
-#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL)
+#if !defined (_WIN32) && !defined (__lv2ppu__)
siginfo_t data; /**< Signal info */
#endif
};
@@ -1071,7 +1071,7 @@ struct _Ecore_Exe_Event_Del
Eina_Bool exited : 1; /**< Set to 1 if the process exited of its own accord */
Eina_Bool signalled : 1; /**< Set to 1 if the process exited due to uncaught signal */
void *ext_data; /**< Extension data - not used */
-#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL)
+#if !defined (_WIN32) && !defined (__lv2ppu__)
siginfo_t data; /**< Signal info */
#endif
};
diff --git a/src/lib/ecore/Efl_Core.h b/src/lib/ecore/Efl_Core.h
index c735b333fc..0178299379 100644
--- a/src/lib/ecore/Efl_Core.h
+++ b/src/lib/ecore/Efl_Core.h
@@ -45,9 +45,7 @@
# include <sys/siginfo.h>
#else
# include <sys/time.h>
-# if !defined (EXOTIC_NO_SIGNAL)
-# include <signal.h>
-# endif
+# include <signal.h>
#endif
#include <sys/types.h>
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index b2ca8aa649..3110c5ef54 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -275,9 +275,7 @@ ecore_init(void)
if (!_ecore_event_init()) goto shutdown_event;
_ecore_signal_init();
-#ifndef HAVE_EXOTIC
_ecore_exe_init();
-#endif
_ecore_thread_init();
_ecore_job_init();
_ecore_time_init();
@@ -434,9 +432,7 @@ ecore_shutdown(void)
eina_lock_free(&_thread_feedback_mutex);
eina_lock_free(&_thread_id_lock);
-#ifndef HAVE_EXOTIC
_ecore_exe_shutdown();
-#endif
_ecore_event_shutdown();
_ecore_main_shutdown();
_ecore_signal_shutdown();
diff --git a/src/lib/ecore/ecore_getopt.c b/src/lib/ecore/ecore_getopt.c
index f81df25105..8dc1981ba8 100644
--- a/src/lib/ecore/ecore_getopt.c
+++ b/src/lib/ecore/ecore_getopt.c
@@ -26,10 +26,6 @@
#define _(x) dgettext("ecore", x)
-#ifdef HAVE_EXOTIC
-# include <Exotic.h>
-#endif
-
#include "Ecore.h"
#include "Ecore_Getopt.h"
diff --git a/src/lib/ecore/ecore_pipe.c b/src/lib/ecore/ecore_pipe.c
index 702f19cbca..4023bfa70f 100644
--- a/src/lib/ecore/ecore_pipe.c
+++ b/src/lib/ecore/ecore_pipe.c
@@ -26,10 +26,6 @@
# endif
#endif
-#ifdef HAVE_EXOTIC
-# include <Exotic.h>
-#endif
-
/*
* On Windows, pipe() is implemented with sockets.
* Contrary to Linux, Windows uses different functions
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index d772e8c99c..e60c191a21 100644
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -356,7 +356,7 @@ _ecore_main_win32_handler_del(Eo *obj,
void _ecore_main_content_clear(Eo *obj, Efl_Loop_Data *pd);
void _ecore_main_shutdown(void);
-#if defined (_WIN32) || defined (__lv2ppu__) || defined (HAVE_EXOTIC)
+#if defined (_WIN32) || defined (__lv2ppu__)
static inline void _ecore_signal_shutdown(void) { }
static inline void _ecore_signal_init(void) { }
diff --git a/src/lib/ecore/ecore_time.c b/src/lib/ecore/ecore_time.c
index 31ffa717c8..f2afe0e860 100644
--- a/src/lib/ecore/ecore_time.c
+++ b/src/lib/ecore/ecore_time.c
@@ -16,7 +16,7 @@
#include "Ecore.h"
#include "ecore_private.h"
-#if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME)
+#if defined (HAVE_CLOCK_GETTIME)
static clockid_t _ecore_time_clock_id;
static Eina_Bool _ecore_time_got_clock_id = EINA_FALSE;
#elif defined(__APPLE__) && defined(__MACH__)
@@ -26,7 +26,7 @@ static double _ecore_time_clock_conversion = 1e-9;
EAPI double
ecore_time_get(void)
{
-#if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME)
+#if defined (HAVE_CLOCK_GETTIME)
struct timespec t;
if (EINA_UNLIKELY(!_ecore_time_got_clock_id))
@@ -82,7 +82,7 @@ ecore_loop_time_set(double t)
void
_ecore_time_init(void)
{
-#if defined(HAVE_CLOCK_GETTIME) || defined(EXOTIC_PROVIDE_CLOCK_GETTIME)
+#if defined(HAVE_CLOCK_GETTIME)
struct timespec t;
if (_ecore_time_got_clock_id) return;
diff --git a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
index 451fd242ae..fc8fb2e95f 100644
--- a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
+++ b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
@@ -21,10 +21,6 @@
# include <evil_private.h> /* dlsym */
#endif
-#ifdef HAVE_EXOTIC
-# include <Exotic.h>
-#endif
-
#include "ecore_con_private.h"
/* OpenSSL's BIO is the abstraction for I/O, provide one for Efl.Io.* */
diff --git a/src/lib/eina/eina_evlog.c b/src/lib/eina/eina_evlog.c
index 4dba784ff1..eb32dfc27b 100644
--- a/src/lib/eina/eina_evlog.c
+++ b/src/lib/eina/eina_evlog.c
@@ -62,7 +62,7 @@ static int _evlog_go = 0;
static Eina_Evlog_Buf *buf; // current event log we are writing events to
static Eina_Evlog_Buf buffers[2]; // double-buffer our event log buffers
-#if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME)
+#if defined (HAVE_CLOCK_GETTIME)
static clockid_t _eina_evlog_time_clock_id = -1;
#elif defined(__APPLE__) && defined(__MACH__)
static double _eina_evlog_time_clock_conversion = 1e-9;
@@ -73,7 +73,7 @@ static int _evlog_get_opcode = EINA_DEBUG_OPCODE_INVALID;
static inline double
get_time(void)
{
-#if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME)
+#if defined (HAVE_CLOCK_GETTIME)
struct timespec t;
if (EINA_UNLIKELY(clock_gettime(_eina_evlog_time_clock_id, &t)))
@@ -288,7 +288,7 @@ eina_evlog_init(void)
{
eina_spinlock_new(&_evlog_lock);
buf = &(buffers[0]);
-#if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME)
+#if defined (HAVE_CLOCK_GETTIME)
{
struct timespec t;
diff --git a/src/lib/eina/eina_module.c b/src/lib/eina/eina_module.c
index 674da6aeb5..171b71afad 100644
--- a/src/lib/eina/eina_module.c
+++ b/src/lib/eina/eina_module.c
@@ -35,10 +35,6 @@
# include <evil_private.h>
#endif
-#ifdef HAVE_EXOTIC
-# include <Exotic.h>
-#endif
-
#include "eina_config.h"
#include "eina_private.h"
#include "eina_alloca.h"
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index 9bcac0b509..377f63bd68 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -60,9 +60,7 @@
# include <sys/siginfo.h>
#else
# include <sys/time.h>
-# if !defined (EXOTIC_NO_SIGNAL)
-# include <signal.h>
-# endif
+# include <signal.h>
#endif
#include <sys/types.h>
diff --git a/src/lib/embryo/embryo_amx.c b/src/lib/embryo/embryo_amx.c
index e8df24dd97..6ee674de67 100644
--- a/src/lib/embryo/embryo_amx.c
+++ b/src/lib/embryo/embryo_amx.c
@@ -28,10 +28,6 @@
#include <stdio.h>
#include <string.h>
-#ifdef HAVE_EXOTIC
-# include <Exotic.h>
-#endif
-
#include <Eina.h>
#include "Embryo.h"
diff --git a/src/lib/embryo/embryo_str.c b/src/lib/embryo/embryo_str.c
index de39437058..d7da4e0dd3 100644
--- a/src/lib/embryo/embryo_str.c
+++ b/src/lib/embryo/embryo_str.c
@@ -11,10 +11,6 @@
# endif
#endif
-#ifdef HAVE_EXOTIC
-# include <Exotic.h>
-#endif
-
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/lib/embryo/embryo_time.c b/src/lib/embryo/embryo_time.c
index ac4a71754d..20553618af 100644
--- a/src/lib/embryo/embryo_time.c
+++ b/src/lib/embryo/embryo_time.c
@@ -9,10 +9,6 @@
# include <evil_private.h> /* setenv unsetenv */
#endif
-#ifdef HAVE_EXOTIC
-# include <Exotic.h>
-#endif
-
#include <Eina.h>
#include "Embryo.h"
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index d2e190df3d..55479009c8 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -2793,7 +2793,7 @@ _eo_log_time_now(void)
return clk_conv * mach_absolute_time();
#else
-#if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME)
+#if defined (HAVE_CLOCK_GETTIME)
struct timespec t;
static int clk_id = -1;
diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h
index 91a2d98165..b2d63476a2 100644
--- a/src/lib/evas/include/evas_common_private.h
+++ b/src/lib/evas/include/evas_common_private.h
@@ -32,10 +32,6 @@
#include <sys/stat.h>
#include <unistd.h>
-#ifdef HAVE_EXOTIC
-# include <Exotic.h>
-#endif
-
#include <Eina.h>
#include <Eo.h>
#include <Ector.h>