Bug 579493 - ANGLE fails to compile on mingw r=vladimir
authorJacek Caban <jacek@codeweavers.com>
Sat, 17 Jul 2010 15:49:04 +0200
changeset 47876 2a9cc85aea6f48abe0b41a06c5a920fa9c9c4f63
parent 47875 d9d236a8d274fc79e5bb748b91bc0e416ce57633
child 47877 41f8758b72f0be683412f0e9a8a9559b27c91b42
push id14458
push userjacek@codeweavers.com
push dateSun, 18 Jul 2010 09:31:21 +0000
treeherderautoland@023554677044 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvladimir
bugs579493
milestone2.0b2pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 579493 - ANGLE fails to compile on mingw r=vladimir
gfx/angle/README.mozilla
gfx/angle/src/compiler/preprocessor/scanner.c
--- a/gfx/angle/README.mozilla
+++ b/gfx/angle/README.mozilla
@@ -1,11 +1,11 @@
 This is the ANGLE project, from http://code.google.com/p/angleproject/.
 
-Current revision: r342
+Current revision: r343
 
 Local patches:
     angle-nspr.patch - use NSPR for TLS
 
     angle-shared.patch - add declspec dllexport/dllimport support on win32
 
 To regenerate the flex/yacc generated files:
 
--- a/gfx/angle/src/compiler/preprocessor/scanner.c
+++ b/gfx/angle/src/compiler/preprocessor/scanner.c
@@ -78,25 +78,25 @@ static int eof_scan(InputSrc *is, yystyp
 static void noop(InputSrc *in, int ch, yystypepp * yylvalpp) {}
 
 static InputSrc eof_inputsrc = { 0, &eof_scan, &eof_scan, &noop };
 
 static int byte_scan(InputSrc *, yystypepp * yylvalpp);
 
 #define EOL_SY '\n'
 
-#if defined(_WIN32)
+#if defined(_MSC_VER)
     #define DBG_BREAKPOINT() __asm int 3
-    #elif defined(_M_AMD64)
+#elif defined(_M_AMD64)
     #define DBG_BREAKPOINT() assert(!"Dbg_Breakpoint");
-    #else
+#else
     #define DBG_BREAKPOINT()
-    #endif
+#endif
 
-    #if defined(_WIN32) && !defined(_M_AMD64)
+#if defined(_MSC_VER) && !defined(_M_AMD64)
     __int64 RDTSC ( void ) {
 
         __int64 v;
     
         __asm __emit 0x0f
         __asm __emit 0x31
         __asm mov dword ptr v, eax
         __asm mov dword ptr v+4, edx