TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #583 from tdev/x64_basics

Browse source 
windows 64 bit basics
This commit is contained in:
Thomas Fischer 2014-03-18 00:51:58 +01:00
commit 29d7fe310d
33 changed files with 81 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/core/strings/stringFunctions.cpp
View file

@ -27,7 +27,7 @@
#include "platform/platform.h"
#if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
// 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, ...)
int dStrcmp( const UTF16 *str1, const UTF16 *str2)
{
#if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
return wcscmp( reinterpret_cast<const wchar_t *>( str1 ), reinterpret_cast<const wchar_t *>( str2 ) );
#else
int ret;
@ -347,7 +347,7 @@ int dStrcmp( const UTF16 *str1, const UTF16 *str2)
char* dStrupr(char *str)
{
#if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
return _strupr(str);
#else
if (str == NULL)
@ -365,7 +365,7 @@ char* dStrupr(char *str)
char* dStrlwr(char *str)
{
#if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
return _strlwr(str);
#else
if (str == NULL)
@ -421,7 +421,7 @@ S32 dVsprintf(char *buffer, U32 bufferSize, const char *format, void *arglist)
S32 dSscanf(const char *buffer, const char *format, ...)
{
#if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
va_list args;
va_start(args, format);

2
Engine/source/core/strings/stringFunctions.h
View file

@ -31,7 +31,7 @@
#include "platform/types.h"
#endif
#if defined(TORQUE_OS_WIN32) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
#if defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)
// These standard functions are not defined on Win32 and other Microsoft platforms...
#define strcasecmp _stricmp
#define strncasecmp _strnicmp

2
Engine/source/core/util/path.h
View file

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

2
Engine/source/core/util/str.cpp
View file

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