Changeset 16392 in vbox for trunk

Timestamp:

Jan 29, 2009 10:58:38 PM (16 years ago)

Author:

vboxsync

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

42241

Message:

XPCOM-darwin/amd64: Use nsLocalFileUnix.cpp instead of nsLocalFileOSX.cpp.

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (2 diffs)
• xpcom/io/nsLocalFile.h (modified) (3 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1015 +1015 @@
         xpcom/io/nsUnicharInputStream.cpp \
         xpcom/io/nsNativeCharsetUtils.cpp
-VBox-xpcom-io_SOURCES.darwin = \
+VBox-xpcom-io_SOURCES.darwin.x86 = \
         xpcom/io/nsLocalFileOSX.cpp \
         xpcom/MoreFiles/FSCopyObject.c \
@@ -1021 +1021 @@
 VBox-xpcom-io_SOURCES.l4 = \
         xpcom/io/nsLocalFileL4.cpp
-ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),)
+if1of ($(KBUILD_TARGET) $(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), freebsd linux netbsd openbsd solaris darwin.amd64)
 VBox-xpcom-io_SOURCES += \
         xpcom/io/nsLocalFileUnix.cpp

trunk/src/libs/xpcom18a4/xpcom/io/nsLocalFile.h

@@ -37 +37 @@
  * ***** END LICENSE BLOCK *****
  *
- * This Original Code has been modified by IBM Corporation. Modifications made by IBM 
+ * This Original Code has been modified by IBM Corporation. Modifications made by IBM
  * described herein are Copyright (c) International Business Machines Corporation, 2000.
  * Modifications to Mozilla code or documentation identified per MPL Section 3.3
@@ -71 +71 @@
 #ifdef XP_WIN
 #include "nsLocalFileWin.h"
-#elif defined(XP_MACOSX)
+#elif defined(XP_MACOSX) && (!defined(VBOX) || !defined(RT_ARCH_AMD64))
 #include "nsLocalFileOSX.h"
 #elif defined(XP_MAC)
@@ -78 +78 @@
   /* Major hack attack!!! */
 #include "nsLocalFileL4.h"
-#elif defined(XP_UNIX) || defined(XP_BEOS)
+#elif defined(XP_UNIX) || defined(XP_BEOS) || (defined(VBOX) && defined(XP_MACOSX))
 #include "nsLocalFileUnix.h"
 #elif defined(XP_OS2)