diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/worldserver/Main.cpp | 17 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/MapBuilder.cpp | 1 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/MapBuilder.h | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index c28adbc7c21..a7b430a4e97 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -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)) { diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index 3b1516b3d11..01a342249fd 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -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" diff --git a/src/tools/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h index 4cd36602a4b..944d03968b5 100644 --- a/src/tools/mmaps_generator/MapBuilder.h +++ b/src/tools/mmaps_generator/MapBuilder.h @@ -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 |