diff options
author | Bardur Arantsson <bardur@scientician.net> | 2010-01-10 19:19:41 +0100 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2010-01-10 19:32:02 +0100 |
commit | d324d9c0ac98e74db26e5dd5c6e379c1fc18cff3 (patch) | |
tree | b3486c747e6113a544a00208d04465d5852e05e2 | |
parent | fc7620691b3dff4b502042d889fd75bb85170c16 (diff) |
Use the C99 standard int32_t/uint32_t instead of the L64 define.
-rw-r--r-- | src/h-config.h | 11 | ||||
-rw-r--r-- | src/h-type.h | 11 |
2 files changed, 4 insertions, 18 deletions
diff --git a/src/h-config.h b/src/h-config.h index bbb6236f..97120cd1 100644 --- a/src/h-config.h +++ b/src/h-config.h @@ -170,17 +170,6 @@ /* - * OPTION: Define "L64" if a "long" is 64-bits. See "h-types.h". - * The only such platform that angband is ported to is currently - * DEC Alpha AXP running OSF/1 (OpenVMS uses 32-bit longs). - */ -#if defined(__alpha) && defined(__osf__) || defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(__ia64) || defined(__ia64__) || defined(__mips64) || defined(__ppc64__) || defined(__PPC64__) || defined(__powerpc64__) || defined(__64BIT__) || defined(__sparc64__) || defined(__LP64__) -# define L64 -#endif - - - -/* * OPTION: set "SET_UID" if the machine is a "multi-user" machine. * This option is used to verify the use of "uids" and "gids" for * various "Unix" calls, and of "pids" for getting a random seed, diff --git a/src/h-type.h b/src/h-type.h index eb865892..2582f325 100644 --- a/src/h-type.h +++ b/src/h-type.h @@ -3,6 +3,8 @@ #ifndef INCLUDED_H_TYPE_H #define INCLUDED_H_TYPE_H +#include <stdint.h> + /* * Basic "types". * @@ -118,13 +120,8 @@ typedef signed short s16b; typedef unsigned short u16b; /* Signed/Unsigned 32 bit value */ -#ifdef L64 /* 64 bit longs */ -typedef signed int s32b; -typedef unsigned int u32b; -#else -typedef signed long s32b; -typedef unsigned long u32b; -#endif +typedef int32_t s32b; +typedef uint32_t u32b; /*** Pointers to all the basic types defined above ***/ |