diff options
Diffstat (limited to 'lang/scm/files/patch-scmfig.h')
| -rw-r--r-- | lang/scm/files/patch-scmfig.h | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/lang/scm/files/patch-scmfig.h b/lang/scm/files/patch-scmfig.h index 5c0cd0613feb..66a080b90f5c 100644 --- a/lang/scm/files/patch-scmfig.h +++ b/lang/scm/files/patch-scmfig.h @@ -1,7 +1,6 @@ ---- scmfig.h -+++ scmfig.h -@@ -256,11 +256,7 @@ - #ifdef __alpha +--- scmfig.h 2013-04-06 22:23:52.000000000 -0400 ++++ scmfig.h 2018-11-18 13:05:53.787326000 -0500 +@@ -257,9 +257,5 @@ # define SHORT_INT #endif -#ifdef __ia64__ @@ -9,17 +8,14 @@ -# define CDR_DOUBLES -#endif -#ifdef __x86_64 -+#if defined(__amd64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__) || defined(__sparc64__) ++#if defined(__amd64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__) || defined(__sparc64__) || defined(__arch64__) # define SHORT_INT # define CDR_DOUBLES - #endif -@@ -393,14 +389,6 @@ - # define WHITE_SPACES ' ':case '\t':case '\r':case '\f' +@@ -394,13 +390,5 @@ #endif -#ifdef __ia64__ -# define PTR2INT(x) ((long)(x)) -+#define PTR2INT(x) ((intptr_t)(x)) -#else -# ifdef __x86_64 -# define PTR2INT(x) ((long)(x)) @@ -27,9 +23,17 @@ -# define PTR2INT(x) ((int)(x)) -# endif -#endif ++#define PTR2INT(x) ((intptr_t)(x)) #ifndef __builtin_expect -@@ -824,5 +816,5 @@ +@@ -538,5 +526,5 @@ + # define MAKINUM(x) ((((x)<<1)<<1)+2L) + #else +-# define MAKINUM(x) (((x)<<2)+2L) ++# define MAKINUM(x) ((((unsigned long)(x))<<2)+2L) + #endif + +@@ -824,5 +812,5 @@ # ifdef ARM_ULIB extern volatile int errno; -# else |