summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
authorflaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-06-16 14:02:37 +0000
committerflaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-06-16 14:02:37 +0000
commit773149f384fdb7bce399fbd7b5e7379d029dc60b (patch)
tree1c833cb92f1dc1b4284a5d6b51a62550df220062 /src/char
parente054cbbdb28a9b555faafd689282140c01d55b3e (diff)
downloadhercules-773149f384fdb7bce399fbd7b5e7379d029dc60b.tar.gz
hercules-773149f384fdb7bce399fbd7b5e7379d029dc60b.tar.bz2
hercules-773149f384fdb7bce399fbd7b5e7379d029dc60b.tar.xz
hercules-773149f384fdb7bce399fbd7b5e7379d029dc60b.zip
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
Diffstat (limited to 'src/char')
-rw-r--r--src/char/char.h2
1 files changed, 2 insertions, 0 deletions
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