diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-10 19:47:46 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-10 19:47:46 +0000 |
| commit | eeac761f609aa982cd30aa57b4a137e5a9f0fb84 (patch) | |
| tree | 70dd561928dcda22029cc20d0ea511743ac9e9c6 /win32 | |
| parent | 0925178256d8c9856a4a91da609eb6a3ab2ac255 (diff) | |
| download | ruby-eeac761f609aa982cd30aa57b4a137e5a9f0fb84.tar.gz ruby-eeac761f609aa982cd30aa57b4a137e5a9f0fb84.tar.xz ruby-eeac761f609aa982cd30aa57b4a137e5a9f0fb84.zip | |
* time.c (time_to_i, time_hash): time_t may be bigger than long
and int.
* time.c (time_timeval, rb_time_timeval, obj2nsec, time_strftime),
(time_mdump, time_mload): suppress warnings.
* win32/Makefile.sub (config.h): added TIMET2NUM and NUM2TIMET.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index de4eb7c80..f6b757d50 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -393,8 +393,12 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define SIZEOF_DOUBLE 8 !if $(MSC_VER) >= 1400 #define SIZEOF_TIME_T 8 +#define TIMET2NUM(v) LL2NUM(v) +#define NUM2TIMET(v) NUM2LL(v) !else #define SIZEOF_TIME_T 4 +#define TIMET2NUM(v) LONG2NUM(v) +#define NUM2TIMET(v) NUM2LONG(v) !endif #define SIZEOF_RLIM_T 0 !if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" @@ -460,6 +464,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub !endif #define GETGROUPS_T int #define RETSIGTYPE void +#define TYPEOF_TIMEVAL_TV_SEC long #define HAVE_ALLOCA 1 #define HAVE_DUP2 1 #define HAVE_MEMCMP 1 |