Bug 941417 - Build ipc/glue in unified mode; r=bent

ipc/glue/MessageChannel.cpp

@@ -11,6 +11,9 @@
 #include "nsDebug.h"
 #include "nsTraceRefcnt.h"
 
+// Undo the damage done by mozzconf.h
+#undef compress
+
 using namespace mozilla;
 using namespace std;
 

ipc/glue/SharedMemorySysV.h

@@ -84,8 +84,8 @@ public:
     void* mem = shmat(mHandle, nullptr, 0);
     if (mem == (void*) -1) {
       char warning[256];
-      snprintf(warning, sizeof(warning)-1,
-               "shmat(): %s (%d)\n", strerror(errno), errno);
+      ::snprintf(warning, sizeof(warning)-1,
+                 "shmat(): %s (%d)\n", strerror(errno), errno);
 
       NS_WARNING(warning);
 

ipc/glue/moz.build

@@ -44,7 +44,7 @@ else:
     EXPORTS.mozilla.ipc += [
         'Transport_posix.h',
     ]
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'CrossProcessMutex_unimplemented.cpp',
         'SharedMemory_posix.cpp',
         'Transport_posix.cpp',
@@ -55,18 +55,18 @@ else:
 # impl.
 if CONFIG['OS_TARGET'] == 'Android':
     EXPORTS.mozilla.ipc += ['SharedMemoryBasic_android.h']
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'SharedMemoryBasic_android.cpp',
     ]
 else:
     EXPORTS.mozilla.ipc += ['SharedMemoryBasic_chromium.h']
 
 if CONFIG['OS_ARCH'] == 'Linux':
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'ProcessUtils_linux.cpp',
     ]
 else:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'ProcessUtils_none.cpp',
     ]
 
@@ -74,11 +74,10 @@ EXPORTS.ipc += [
     'IPCMessageUtils.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'BrowserProcessSubThread.cpp',
     'FileDescriptor.cpp',
     'FileDescriptorUtils.cpp',
-    'GeckoChildProcessHost.cpp',
     'InputStreamUtils.cpp',
     'MessageChannel.cpp',
     'MessageLink.cpp',
@@ -89,6 +88,12 @@ SOURCES += [
     'SharedMemory.cpp',
     'Shmem.cpp',
     'StringUtil.cpp',
+]
+
+# GeckoChildProcessHost.cpp cannot be built in unified mode because it uses plarena.h.
+# URIUtils.cpp cannot be built in unified mode because of name clashes on strdup.
+SOURCES += [
+    'GeckoChildProcessHost.cpp',
     'URIUtils.cpp',
 ]