Bug 938865 - Build layout/tables in unified mode; r=roc

layout/base/StackArena.h

@@ -2,6 +2,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 StackArena_h
+#define StackArena_h
+
 #include "nsError.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/MemoryReporting.h"
@@ -91,3 +94,5 @@ private:
 };
 
 } // namespace mozilla
+
+#endif

layout/tables/SpanningCellSorter.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 SpanningCellSorter_h
+#define SpanningCellSorter_h
+
 /*
  * Code to sort cells by their colspan, used by BasicTableLayoutStrategy.
  */
@@ -93,3 +96,4 @@ private:
     void* operator new(size_t sz) CPP_THROW_NEW { return nullptr; }
 };
 
+#endif

layout/tables/moz.build

@@ -12,7 +12,7 @@ EXPORTS += [
     'nsITableCellLayout.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'BasicTableLayoutStrategy.cpp',
     'FixedTableLayoutStrategy.cpp',
     'nsCellMap.cpp',