GCC compile fixes

This commit is contained in:
leak
2014-07-16 19:27:15 +02:00
parent e2fed64550
commit 8c10ffa62d
3 changed files with 10 additions and 10 deletions

View File

@@ -99,15 +99,14 @@ extern int main(int argc, char** argv)
if (vm.count("help"))
return 0;
if (!configService.empty())
{
if (configService.compare("install") == 0)
return WinServiceInstall() == true ? 0 : 1;
else if (configService.compare("uninstall") == 0)
return WinServiceUninstall() == true ? 0 : 1;
else if (configService.compare("run") == 0)
WinServiceRun();
}
#ifdef _WIN32
if (configService.compare("install") == 0)
return WinServiceInstall() == true ? 0 : 1;
else if (configService.compare("uninstall") == 0)
return WinServiceUninstall() == true ? 0 : 1;
else if (configService.compare("run") == 0)
WinServiceRun();
#endif
if (!sConfigMgr->LoadInitial(configFile))
{

View File

@@ -15,6 +15,7 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <limits.h>
#include "PathCommon.h"
#include "MapBuilder.h"

View File

@@ -99,7 +99,7 @@ namespace MMAP
// builds list of maps, then builds all of mmap tiles (based on the skip settings)
void buildAllMaps(int threads);
void MapBuilder::WorkerThread();
void WorkerThread();
private:
// detect maps and tiles