Skip to content

Commit

Permalink
* win32/Makefile.sub, symbian/setup (config.h): pack.c requires
Browse files Browse the repository at this point in the history
  SIZEOF_INT*_T now.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Mar 2, 2010
1 parent a0ff5ca commit d20440a
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 6 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
9 changes: 7 additions & 2 deletions bcc32/Makefile.sub
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions symbian/setup
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions version.h
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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"

Expand Down
11 changes: 9 additions & 2 deletions win32/Makefile.sub
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d20440a

Please sign in to comment.