From 3dcdba16c08eed5e9a852ef019aa886b671439b5 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Fri, 28 Feb 2014 12:51:08 -0800
Subject: [PATCH] Bug 978188: Guard 'restartVerifier' member-var decl with the
 same #ifdef as its usage, to fix clang 'unused-private-field' warning.
 r=terrence

---
 js/public/GCAPI.h      | 2 +-
 js/src/jsfriendapi.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/public/GCAPI.h b/js/public/GCAPI.h
index 29b24f05569..325cc4a38d0 100644
--- a/js/public/GCAPI.h
+++ b/js/public/GCAPI.h
@@ -316,7 +316,7 @@ WasIncrementalGC(JSRuntime *rt);
 class JS_FRIEND_API(AutoDisableGenerationalGC)
 {
     JSRuntime *runtime;
-#ifdef JS_GC_ZEAL
+#if defined(JSGC_GENERATIONAL) && defined(JS_GC_ZEAL)
     bool restartVerifier;
 #endif
 
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index 39090d28414..cc14abf8ec1 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -932,7 +932,7 @@ JS::DisableIncrementalGC(JSRuntime *rt)
 
 JS::AutoDisableGenerationalGC::AutoDisableGenerationalGC(JSRuntime *rt)
   : runtime(rt)
-#ifdef JS_GC_ZEAL
+#if defined(JSGC_GENERATIONAL) && defined(JS_GC_ZEAL)
   , restartVerifier(rt->gcVerifyPostData)
 #endif
 {