From 773149f384fdb7bce399fbd7b5e7379d029dc60b Mon Sep 17 00:00:00 2001 From: flaviojs Date: Thu, 16 Jun 2011 14:02:37 +0000 Subject: Fixed char-converter not being able to compile due to both char.h being included. (caused by last commit) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14852 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + src/char/char.h | 2 ++ src/char_sql/char.h | 2 ++ 3 files changed, 5 insertions(+) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index dde0c152b..42bda730a 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,7 @@ Date Added 2011/06/16 + * Fixed char-converter not being able to compile due to both char.h being included. (caused by last commit) [FlavioJS] * Merges from charmerge: - Added DBMap::exists. (r14090) - Added sv_parse_next, a stepped version of sv_parse (delim-separated parser). (r14100 r14104) diff --git a/src/char/char.h b/src/char/char.h index f865722ba..bb1a530f0 100644 --- a/src/char/char.h +++ b/src/char/char.h @@ -7,12 +7,14 @@ #include "../common/core.h" // CORE_ST_LAST #include "../common/mmo.h" +#ifndef TXT_SQL_CONVERT enum E_CHARSERVER_ST { CHARSERVER_ST_RUNNING = CORE_ST_LAST, CHARSERVER_ST_SHUTDOWN, CHARSERVER_ST_LAST }; +#endif #define MAX_MAP_SERVERS 30 diff --git a/src/char_sql/char.h b/src/char_sql/char.h index 73c2f9f72..c9ec54a16 100644 --- a/src/char_sql/char.h +++ b/src/char_sql/char.h @@ -6,12 +6,14 @@ #include "../common/core.h" // CORE_ST_LAST +#ifndef TXT_SQL_CONVERT enum E_CHARSERVER_ST { CHARSERVER_ST_RUNNING = CORE_ST_LAST, CHARSERVER_ST_SHUTDOWN, CHARSERVER_ST_LAST }; +#endif struct mmo_charstatus; -- cgit v1.2.3-60-g2f50