aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/shared')
-rw-r--r--src/server/shared/Common.h3
-rw-r--r--src/server/shared/Threading/ProcessPriority.h5
2 files changed, 6 insertions, 2 deletions
diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h
index 1e3b0e46221..e74e707a942 100644
--- a/src/server/shared/Common.h
+++ b/src/server/shared/Common.h
@@ -101,7 +101,6 @@
#define snprintf _snprintf
#define atoll _atoi64
#define vsnprintf _vsnprintf
-#define finite(X) _finite(X)
#define llabs _abs64
#else
@@ -111,7 +110,7 @@
#endif
-inline float finiteAlways(float f) { return finite(f) ? f : 0.0f; }
+inline float finiteAlways(float f) { return std::isfinite(f) ? f : 0.0f; }
#define STRINGIZE(a) #a
diff --git a/src/server/shared/Threading/ProcessPriority.h b/src/server/shared/Threading/ProcessPriority.h
index cd116ccbbc8..06a5622fb9d 100644
--- a/src/server/shared/Threading/ProcessPriority.h
+++ b/src/server/shared/Threading/ProcessPriority.h
@@ -28,6 +28,11 @@
void SetProcessPriority(const std::string logChannel)
{
+// Suppresses Mac OS X Warning since logChannel isn't used.
+#if PLATFORM_APPLE
+ (void)logChannel;
+#endif
+
#if defined(_WIN32) || defined(__linux__)
///- Handle affinity for multiple processors and process priority