diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-03-29 18:50:43 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-03-29 18:50:43 +0000 |
| commit | 30c122df62ec75f9ed7f392f24c2925675bf1d06 (patch) | |
| tree | 16d473b935d3ef5b48dbae047b9fa3093c2a3f3f /compiler/HsVersions.h | |
| parent | 7c7104a51d477c18f8950112c4bc22c4800367f3 (diff) | |
| download | haskell-30c122df62ec75f9ed7f392f24c2925675bf1d06.tar.gz | |
Don't import FastString in HsVersions.h
Modules that need it import it themselves instead.
Diffstat (limited to 'compiler/HsVersions.h')
| -rw-r--r-- | compiler/HsVersions.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/compiler/HsVersions.h b/compiler/HsVersions.h index 034a9bc07c..1ba8a01022 100644 --- a/compiler/HsVersions.h +++ b/compiler/HsVersions.h @@ -60,21 +60,12 @@ name = Util.global (value); #define WARN(e,msg) if False && (e) then pprPanic "WARN" (msg) else #endif --- This conditional lets us switch off the "import FastString" --- when compiling FastString itself, or when compiling modules that --- don't use it (and would otherwise get warnings, which we treat --- as errors). Can we do this more nicely? -#if !defined(COMPILING_FAST_STRING) && !defined(FAST_STRING_NOT_NEEDED) --- -import qualified FastString as FS -#endif - #if defined(__GLASGOW_HASKELL__) -#define SLIT(x) (FS.mkLitString# (x#)) -#define FSLIT(x) (FS.mkFastString# (x#)) +#define SLIT(x) (FastString.mkLitString# (x#)) +#define FSLIT(x) (FastString.mkFastString# (x#)) #else -#define SLIT(x) (FS.mkLitString (x)) -#define FSLIT(x) (FS.mkFastString (x)) +#define SLIT(x) (FastString.mkLitString (x)) +#define FSLIT(x) (FastString.mkFastString (x)) #endif -- Useful for declaring arguments to be strict |