Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MSVC-specific function calls wrapped in a MSVC-specific macro instead of a Windows-specific one.

Browse Source
This commit is contained in:
sippeangelo
2014-10-07 18:21:13 +02:00
parent 46bd05f4f7
commit f9674d4b95
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Bullet3Common/b3Logging.cpp
View File

@@ -82,7 +82,7 @@ void b3OutputPrintfVarArgsInternal(const char *str, ...)
char strDebug[B3_MAX_DEBUG_STRING_LENGTH]={0}; char strDebug[B3_MAX_DEBUG_STRING_LENGTH]={0};
va_list argList; va_list argList;
va_start(argList, str); va_start(argList, str);
#ifdef _WIN32 #ifdef _MSC_VER
vsprintf_s(strDebug,B3_MAX_DEBUG_STRING_LENGTH,str,argList); vsprintf_s(strDebug,B3_MAX_DEBUG_STRING_LENGTH,str,argList);
#else #else
vsnprintf(strDebug,B3_MAX_DEBUG_STRING_LENGTH,str,argList); vsnprintf(strDebug,B3_MAX_DEBUG_STRING_LENGTH,str,argList);
@@ -95,7 +95,7 @@ void b3OutputWarningMessageVarArgsInternal(const char *str, ...)
char strDebug[B3_MAX_DEBUG_STRING_LENGTH]={0}; char strDebug[B3_MAX_DEBUG_STRING_LENGTH]={0};
va_list argList; va_list argList;
va_start(argList, str); va_start(argList, str);
#ifdef _WIN32 #ifdef _MSC_VER
vsprintf_s(strDebug,B3_MAX_DEBUG_STRING_LENGTH,str,argList); vsprintf_s(strDebug,B3_MAX_DEBUG_STRING_LENGTH,str,argList);
#else #else
vsnprintf(strDebug,B3_MAX_DEBUG_STRING_LENGTH,str,argList); vsnprintf(strDebug,B3_MAX_DEBUG_STRING_LENGTH,str,argList);
@@ -109,7 +109,7 @@ void b3OutputErrorMessageVarArgsInternal(const char *str, ...)
char strDebug[B3_MAX_DEBUG_STRING_LENGTH]={0}; char strDebug[B3_MAX_DEBUG_STRING_LENGTH]={0};
va_list argList; va_list argList;
va_start(argList, str); va_start(argList, str);
#ifdef _WIN32 #ifdef _MSC_VER
vsprintf_s(strDebug,B3_MAX_DEBUG_STRING_LENGTH,str,argList); vsprintf_s(strDebug,B3_MAX_DEBUG_STRING_LENGTH,str,argList);
#else #else
vsnprintf(strDebug,B3_MAX_DEBUG_STRING_LENGTH,str,argList); vsnprintf(strDebug,B3_MAX_DEBUG_STRING_LENGTH,str,argList);
@@ -149,7 +149,7 @@ void b3SetCustomLeaveProfileZoneFunc(b3LeaveProfileZoneFunc* leaveFunc)
#ifndef _WIN32 #ifndef _MSC_VER
#undef vsprintf_s #undef vsprintf_s
#endif #endif

8
src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp
View File

@@ -618,7 +618,7 @@ cl_program b3OpenCLUtils_compileCLProgramFromString(cl_context clContext, cl_dev
strippedName = strip2(clFileNameForCaching,"\\"); strippedName = strip2(clFileNameForCaching,"\\");
strippedName = strip2(strippedName,"/"); strippedName = strip2(strippedName,"/");
#ifdef _WIN32 #ifdef _MSVC_VER
sprintf_s(binaryFileName,B3_MAX_STRING_LENGTH,"%s/%s.%s.%s.bin",sCachedBinaryPath,strippedName, deviceName,driverVersion ); sprintf_s(binaryFileName,B3_MAX_STRING_LENGTH,"%s/%s.%s.%s.bin",sCachedBinaryPath,strippedName, deviceName,driverVersion );
#else #else
sprintf(binaryFileName,"%s/%s.%s.%s.bin",sCachedBinaryPath,strippedName, deviceName,driverVersion ); sprintf(binaryFileName,"%s/%s.%s.%s.bin",sCachedBinaryPath,strippedName, deviceName,driverVersion );
@@ -765,7 +765,7 @@ cl_program b3OpenCLUtils_compileCLProgramFromString(cl_context clContext, cl_dev
if( fileUpToDate) if( fileUpToDate)
{ {
#ifdef _WIN32 #ifdef _MSC_VER
FILE* file; FILE* file;
if (fopen_s(&file,binaryFileName, "rb")!=0) if (fopen_s(&file,binaryFileName, "rb")!=0)
file=0; file=0;
@@ -892,7 +892,7 @@ cl_program b3OpenCLUtils_compileCLProgramFromString(cl_context clContext, cl_dev
flagsize = sizeof(char)*(strlen(additionalMacros) + strlen(flags) + 5); flagsize = sizeof(char)*(strlen(additionalMacros) + strlen(flags) + 5);
compileFlags = (char*) malloc(flagsize); compileFlags = (char*) malloc(flagsize);
#ifdef _WIN32 #ifdef _MSC_VER
sprintf_s(compileFlags,flagsize, "%s %s", flags, additionalMacros); sprintf_s(compileFlags,flagsize, "%s %s", flags, additionalMacros);
#else #else
sprintf(compileFlags, "%s %s", flags, additionalMacros); sprintf(compileFlags, "%s %s", flags, additionalMacros);
@@ -941,7 +941,7 @@ cl_program b3OpenCLUtils_compileCLProgramFromString(cl_context clContext, cl_dev
{ {
FILE* file=0; FILE* file=0;
#ifdef _WIN32 #ifdef _MSC_VER
if (fopen_s(&file,binaryFileName, "wb")!=0) if (fopen_s(&file,binaryFileName, "wb")!=0)
file=0; file=0;
#else #else