Bug 939572 - Build widget/cocoa in unified mode. r=josh

widget/cocoa/GfxInfo.h

@@ -53,7 +53,7 @@ public:
   NS_DECL_NSIGFXINFODEBUG
 #endif
 
-  virtual uint32_t OperatingSystemVersion() const { return mOSXVersion; }
+  virtual uint32_t OperatingSystemVersion() MOZ_OVERRIDE { return mOSXVersion; }
 
 protected:
 

widget/cocoa/moz.build

@@ -23,7 +23,7 @@ LIBRARY_NAME = 'widget_mac'
 
 LIBXUL_LIBRARY = True
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'GfxInfo.mm',
     'NativeKeyBindings.mm',
     'nsAppShell.mm',
@@ -65,7 +65,7 @@ SOURCES += [
 ]
 
 if CONFIG['TARGET_CPU'] == 'x86_64':
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'ComplexTextInputPanel.mm',
     ]
 

widget/cocoa/nsMenuGroupOwnerX.mm

@@ -25,7 +25,7 @@
 
 #include "nsINode.h"
 
-namespace dom = mozilla::dom;
+using namespace mozilla;
 
 NS_IMPL_ISUPPORTS1(nsMenuGroupOwnerX, nsIMutationObserver)
 

widget/shared/moz.build

@@ -9,7 +9,7 @@ if CONFIG['MOZ_X11']:
 
 MODULE = 'widget'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsShmImage.cpp',
     'SharedWidgetUtils.cpp',
     'WidgetEventImpl.cpp',