gcl.git - GNU Common Lisp

diff --git a/gcl/o/fasdump.c b/gcl/o/fasdump.c
index b7821dda4..c03be3d1c 100755
--- a/gcl/o/fasdump.c
+++ b/gcl/o/fasdump.c

@@ -345,14 +345,14 @@ getd(str)

#define READ_BYTE1() getc(fas_stream)

#define GET8(varx ) \

- do{unsigned long var=(unsigned long)READ_BYTE1(); \

- var |= ((unsigned long)READ_BYTE1() << SIZE_BYTE); \

- var |= ((unsigned long)READ_BYTE1() << (2*SIZE_BYTE)); \

- var |= ((unsigned long)READ_BYTE1() << (3*SIZE_BYTE)); \

- var |= ((unsigned long)READ_BYTE1() << (4*SIZE_BYTE)); \

- var |= ((unsigned long)READ_BYTE1() << (5*SIZE_BYTE)); \

- var |= ((unsigned long)READ_BYTE1() << (6*SIZE_BYTE)); \

- var |= ((unsigned long)READ_BYTE1() << (7*SIZE_BYTE)); \

+ do{unsigned long long var=READ_BYTE1(); \

+ var |= ((unsigned long long)READ_BYTE1() << SIZE_BYTE); \

+ var |= ((unsigned long long)READ_BYTE1() << (2*SIZE_BYTE)); \

+ var |= ((unsigned long long)READ_BYTE1() << (3*SIZE_BYTE)); \

+ var |= ((unsigned long long)READ_BYTE1() << (4*SIZE_BYTE)); \

+ var |= ((unsigned long long)READ_BYTE1() << (5*SIZE_BYTE)); \

+ var |= ((unsigned long long)READ_BYTE1() << (6*SIZE_BYTE)); \

+ var |= ((unsigned long long)READ_BYTE1() << (7*SIZE_BYTE)); \

DPRINTF("{8byte:varx= %ld}", var); \

varx=var;} while (0)

@@ -386,7 +386,7 @@ getd(str)

#define GETFIX(v_) Join(GET,SIZEOF_LONG)(v_)

#define PUT8(varx ) \

- do{unsigned long var= varx ; \

+ do{unsigned long long var= varx ; \

DPRINTF("{8byte:varx= %ld}", var); \

WRITE_BYTEI(var,0); \

WRITE_BYTEI(var,1); \

@@ -808,7 +808,7 @@ write_fasd(object obj)

{int l = MP(obj)->_mp_size;

int m = (l >= 0 ? l : -l);

- unsigned long *u = (unsigned long *) MP(obj)->_mp_d;

+ mp_limb_t *u = MP(obj)->_mp_d;

/* fix this */

/* if (sizeof(mp_limb_t) != 4) { FEerror("fix for gmp",0);} */

PUT4(l);

@@ -1279,7 +1279,7 @@ read_fasd1(int i, object *loc)

case DP( d_bignum:)

{int j,m;

object tem;

- unsigned long *u;

+ mp_limb_t *u;

GET4(j);

#ifdef GMP

tem = new_bignum();

@@ -1287,7 +1287,7 @@ read_fasd1(int i, object *loc)

_mpz_realloc(MP(tem),m);

MP(tem)->_mp_size = j;

j = m;

- u = (unsigned long *) MP(tem)->_mp_d;

+ u = MP(tem)->_mp_d;

#else

{ BEGIN_NO_INTERRUPT;

tem = alloc_object(t_bignum);

diff --git a/gcl/o/sfaslelf.c b/gcl/o/sfaslelf.c
index 247ebdf0d..39fa455f2 100755
--- a/gcl/o/sfaslelf.c
+++ b/gcl/o/sfaslelf.c

@@ -58,7 +58,7 @@ License for more details.

#define LOAD_SYM(sym) ({ul _b=ELF_ST_BIND(sym->st_info),_t=ELF_ST_TYPE(sym->st_info); \

sym->st_value && (_b==STB_GLOBAL || _b==STB_WEAK || (_t>=STT_LOPROC && _t<=STT_HIPROC));})

-#define MASK(n) (~(~0L << (n)))

+#define MASK(n) (~(~0ULL << (n)))

diff --git a/gcl/o/unixtime.c b/gcl/o/unixtime.c
index ff9d07d5f..0b557bb44 100755
--- a/gcl/o/unixtime.c
+++ b/gcl/o/unixtime.c

@@ -282,7 +282,7 @@ DEFUN_NEW("CURRENT-TIMEZONE",object,fScurrent_timezone,SI,0,0,NONE,IO,OO,OO,OO,(

localtime_r(&_t, &lt);

return (object)(gt.tm_hour-lt.tm_hour+24*(gt.tm_yday!=lt.tm_yday ? (gt.tm_year>lt.tm_year||gt.tm_yday>lt.tm_yday ? 1 : -1) : 0));

#else

- fixnum _t=time(0);

+ time_t _t=time(0);

return (object)(-localtime(&_t)->tm_gmtoff/3600);

#endif

}

@@ -296,7 +296,7 @@ DEFUN_NEW("CURRENT-DSTP",object,fScurrent_dstp,SI,0,0,NONE,OO,OO,OO,OO,(void),""

#elif defined NO_SYSTEM_TIME_ZONE /*solaris*/

return Cnil;

#else

- fixnum _t=time(0);

+ time_t _t=time(0);

return localtime(&_t)->tm_isdst > 0 ? Ct : Cnil;

#endif

}