diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-29 06:18:21 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-29 06:18:21 +0000 |
| commit | c1a8f6f0ac98a694e670bae4c8f74db126e0e8e8 (patch) | |
| tree | 57a37cf82ced0b0b998b99e5dfdc27d62932420a /src/char_sql/char.c | |
| parent | 7bfe35400c79bf97a5b0bed9f170912c37cf9452 (diff) | |
| download | hercules-c1a8f6f0ac98a694e670bae4c8f74db126e0e8e8.tar.gz hercules-c1a8f6f0ac98a694e670bae4c8f74db126e0e8e8.tar.bz2 hercules-c1a8f6f0ac98a694e670bae4c8f74db126e0e8e8.tar.xz hercules-c1a8f6f0ac98a694e670bae4c8f74db126e0e8e8.zip | |
Fixe compile time problems with our mixed C++/C conformance
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1328 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char_sql/char.c')
| -rw-r--r-- | src/char_sql/char.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/char_sql/char.c b/src/char_sql/char.c index ab20b893b..75bf663d0 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -67,6 +67,7 @@ char party_db[256] = "party"; char pet_db[256] = "pet"; char login_db[256] = "login"; char friend_db[256] = "friends"; +int db_use_sqldbs; char login_db_account_id[32] = "account_id"; char login_db_level[32] = "level"; @@ -3138,7 +3139,7 @@ int char_lan_config_read(const char *lancfgName){ static int char_db_final(void *key,void *data,va_list ap) { - struct mmo_charstatus *p = data; + struct mmo_charstatus *p = (struct mmo_charstatus *) data; if (p) aFree(p); return 0; } @@ -3280,8 +3281,8 @@ int char_config_read(const char *cfgName) { if (sscanf(line,"%[^:]: %[^\r\n]", w1, w2) != 2) continue; - remove_control_chars(w1); - remove_control_chars(w2); + remove_control_chars((unsigned char *) w1); + remove_control_chars((unsigned char *) w2); if (strcmpi(w1, "userid") == 0) { memcpy(userid, w2, 24); } else if (strcmpi(w1, "passwd") == 0) { |