Missed a bit. Readded an accidental removal, and cleaned up an extraneous endif

Engine/source/console/debugOutputConsumer.h

@@ -27,6 +27,10 @@
 
 //#define TORQUE_LOCBUILD
 
+#if !defined(TORQUE_DEBUG) && !defined(TORQUE_LOCBUILD)
+   #define DISABLE_DEBUG_SPEW
+#endif
+
 #include "console/console.h"
 
 namespace DebugOutputConsumer

Engine/source/platform/platformCPUCount.cpp

@@ -30,7 +30,7 @@
 #include "platform/platform.h"
 #include "platform/platformCPUCount.h"
 
-#if defined(TORQUE_OS_LINUX) || defined(TORQUE_OS_MAC)
+#if defined(TORQUE_OS_LINUX) || defined(TORQUE_OS_OSX)
 
 #ifdef TORQUE_OS_LINUX
 // 	The Linux source code listing can be compiled using Linux kernel verison 2.6 
@@ -654,6 +654,4 @@ next:
 } // namespace CPUInfo
 #endif
 
-#endif
-
 #endif