manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

In MinGW there's no strtok_r, nor strtok_s functions. strtok is the only one available (to my knowledge)

This commit is contained in:
Paolo Cignoni 2011-06-14 14:25:45 +00:00
parent 2ad7d34050
commit 6ade8d7dfb
1 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
wrap/ply/plylib.cpp
View File

@ -1041,8 +1041,12 @@ int PlyFile::OpenRead( const char * filename )
goto error; goto error;
} }
header.append(buf); header.append(buf);
#ifdef __MINGW32__
token = strtok(buf,SEP);
#else
char *tokenPtr; char *tokenPtr;
token = strtok_r(buf,SEP,&tokenPtr); token = strtok_r(buf,SEP,&tokenPtr);
#endif
if(token==0) if(token==0)
{ {
error = E_UNESPECTEDEOF; error = E_UNESPECTEDEOF;
@ -1053,7 +1057,11 @@ int PlyFile::OpenRead( const char * filename )
error = E_NOFORMAT; error = E_NOFORMAT;
goto error; goto error;
} }
#ifdef __MINGW32__
token = strtok(0,SEP);
#else
token = strtok_r(0,SEP,&tokenPtr); token = strtok_r(0,SEP,&tokenPtr);
#endif
if(token==0) if(token==0)
{ {
error = E_UNESPECTEDEOF; error = E_UNESPECTEDEOF;
@ -1070,7 +1078,11 @@ int PlyFile::OpenRead( const char * filename )
error = E_NOFORMAT; error = E_NOFORMAT;
goto error; goto error;
} }
#ifdef __MINGW32__
token = strtok(0,SEP);
#else
token = strtok_r(0,SEP,&tokenPtr); token = strtok_r(0,SEP,&tokenPtr);
#endif
if(token==0) if(token==0)
{ {
error = E_UNESPECTEDEOF; error = E_UNESPECTEDEOF;
@ -1089,7 +1101,11 @@ int PlyFile::OpenRead( const char * filename )
} }
header.append(buf); header.append(buf);
#ifdef __MINGW32__
token = strtok(buf,SEP);
#else
token = strtok_r(buf,SEP,&tokenPtr); token = strtok_r(buf,SEP,&tokenPtr);
#endif
if(token==0) if(token==0)
{ {
error = E_UNESPECTEDEOF; error = E_UNESPECTEDEOF;
@ -1113,14 +1129,22 @@ int PlyFile::OpenRead( const char * filename )
else if( !strcmp(token,ELEMENT) ) else if( !strcmp(token,ELEMENT) )
{ {
// Lettura nome elemento // Lettura nome elemento
#ifdef __MINGW32__
char * name = strtok(0,SEP);
#else
char * name = strtok_r(0,SEP,&tokenPtr); char * name = strtok_r(0,SEP,&tokenPtr);
#endif
if(name==0) if(name==0)
{ {
error = E_SYNTAX; error = E_SYNTAX;
goto error; goto error;
} }
// Lettura numero di elementi // Lettura numero di elementi
#ifdef __MINGW32__
token = strtok(0,SEP);
#else
token = strtok_r(0,SEP,&tokenPtr); token = strtok_r(0,SEP,&tokenPtr);
#endif
if(name==0) if(name==0)
{ {
error = E_SYNTAX; error = E_SYNTAX;
@ -1139,7 +1163,11 @@ int PlyFile::OpenRead( const char * filename )
error = E_PROPOUTOFELEMENT; error = E_PROPOUTOFELEMENT;
goto error; goto error;
} }
#ifdef __MINGW32__
token = strtok(0,SEP);
#else
token = strtok_r(0,SEP,&tokenPtr); token = strtok_r(0,SEP,&tokenPtr);
#endif
if(token==0) if(token==0)
{ {
error = E_SYNTAX; error = E_SYNTAX;
@ -1147,7 +1175,11 @@ int PlyFile::OpenRead( const char * filename )
} }
if( !strcmp(token,LIST) ) if( !strcmp(token,LIST) )
{ {
#ifdef __MINGW32__
token = strtok(0,SEP);
#else
token = strtok_r(0,SEP,&tokenPtr); token = strtok_r(0,SEP,&tokenPtr);
#endif
if(token==0) if(token==0)
{ {
error = E_SYNTAX; error = E_SYNTAX;
@ -1159,7 +1191,11 @@ int PlyFile::OpenRead( const char * filename )
error = E_BADTYPENAME; error = E_BADTYPENAME;
goto error; goto error;
} }
#ifdef __MINGW32__
token = strtok(0,SEP);
#else
token = strtok_r(0,SEP,&tokenPtr); token = strtok_r(0,SEP,&tokenPtr);
#endif
if(token==0) if(token==0)
{ {
error = E_SYNTAX; error = E_SYNTAX;
@ -1171,7 +1207,11 @@ int PlyFile::OpenRead( const char * filename )
error = E_BADTYPENAME; error = E_BADTYPENAME;
goto error; goto error;
} }
#ifdef __MINGW32__
token = strtok(0,SEP);
#else
token = strtok_r(0,SEP,&tokenPtr); token = strtok_r(0,SEP,&tokenPtr);
#endif
if(token==0) if(token==0)
{ {
error = E_SYNTAX; error = E_SYNTAX;
@ -1188,7 +1228,11 @@ int PlyFile::OpenRead( const char * filename )
error = E_BADTYPENAME; error = E_BADTYPENAME;
goto error; goto error;
} }
#ifdef __MINGW32__
token = strtok(0,SEP);
#else
token = strtok_r(0,SEP,&tokenPtr); token = strtok_r(0,SEP,&tokenPtr);
#endif
if(token==0) if(token==0)
{ {
error = E_SYNTAX; error = E_SYNTAX;