Removes bits of code and includes that are based on old 360, xbox and PS3 flags that are no longer needed.

This commit is contained in:
Areloch 2017-04-08 20:30:57 -05:00
parent 513789c2c7
commit 26fd24fbab
43 changed files with 35 additions and 356 deletions

View file

@ -27,7 +27,7 @@
#include "platform/platform.h"
#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
#if defined(TORQUE_OS_WIN)
// This standard function is not defined when compiling with VC7...
#define vsnprintf _vsnprintf
#endif
@ -330,7 +330,7 @@ char* dStrcpyl(char *dst, dsize_t dstSize, ...)
S32 dStrcmp( const UTF16 *str1, const UTF16 *str2)
{
#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
#if defined(TORQUE_OS_WIN)
return wcscmp( reinterpret_cast<const wchar_t *>( str1 ), reinterpret_cast<const wchar_t *>( str2 ) );
#else
S32 ret;
@ -347,7 +347,7 @@ S32 dStrcmp( const UTF16 *str1, const UTF16 *str2)
char* dStrupr(char *str)
{
#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
#if defined(TORQUE_OS_WIN)
return _strupr(str);
#else
if (str == NULL)
@ -365,7 +365,7 @@ char* dStrupr(char *str)
char* dStrlwr(char *str)
{
#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
#if defined(TORQUE_OS_WIN)
return _strlwr(str);
#else
if (str == NULL)
@ -423,7 +423,7 @@ S32 dVsprintf(char *buffer, U32 bufferSize, const char *format, va_list arglist)
S32 dSscanf(const char *buffer, const char *format, ...)
{
#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
#if defined(TORQUE_OS_WIN)
va_list args;
va_start(args, format);

View file

@ -32,7 +32,7 @@
#include "platform/types.h"
#endif
#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
#if defined(TORQUE_OS_WIN)
// These standard functions are not defined on Win32 and other Microsoft platforms...
#define strcasecmp _stricmp
#define strncasecmp _strnicmp
@ -41,7 +41,7 @@
#define strtof (float)strtod
#endif // _MSC_VER < 1800
#endif // defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
#endif // defined(TORQUE_OS_WIN)
//------------------------------------------------------------------------------

View file

@ -40,7 +40,7 @@ class Path
public:
enum Separator
{
#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XENON)
#if defined(TORQUE_OS_WIN)
OsSeparator = '\\'
#else
OsSeparator = '/'

View file

@ -1427,7 +1427,7 @@ void String::copy(StringChar* dst, const StringChar *src, U32 len)
//-----------------------------------------------------------------------------
#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
#if defined(TORQUE_OS_WIN)
// This standard function is not defined when compiling with VC7...
#define vsnprintf _vsnprintf
#endif

View file

@ -154,8 +154,4 @@ inline void Swizzle<T, mapLength>::InPlace( void *memory, const dsize_t size ) c
// Template specializations for certain swizzles
//#include "core/util/swizzleSpec.h"
#ifdef TORQUE_OS_XENON
# include "platformXbox/altivecSwizzle.h"
#endif
#endif

View file

@ -100,17 +100,12 @@ typedef struct {
unsigned16 cs; /* saved clock sequence */
} uuid_state;
#if defined(_XBOX)
#include <xtl.h>
#elif defined(_WIN32)
#if defined(_WIN32)
#include <windows.h>
#else
#include <sys/types.h>
#include <sys/time.h>
#include <unistd.h>
#ifdef XP_BEOS
#include <be/net/netdb.h>
#endif
#endif
/* set the following to the number of 100ns ticks of the actual resolution of