X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStgMacros.h;h=8aabf2ee55e204af960dd403fe09480f3016497e;hb=b2d633b6251dec6704cfeccbd8638716cf5202f0;hp=86d99da5ef46ec65d6a1db7c49c4d18a0a76c255;hpb=9a972425548b14c2267e4a82fa1525314ebd7b06;p=ghc-hetmet.git

diff --git a/ghc/includes/StgMacros.h b/ghc/includes/StgMacros.h
index 86d99da..8aabf2e 100644
--- a/ghc/includes/StgMacros.h
+++ b/ghc/includes/StgMacros.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgMacros.h,v 1.47 2002/07/16 14:56:08 simonmar Exp $
+ * $Id: StgMacros.h,v 1.49 2002/10/12 23:19:54 wolfgang Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -148,7 +148,7 @@ static inline int IS_ARG_TAG( StgWord p ) { return p <= ARGTAG_MAX; }
 
 #define HP_STK_CHK(stk_headroom,hp_headroom,ret,r,layout,tag_assts) \
         DO_GRAN_ALLOCATE(hp_headroom)                              \
-	if (Sp - stk_headroom < SpLim || (Hp += hp_headroom) > HpLim) {	\
+	if ((Hp += hp_headroom) > HpLim || Sp - stk_headroom < SpLim) {	\
             HpAlloc = (hp_headroom);				\
 	    tag_assts						\
 	    (r) = (P_)ret;	                               	\
@@ -198,7 +198,7 @@ static inline int IS_ARG_TAG( StgWord p ) { return p <= ARGTAG_MAX; }
 
 #define HP_STK_CHK_NP(stk_headroom, hp_headroom, ptrs, tag_assts) \
         DO_GRAN_ALLOCATE(hp_headroom)                              \
-	if ((Sp - (stk_headroom)) < SpLim || (Hp += (hp_headroom)) > HpLim) { \
+	if ((Hp += (hp_headroom)) > HpLim || (Sp - (stk_headroom)) < SpLim) { \
             HpAlloc = (hp_headroom);				\
             tag_assts						\
 	    JMP_(stg_gc_enter_##ptrs);			   	\
@@ -680,7 +680,7 @@ extern DLL_IMPORT_RTS const StgPolyInfoTable stg_seq_frame_info;
    -------------------------------------------------------------------------- */
 
 #if defined(USE_SPLIT_MARKERS)
-#if defined(cygwin32_TARGET_OS) || defined(mingw32_TARGET_OS)
+#if defined(LEADING_UNDERSCORE)
 #define __STG_SPLIT_MARKER __asm__("\n___stg_split_marker:");
 #else
 #define __STG_SPLIT_MARKER __asm__("\n__stg_split_marker:");