Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14852 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
flaviojs 2011-06-16 14:02:37 +00:00
parent b02133b422
commit ccb0bdde68
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -1,6 +1,7 @@
Date Added Date Added
2011/06/16 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: * Merges from charmerge:
- Added DBMap::exists. (r14090) - Added DBMap::exists. (r14090)
- Added sv_parse_next, a stepped version of sv_parse (delim-separated parser). (r14100 r14104) - Added sv_parse_next, a stepped version of sv_parse (delim-separated parser). (r14100 r14104)

2
src/char/char.h
View File

@ -7,12 +7,14 @@
#include "../common/core.h" // CORE_ST_LAST #include "../common/core.h" // CORE_ST_LAST
#include "../common/mmo.h" #include "../common/mmo.h"
#ifndef TXT_SQL_CONVERT
enum E_CHARSERVER_ST enum E_CHARSERVER_ST
{ {
CHARSERVER_ST_RUNNING = CORE_ST_LAST, CHARSERVER_ST_RUNNING = CORE_ST_LAST,
CHARSERVER_ST_SHUTDOWN, CHARSERVER_ST_SHUTDOWN,
CHARSERVER_ST_LAST CHARSERVER_ST_LAST
}; };
#endif
#define MAX_MAP_SERVERS 30 #define MAX_MAP_SERVERS 30

2
src/char_sql/char.h
View File

@ -6,12 +6,14 @@
#include "../common/core.h" // CORE_ST_LAST #include "../common/core.h" // CORE_ST_LAST
#ifndef TXT_SQL_CONVERT
enum E_CHARSERVER_ST enum E_CHARSERVER_ST
{ {
CHARSERVER_ST_RUNNING = CORE_ST_LAST, CHARSERVER_ST_RUNNING = CORE_ST_LAST,
CHARSERVER_ST_SHUTDOWN, CHARSERVER_ST_SHUTDOWN,
CHARSERVER_ST_LAST CHARSERVER_ST_LAST
}; };
#endif
struct mmo_charstatus; struct mmo_charstatus;