diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 3 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 8 |
4 files changed, 19 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sun Jul 13 05:37:50 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * include/ruby/ruby.h (PRI_PTRDIFF_PREFIX, PRI_SIZE_PREFIX): typo. + + * {bcc32,win32}/Makefile.sub: (SIZEOF_SIZE_T, SIZEOF_PTRDIFF_T): added. + Sat Jul 12 23:54:55 2008 NAKAMURA Usaku <usa@ruby-lang.org> * win32/Makefile.sub (LIBRUBY_DLDFLAGS): import library which created diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index fe848452e8..b169aea1d1 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -269,6 +269,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub \#define SIZEOF_FLOAT 4 \#define SIZEOF_DOUBLE 8 \#define SIZEOF_TIME_T 4 +\#define SIZEOF_RLIM_T 0 +\#define SIZEOF_SIZE_T 4 +\#define SIZEOF_PTRDIFF_T 4 \#define HAVE_PROTOTYPES 1 \#define TOKEN_PASTE(x,y) x\#\#y \#define HAVE_STDARG_PROTOTYPES 1 diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index b297231ea4..eb3d282917 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -109,7 +109,7 @@ typedef unsigned LONG_LONG ID; # define PRI_PTRDIFF_PREFIX #elif SIZEOF_PTRDIFF_T == SIZEOF_LONG # define PRI_PTRDIFF_PREFIX "l" -#elif SIZEOF_PTRDIFF_T == SIZEOF_LONG +#elif SIZEOF_PTRDIFF_T == SIZEOF_LONG_LONG # define PRI_PTRDIFF_PREFIX "ll" #endif #define PRIdPTRDIFF PRI_PTRDIFF_PREFIX"d" @@ -123,7 +123,7 @@ typedef unsigned LONG_LONG ID; # define PRI_SIZE_PREFIX #elif SIZEOF_SIZE_T == SIZEOF_LONG # define PRI_SIZE_PREFIX "l" -#elif SIZEOF_SIZE_T == SIZEOF_LONG +#elif SIZEOF_SIZE_T == SIZEOF_LONG_LONG # define PRI_SIZE_PREFIX "ll" #endif #define PRIdSIZE PRI_SIZE_PREFIX"d" diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 0dadb0ccb4..513b70c4af 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -342,6 +342,14 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub !else #define SIZEOF_TIME_T 4 !endif +#define SIZEOF_RLIM_T 0 +!if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" +#define SIZEOF_SIZE_T 8 +#define SIZEOF_PTRDIFF_T 8 +!else +#define SIZEOF_SIZE_T 4 +#define SIZEOF_PTRDIFF_T 4 +!endif #define HAVE_PROTOTYPES 1 #define TOKEN_PASTE(x,y) x##y #define HAVE_STDARG_PROTOTYPES 1 |