diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-04-26 16:52:44 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-04-26 16:52:44 +0100 |
| commit | 1dbe6d59b621ab9bd836241d633b3a8d99812cb3 (patch) | |
| tree | 6482c2019a3a85f93c9b38c0e985d77f24388692 /includes/Rts.h | |
| parent | 3e314cc2060734ade9b82d4da418c119b3a05b4c (diff) | |
| download | haskell-1dbe6d59b621ab9bd836241d633b3a8d99812cb3.tar.gz | |
Fix warnings on Win64
Mostly this meant getting pointer<->int conversions to use the right
sizes. lnat is now size_t, rather than unsigned long, as that seems a
better match for how it's used.
Diffstat (limited to 'includes/Rts.h')
| -rw-r--r-- | includes/Rts.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/includes/Rts.h b/includes/Rts.h index 89efb15d9d..24e4c88689 100644 --- a/includes/Rts.h +++ b/includes/Rts.h @@ -145,15 +145,24 @@ void _assertFail(const char *filename, unsigned int linenum) #if SIZEOF_VOID_P == 8 # if SIZEOF_LONG == 8 -# define FMT_SizeT "lu" +# define FMT_SizeT "lu" +# define FMT_HexSizeT "lx" +# define FMT_Word "lu" +# define FMT_Int "ld" # elif SIZEOF_LONG_LONG == 8 -# define FMT_SizeT "llu" +# define FMT_SizeT "llu" +# define FMT_HexSizeT "llx" +# define FMT_Word "llu" +# define FMT_Int "lld" # else # error Cannot find format specifier for size_t size type # endif #elif SIZEOF_VOID_P == 4 # if SIZEOF_INT == 4 -# define FMT_SizeT "u" +# define FMT_SizeT "u" +# define FMT_HexSizeT "x" +# define FMT_Word "u" +# define FMT_Int "d" # else # error Cannot find format specifier for size_t size type # endif |