summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--include/ruby/win32.h2
-rw-r--r--win32/win32.c3
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b71e8f71e0..0eff2ba199 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug 19 13:28:47 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * include/ruby/win32.h (CLOCK_MONOTONIC): typo.
+
+ * win32/win32.c: removed duplicated declarations.
+
Mon Aug 19 13:03:08 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (clock_gettime): should not overwrite cache variable
diff --git a/include/ruby/win32.h b/include/ruby/win32.h
index b8c99b2c3a..260c5d914d 100644
--- a/include/ruby/win32.h
+++ b/include/ruby/win32.h
@@ -126,7 +126,7 @@ typedef unsigned int uintptr_t;
typedef int clockid_t;
#define CLOCK_REALTIME 0
-#define CLOCK_MONOTINIC 1
+#define CLOCK_MONOTONIC 1
#undef getc
#undef putc
diff --git a/win32/win32.c b/win32/win32.c
index c64b7b99e3..b20ca9da82 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -4310,9 +4310,6 @@ gettimeofday(struct timeval *tv, struct timezone *tz)
}
/* License: Ruby's */
-typedef int clockid_t;
-#define CLOCK_REALTIME 0
-#define CLOCK_MONOTONIC 1
int
clock_gettime(clockid_t clock_id, struct timespec *sp)
{