From 6e106c4272b85ba0ecf88cefbdad80f61e3b4993 Mon Sep 17 00:00:00 2001
From: Igor Bukanov <igor@mir2.org>
Date: Sat, 19 Jul 2008 19:51:05 +0200
Subject: [PATCH] [Bug 444846] Fixing GCC warning on x86-64 about redefined
 HAVE_VA_LIST_AS_ARRAY. r=crowder

---
 js/src/jscpucfg.cpp | 6 +++---
 js/src/jscpucfg.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/src/jscpucfg.cpp b/js/src/jscpucfg.cpp
index 9173284c333..c41a47ee2f8 100644
--- a/js/src/jscpucfg.cpp
+++ b/js/src/jscpucfg.cpp
@@ -376,10 +376,10 @@ int main(int argc, char **argv)
     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");
 
diff --git a/js/src/jscpucfg.h b/js/src/jscpucfg.h
index 0cfd211f60c..c745e81a713 100644
--- a/js/src/jscpucfg.h
+++ b/js/src/jscpucfg.h
@@ -97,7 +97,7 @@
 #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