summaryrefslogtreecommitdiff
path: root/src/lib/ecore
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ecore')
-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
8 files changed, 12 insertions, 28 deletions
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 @@
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 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
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 c735b333fc..0178299379 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 b2ca8aa649..3110c5ef54 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 f81df25105..8dc1981ba8 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 702f19cbca..4023bfa70f 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 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,
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 31ffa717c8..f2afe0e860 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;