mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Increase portability. (Submission from Nikita Kindt, as were some recent related submissions.)

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@28444 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2014-10-06 19:57:34 +00:00
parent f57aa7bd91
commit 3ce4e59090
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
StandAlone/StandAlone.cpp
View File

@@ -868,7 +868,7 @@ void usage()
); );
} }
#ifndef _WIN32 #if !defined _MSC_VER && !defined MINGW_HAS_SECURE_API
#include <errno.h> #include <errno.h>
@@ -903,12 +903,7 @@ int fopen_s(
char** ReadFileData(const char* fileName) char** ReadFileData(const char* fileName)
{ {
FILE *in; FILE *in;
#if defined(_WIN32) && defined(__GNUC__) int errorCode = fopen_s(&in, fileName, "r");
in = fopen(fileName, "r");
int errorCode = in ? 0 : 1;
#else
int errorCode = fopen_s(&in, fileName, "r");
#endif
char *fdata; char *fdata;
int count = 0; int count = 0;

8
glslang/Include/Common.h
View File

@@ -37,7 +37,7 @@
#ifndef _COMMON_INCLUDED_ #ifndef _COMMON_INCLUDED_
#define _COMMON_INCLUDED_ #define _COMMON_INCLUDED_
#if defined _WIN32 && !defined __GNUC__ #if defined _MSC_VER || defined MINGW_HAS_SECURE_API
#include <basetsd.h> #include <basetsd.h>
#define snprintf sprintf_s #define snprintf sprintf_s
#define safe_vsprintf(buf,max,format,args) vsnprintf_s((buf), (max), (max), (format), (args)) #define safe_vsprintf(buf,max,format,args) vsnprintf_s((buf), (max), (max), (format), (args))
@@ -166,11 +166,11 @@ inline const TString String(const int i, const int base = 10)
{ {
char text[16]; // 32 bit ints are at most 10 digits in base 10 char text[16]; // 32 bit ints are at most 10 digits in base 10
#if defined _WIN32 && !defined __GNUC__ #if defined _MSC_VER || defined MINGW_HAS_SECURE_API
_itoa_s(i, text, base); _itoa_s(i, text, sizeof(text), base);
#else #else
// we assume base 10 for all cases // we assume base 10 for all cases
sprintf(text, "%d", i); snprintf(text, sizeof(text), "%d", i);
#endif #endif
return text; return text;