From: simonmar <unknown>
Date: Mon, 8 May 2000 15:05:36 +0000 (+0000)
Subject: [project @ 2000-05-08 15:05:36 by simonmar]
X-Git-Tag: Approximately_9120_patches~4559
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=e164329d3f453f4959a5a0a900b6f8a10003a3a1;p=ghc-hetmet.git

[project @ 2000-05-08 15:05:36 by simonmar]
change a bunch of externs into statics.  This fixes a long-standing
bug and should eliminate the annoying "<blah> was declared extern and
later static" warnings from gcc.
---

diff --git a/ghc/includes/StgMacros.h b/ghc/includes/StgMacros.h
index fb074e8..b58ff2b 100644
--- a/ghc/includes/StgMacros.h
+++ b/ghc/includes/StgMacros.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgMacros.h,v 1.24 2000/03/17 13:30:23 simonmar Exp $
+ * $Id: StgMacros.h,v 1.25 2000/05/08 15:05:36 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -50,17 +50,17 @@
 #define ED_		extern
 #define EDD_		extern DLLIMPORT 
 #define ED_RO_		extern const
-#define ID_		extern
-#define ID_RO_		extern const
+#define ID_		static
+#define ID_RO_		static const
 #define EI_             extern INFO_TBL_CONST StgInfoTable
 #define EDI_            extern DLLIMPORT INFO_TBL_CONST StgInfoTable
-#define II_             extern INFO_TBL_CONST StgInfoTable
+#define II_             static INFO_TBL_CONST StgInfoTable
 #define EC_		extern StgClosure
 #define EDC_		extern DLLIMPORT StgClosure
-#define IC_		extern StgClosure
+#define IC_		static StgClosure
 #define ECP_(x)		extern const StgClosure *(x)[]
 #define EDCP_(x)	extern DLLIMPORT StgClosure *(x)[]
-#define ICP_(x)		extern const StgClosure *(x)[]
+#define ICP_(x)		static const StgClosure *(x)[]
 
 /* -----------------------------------------------------------------------------
    Stack Tagging.