diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/cbasetypes.h | 4 | ||||
| -rw-r--r-- | src/common/db.h | 2 | ||||
| -rw-r--r-- | src/common/timer.c | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h index c61424191..3a3bde818 100644 --- a/src/common/cbasetypes.h +++ b/src/common/cbasetypes.h @@ -126,6 +126,10 @@ 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. diff --git a/src/common/db.h b/src/common/db.h index aa165acd7..a79c88822 100644 --- a/src/common/db.h +++ b/src/common/db.h @@ -130,7 +130,7 @@ typedef enum { * @see #db_default_release(DBType,DBOptions) * @see #db_alloc(const char *,int,DBType,DBOptions,unsigned short) */ -typedef enum { +typedef enum db_opt { DB_OPT_BASE = 0, DB_OPT_DUP_KEY = 1, DB_OPT_RELEASE_KEY = 2, diff --git a/src/common/timer.c b/src/common/timer.c index cf71f2ffc..63a06acc2 100644 --- a/src/common/timer.c +++ b/src/common/timer.c @@ -18,9 +18,11 @@ #include <stdlib.h> #include <string.h> #include <time.h> + +#include "../common/cbasetypes.h" +#include "../common/malloc.h" +#include "../common/showmsg.h" #include "timer.h" -#include "malloc.h" -#include "showmsg.h" // タイマー間隔の最小値。モンスターの大量召還時、多数のクライアント接続時に // サーバーが反応しなくなる場合は、TIMER_MIN_INTERVAL を増やしてください。 |