diff --git a/tinyxml2/tinyxml2.cpp b/tinyxml2/tinyxml2.cpp index f181b9050c..bfd42c975d 100644 --- a/tinyxml2/tinyxml2.cpp +++ b/tinyxml2/tinyxml2.cpp @@ -24,7 +24,7 @@ distribution. #include "tinyxml2.h" #include // yes, this one new style header, is in the Android SDK. -# if defined(ANDROID_NDK) || (CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY) +# if defined(ANDROID_NDK) # include #else # include @@ -1587,7 +1587,7 @@ XMLError XMLDocument::LoadFile( const char* filename ) InitDocument(); FILE* fp = 0; -#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE) +#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) errno_t err = fopen_s(&fp, filename, "rb" ); if ( !fp || err) { #else @@ -1641,7 +1641,7 @@ XMLError XMLDocument::LoadFile( FILE* fp ) XMLError XMLDocument::SaveFile( const char* filename, bool compact ) { FILE* fp = 0; -#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE) +#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) errno_t err = fopen_s(&fp, filename, "w" ); if ( !fp || err) { #else @@ -1768,7 +1768,7 @@ void XMLPrinter::Print( const char* format, ... ) else { // This seems brutally complex. Haven't figured out a better // way on windows. -#if defined _MSC_VER && (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE) +#if defined _MSC_VER int len = -1; int expand = 1000; while ( len < 0 ) { diff --git a/tinyxml2/tinyxml2.h b/tinyxml2/tinyxml2.h index f288dc5ba5..5bbac9bf8c 100644 --- a/tinyxml2/tinyxml2.h +++ b/tinyxml2/tinyxml2.h @@ -40,7 +40,7 @@ distribution. #endif -#if defined(ANDROID_NDK) || defined(__BORLANDC__) || (CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY) +#if defined(ANDROID_NDK) || defined(__BORLANDC__) # include # include # include @@ -89,7 +89,7 @@ distribution. #endif -#if (defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)) +#if (defined(_MSC_VER) && (_MSC_VER >= 1400 )) // Microsoft visual studio, version 2005 and higher. /*int _snprintf_s( char *buffer, diff --git a/unzip/ioapi.cpp b/unzip/ioapi.cpp index 669ea36927..7898b28047 100644 --- a/unzip/ioapi.cpp +++ b/unzip/ioapi.cpp @@ -111,11 +111,7 @@ static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, if ((filename!=NULL) && (mode_fopen != NULL)) { -#if (CC_TARGET_PLATFORM == CC_PLATFORM_MARMALADE || CC_TARGET_PLATFORM == CC_PLATFORM_BADA || CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY || CC_TARGET_PLATFORM == CC_PLATFORM_NACL || CC_TARGET_PLATFORM == CC_PLATFORM_EMSCRIPTEN) - file = NULL; -#else - file = fopen64((const char*)filename, mode_fopen); -#endif + file = fopen64((const char*)filename, mode_fopen); } return file; @@ -147,11 +143,7 @@ static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream) static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream) { ZPOS64_T ret; -#if (CC_TARGET_PLATFORM == CC_PLATFORM_MARMALADE || CC_TARGET_PLATFORM == CC_PLATFORM_BADA || CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY || CC_TARGET_PLATFORM == CC_PLATFORM_NACL || CC_TARGET_PLATFORM == CC_PLATFORM_EMSCRIPTEN) - ret = 0; -#else ret = ftello64((FILE *)stream); -#endif return ret; } @@ -180,9 +172,6 @@ static long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offs static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin) { -#if (CC_TARGET_PLATFORM == CC_PLATFORM_MARMALADE || CC_TARGET_PLATFORM == CC_PLATFORM_BADA || CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY || CC_TARGET_PLATFORM == CC_PLATFORM_NACL || CC_TARGET_PLATFORM == CC_PLATFORM_EMSCRIPTEN) - return -1; -#else int fseek_origin=0; switch (origin) { @@ -200,7 +189,6 @@ static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T if(fseeko64((FILE *)stream, offset, fseek_origin) != 0) return -1; return 0; -#endif }