X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FHsVersions.h;h=add588d8b82a5daa2e06fa69699a33b4d96925d2;hb=047864943968324c12c9252c69f32672bec241cb;hp=464bf820297d5b74ba15697b8b159aff9ddca20c;hpb=d068f78b3ae99da8976e0836739cde6213c40041;p=ghc-hetmet.git

diff --git a/compiler/HsVersions.h b/compiler/HsVersions.h
index 464bf82..add588d 100644
--- a/compiler/HsVersions.h
+++ b/compiler/HsVersions.h
@@ -55,9 +55,11 @@ name = Util.global (value) :: IORef (ty); \
 #define WARN(e,msg)    if False && (e) then pprPanic "WARN" (msg) else
 #endif
 
--- This #ifndef lets us switch off the "import FastString"
--- when compiling FastString itself
-#ifndef COMPILING_FAST_STRING
+-- 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