projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-08-13 13:57:04 by simonmar]
[ghc-hetmet.git]
/
ghc
/
includes
/
RtsTypes.h
diff --git
a/ghc/includes/RtsTypes.h
b/ghc/includes/RtsTypes.h
index
90741af
..
e03ca1e
100644
(file)
--- a/
ghc/includes/RtsTypes.h
+++ b/
ghc/includes/RtsTypes.h
@@
-17,7
+17,13
@@
typedef unsigned long nat; /* at least 32 bits (like int) */
typedef unsigned int nat; /* at least 32 bits (like int) */
#endif
typedef unsigned long lnat; /* at least 32 bits */
typedef unsigned int nat; /* at least 32 bits (like int) */
#endif
typedef unsigned long lnat; /* at least 32 bits */
+#ifndef _MSC_VER
typedef unsigned long long ullong; /* at least 32 bits */
typedef unsigned long long ullong; /* at least 32 bits */
+typedef long long llong;
+#else
+typedef unsigned __int64 ullong; /* at least 32 bits */
+typedef __int64 llong;
+#endif
/* ullong (64|128-bit) type: only include if needed (not ANSI) */
#if defined(__GNUC__)
/* ullong (64|128-bit) type: only include if needed (not ANSI) */
#if defined(__GNUC__)