From 4c62111e4476fd159fcf8528ee5126adfcd82186 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 26 Jan 2008 10:11:48 +0000
Subject: [PATCH] relegate _WIN32 ifdef mess to ecore_private.h

SVN revision: 33620
---
 legacy/ecore/src/lib/ecore/ecore.c         |  6 ++----
 legacy/ecore/src/lib/ecore/ecore_main.c    | 16 ----------------
 legacy/ecore/src/lib/ecore/ecore_private.h |  7 +++++++
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/legacy/ecore/src/lib/ecore/ecore.c b/legacy/ecore/src/lib/ecore/ecore.c
index d549e35658..44f8053738 100644
--- a/legacy/ecore/src/lib/ecore/ecore.c
+++ b/legacy/ecore/src/lib/ecore/ecore.c
@@ -63,9 +63,9 @@ ecore_init(void)
 	 */
 	if (getenv("ECORE_FPS_DEBUG")) _ecore_fps_debug = 1;
 	if (_ecore_fps_debug) _ecore_fps_debug_init();
-#ifndef _WIN32
 	_ecore_signal_init();
-        _ecore_exe_init();
+#ifndef _WIN32
+	_ecore_exe_init();
 #endif
      }
 
@@ -100,9 +100,7 @@ ecore_shutdown(void)
    _ecore_timer_shutdown();
    _ecore_event_shutdown();
    _ecore_main_shutdown();
-#ifndef _WIN32
    _ecore_signal_shutdown();
-#endif
 
    return _ecore_init_count;
 }
diff --git a/legacy/ecore/src/lib/ecore/ecore_main.c b/legacy/ecore/src/lib/ecore/ecore_main.c
index 8ed0e93409..9e5aedf270 100644
--- a/legacy/ecore/src/lib/ecore/ecore_main.c
+++ b/legacy/ecore/src/lib/ecore/ecore_main.c
@@ -349,9 +349,7 @@ _ecore_main_select(double timeout)
 	     if (fdh->fd > max_fd) max_fd = fdh->fd;
 	  }
      }
-#ifndef _WIN32
    if (_ecore_signal_count_get()) return -1;
-#endif /* _WIN32 */
    ret = select(max_fd + 1, &rfds, &wfds, &exfds, t);
    if (ret < 0)
      {
@@ -535,10 +533,8 @@ _ecore_main_loop_iterate_internal(int once_only)
      }
    /* any timers re-added as a result of these are allowed to go */
    _ecore_timer_enable_new();
-#ifndef _WIN32
    /* process signals into events .... */
    while (_ecore_signal_count_get()) _ecore_signal_call();
-#endif /* _WIN32 */
    if (_ecore_event_exist())
      {
 	have_event = 1;
@@ -558,9 +554,7 @@ _ecore_main_loop_iterate_internal(int once_only)
 	if (_ecore_main_select(0.0) > 0) have_event = 1;
 
 	if (_ecore_main_win32_message(0.0) > 0) have_msg = 1;
-#ifndef _WIN32
 	if (_ecore_signal_count_get() > 0) have_signal = 1;
-#endif /* _WIN32 */
 
 	if (have_signal || have_event || have_msg)
 	  goto process_events;
@@ -611,9 +605,7 @@ _ecore_main_loop_iterate_internal(int once_only)
 	       {
 		  if (_ecore_main_select(-1.0) > 0) have_event = 1;
 		  if (_ecore_main_win32_message(-1.0) > 0) have_msg = 1;
-#ifndef _WIN32
 		  if (_ecore_signal_count_get() > 0) have_signal = 1;
-#endif /* _WIN32 */
 	       }
 	     /* idlers */
 	     else
@@ -624,9 +616,7 @@ _ecore_main_loop_iterate_internal(int once_only)
 		       if (_ecore_event_exist()) break;
 		       if (_ecore_main_select(0.0) > 0) have_event = 1;
 		       if (_ecore_main_win32_message(0.0) > 0) have_msg = 1;
-#ifndef _WIN32
 		       if (_ecore_signal_count_get() > 0) have_signal = 1;
-#endif /* _WIN32 */
 		       if (have_event || have_signal || have_msg) break;
 		       next_time = _ecore_timer_next_get();
 		       if (next_time >= 0) goto start_loop;
@@ -642,9 +632,7 @@ _ecore_main_loop_iterate_internal(int once_only)
 	       {
 		  if (_ecore_main_select(next_time) > 0) have_event = 1;
 		  if (_ecore_main_win32_message(next_time) > 0) have_msg = 1;
-#ifndef _WIN32
 		  if (_ecore_signal_count_get() > 0) have_signal = 1;
-#endif /* _WIN32 */
 	       }
 	     /* idlers */
 	     else
@@ -657,9 +645,7 @@ _ecore_main_loop_iterate_internal(int once_only)
 		       if (_ecore_event_exist()) break;
 		       if (_ecore_main_select(0.0) > 0) have_event = 1;
 		       if (_ecore_main_win32_message(0.0) > 0) have_msg = 1;
-#ifndef _WIN32
 		       if (_ecore_signal_count_get() > 0) have_signal = 1;
-#endif /* _WIN32 */
 		       if (have_event || have_signal || have_msg) break;
 		       cur_time = ecore_time_get();
 		       t = ecore_time_get() - cur_time;
@@ -685,10 +671,8 @@ _ecore_main_loop_iterate_internal(int once_only)
    if (have_event) _ecore_main_fd_handlers_call();
    do
      {
-#ifndef _WIN32
 	/* process signals into events .... */
 	while (_ecore_signal_count_get()) _ecore_signal_call();
-#endif /* _WIN32 */
 
 	/* handle events ... */
 	_ecore_event_call();
diff --git a/legacy/ecore/src/lib/ecore/ecore_private.h b/legacy/ecore/src/lib/ecore/ecore_private.h
index 91f3a81db4..fcaac16f99 100644
--- a/legacy/ecore/src/lib/ecore/ecore_private.h
+++ b/legacy/ecore/src/lib/ecore/ecore_private.h
@@ -424,10 +424,17 @@ void         *_ecore_event_signal_realtime_new(void);
 
 void          _ecore_main_shutdown(void);
 
+#ifdef _WIN32F
+static inline void _ecore_signal_shutdown(void) { }
+static inline void _ecore_signal_init(void) { }
+static inline int  _ecore_signal_count_get(void) { return 0; }
+static inline void _ecore_signal_call(void) { }
+#else
 void          _ecore_signal_shutdown(void);
 void          _ecore_signal_init(void);
 int           _ecore_signal_count_get(void);
 void          _ecore_signal_call(void);
+#endif
 
 #ifndef _WIN32
 void          _ecore_exe_init(void);