diff options
| author | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 2000-03-12 16:10:02 +0000 |
|---|---|---|
| committer | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 2000-03-12 16:10:02 +0000 |
| commit | 7a58e59f51cb1ee770e4395d661427dc4afc462e (patch) | |
| tree | df0ce548221e24dae461e2c11a5fc46a11f96207 /libguile/numbers.h | |
| parent | 8dee1541be0a2af272520b245f1ede7dc2051613 (diff) | |
| download | guile-7a58e59f51cb1ee770e4395d661427dc4afc462e.tar.gz | |
* numbers.h (SCM_SRS, SCM_INUM): Corrected SCM_ASSCM/ASWORD fixes.
Diffstat (limited to 'libguile/numbers.h')
| -rw-r--r-- | libguile/numbers.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libguile/numbers.h b/libguile/numbers.h index 38b25ca8b..b1077dc43 100644 --- a/libguile/numbers.h +++ b/libguile/numbers.h @@ -2,7 +2,7 @@ #ifndef NUMBERSH #define NUMBERSH -/* Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1998, 2000 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -83,15 +83,16 @@ * It is believed to be fixed in Turbo C++ v1.01 */ #if (-1==(((-1)<<2)+2)>>2) && (__TURBOC__ != 0x295) -# define SCM_SRS(x, y) (SCM_ASWORD (x)>>y) +# define SCM_SRS(x, y) ((x) >> y) # ifdef __TURBOC__ -# define SCM_INUM(x) ((SCM_ASWORD(x) >>1) >>1) +# define SCM_INUM(x) ((SCM_ASWORD (x) >>1) >>1) # else -# define SCM_INUM(x) SCM_SRS(x, 2) +# define SCM_INUM(x) SCM_SRS (SCM_ASWORD (x), 2) # endif /* def __TURBOC__ */ #else -# define SCM_SRS(x, y) ((SCM_ASWORD(x) < 0) ? ~( (~SCM_ASWORD(x)) >>y) : (SCM_ASWORD (x)>>y)) -# define SCM_INUM(x) SCM_SRS(x, 2) +# define SCM_SRS(x, y)\ + ((SCM_ASWORD (x) < 0) ? ~( (~SCM_ASWORD (x)) >> y) : (SCM_ASWORD (x) >> y)) +# define SCM_INUM(x) SCM_SRS (SCM_ASWORD (x), 2) #endif /* (-1==(((-1)<<2)+2)>>2) && (__TURBOC__ != 0x295) */ |