[project @ 1998-08-16 17:43:27 by sof]

Protect long long bits with HAVE_LONG_LONG

diff --git a/ghc/includes/StgMacros.lh b/ghc/includes/StgMacros.lh
index 2dbca45..d498a01 100644 (file)
--- a/ghc/includes/StgMacros.lh
+++ b/ghc/includes/StgMacros.lh
@@ -1221,6 +1221,7 @@ PK_FLT(W_ p_src[])
 
 #endif /* not __m68k__ */
 
+#if HAVE_LONG_LONG
 extern STG_INLINE
 void
 ASSIGN_Word64(W_ p_dest[], StgWord64 src)
@@ -1260,6 +1261,7 @@ PK_Int64(W_ p_src[])
     y.iu.dlo = p_src[1];
     return(y.i);
 }
+#endif
 
 \end{code}
 

diff --git a/ghc/includes/StgTypes.lh b/ghc/includes/StgTypes.lh
index 553cd46..824f56d 100644 (file)
--- a/ghc/includes/StgTypes.lh
+++ b/ghc/includes/StgTypes.lh
@@ -247,6 +247,14 @@ typedef union __dt
     unpacked_double du;
   } double_thing;
 
+typedef StgWord unpacked_float;
+
+typedef union __ft
+  { StgFloat f;
+    unpacked_float fu;
+  } float_thing;
+
+#if HAVE_LONG_LONG
 typedef union __it
   { StgInt64 i;
     unpacked_double iu;
@@ -256,13 +264,7 @@ typedef union __wt
   { StgWord64 w;
     unpacked_double wu;
   } word64_thing;
-
-typedef StgWord unpacked_float;
-
-typedef union __ft
-  { StgFloat f;
-    unpacked_float fu;
-  } float_thing;
+#endif
 
 \end{code}