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/int_guild.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/int_guild.c')
| -rw-r--r-- | src/char_sql/int_guild.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c index b5d20590a..5ec700a54 100644 --- a/src/char_sql/int_guild.c +++ b/src/char_sql/int_guild.c @@ -532,7 +532,7 @@ int inter_guildcastle_tosql(struct guild_castle *gc) return 0; } //printf("[Guild Castle %02i]: Save...\n",gc->castle_id); - gcopy = numdb_search(castle_db_,gc->castle_id); + gcopy = (struct guild_castle *) numdb_search(castle_db_,gc->castle_id); if (gcopy == NULL) { gcopy = (struct guild_castle *) aMalloc(sizeof(struct guild_castle)); numdb_insert(castle_db_, gc->castle_id, gcopy); @@ -714,13 +714,13 @@ int guild_infoevent_db_final (void *k, void *data, va_list ap) { return 0; } int guild_castleinfoevent_db_final (void *k, void *data, va_list ap) { return 0; } int guild_db_final (void *k, void *data, va_list ap) { - struct guild *g = data; + struct guild *g = (struct guild *) data; if (g) aFree(g); return 0; } int castle_db_final (void *k, void *data, va_list ap) { - struct guild_castle *gc = data; + struct guild_castle *gc = (struct guild_castle *) data; if (gc) aFree(gc); return 0; } |