diff options
| author | panikon <panikon@zoho.com> | 2014-05-10 06:08:56 -0300 |
|---|---|---|
| committer | panikon <panikon@zoho.com> | 2014-05-10 06:08:56 -0300 |
| commit | 94657284973f4037596bae468ebfbee5c217e02b (patch) | |
| tree | c99c1e3a39ad41183f2d70eb093df54ca60ad0fb /src/config | |
| parent | a1eba2e076401ddbc34e5a65e15bb0f418591b1a (diff) | |
| download | hercules-94657284973f4037596bae468ebfbee5c217e02b.tar.gz hercules-94657284973f4037596bae468ebfbee5c217e02b.tar.bz2 hercules-94657284973f4037596bae468ebfbee5c217e02b.tar.xz hercules-94657284973f4037596bae468ebfbee5c217e02b.zip | |
Revert "Fixed order of includes in all source files"
This reverts commit b6b3f58795288701d0e162d43fa6f0a47af913b3.
Fixes issue 8184
http://hercules.ws/board/tracker/issue-8184-cart-related/
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/const.h | 7 | ||||
| -rw-r--r-- | src/config/renewal.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/config/const.h b/src/config/const.h index f9baa4d7d..6557cb987 100644 --- a/src/config/const.h +++ b/src/config/const.h @@ -52,6 +52,13 @@ #define DEFTYPE_MAX CHAR_MAX #endif +/* pointer size fix which fixes several gcc warnings */ +#ifdef __64BIT__ + #define __64BPTRSIZE(y) ((intptr)(y)) +#else + #define __64BPTRSIZE(y) (y) +#endif + /* ATCMD_FUNC(mobinfo) HIT and FLEE calculations */ #ifdef RENEWAL #define MOB_FLEE(mobdata) ( (mobdata)->lv + (mobdata)->status.agi + 100 ) diff --git a/src/config/renewal.h b/src/config/renewal.h index 36bdd3958..36615d63b 100644 --- a/src/config/renewal.h +++ b/src/config/renewal.h @@ -74,6 +74,5 @@ #define RENEWAL_ASPD #endif // DISABLE_RENEWAL -#undef DISABLE_RENEWAL #endif // _CONFIG_RENEWAL_H_ |