Fixed char-converter not being able to compile due to both char.h being included. (caused by last commit)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14852 54d463be-8e91-2dee-dedb-b68131a5f0ec

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)

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
 

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;