clean up

Engine/lib/convexDecomp/NvSimpleTypes.h

@@ -58,7 +58,7 @@ NvSimpleTypes.h : Defines basic data types for integers and floats.
 */
 
 
-#ifdef __APPLE__
+#if defined(__APPLE__)
    #include <sys/malloc.h>
 #else
 #if defined( __FreeBSD__)
@@ -78,7 +78,7 @@ NvSimpleTypes.h : Defines basic data types for integers and floats.
 
 #endif
 
-#ifdef WIN32
+#if defined(WIN32)
 	typedef __int64				NxI64;
 	typedef signed int			NxI32;
 	typedef signed short		NxI16;
@@ -92,7 +92,7 @@ NvSimpleTypes.h : Defines basic data types for integers and floats.
 	typedef float				NxF32;
 	typedef double				NxF64;
 
-#elif LINUX
+#elif defined(LINUX)
 	typedef long long			NxI64;
 	typedef signed int			NxI32;
 	typedef signed short		NxI16;
@@ -106,7 +106,7 @@ NvSimpleTypes.h : Defines basic data types for integers and floats.
 	typedef float				NxF32;
 	typedef double				NxF64;
 
-#elif __APPLE__
+#elif defined(__APPLE__)
 	typedef long long			NxI64;
 	typedef signed int			NxI32;
 	typedef signed short		NxI16;
@@ -120,7 +120,7 @@ NvSimpleTypes.h : Defines basic data types for integers and floats.
 	typedef float				NxF32;
 	typedef double				NxF64;
 
-#elif __CELLOS_LV2__
+#elif defined(__FreeBSD__)
 	typedef long long			NxI64;
 	typedef signed int			NxI32;
 	typedef signed short		NxI16;
@@ -134,7 +134,21 @@ NvSimpleTypes.h : Defines basic data types for integers and floats.
 	typedef float				NxF32;
 	typedef double				NxF64;
 
-#elif _XBOX
+#elif defined(__CELLOS_LV2__)
+	typedef long long			NxI64;
+	typedef signed int			NxI32;
+	typedef signed short		NxI16;
+	typedef signed char			NxI8;
+
+	typedef unsigned long long	NxU64;
+	typedef unsigned int		NxU32;
+	typedef unsigned short		NxU16;
+	typedef unsigned char		NxU8;
+
+	typedef float				NxF32;
+	typedef double				NxF64;
+
+#elif defined(_XBOX)
 	typedef __int64				NxI64;
 	typedef signed int			NxI32;
 	typedef signed short		NxI16;

Engine/lib/convexDecomp/NvStanHull.cpp

@@ -2656,7 +2656,7 @@ static NxI32 overhull(Plane *planes,NxI32 planes_count,float3 *verts, NxI32 vert
 			 float3 *&verts_out, NxI32 &verts_count_out,  NxI32 *&faces_out, NxI32 &faces_count_out ,NxF32 inflate)
 {
 	NxI32 i,j;
-   if (verts_count < 4) return 0; //XXTH NULL;
+   if (verts_count < 4) return 0;
 	maxplanes = Min(maxplanes,planes_count);
 	float3 bmin(verts[0]),bmax(verts[0]);
 	for(i=0;i<verts_count;i++)

Engine/lib/convexDecomp/NvThreadConfig.cpp

@@ -133,14 +133,20 @@ void   tc_sleep(NxU32 ms)
 
 void tc_spinloop()
 {
-   #if defined(__linux__) || defined( __APPLE__ ) ||  defined( __FreeBSD__)
 
-      asm ( "pause" );
+   #if defined( _XBOX )
-   #elif defined( _XBOX )
       // Pause would do nothing on the Xbox. Threads are not scheduled.
    #elif defined( _WIN64 )
       YieldProcessor( );
-   #else
+   #elif defined( __APPLE__ )
+      pthread_yield_np();
+   #elif defined(__linux__)  || defined(__FreeBSD__)
+      #if defined(_POSIX_PRIORITY_SCHEDULING)
+         sched_yield();
+      #else
+         asm("pause");
+      #endif
+   #elif
       __asm { pause };
    #endif
 }

Engine/source/gfx/gl/gfxGLTextureObject.cpp

@@ -204,7 +204,6 @@ bool GFXGLTextureObject::copyToBmp(GBitmap * bmp)
          }
       }
    }
-   //XXTH orig: glBindTexture(mBinding, NULL);
    glBindTexture(mBinding, 0);
 
    return true;

Engine/source/gui/editor/popupMenu.cpp

@@ -46,7 +46,6 @@ public:
 //-----------------------------------------------------------------------------
 PopupMenu::PopupMenu()
 {
-	//XXTH orig mMenuItems = NULL;
    mMenuItems = 0;
 	mMenuBarCtrl = nullptr;
 

Engine/source/platformPOSIX/POSIXCPUInfo.cpp

@@ -20,8 +20,7 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-//XXTH orig #ifndef __APPLE__
+#ifndef __APPLE__
-#if not defined (__APPLE__) //and not defined (__FreeBSD__)
 
 #include <fstream>
 #include <iostream>

Engine/source/platformPOSIX/POSIXProcessControl.cpp

@@ -149,10 +149,6 @@ void ProcessControlInit()
 void Platform::postQuitMessage(const S32 in_quitVal)
 {
 
-   Process::requestShutdown();
-   return;
-
-
    // if we have a window send a quit event, otherwise just force shutdown
 #if 0
    if (x86UNIXState->windowCreated())
@@ -161,10 +157,11 @@ void Platform::postQuitMessage(const S32 in_quitVal)
       SendQuitEvent();
    }
    else
-#endif
    {
       forceShutdown(in_quitVal);
    }
+#endif
+   Process::requestShutdown();
 }
 
 //-----------------------------------------------------------------------------

Engine/source/ts/tsShapeInstance.h

@@ -788,7 +788,7 @@ class TSThread
       keyPos = 0;
       mSeqPos = 0;
       mShapeInstance = NULL;
-      makePath = false; //XXTH NULL;
+      makePath = false;
       priority = 0;
       sequence = 0;
       timeScale = 1.0f;