Skip to content

Commit 4715b2d

Browse files
PatriceJiangdrelaptop
authored andcommitted
Remove CC_TARGET_PLATFORM marco (#340)
1 parent e20bf65 commit 4715b2d

File tree

3 files changed

+7
-19
lines changed

3 files changed

+7
-19
lines changed

tinyxml2/tinyxml2.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ distribution.
2424
#include "tinyxml2.h"
2525

2626
#include <new> // yes, this one new style header, is in the Android SDK.
27-
# if defined(ANDROID_NDK) || (CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY)
27+
# if defined(ANDROID_NDK)
2828
# include <stddef.h>
2929
#else
3030
# include <cstddef>
@@ -1587,7 +1587,7 @@ XMLError XMLDocument::LoadFile( const char* filename )
15871587
InitDocument();
15881588
FILE* fp = 0;
15891589

1590-
#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)
1590+
#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
15911591
errno_t err = fopen_s(&fp, filename, "rb" );
15921592
if ( !fp || err) {
15931593
#else
@@ -1641,7 +1641,7 @@ XMLError XMLDocument::LoadFile( FILE* fp )
16411641
XMLError XMLDocument::SaveFile( const char* filename, bool compact )
16421642
{
16431643
FILE* fp = 0;
1644-
#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)
1644+
#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
16451645
errno_t err = fopen_s(&fp, filename, "w" );
16461646
if ( !fp || err) {
16471647
#else
@@ -1768,7 +1768,7 @@ void XMLPrinter::Print( const char* format, ... )
17681768
else {
17691769
// This seems brutally complex. Haven't figured out a better
17701770
// way on windows.
1771-
#if defined _MSC_VER && (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)
1771+
#if defined _MSC_VER
17721772
int len = -1;
17731773
int expand = 1000;
17741774
while ( len < 0 ) {

tinyxml2/tinyxml2.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ distribution.
4040
#endif
4141

4242

43-
#if defined(ANDROID_NDK) || defined(__BORLANDC__) || (CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY)
43+
#if defined(ANDROID_NDK) || defined(__BORLANDC__)
4444
# include <ctype.h>
4545
# include <limits.h>
4646
# include <stdio.h>
@@ -89,7 +89,7 @@ distribution.
8989
#endif
9090

9191

92-
#if (defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE))
92+
#if (defined(_MSC_VER) && (_MSC_VER >= 1400 ))
9393
// Microsoft visual studio, version 2005 and higher.
9494
/*int _snprintf_s(
9595
char *buffer,

unzip/ioapi.cpp

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,7 @@ static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename,
111111

112112
if ((filename!=NULL) && (mode_fopen != NULL))
113113
{
114-
#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)
115-
file = NULL;
116-
#else
117-
file = fopen64((const char*)filename, mode_fopen);
118-
#endif
114+
file = fopen64((const char*)filename, mode_fopen);
119115
}
120116

121117
return file;
@@ -147,11 +143,7 @@ static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
147143
static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
148144
{
149145
ZPOS64_T ret;
150-
#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)
151-
ret = 0;
152-
#else
153146
ret = ftello64((FILE *)stream);
154-
#endif
155147
return ret;
156148
}
157149

@@ -180,9 +172,6 @@ static long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offs
180172

181173
static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)
182174
{
183-
#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)
184-
return -1;
185-
#else
186175
int fseek_origin=0;
187176
switch (origin)
188177
{
@@ -200,7 +189,6 @@ static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T
200189
if(fseeko64((FILE *)stream, offset, fseek_origin) != 0)
201190
return -1;
202191
return 0;
203-
#endif
204192
}
205193

206194

0 commit comments

Comments
 (0)