diff options
| author | Isaac Dupree <id@isaac.cedarswampstudios.org> | 2008-01-17 01:13:12 +0000 |
|---|---|---|
| committer | Isaac Dupree <id@isaac.cedarswampstudios.org> | 2008-01-17 01:13:12 +0000 |
| commit | 206b4dec78250efef3cd927d64dc6cbc54a16c3d (patch) | |
| tree | 5c922e32a60500a0935e4bf378bb0bdd7819fef0 /compiler/HsVersions.h | |
| parent | 1286da96dc65faa5992a8a34c5b3bf29dfe2be04 (diff) | |
| download | haskell-206b4dec78250efef3cd927d64dc6cbc54a16c3d.tar.gz | |
lots of portability changes (#1405)
re-recording to avoid new conflicts was too hard, so I just put it
all in one big patch :-( (besides, some of the changes depended on
each other.) Here are what the component patches were:
Fri Dec 28 11:02:55 EST 2007 Isaac Dupree <id@isaac.cedarswampstudios.org>
* document BreakArray better
Fri Dec 28 11:39:22 EST 2007 Isaac Dupree <id@isaac.cedarswampstudios.org>
* properly ifdef BreakArray for GHCI
Fri Jan 4 13:50:41 EST 2008 Isaac Dupree <id@isaac.cedarswampstudios.org>
* change ifs on __GLASGOW_HASKELL__ to account for... (#1405)
for it not being defined. I assume it being undefined implies
a compiler with relatively modern libraries but without most
unportable glasgow extensions.
Fri Jan 4 14:21:21 EST 2008 Isaac Dupree <id@isaac.cedarswampstudios.org>
* MyEither-->EitherString to allow Haskell98 instance
Fri Jan 4 16:13:29 EST 2008 Isaac Dupree <id@isaac.cedarswampstudios.org>
* re-portabilize Pretty, and corresponding changes
Fri Jan 4 17:19:55 EST 2008 Isaac Dupree <id@isaac.cedarswampstudios.org>
* Augment FastTypes to be much more complete
Fri Jan 4 20:14:19 EST 2008 Isaac Dupree <id@isaac.cedarswampstudios.org>
* use FastFunctions, cleanup FastString slightly
Fri Jan 4 21:00:22 EST 2008 Isaac Dupree <id@isaac.cedarswampstudios.org>
* Massive de-"#", mostly Int# --> FastInt (#1405)
Fri Jan 4 21:02:49 EST 2008 Isaac Dupree <id@isaac.cedarswampstudios.org>
* miscellaneous unnecessary-extension-removal
Sat Jan 5 19:30:13 EST 2008 Isaac Dupree <id@isaac.cedarswampstudios.org>
* add FastFunctions
Diffstat (limited to 'compiler/HsVersions.h')
| -rw-r--r-- | compiler/HsVersions.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/compiler/HsVersions.h b/compiler/HsVersions.h index add588d8b8..dcab3c189a 100644 --- a/compiler/HsVersions.h +++ b/compiler/HsVersions.h @@ -22,13 +22,15 @@ you will screw up the layout where they are used in case expressions! * settings for the target plat instead). */ #include "../includes/ghcautoconf.h" -#if __GLASGOW_HASKELL__ >= 602 +#if !defined(__GLASGOW_HASKELL__) || __GLASGOW_HASKELL__ >= 602 #define SYSTEM_IO_ERROR System.IO.Error #else #define SYSTEM_IO_ERROR System.IO #endif -#ifdef __GLASGOW_HASKELL__ +/* Global variables may not work in other Haskell implementations, + * but we need them currently! so the conditional on GLASGOW won't do. */ +#if defined(__GLASGOW_HASKELL__) || !defined(__GLASGOW_HASKELL__) #define GLOBAL_VAR(name,value,ty) \ name = Util.global (value) :: IORef (ty); \ {-# NOINLINE name #-} @@ -64,8 +66,13 @@ name = Util.global (value) :: IORef (ty); \ import qualified FastString as FS #endif +#if defined(__GLASGOW_HASKELL__) #define SLIT(x) (FS.mkLitString# (x#)) #define FSLIT(x) (FS.mkFastString# (x#)) +#else +#define SLIT(x) (FS.mkLitString (x)) +#define FSLIT(x) (FS.mkFastString (x)) +#endif -- Useful for declaring arguments to be strict #define STRICT1(f) f a | a `seq` False = undefined |