sync with public repo

This commit is contained in:
CodeCodon
2015-08-10 18:24:48 -05:00
parent 2309948944
commit 67a5f61ff0
2 changed files with 2 additions and 2 deletions
@@ -846,7 +846,6 @@ static int preprocessSource(char *sourceName)
}
else
sprintf(shellCommand, "cccp.exe -nostdinc -nostdinc++ -x c++ -pedantic -Wall -dD %s mIFF.$$$", sourceName);
}
}
// else
{
@@ -185,6 +185,7 @@ static const char * SubscriptionStatusString[SUBSCRIPTION_STATUS_END] =
"SUBSCRIPTION_STATUS_BANNED_CHARGEBACK",
};
#ifdef UNIX
const std::pair<std::string, apiGamecode> _gamecodeID[GAMECODE_END] =
{
text_gamecode(std::string("SP"), GAMECODE_STATION_PASS),
@@ -246,6 +247,6 @@ const gamecode_text _gamecodeName[GAMECODE_END] =
};
static std::map<apiGamecode,const char *> GamecodeName((const std::map<apiGamecode,const char *>::value_type *)&_gamecodeName[0],(const std::map<apiGamecode,const char *>::value_type *)&_gamecodeName[GAMECODE_END]);
#endif UNIX
#endif