kosaki	2011-05-07 02:50:23 +0900 (Sat, 07 May 2011)

  New Revision: 31455

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31455

  Log:
    fix win32 compile error.
    
    * thread_win32.c (RB_CONDATTR_CLOCK_MONOTONIC): define
      RB_CONDATTR_CLOCK_MONOTONIC always.
    * thread_pthread.c (RB_CONDATTR_CLOCK_MONOTONIC): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/thread_pthread.c
    trunk/thread_win32.c

Index: thread_win32.c
===================================================================
--- thread_win32.c	(revision 31454)
+++ thread_win32.c	(revision 31455)
@@ -14,6 +14,8 @@
 #include <process.h>
 
 #define WIN32_WAIT_TIMEOUT 10	/* 10 ms */
+#define RB_CONDATTR_CLOCK_MONOTONIC 1 /* no effect */
+
 #undef Sleep
 
 #define native_thread_yield() Sleep(0)
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31454)
+++ ChangeLog	(revision 31455)
@@ -1,3 +1,10 @@
+Sat May  7 02:49:12 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
+	  fix win32 compile error.
+
+	* thread_win32.c (RB_CONDATTR_CLOCK_MONOTONIC): define
+	  RB_CONDATTR_CLOCK_MONOTONIC always.
+	* thread_pthread.c (RB_CONDATTR_CLOCK_MONOTONIC): ditto.
+
 Sat May  7 02:29:41 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	  mutex: deadlock check timeout use monotonic time.
Index: thread_pthread.c
===================================================================
--- thread_pthread.c	(revision 31454)
+++ thread_pthread.c	(revision 31455)
@@ -28,9 +28,10 @@
 static void native_cond_initialize(rb_thread_cond_t *cond, int flags);
 static void native_cond_destroy(rb_thread_cond_t *cond);
 
+#define RB_CONDATTR_CLOCK_MONOTONIC 1
+
 #if defined(HAVE_PTHREAD_CONDATTR_SETCLOCK) && defined(CLOCK_MONOTONIC) && defined(HAVE_CLOCK_GETTIME)
 #define USE_MONOTONIC_COND 1
-#define RB_CONDATTR_CLOCK_MONOTONIC 1
 #endif
 
 #define GVL_SIMPLE_LOCK 0

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/