diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-19 04:29:41 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-19 04:29:41 +0000 |
commit | 5a096eddb34fcff83c5662925e5440c410409af0 (patch) | |
tree | dbe5e6a9e5d0c264ad258735b1ef1b86310bb3bb | |
parent | a3b4296369a2456c6ec95820b87bb686d50bf64e (diff) | |
download | ruby-5a096eddb34fcff83c5662925e5440c410409af0.tar.gz |
* include/ruby/win32.h (CLOCK_MONOTONIC): typo.
* win32/win32.c: removed duplicated declarations.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42617 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | include/ruby/win32.h | 2 | ||||
-rw-r--r-- | win32/win32.c | 3 |
3 files changed, 7 insertions, 4 deletions
@@ -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) { |