diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-03-15 16:38:39 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-03-15 17:05:16 +0000 |
| commit | 0268a23c34417849ec05603254311f979af97c41 (patch) | |
| tree | 8269f7835e950348706d88d7ecb3e3939ab1d480 /includes/MachDeps.h | |
| parent | b0b76b2e926d08582538e2d31b18a1d80b83398d (diff) | |
| download | haskell-0268a23c34417849ec05603254311f979af97c41.tar.gz | |
More fixes for Win64
Diffstat (limited to 'includes/MachDeps.h')
| -rw-r--r-- | includes/MachDeps.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/includes/MachDeps.h b/includes/MachDeps.h index f97d3e87d4..81e223dfb5 100644 --- a/includes/MachDeps.h +++ b/includes/MachDeps.h @@ -83,19 +83,18 @@ #define SIZEOF_WORD32 SIZEOF_UNSIGNED_INT #define ALIGNMENT_WORD32 ALIGNMENT_UNSIGNED_INT -#if HAVE_LONG_LONG && SIZEOF_VOID_P < 8 -/* assume long long is 64 bits */ -#define SIZEOF_INT64 SIZEOF_LONG_LONG -#define ALIGNMENT_INT64 ALIGNMENT_LONG_LONG -#define SIZEOF_WORD64 SIZEOF_UNSIGNED_LONG_LONG -#define ALIGNMENT_WORD64 ALIGNMENT_UNSIGNED_LONG_LONG -#elif SIZEOF_LONG == 8 +#if SIZEOF_LONG == 8 #define SIZEOF_INT64 SIZEOF_LONG #define ALIGNMENT_INT64 ALIGNMENT_LONG #define SIZEOF_WORD64 SIZEOF_UNSIGNED_LONG #define ALIGNMENT_WORD64 ALIGNMENT_UNSIGNED_LONG +#elif HAVE_LONG_LONG && SIZEOF_LONG_LONG == 8 +#define SIZEOF_INT64 SIZEOF_LONG_LONG +#define ALIGNMENT_INT64 ALIGNMENT_LONG_LONG +#define SIZEOF_WORD64 SIZEOF_UNSIGNED_LONG_LONG +#define ALIGNMENT_WORD64 ALIGNMENT_UNSIGNED_LONG_LONG #else -#error GHC untested on this architecture: sizeof(void *) < 8 and no long longs. +#error Cannot find a 64bit type. #endif #ifndef WORD_SIZE_IN_BITS |