[project @ 2004-08-13 13:29:00 by simonmar]

Changes required be merge of backend-hacking-branch.  Mostly config.h
==> ghcconfig.h.

diff --git a/Debug/Trace.hs b/Debug/Trace.hs
index d0c0341..8b85f62 100644 (file)
--- a/Debug/Trace.hs
+++ b/Debug/Trace.hs
@@ -13,7 +13,7 @@
 -----------------------------------------------------------------------------
 
 #ifdef __GLASGOW_HASKELL__
-#include "config.h"
+#include "ghcconfig.h"
 #endif
 
 module Debug.Trace (

diff --git a/Foreign/C/Error.hs b/Foreign/C/Error.hs
index 7cf294c..927924c 100644 (file)
--- a/Foreign/C/Error.hs
+++ b/Foreign/C/Error.hs
@@ -91,7 +91,7 @@ module Foreign.C.Error (
 -- calculated for us
 --
 #ifndef __NHC__
-#include "config.h"
+#include "ghcconfig.h"
 #endif
 
 -- system dependent imports

diff --git a/Foreign/Storable.hs b/Foreign/Storable.hs
index 3b2823e..9794586 100644 (file)
--- a/Foreign/Storable.hs
+++ b/Foreign/Storable.hs
@@ -37,7 +37,7 @@ import NHC.FFI (Storable(..),Ptr,FunPtr,StablePtr
 import Control.Monad           ( liftM )
 
 #include "MachDeps.h"
-#include "config.h"
+#include "ghcconfig.h"
 
 #ifdef __GLASGOW_HASKELL__
 import GHC.Storable

diff --git a/GHC/Conc.lhs b/GHC/Conc.lhs
index 8965188..2abc28e 100644 (file)
--- a/GHC/Conc.lhs
+++ b/GHC/Conc.lhs
@@ -14,7 +14,7 @@
 -- 
 -----------------------------------------------------------------------------
 
-#include "config.h"
+#include "ghcconfig.h"
 module GHC.Conc
        ( ThreadId(..)
 

diff --git a/GHC/Handle.hs b/GHC/Handle.hs
index 25d8e78..901a4ae 100644 (file)
--- a/GHC/Handle.hs
+++ b/GHC/Handle.hs
@@ -51,7 +51,7 @@ module GHC.Handle (
 
  ) where
 
-#include "config.h"
+#include "ghcconfig.h"
 
 import Control.Monad
 import Data.Bits

diff --git a/GHC/IO.hs b/GHC/IO.hs
index b58c8cd..29fdc60 100644 (file)
--- a/GHC/IO.hs
+++ b/GHC/IO.hs
@@ -27,7 +27,7 @@ module GHC.IO (
    memcpy_baoff_ptr,
  ) where
 
-#include "config.h"
+#include "ghcconfig.h"
 
 import Foreign
 import Foreign.C

diff --git a/GHC/Unicode.hs b/GHC/Unicode.hs
index 2d836a2..a98ce24 100644 (file)
--- a/GHC/Unicode.hs
+++ b/GHC/Unicode.hs
@@ -30,7 +30,7 @@ import GHC.Int
 import GHC.Word
 import GHC.Num  (fromInteger)
 
-#include "config.h"
+#include "ghcconfig.h"
 
 -- | Selects the first 128 characters of the Unicode character set,
 -- corresponding to the ASCII character set.

diff --git a/System/Cmd.hs b/System/Cmd.hs
index 978c7a0..5838f85 100644 (file)
--- a/System/Cmd.hs
+++ b/System/Cmd.hs
@@ -26,7 +26,7 @@ import Foreign
 import Foreign.C
 import System.Exit
 import GHC.IOBase
-#include "config.h"
+#include "ghcconfig.h"
 #endif
 
 #ifdef __HUGS__

diff --git a/System/Environment.hs b/System/Environment.hs
index 245a9db..bd285e5 100644 (file)
--- a/System/Environment.hs
+++ b/System/Environment.hs
@@ -31,7 +31,7 @@ import Foreign.C
 import Control.Exception       ( bracket )
 import Control.Monad
 import GHC.IOBase
-#include "config.h"
+#include "ghcconfig.h"
 #endif
 
 #ifdef __HUGS__

diff --git a/System/Posix/Internals.hs b/System/Posix/Internals.hs
index b1fe4f7..e21a01c 100644 (file)
--- a/System/Posix/Internals.hs
+++ b/System/Posix/Internals.hs
@@ -21,7 +21,7 @@
 -- #hide
 module System.Posix.Internals where
 
-#include "config.h"
+#include "ghcconfig.h"
 
 import Control.Monad
 import System.Posix.Types

diff --git a/System/Posix/Signals.hsc b/System/Posix/Signals.hsc
index 5168aeb..7369f69 100644 (file)
--- a/System/Posix/Signals.hsc
+++ b/System/Posix/Signals.hsc
@@ -12,7 +12,7 @@
 --
 -----------------------------------------------------------------------------
 
-#include "config.h"
+#include "ghcconfig.h"
 
 module System.Posix.Signals (
 #ifndef mingw32_TARGET_OS

diff --git a/System/Posix/Types.hs b/System/Posix/Types.hs
index 7acb364..f87614f 100644 (file)
--- a/System/Posix/Types.hs
+++ b/System/Posix/Types.hs
@@ -14,7 +14,7 @@
 --
 -----------------------------------------------------------------------------
 
-#include "config.h"
+#include "ghcconfig.h"
 
 module System.Posix.Types (
 

diff --git a/Text/Regex.hs b/Text/Regex.hs
index 94c5c58..7957151 100644 (file)
--- a/Text/Regex.hs
+++ b/Text/Regex.hs
@@ -13,7 +13,7 @@
 -- interface in "Text.Regex.Posix".
 --
 -----------------------------------------------------------------------------
-#include "config.h"
+#include "ghcconfig.h"
 module Text.Regex (
     -- * Regular expressions
     Regex,

diff --git a/Text/Regex/Posix.hsc b/Text/Regex/Posix.hsc
index 8cda010..6664165 100644 (file)
--- a/Text/Regex/Posix.hsc
+++ b/Text/Regex/Posix.hsc
@@ -13,7 +13,7 @@
 -----------------------------------------------------------------------------
 
 -- ToDo: should have an interface using PackedStrings.
-#include "config.h"
+#include "ghcconfig.h"
 
 module Text.Regex.Posix (
        -- * The @Regex@ type

diff --git a/cbits/consUtils.c b/cbits/consUtils.c
index 3514d63..63665d0 100644 (file)
--- a/cbits/consUtils.c
+++ b/cbits/consUtils.c
@@ -3,7 +3,7 @@
  *
  * Win32 Console API support
  */
-#include "config.h"
+#include "ghcconfig.h"
 #if defined(mingw32_TARGET_OS) || defined(cygwin32_TARGET_OS) || defined(__MINGW32__) || defined(_MSC_VER)
 /* to the end */
 

diff --git a/cbits/dirUtils.c b/cbits/dirUtils.c
index 0e76972..08ea54e 100644 (file)
--- a/cbits/dirUtils.c
+++ b/cbits/dirUtils.c
@@ -4,7 +4,7 @@
  * Directory Runtime Support
  */
 
-#include "config.h"
+#include "ghcconfig.h"
 
 // The following is required on Solaris to force the POSIX versions of
 // the various _r functions instead of the Solaris versions.

diff --git a/cbits/rawSystem.c b/cbits/rawSystem.c
index 846ceee..62d2efd 100644 (file)
--- a/cbits/rawSystem.c
+++ b/cbits/rawSystem.c
@@ -7,7 +7,7 @@
 /* The itimer stuff in this module is non-posix */
 /* #include "PosixSource.h" */
 
-#include "config.h"
+#include "ghcconfig.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/include/HsBase.h b/include/HsBase.h
index 1bcce33..b291451 100644 (file)
--- a/include/HsBase.h
+++ b/include/HsBase.h
@@ -9,7 +9,7 @@
 #ifndef __HSBASE_H__
 #define __HSBASE_H__
 
-#include "config.h"
+#include "ghcconfig.h"
 #include "HsFFI.h"
 
 #include <stdio.h>

diff --git a/package.conf.in b/package.conf.in
index bce6524..99fac4c 100644 (file)
--- a/package.conf.in
+++ b/package.conf.in
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "ghcconfig.h"
 
 Package {
         name           = "base",