Changeset 60975 in vbox

Timestamp:

May 13, 2016 11:05:22 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

107210

Message:

Attempt at mac build fix; cleanups.

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (1 diff)
• python/Makefile.kmk (modified) (1 diff)
• vboxdeps.cpp (modified) (2 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -92 +92 @@
 
 VBOX_XPCOM_DLLS := \
-    VBoxXPCOM \
+        VBoxXPCOM \
         VBoxXPCOMIPCC
 DLLS += $(VBOX_XPCOM_DLLS)

trunk/src/libs/xpcom18a4/python/Makefile.kmk

@@ -31 +31 @@
 #
 ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
-$(warning %%%)
-$(warning %%%)
-$(warning %%%)
-$(warning VBOX_DEF_MACOSX_VERSION_MIN=$(VBOX_DEF_MACOSX_VERSION_MIN))
-$(warning VBOX_XCODE_VERSION=$(VBOX_XCODE_VERSION))
-$(warning %%%)
-$(warning %%%)
-$(warning %%%)
  ifndef VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6
   if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.5 10.4)

trunk/src/libs/xpcom18a4/vboxdeps.cpp

@@ -8 +8 @@
 #include <nsIPipe.h>
 #include <xptcall.h>
+#include <nsProxyRelease.h>
 #include "xpcom/proxy/src/nsProxyEventPrivate.h"
 
@@ -18 +19 @@
     (uintptr_t)PR_DestroyPollableEvent,
     (uintptr_t)NS_NewPipe2,
+    (uintptr_t)NS_ProxyRelease,
     0
 };