[Bug 444846] Fixing GCC warning on x86-64 about redefined HAVE_VA_LIST_AS_ARRAY. r=crowder
authorIgor Bukanov <igor@mir2.org>
Sat, 19 Jul 2008 19:51:05 +0200
changeset 16062 60245c8c0ff3506fecfcdc783784f44dfcb9b8b2
parent 16061 4d224cd01b19ffe1441728104237c26e4c93f807
child 16063 d54d857e173c8f2c1fe9f154c3318208d82e5e4d
push id728
push useribukanov@mozilla.com
push dateSat, 19 Jul 2008 17:51:04 +0000
treeherdermozilla-central@60245c8c0ff3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscrowder
bugs444846
milestone1.9.1a1pre
[Bug 444846] Fixing GCC warning on x86-64 about redefined HAVE_VA_LIST_AS_ARRAY. r=crowder
js/src/jscpucfg.cpp
js/src/jscpucfg.h
--- a/js/src/jscpucfg.cpp
+++ b/js/src/jscpucfg.cpp
@@ -371,18 +371,18 @@ int main(int argc, char **argv)
     printf("\n");
 
     printf("#define JS_STACK_GROWTH_DIRECTION (%d)\n", StackGrowthDirection(&dummy1));
     printf("\n");
 
     printf("#define JS_HAVE_LONG_LONG\n");
     printf("\n");
 
-    #if defined __GNUC__ && defined __x86_64__
-    printf("#define HAVE_VA_LIST_AS_ARRAY\n");
+#if defined __GNUC__ && defined __x86_64__
+    printf("#define HAVE_VA_LIST_AS_ARRAY 1\n");
     printf("\n");
-    #endif
+#endif
 
     printf("#endif /* js_cpucfg___ */\n");
 
     return EXIT_SUCCESS;
 }
 
--- a/js/src/jscpucfg.h
+++ b/js/src/jscpucfg.h
@@ -92,17 +92,17 @@
 #define PR_WORDS_PER_DWORD_LOG2  0L
 #else  /* !(defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)) */
 #error "CPU type is unknown"
 #endif /* !(defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)) */
 
 #elif defined(_WIN32) || defined(XP_OS2) || defined(WINCE)
 
 #ifdef __WATCOMC__
-#define HAVE_VA_LIST_AS_ARRAY
+#define HAVE_VA_LIST_AS_ARRAY 1
 #endif
 
 #define IS_LITTLE_ENDIAN 1
 #undef  IS_BIG_ENDIAN
 
 #define JS_BYTES_PER_BYTE   1L
 #define JS_BYTES_PER_SHORT  2L
 #define JS_BYTES_PER_INT    4L