TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-24 00:53:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Areloch 2017-04-08 21:06:47 -05:00
parent ed14b6fced
commit bf229a9c0b
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/console/debugOutputConsumer.h
View file

@ -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

4
Engine/source/platform/platformCPUCount.cpp
View file

@ -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