Skip to content

Commit 01514b7

Browse files
authored
Merge pull request #599 from pinotree/glibc
Use more Linux codepaths on any GNU libc-based system
2 parents 77fa74e + c606c5b commit 01514b7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

COLLADABaseUtils/src/COLLADABUNativeString.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ namespace COLLADABU
5757
WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)wideString.c_str(), -1, dest, multibyteLength, 0, 0 );
5858
this->assign( dest );
5959
delete[] dest;
60-
#elif defined (COLLADABU_OS_LINUX) || defined (COLLADABU_OS_MAC)
60+
#elif defined (COLLADABU_OS_LINUX) || defined (COLLADABU_OS_MAC) || defined (__GLIBC__)
6161
//# error check if this really works on linux
6262
size_t maxStringLength = wcstombs( 0, wideString.c_str(), 0 ) + 1; // wideString.length()*MB_CUR_MAX + 1;
6363
char* dest = new char[ maxStringLength ];
@@ -80,7 +80,7 @@ namespace COLLADABU
8080
WideString returnValue( dest );
8181
delete[] dest;
8282
return returnValue;
83-
#elif defined (COLLADABU_OS_LINUX) || defined (COLLADABU_OS_MAC)
83+
#elif defined (COLLADABU_OS_LINUX) || defined (COLLADABU_OS_MAC) || defined (__GLIBC__)
8484
//# error check if this really works on linux
8585

8686
size_t maxStringLength = length() + 1;

GeneratedSaxParser/include/GeneratedSaxParserPrerequisites.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ namespace GeneratedSaxParser
6262
typedef unsigned int uint32;
6363
typedef unsigned long long uint64;
6464

65-
#elif defined COLLADABU_OS_LINUX
65+
#elif defined COLLADABU_OS_LINUX || defined __GLIBC__
6666
typedef signed char sint8;
6767
typedef signed short sint16;
6868
typedef signed int sint32;

0 commit comments

Comments
 (0)