commit 3ce4e590901b52f567086856d55f6e9c330dbe34
author John Kessenich <cepheus@frii.com> Mon Oct 06 19:57:34 2014 +0000
committer John Kessenich <cepheus@frii.com> Mon Oct 06 19:57:34 2014 +0000
tree 1788bcd8c5e4b869250382afbc07d5e9c9eee2cf
parent f57aa7bd916c9532619d898e66df67d3ad912a55

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


git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@28444 e7fa87d3-cd2b-0410-9028-fcbf551c1848

StandAlone/StandAlone.cpp

diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index b0bee97..c14e12a 100644
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -868,7 +868,7 @@
            );
 }
 
-#ifndef _WIN32
+#if !defined _MSC_VER && !defined MINGW_HAS_SECURE_API
 
 #include <errno.h>
 
@@ -903,12 +903,7 @@
 char** ReadFileData(const char* fileName) 
 {
     FILE *in;
-    #if defined(_WIN32) && defined(__GNUC__)
-        in = fopen(fileName, "r");
-        int errorCode = in ? 0 : 1;
-    #else
-        int errorCode = fopen_s(&in, fileName, "r");
-    #endif
+    int errorCode = fopen_s(&in, fileName, "r");
 
     char *fdata;
     int count = 0;