From: sof Date: Tue, 14 Mar 2000 01:54:06 +0000 (+0000) Subject: [project @ 2000-03-14 01:54:06 by sof] X-Git-Tag: Approximately_9120_patches~4991 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=5ab9090d94844dd5ca8fe267c2b67a093d0db563;p=ghc-hetmet.git [project @ 2000-03-14 01:54:06 by sof] Simplified prog_* externs a little --- diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h index cf0f6f5..6fba25c 100644 --- a/ghc/includes/Stg.h +++ b/ghc/includes/Stg.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Stg.h,v 1.23 2000/03/13 10:53:55 simonmar Exp $ + * $Id: Stg.h,v 1.24 2000/03/14 01:54:06 sof Exp $ * * (c) The GHC Team, 1998-1999 * @@ -177,13 +177,8 @@ void _stgAssert (char *, unsigned int); #include "Hooks.h" /* Misc stuff without a home */ -#if defined(ENABLE_WIN32_DLL_SUPPOT) && !defined(COMPILING_RTS) -extern DLLIMPORT char **prog_argv; /* so we can get at these from Haskell */ -extern DLLIMPORT int prog_argc; -#else -extern char **prog_argv; /* so we can get at these from Haskell */ -extern int prog_argc; -#endif +DLL_IMPORT_RTS extern char **prog_argv; /* so we can get at these from Haskell */ +DLL_IMPORT_RTS extern int prog_argc; extern char **environ;