diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-02 20:49:02 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-02 20:49:02 +0000 |
| commit | d20440ab6fae8590d7eeb0da5614b86e3eaa5228 (patch) | |
| tree | 1e7b98a621036853ad6f6b2f4e028062915a36b4 | |
| parent | a0ff5cae7c778e3c8b2b1e387c0c0163010d6c00 (diff) | |
* win32/Makefile.sub, symbian/setup (config.h): pack.c requires
SIZEOF_INT*_T now.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 9 | ||||
| -rw-r--r-- | symbian/setup | 12 | ||||
| -rw-r--r-- | version.h | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 11 |
5 files changed, 35 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Wed Mar 3 05:48:54 2010 Nobuyoshi Nakada <[email protected]> + + * win32/Makefile.sub, symbian/setup (config.h): pack.c requires + SIZEOF_INT*_T now. + Tue Mar 2 21:16:48 2010 Yusuke Endoh <[email protected]> * io.c (rb_io_lines, rb_io_bytes, rb_io_chars, rb_io_codepoints): diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 130b0f243d..24941e7150 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -299,13 +299,18 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub \#define uint64_t unsigned __int64 \#define ssize_t int !endif +\#define HAVE_INT8_T 1 \#define HAVE_UINT8_T 1 +\#define SIZEOF_INT8_T 1 \#define HAVE_INT16_T 1 \#define HAVE_UINT16_T 1 +\#define SIZEOF_INT32_T 2 \#define HAVE_INT32_T 1 \#define HAVE_UINT32_T 1 -\#define HAVE_INT64_T HAVE_LONG_LONG -\#define HAVE_UINT64_T HAVE_LONG_LONG +\#define SIZEOF_INT32_T 4 +\#define HAVE_INT64_T 1 +\#define HAVE_UINT64_T 1 +\#define SIZEOF_INT64_T 8 \#define HAVE_INTPTR_T 1 \#define HAVE_UINTPTR_T 1 \#define HAVE_SSIZE_T 1 diff --git a/symbian/setup b/symbian/setup index 04d30858af..bac03fb0f6 100644 --- a/symbian/setup +++ b/symbian/setup @@ -75,6 +75,18 @@ define config_h @echo>>$(1) #define HAVE_ST_BLOCKS 1 @echo>>$(1) #define HAVE_STRUCT_STAT_ST_RDEV 1 @echo>>$(1) #define HAVE_ST_RDEV 1 +@echo>>$(1) #define HAVE_INT8_T 1 +@echo>>$(1) #define HAVE_UINT8_T 1 +@echo>>$(1) #define SIZEOF_INT8_T 1 +@echo>>$(1) #define HAVE_INT16_T 1 +@echo>>$(1) #define HAVE_UINT16_T 1 +@echo>>$(1) #define SIZEOF_INT16_T 2 +@echo>>$(1) #define HAVE_INT32_T 1 +@echo>>$(1) #define HAVE_UINT32_T 1 +@echo>>$(1) #define SIZEOF_INT32_T 4 +@echo>>$(1) #define HAVE_INT64_T 1 +@echo>>$(1) #define HAVE_UINT64_T 1 +@echo>>$(1) #define SIZEOF_INT64_T 8 @echo>>$(1) #define HAVE_STRUCT_STAT_ST_ATIMESPEC 1 @echo>>$(1) #define HAVE_STRUCT_STAT_ST_MTIMESPEC 1 @echo>>$(1) #define HAVE_STRUCT_STAT_ST_CTIMESPEC 1 @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2010-03-02" +#define RUBY_RELEASE_DATE "2010-03-03" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 2 +#define RUBY_RELEASE_DAY 3 #include "ruby/version.h" diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 19aa5973ac..8f1d779207 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -481,21 +481,28 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define rb_uid_t int #define HAVE_STRUCT_STAT_ST_RDEV 1 #define HAVE_ST_RDEV 1 +#define HAVE_INT8_T 1 #define int8_t signed char #define HAVE_UINT8_T 1 #define uint8_t unsigned char +#define SIZEOF_INT8_T 1 #define HAVE_INT16_T 1 #define int16_t short #define HAVE_UINT16_T 1 #define uint16_t unsigned short +#define SIZEOF_INT16_T 2 #define HAVE_INT32_T 1 #define int32_t int #define HAVE_UINT32_T 1 #define uint32_t unsigned int -#define HAVE_INT64_T HAVE_LONG_LONG +#define SIZEOF_INT32_T 4 +!if $(MSC_VER) >= 1400 +#define HAVE_INT64_T 1 #define int64_t __int64 -#define HAVE_UINT64_T HAVE_LONG_LONG +#define HAVE_UINT64_T 1 #define uint64_t unsigned __int64 +#define SIZEOF_INT64_T 8 +!endif #define HAVE_INTPTR_T 1 #define HAVE_UINTPTR_T 1 #define HAVE_SSIZE_T 1 |