* include/ruby/ruby.h (PRI_PTRDIFF_PREFIX): must define as string.
if not, cause compile error in using PRI?VALUE. * win32/Makefile.sub (config.h): add SIZEOF_INTPTR_T and SIZEOF_UINTPTR_T for SIZEOF_VALUE. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21590 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
0be716237d
commit
f1e87dd9ac
@ -1,3 +1,11 @@
|
|||||||
|
Fri Jan 16 12:15:07 2009 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||||
|
|
||||||
|
* include/ruby/ruby.h (PRI_PTRDIFF_PREFIX): must define as string.
|
||||||
|
if not, cause compile error in using PRI?VALUE.
|
||||||
|
|
||||||
|
* win32/Makefile.sub (config.h): add SIZEOF_INTPTR_T and
|
||||||
|
SIZEOF_UINTPTR_T for SIZEOF_VALUE.
|
||||||
|
|
||||||
Fri Jan 16 11:51:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Fri Jan 16 11:51:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* symbian/pre-build (COMSPEC): should not overridden.
|
* symbian/pre-build (COMSPEC): should not overridden.
|
||||||
|
@ -85,7 +85,7 @@ typedef uintptr_t VALUE;
|
|||||||
typedef uintptr_t ID;
|
typedef uintptr_t ID;
|
||||||
# define SIGNED_VALUE intptr_t
|
# define SIGNED_VALUE intptr_t
|
||||||
# define SIZEOF_VALUE SIZEOF_UINTPTR_T
|
# define SIZEOF_VALUE SIZEOF_UINTPTR_T
|
||||||
# undef PRI_VALUE_PREFIX
|
# define PRI_VALUE_PREFIX ""
|
||||||
#elif SIZEOF_LONG == SIZEOF_VOIDP
|
#elif SIZEOF_LONG == SIZEOF_VOIDP
|
||||||
typedef unsigned long VALUE;
|
typedef unsigned long VALUE;
|
||||||
typedef unsigned long ID;
|
typedef unsigned long ID;
|
||||||
|
@ -358,9 +358,13 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
|
|||||||
!if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64"
|
!if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64"
|
||||||
#define SIZEOF_SIZE_T 8
|
#define SIZEOF_SIZE_T 8
|
||||||
#define SIZEOF_PTRDIFF_T 8
|
#define SIZEOF_PTRDIFF_T 8
|
||||||
|
#define SIZEOF_INTPTR_T 8
|
||||||
|
#define SIZEOF_UINTPTR_T 8
|
||||||
!else
|
!else
|
||||||
#define SIZEOF_SIZE_T 4
|
#define SIZEOF_SIZE_T 4
|
||||||
#define SIZEOF_PTRDIFF_T 4
|
#define SIZEOF_PTRDIFF_T 4
|
||||||
|
#define SIZEOF_INTPTR_T 4
|
||||||
|
#define SIZEOF_UINTPTR_T 4
|
||||||
!endif
|
!endif
|
||||||
!if $(MSC_VER) < 1400
|
!if $(MSC_VER) < 1400
|
||||||
#define SIZE_MAX UINT_MAX
|
#define SIZE_MAX UINT_MAX
|
||||||
|
Loading…
x
Reference in New Issue
Block a user