checking in the recent efforts at optimizing clam

[feisty_meow.git] / nucleus / library / timely / timer_driver.h

diff --git a/nucleus/library/timely/timer_driver.h b/nucleus/library/timely/timer_driver.h
index ae2b9735c36dc7d73871caa99ef751777f3efb7b..26875baed4652edb6520f4eba32d204146248bb6 100644 (file)
--- a/nucleus/library/timely/timer_driver.h
+++ b/nucleus/library/timely/timer_driver.h
@@ -69,10 +69,12 @@ public:
 
   // internal methods.
 
-#ifdef __WIN32__
+/*
+#if defined(_MSC_VER)
   basis::un_int *real_timer_id();
     //!< provides the timer id for comparison on windows platforms.
 #endif
+*/
 
   void handle_system_timer();
     //!< invoked by the OS timer support and must be called by main thread.
@@ -83,10 +85,9 @@ public:
 private:
   driven_objects_list *_timers;  //!< timer hooked objects.
   basis::mutex *_lock;  //!< protects list of timers.
-#ifdef __UNIX__
+#if defined(__UNIX__) || defined(__GNU_WINDOWS__)
   signalling_thread *_prompter;  //!< drives our timers.
-#endif
-#ifdef __WIN32__
+#else
   basis::un_int *_real_timer_id;  //!< used for storing window timer handle.
 #endif
   bool _in_timer;  //!< true if we're handling the timer right now.