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)
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 c83f48b..3aaf377 100644
--- a/header_checks/meson.build
+++ b/header_checks/meson.build
@@ -48,7 +48,6 @@ header_checks = [
48 'sys/resource.h', 48 'sys/resource.h',
49 'sys/times.h', 49 'sys/times.h',
50 'longinfo.h', 50 'longinfo.h',
51 'exotic.h',
52 'ieeefp.h', 51 'ieeefp.h',
53 'node/uv.h', 52 'node/uv.h',
54 'sys/timerfd.h', 53 'sys/timerfd.h',
diff --git a/src/bin/ecore_evas/ecore_evas_convert.c b/src/bin/ecore_evas/ecore_evas_convert.c
index 4ec1cab..8b4f19a 100644
--- a/src/bin/ecore_evas/ecore_evas_convert.c
+++ b/src/bin/ecore_evas/ecore_evas_convert.c
@@ -8,7 +8,7 @@
8#include <Ecore_Getopt.h> 8#include <Ecore_Getopt.h>
9#include <Ecore_Evas.h> 9#include <Ecore_Evas.h>
10 10
11#if defined(_WIN32) || defined(EXOTIC_NO_SIGNAL) 11#if defined(_WIN32)
12# define NO_SIGNAL 12# define NO_SIGNAL
13#else 13#else
14# include <signal.h> 14# include <signal.h>
diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h
index cfc6dd7..7818faf 100644
--- a/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
@@ -315,9 +315,7 @@
315# include <sys/siginfo.h> 315# include <sys/siginfo.h>
316#else 316#else
317# include <sys/time.h> 317# include <sys/time.h>
318# if !defined (EXOTIC_NO_SIGNAL) 318# include <signal.h>
319# include <signal.h>
320# endif
321#endif 319#endif
322 320
323#include <sys/types.h> 321#include <sys/types.h>
diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h
index 8f1a99b..443a058 100644
--- a/src/lib/ecore/Ecore_Common.h
+++ b/src/lib/ecore/Ecore_Common.h
@@ -611,7 +611,7 @@ struct _Ecore_Event_Signal_User
611 int number; /**< The signal number. Either 1 or 2 */ 611 int number; /**< The signal number. Either 1 or 2 */
612 void *ext_data; /**< Extension data - not used */ 612 void *ext_data; /**< Extension data - not used */
613 613
614#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL) 614#if !defined (_WIN32) && !defined (__lv2ppu__)
615 siginfo_t data; /**< Signal info */ 615 siginfo_t data; /**< Signal info */
616#endif 616#endif
617}; 617};
@@ -624,7 +624,7 @@ struct _Ecore_Event_Signal_Hup
624{ 624{
625 void *ext_data; /**< Extension data - not used */ 625 void *ext_data; /**< Extension data - not used */
626 626
627#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL) 627#if !defined (_WIN32) && !defined (__lv2ppu__)
628 siginfo_t data; /**< Signal info */ 628 siginfo_t data; /**< Signal info */
629#endif 629#endif
630}; 630};
@@ -640,7 +640,7 @@ struct _Ecore_Event_Signal_Exit
640 Eina_Bool terminate : 1; /**< Set if the exit request was a terminate signal */ 640 Eina_Bool terminate : 1; /**< Set if the exit request was a terminate signal */
641 void *ext_data; /**< Extension data - not used */ 641 void *ext_data; /**< Extension data - not used */
642 642
643#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL) 643#if !defined (_WIN32) && !defined (__lv2ppu__)
644 siginfo_t data; /**< Signal info */ 644 siginfo_t data; /**< Signal info */
645#endif 645#endif
646}; 646};
@@ -653,7 +653,7 @@ struct _Ecore_Event_Signal_Power
653{ 653{
654 void *ext_data; /**< Extension data - not used */ 654 void *ext_data; /**< Extension data - not used */
655 655
656#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL) 656#if !defined (_WIN32) && !defined (__lv2ppu__)
657 siginfo_t data; /**< Signal info */ 657 siginfo_t data; /**< Signal info */
658#endif 658#endif
659}; 659};
@@ -666,7 +666,7 @@ struct _Ecore_Event_Signal_Realtime
666{ 666{
667 int num; /**< The realtime signal's number */ 667 int num; /**< The realtime signal's number */
668 668
669#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL) 669#if !defined (_WIN32) && !defined (__lv2ppu__)
670 siginfo_t data; /**< Signal info */ 670 siginfo_t data; /**< Signal info */
671#endif 671#endif
672}; 672};
@@ -1071,7 +1071,7 @@ struct _Ecore_Exe_Event_Del
1071 Eina_Bool exited : 1; /**< Set to 1 if the process exited of its own accord */ 1071 Eina_Bool exited : 1; /**< Set to 1 if the process exited of its own accord */
1072 Eina_Bool signalled : 1; /**< Set to 1 if the process exited due to uncaught signal */ 1072 Eina_Bool signalled : 1; /**< Set to 1 if the process exited due to uncaught signal */
1073 void *ext_data; /**< Extension data - not used */ 1073 void *ext_data; /**< Extension data - not used */
1074#if !defined (_WIN32) && !defined (__lv2ppu__) && !defined (EXOTIC_NO_SIGNAL) 1074#if !defined (_WIN32) && !defined (__lv2ppu__)
1075 siginfo_t data; /**< Signal info */ 1075 siginfo_t data; /**< Signal info */
1076#endif 1076#endif
1077}; 1077};
diff --git a/src/lib/ecore/Efl_Core.h b/src/lib/ecore/Efl_Core.h
index c735b33..0178299 100644
--- a/src/lib/ecore/Efl_Core.h
+++ b/src/lib/ecore/Efl_Core.h
@@ -45,9 +45,7 @@
45# include <sys/siginfo.h> 45# include <sys/siginfo.h>
46#else 46#else
47# include <sys/time.h> 47# include <sys/time.h>
48# if !defined (EXOTIC_NO_SIGNAL) 48# include <signal.h>
49# include <signal.h>
50# endif
51#endif 49#endif
52 50
53#include <sys/types.h> 51#include <sys/types.h>
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index b2ca8aa..3110c5e 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -275,9 +275,7 @@ ecore_init(void)
275 if (!_ecore_event_init()) goto shutdown_event; 275 if (!_ecore_event_init()) goto shutdown_event;
276 276
277 _ecore_signal_init(); 277 _ecore_signal_init();
278#ifndef HAVE_EXOTIC
279 _ecore_exe_init(); 278 _ecore_exe_init();
280#endif
281 _ecore_thread_init(); 279 _ecore_thread_init();
282 _ecore_job_init(); 280 _ecore_job_init();
283 _ecore_time_init(); 281 _ecore_time_init();
@@ -434,9 +432,7 @@ ecore_shutdown(void)
434 eina_lock_free(&_thread_feedback_mutex); 432 eina_lock_free(&_thread_feedback_mutex);
435 eina_lock_free(&_thread_id_lock); 433 eina_lock_free(&_thread_id_lock);
436 434
437#ifndef HAVE_EXOTIC
438 _ecore_exe_shutdown(); 435 _ecore_exe_shutdown();
439#endif
440 _ecore_event_shutdown(); 436 _ecore_event_shutdown();
441 _ecore_main_shutdown(); 437 _ecore_main_shutdown();
442 _ecore_signal_shutdown(); 438 _ecore_signal_shutdown();
diff --git a/src/lib/ecore/ecore_getopt.c b/src/lib/ecore/ecore_getopt.c
index f81df25..8dc1981 100644
--- a/src/lib/ecore/ecore_getopt.c
+++ b/src/lib/ecore/ecore_getopt.c
@@ -26,10 +26,6 @@
26 26
27#define _(x) dgettext("ecore", x) 27#define _(x) dgettext("ecore", x)
28 28
29#ifdef HAVE_EXOTIC
30# include <Exotic.h>
31#endif
32
33#include "Ecore.h" 29#include "Ecore.h"
34#include "Ecore_Getopt.h" 30#include "Ecore_Getopt.h"
35 31
diff --git a/src/lib/ecore/ecore_pipe.c b/src/lib/ecore/ecore_pipe.c
index 702f19c..4023bfa 100644
--- a/src/lib/ecore/ecore_pipe.c
+++ b/src/lib/ecore/ecore_pipe.c
@@ -26,10 +26,6 @@
26# endif 26# endif
27#endif 27#endif
28 28
29#ifdef HAVE_EXOTIC
30# include <Exotic.h>
31#endif
32
33/* 29/*
34 * On Windows, pipe() is implemented with sockets. 30 * On Windows, pipe() is implemented with sockets.
35 * Contrary to Linux, Windows uses different functions 31 * Contrary to Linux, Windows uses different functions
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index d772e8c..e60c191 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,
356void _ecore_main_content_clear(Eo *obj, Efl_Loop_Data *pd); 356void _ecore_main_content_clear(Eo *obj, Efl_Loop_Data *pd);
357void _ecore_main_shutdown(void); 357void _ecore_main_shutdown(void);
358 358
359#if defined (_WIN32) || defined (__lv2ppu__) || defined (HAVE_EXOTIC) 359#if defined (_WIN32) || defined (__lv2ppu__)
360static inline void _ecore_signal_shutdown(void) { } 360static inline void _ecore_signal_shutdown(void) { }
361 361
362static inline void _ecore_signal_init(void) { } 362static inline void _ecore_signal_init(void) { }
diff --git a/src/lib/ecore/ecore_time.c b/src/lib/ecore/ecore_time.c
index 31ffa71..f2afe0e 100644
--- a/src/lib/ecore/ecore_time.c
+++ b/src/lib/ecore/ecore_time.c
@@ -16,7 +16,7 @@
16#include "Ecore.h" 16#include "Ecore.h"
17#include "ecore_private.h" 17#include "ecore_private.h"
18 18
19#if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME) 19#if defined (HAVE_CLOCK_GETTIME)
20static clockid_t _ecore_time_clock_id; 20static clockid_t _ecore_time_clock_id;
21static Eina_Bool _ecore_time_got_clock_id = EINA_FALSE; 21static Eina_Bool _ecore_time_got_clock_id = EINA_FALSE;
22#elif defined(__APPLE__) && defined(__MACH__) 22#elif defined(__APPLE__) && defined(__MACH__)
@@ -26,7 +26,7 @@ static double _ecore_time_clock_conversion = 1e-9;
26EAPI double 26EAPI double
27ecore_time_get(void) 27ecore_time_get(void)
28{ 28{
29#if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME) 29#if defined (HAVE_CLOCK_GETTIME)
30 struct timespec t; 30 struct timespec t;
31 31
32 if (EINA_UNLIKELY(!_ecore_time_got_clock_id)) 32 if (EINA_UNLIKELY(!_ecore_time_got_clock_id))
@@ -82,7 +82,7 @@ ecore_loop_time_set(double t)
82void 82void
83_ecore_time_init(void) 83_ecore_time_init(void)
84{ 84{
85#if defined(HAVE_CLOCK_GETTIME) || defined(EXOTIC_PROVIDE_CLOCK_GETTIME) 85#if defined(HAVE_CLOCK_GETTIME)
86 struct timespec t; 86 struct timespec t;
87 87
88 if (_ecore_time_got_clock_id) return; 88 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 451fd24..fc8fb2e 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 @@
21# include <evil_private.h> /* dlsym */ 21# include <evil_private.h> /* dlsym */
22#endif 22#endif
23 23
24#ifdef HAVE_EXOTIC
25# include <Exotic.h>
26#endif
27
28#include "ecore_con_private.h" 24#include "ecore_con_private.h"
29 25
30/* OpenSSL's BIO is the abstraction for I/O, provide one for Efl.Io.* */ 26/* 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 4dba784..eb32dfc 100644
--- a/src/lib/eina/eina_evlog.c
+++ b/src/lib/eina/eina_evlog.c
@@ -62,7 +62,7 @@ static int _evlog_go = 0;
62static Eina_Evlog_Buf *buf; // current event log we are writing events to 62static Eina_Evlog_Buf *buf; // current event log we are writing events to
63static Eina_Evlog_Buf buffers[2]; // double-buffer our event log buffers 63static Eina_Evlog_Buf buffers[2]; // double-buffer our event log buffers
64 64
65#if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME) 65#if defined (HAVE_CLOCK_GETTIME)
66static clockid_t _eina_evlog_time_clock_id = -1; 66static clockid_t _eina_evlog_time_clock_id = -1;
67#elif defined(__APPLE__) && defined(__MACH__) 67#elif defined(__APPLE__) && defined(__MACH__)
68static double _eina_evlog_time_clock_conversion = 1e-9; 68static double _eina_evlog_time_clock_conversion = 1e-9;
@@ -73,7 +73,7 @@ static int _evlog_get_opcode = EINA_DEBUG_OPCODE_INVALID;
73static inline double 73static inline double
74get_time(void) 74get_time(void)
75{ 75{
76#if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME) 76#if defined (HAVE_CLOCK_GETTIME)
77 struct timespec t; 77 struct timespec t;
78 78
79 if (EINA_UNLIKELY(clock_gettime(_eina_evlog_time_clock_id, &t))) 79 if (EINA_UNLIKELY(clock_gettime(_eina_evlog_time_clock_id, &t)))
@@ -288,7 +288,7 @@ eina_evlog_init(void)
288{ 288{
289 eina_spinlock_new(&_evlog_lock); 289 eina_spinlock_new(&_evlog_lock);
290 buf = &(buffers[0]); 290 buf = &(buffers[0]);
291#if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME) 291#if defined (HAVE_CLOCK_GETTIME)
292 { 292 {
293 struct timespec t; 293 struct timespec t;
294 294
diff --git a/src/lib/eina/eina_module.c b/src/lib/eina/eina_module.c
index 674da6a..171b71a 100644
--- a/src/lib/eina/eina_module.c
+++ b/src/lib/eina/eina_module.c
@@ -35,10 +35,6 @@
35# include <evil_private.h> 35# include <evil_private.h>
36#endif 36#endif
37 37
38#ifdef HAVE_EXOTIC
39# include <Exotic.h>
40#endif
41
42#include "eina_config.h" 38#include "eina_config.h"
43#include "eina_private.h" 39#include "eina_private.h"
44#include "eina_alloca.h" 40#include "eina_alloca.h"
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index 9bcac0b..377f63b 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -60,9 +60,7 @@
60# include <sys/siginfo.h> 60# include <sys/siginfo.h>
61#else 61#else
62# include <sys/time.h> 62# include <sys/time.h>
63# if !defined (EXOTIC_NO_SIGNAL) 63# include <signal.h>
64# include <signal.h>
65# endif
66#endif 64#endif
67 65
68#include <sys/types.h> 66#include <sys/types.h>
diff --git a/src/lib/embryo/embryo_amx.c b/src/lib/embryo/embryo_amx.c
index e8df24d..6ee674d 100644
--- a/src/lib/embryo/embryo_amx.c
+++ b/src/lib/embryo/embryo_amx.c
@@ -28,10 +28,6 @@
28#include <stdio.h> 28#include <stdio.h>
29#include <string.h> 29#include <string.h>
30 30
31#ifdef HAVE_EXOTIC
32# include <Exotic.h>
33#endif
34
35#include <Eina.h> 31#include <Eina.h>
36 32
37#include "Embryo.h" 33#include "Embryo.h"
diff --git a/src/lib/embryo/embryo_str.c b/src/lib/embryo/embryo_str.c
index de39437..d7da4e0 100644
--- a/src/lib/embryo/embryo_str.c
+++ b/src/lib/embryo/embryo_str.c
@@ -11,10 +11,6 @@
11# endif 11# endif
12#endif 12#endif
13 13
14#ifdef HAVE_EXOTIC
15# include <Exotic.h>
16#endif
17
18#include <stdlib.h> 14#include <stdlib.h>
19#include <stdio.h> 15#include <stdio.h>
20#include <string.h> 16#include <string.h>
diff --git a/src/lib/embryo/embryo_time.c b/src/lib/embryo/embryo_time.c
index ac4a717..2055361 100644
--- a/src/lib/embryo/embryo_time.c
+++ b/src/lib/embryo/embryo_time.c
@@ -9,10 +9,6 @@
9# include <evil_private.h> /* setenv unsetenv */ 9# include <evil_private.h> /* setenv unsetenv */
10#endif 10#endif
11 11
12#ifdef HAVE_EXOTIC
13# include <Exotic.h>
14#endif
15
16#include <Eina.h> 12#include <Eina.h>
17 13
18#include "Embryo.h" 14#include "Embryo.h"
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index d2e190d..5547900 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -2793,7 +2793,7 @@ _eo_log_time_now(void)
2793 2793
2794 return clk_conv * mach_absolute_time(); 2794 return clk_conv * mach_absolute_time();
2795#else 2795#else
2796#if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME) 2796#if defined (HAVE_CLOCK_GETTIME)
2797 struct timespec t; 2797 struct timespec t;
2798 static int clk_id = -1; 2798 static int clk_id = -1;
2799 2799
diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h
index 91a2d98..b2d6347 100644
--- a/src/lib/evas/include/evas_common_private.h
+++ b/src/lib/evas/include/evas_common_private.h
@@ -32,10 +32,6 @@
32#include <sys/stat.h> 32#include <sys/stat.h>
33#include <unistd.h> 33#include <unistd.h>
34 34
35#ifdef HAVE_EXOTIC
36# include <Exotic.h>
37#endif
38
39#include <Eina.h> 35#include <Eina.h>
40#include <Eo.h> 36#include <Eo.h>
41#include <Ector.h> 37#include <Ector.h>