diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-04-04 17:08:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-04-04 17:08:44 +0300 |
| commit | 3732bd4a6b708651f6b4bcd32d6beb2b7f49c478 (patch) | |
| tree | 83155915c35c72d018108231437248cc78d5060d /src/char/inter.c | |
| parent | 0bd30a0fac1db1b478b3173a22a81bd5249113f8 (diff) | |
| parent | 9147fe9473b26ee32aafed65fd02b03f11397629 (diff) | |
| download | hercules-3732bd4a6b708651f6b4bcd32d6beb2b7f49c478.tar.gz hercules-3732bd4a6b708651f6b4bcd32d6beb2b7f49c478.tar.bz2 hercules-3732bd4a6b708651f6b4bcd32d6beb2b7f49c478.tar.xz hercules-3732bd4a6b708651f6b4bcd32d6beb2b7f49c478.zip | |
Merge pull request #1210 from HerculesWS/wcast_qual
Added -Wcast-qual compiler flag
Diffstat (limited to 'src/char/inter.c')
| -rw-r--r-- | src/char/inter.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/char/inter.c b/src/char/inter.c index 4ef94efdf..9fea2885c 100644 --- a/src/char/inter.c +++ b/src/char/inter.c @@ -42,6 +42,7 @@ #include "common/nullpo.h" #include "common/showmsg.h" #include "common/socket.h" +#include "common/sql.h" #include "common/strlib.h" #include "common/timer.h" @@ -82,7 +83,7 @@ struct WisData { int64 tick; unsigned char src[24], dst[24], msg[512]; }; -static DBMap* wis_db = NULL; // int wis_id -> struct WisData* +static struct DBMap *wis_db = NULL; // int wis_id -> struct WisData* static int wis_dellist[WISDELLIST_MAX], wis_delnum; #define MAX_JOB_NAMES 150 @@ -1037,7 +1038,7 @@ int mapif_disconnectplayer(int fd, int account_id, int char_id, int reason) * Existence check of WISP data * @see DBApply */ -int inter_check_ttl_wisdata_sub(DBKey key, DBData *data, va_list ap) +int inter_check_ttl_wisdata_sub(union DBKey key, struct DBData *data, va_list ap) { int64 tick; struct WisData *wd = DB->data2ptr(data); |