Commit 79fb1019 by alokp@chromium.org

Ugly hack to fix compile error on windows. VC++ does not support C99 and hence snprintf.

BUG=308 Review URL: https://codereview.appspot.com/6120055 git-svn-id: https://angleproject.googlecode.com/svn/trunk@1057 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 828cc489
...@@ -15,4 +15,8 @@ ...@@ -15,4 +15,8 @@
TypeName(const TypeName&); \ TypeName(const TypeName&); \
void operator=(const TypeName&) void operator=(const TypeName&)
#if defined(_MSC_VER)
#define snprintf _snprintf
#endif
#endif // COMMON_ANGLEUTILS_H_ #endif // COMMON_ANGLEUTILS_H_
#define MAJOR_VERSION 1 #define MAJOR_VERSION 1
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 1046 #define BUILD_REVISION 1057
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "compiler/OutputHLSL.h" #include "compiler/OutputHLSL.h"
#include "common/angleutils.h"
#include "compiler/debug.h" #include "compiler/debug.h"
#include "compiler/InfoSink.h" #include "compiler/InfoSink.h"
#include "compiler/UnfoldSelect.h" #include "compiler/UnfoldSelect.h"
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#endif #endif
#include <stdio.h> #include <stdio.h>
#include "common/angleutils.h"
#include "compiler/InitializeGlobals.h" #include "compiler/InitializeGlobals.h"
#include "compiler/osinclude.h" #include "compiler/osinclude.h"
......
...@@ -16,9 +16,10 @@ ...@@ -16,9 +16,10 @@
#include "compiler/SymbolTable.h" #include "compiler/SymbolTable.h"
#include <stdio.h> #include <stdio.h>
#include <algorithm> #include <algorithm>
#include "common/angleutils.h"
// //
// TType helper function needs a place to live. // TType helper function needs a place to live.
// //
......
...@@ -50,6 +50,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -50,6 +50,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "common/angleutils.h"
#include "compiler/debug.h" #include "compiler/debug.h"
#include "compiler/preprocessor/slglobals.h" #include "compiler/preprocessor/slglobals.h"
......
...@@ -51,6 +51,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -51,6 +51,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include "common/angleutils.h"
#include "compiler/preprocessor/slglobals.h" #include "compiler/preprocessor/slglobals.h"
#if defined(_MSC_VER) #if defined(_MSC_VER)
......
...@@ -50,6 +50,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -50,6 +50,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include "common/angleutils.h"
#include "compiler/debug.h" #include "compiler/debug.h"
#include "compiler/preprocessor/slglobals.h" #include "compiler/preprocessor/slglobals.h"
#include "compiler/util.h" #include "compiler/util.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment