diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-23 03:24:32 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-23 03:24:32 +0000 |
| commit | d28762e63974a9dbe1e642829df185cdd40abde5 (patch) | |
| tree | 93e3775658baccb87a804d89068c2c27315d1231 /src/common | |
| parent | ec0953fdd84a6b85189e9698118ea8aa62d8bdc1 (diff) | |
| download | hercules-d28762e63974a9dbe1e642829df185cdd40abde5.tar.gz hercules-d28762e63974a9dbe1e642829df185cdd40abde5.tar.bz2 hercules-d28762e63974a9dbe1e642829df185cdd40abde5.tar.xz hercules-d28762e63974a9dbe1e642829df185cdd40abde5.zip | |
- Moved "#include <limits.h>" to cbasetypes.h to ensure it's included before checking if UINT_MAX has been defined.
- Minor changes in pc_readdb related to max_level being unsigned.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9561 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/cbasetypes.h | 11 | ||||
| -rw-r--r-- | src/common/timer.c | 1 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h index 3a3bde818..76f494851 100644 --- a/src/common/cbasetypes.h +++ b/src/common/cbasetypes.h @@ -59,6 +59,12 @@ // only Silicon Graphics/Cray goes ILP64 so don't care (and don't support) ////////////////////////////////////////////////////////////////////////// +#include <limits.h> +// ILP64 isn't supported, so always 32 bits? +#ifndef UINT_MAX +#define UINT_MAX 0xffffffff +#endif + ////////////////////////////////////////////////////////////////////////// // Integers with guaranteed _exact_ size. ////////////////////////////////////////////////////////////////////////// @@ -126,11 +132,6 @@ typedef unsigned int uint32; #define SINT16_MAX ((sint16)0x7FFF) #define SINT32_MAX ((sint32)0x7FFFFFFF) -// ILP64 isn't supported, so always 32 bits? -#ifndef UINT_MAX -#define UINT_MAX 0xFFFFFFFF -#endif - ////////////////////////////////////////////////////////////////////////// // Integers with guaranteed _minimum_ size. // These could be larger than you expect, diff --git a/src/common/timer.c b/src/common/timer.c index 63a06acc2..3b4fb1db4 100644 --- a/src/common/timer.c +++ b/src/common/timer.c @@ -13,7 +13,6 @@ #include <sys/time.h> #endif -#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> |