diff --git a/lib/CStopWatch.h b/lib/CStopWatch.h index 0431e9c1a..b2821130c 100644 --- a/lib/CStopWatch.h +++ b/lib/CStopWatch.h @@ -53,7 +53,7 @@ public: private: si64 clock() { - #ifdef __FreeBSD__ + #ifdef __FreeBSD__ // TODO: enable also for Apple? struct rusage usage; getrusage(RUSAGE_SELF, &usage); return static_cast(usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) * 1000000 + usage.ru_utime.tv_usec + usage.ru_stime.tv_usec; diff --git a/server/CVCMIServer.cpp b/server/CVCMIServer.cpp index c918743e5..902d1a8e2 100644 --- a/server/CVCMIServer.cpp +++ b/server/CVCMIServer.cpp @@ -916,7 +916,7 @@ int main(int argc, char * argv[]) signal(SIGSEGV, handleLinuxSignal); #endif - // todo ios: double console log + // todo ios: double console log in single-process mode. Why removing the lines below breaks connecting to local server?! console = new CConsoleHandler(); CBasicLogConfigurator logConfig(VCMIDirs::get().userLogsPath() / "VCMI_Server_log.txt", console); logConfig.configureDefault(); @@ -927,7 +927,6 @@ int main(int argc, char * argv[]) argc = 1; boost::condition_variable * cond = reinterpret_cast(argv[1]); cond->notify_one(); -//#endif #else handleCommandOptions(argc, argv, opts); preinitDLL(console); @@ -936,7 +935,6 @@ int main(int argc, char * argv[]) loadDLLClasses(); srand((ui32)time(nullptr)); -//#ifdef VCMI_IOS #endif try {