diff options
Diffstat (limited to 'src/h-type.h')
| -rw-r--r-- | src/h-type.h | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/h-type.h b/src/h-type.h index 5dbb4975..bcf013bb 100644 --- a/src/h-type.h +++ b/src/h-type.h @@ -3,6 +3,11 @@ #ifndef INCLUDED_H_TYPE_H #define INCLUDED_H_TYPE_H +#ifdef __cplusplus +extern "C" { +#endif + + /* * Basic "types". * @@ -67,17 +72,11 @@ typedef int errr; #define uint uint_hack /* - * Hack -- prevent problems with MSDOS and WINDOWS + * Hack -- prevent problems with WINDOWS */ #undef huge #define huge huge_hack -/* - * Hack -- prevent problems with AMIGA - */ -#undef byte -#define byte byte_hack - /* Note that "signed char" is not always "defined" */ /* So always use "s16b" to hold small signed values */ /* A signed byte of memory */ @@ -109,14 +108,20 @@ typedef unsigned long huge; /* Signed/Unsigned 16 bit value */ typedef signed short s16b; typedef unsigned short u16b; +#define FMTs16b "%hd" +#define FMTu16b "%hu" /* Signed/Unsigned 32 bit value */ #ifdef L64 /* 64 bit longs */ typedef signed int s32b; typedef unsigned int u32b; +#define FMTs32b "%d" +#define FMTu32b "%u" #else typedef signed long s32b; typedef unsigned long u32b; +#define FMTs32b "%ld" +#define FMTu32b "%lu" #endif @@ -174,5 +179,9 @@ typedef vptr (*func_key)(vptr); +#ifdef __cplusplus +} // extern "C" +#endif + #endif |