Bug 938852 - Build layout/inspector in unified mode; r=roc

content/base/src/ChildIterator.h

@@ -4,6 +4,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifndef ChildIterator_h
+#define ChildIterator_h
+
 /**
  * Iterates over the children on a node. If a child is an insertion point,
  * iterates over the children inserted there instead, or the default content
@@ -104,3 +107,5 @@ private:
 
 } // namespace dom
 } // namespace mozilla
+
+#endif

layout/inspector/src/moz.build

@@ -11,7 +11,7 @@ EXPORTS += [
     'nsFontFaceList.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'inCSSValueSearch.cpp',
     'inDeepTreeWalker.cpp',
     'inDOMUtils.cpp',
@@ -23,7 +23,7 @@ SOURCES += [
 ]
 
 if CONFIG['MOZ_XUL']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'inDOMView.cpp',
     ]