From: daan Date: Thu, 15 Jun 2000 13:16:16 +0000 (+0000) Subject: [project @ 2000-06-15 13:16:16 by daan] X-Git-Tag: Approximately_9120_patches~4191 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=d188050a70f6592eff40b5361883fabf135a2250;p=ghc-hetmet.git [project @ 2000-06-15 13:16:16 by daan] Added definition of int64 to make it compilable with both gcc and VisualC++ --- diff --git a/ghc/includes/RtsAPI.h b/ghc/includes/RtsAPI.h index b6fd0f1..1eb0d27 100644 --- a/ghc/includes/RtsAPI.h +++ b/ghc/includes/RtsAPI.h @@ -1,5 +1,5 @@ /* ---------------------------------------------------------------------------- - * $Id: RtsAPI.h,v 1.13 2000/04/26 09:29:37 simonmar Exp $ + * $Id: RtsAPI.h,v 1.14 2000/06/15 13:16:16 daan Exp $ * * (c) The GHC Team, 1998-1999 * @@ -10,6 +10,18 @@ #ifndef RTSAPI_H #define RTSAPI_H +/* Make this compilable with Visual C++ */ +#ifndef HAVE_INT64 +#define HAVE_INT64 +#ifdef _MSC_VER +typedef __int64 int64; +typedef unsigned __int64 nat64; +#else +typedef long long int64; +typedef unsigned long long nat64; +#endif +#endif + /* * Running the scheduler */ @@ -40,12 +52,12 @@ HaskellObj rts_mkInt ( int i ); HaskellObj rts_mkInt8 ( int i ); HaskellObj rts_mkInt16 ( int i ); HaskellObj rts_mkInt32 ( int i ); -HaskellObj rts_mkInt64 ( long long i ); +HaskellObj rts_mkInt64 ( int64 i ); HaskellObj rts_mkWord ( unsigned int w ); HaskellObj rts_mkWord8 ( unsigned int w ); HaskellObj rts_mkWord16 ( unsigned int w ); HaskellObj rts_mkWord32 ( unsigned int w ); -HaskellObj rts_mkWord64 ( unsigned long long w ); +HaskellObj rts_mkWord64 ( nat64 w ); HaskellObj rts_mkFloat ( float f ); HaskellObj rts_mkDouble ( double f ); HaskellObj rts_mkStablePtr ( StgStablePtr s );