Changeset 589 in vbox for trunk/src/libs/xpcom18a4/nsprpub/pr/include

Timestamp:

Feb 4, 2007 12:25:57 PM (18 years ago)

Author:

vboxsync

Message:

Make it build and run on Mac OS X.

Location:

trunk/src/libs/xpcom18a4/nsprpub/pr/include/md

Files:

• _darwin.cfg (modified) (1 diff)
• _darwin.h (modified) (4 diffs)
• _vbox.cfg (modified) (2 diffs)

trunk/src/libs/xpcom18a4/nsprpub/pr/include/md/_darwin.cfg

@@ -42 +42 @@
 #define XP_UNIX
 #endif
+
+#ifndef DARWIN      /*bird*/
+#define DARWIN      /*bird*/
+#endif              /*bird*/
 
 #define PR_AF_INET6 30  /* same as AF_INET6 */

trunk/src/libs/xpcom18a4/nsprpub/pr/include/md/_darwin.h

@@ -43 +43 @@
 #include <sys/syscall.h>
 
+#ifdef XP_MACOSX
+#include <AvailabilityMacros.h>
+#endif
+
 #define PR_LINKER_ARCH  "darwin"
 #define _PR_SI_SYSNAME  "DARWIN"
-#ifdef i386
+#ifdef __i386__
 #define _PR_SI_ARCHITECTURE "x86"
-#else
+#elif defined(__ppc__)
 #define _PR_SI_ARCHITECTURE "ppc"
 #endif
@@ -62 +66 @@
 #define _PR_HAVE_SOCKADDR_LEN  
 #define _PR_STAT_HAS_ST_ATIMESPEC
-#define _PR_NO_LARGE_FILES
+#define _PR_HAVE_LARGE_OFF_T
 #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
 
@@ -78 +82 @@
  */
 #define _PR_GHBA_DISALLOW_V4MAPPED
+#ifdef XP_MACOSX
+#if !defined(MAC_OS_X_VERSION_10_3) || \
+    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_3
 /*
  * socket(AF_INET6) fails with EPROTONOSUPPORT on Mac OS X 10.1.
  * IPv6 under OS X 10.2 and below is not complete (see bug 222031).
  */
-#if MACOS_DEPLOYMENT_TARGET < 100300
 #define _PR_INET6_PROBE
-#endif
+#endif /* DT < 10.3 */
+#if defined(MAC_OS_X_VERSION_10_2) && \
+    MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_2
 /* Mac OS X 10.2 has inet_ntop and inet_pton. */
-#if MACOS_DEPLOYMENT_TARGET >= 100200
 #define _PR_HAVE_INET_NTOP
+#endif /* DT >= 10.2 */
+#endif /* XP_MACOSX */
+#define _PR_IPV6_V6ONLY_PROBE
+/* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
+#ifndef IPV6_V6ONLY
+#define IPV6_V6ONLY 27
 #endif
 
@@ -101 +114 @@
 extern PRInt32 _PR_DarwinPPC_AtomicAdd(PRInt32 *ptr, PRInt32 val);
 #define _MD_ATOMIC_ADD(ptr, val)    _PR_DarwinPPC_AtomicAdd(ptr, val)
-#endif /* __ppc__ */
+#elif defined(__i386__)
+#define _PR_HAVE_ATOMIC_OPS
+#define _MD_INIT_ATOMIC()
+extern PRInt32 _PR_Darwin_x86_AtomicIncrement(PRInt32 *val);
+#define _MD_ATOMIC_INCREMENT(val)   _PR_Darwin_x86_AtomicIncrement(val)
+extern PRInt32 _PR_Darwin_x86_AtomicDecrement(PRInt32 *val);
+#define _MD_ATOMIC_DECREMENT(val)   _PR_Darwin_x86_AtomicDecrement(val)
+extern PRInt32 _PR_Darwin_x86_AtomicSet(PRInt32 *val, PRInt32 newval);
+#define _MD_ATOMIC_SET(val, newval) _PR_Darwin_x86_AtomicSet(val, newval)
+extern PRInt32 _PR_Darwin_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+#define _MD_ATOMIC_ADD(ptr, val)    _PR_Darwin_x86_AtomicAdd(ptr, val)
+#endif /* __i386__ */
 
 #define USE_SETJMP

trunk/src/libs/xpcom18a4/nsprpub/pr/include/md/_vbox.cfg

@@ -21 +21 @@
  *
  * Contributor(s):
+ *  InnoTek
  *
  * Alternatively, the contents of this file may be used under the terms of
@@ -39 +40 @@
 #define nspr_vboxcfg___
 
-#ifndef __L4_XPCOM__
-# include <_linuxcfg.h>
+#ifdef __DARWIN__
+# include <md/_darwin.cfg>
+#elif defined(__FREEBSD__)
+# include <md/_freebsd.cfg>
+#elif defined(__L4__)
+# include <md/_l4v2.cfg>
+#elif defined(__LINUX__)
+# include <md/_linux.cfg>
+#elif defined(__NETBSD__)
+# include <md/_netbsd.cfg>
+#elif defined(__OPENBSD__)
+# include <md/_openbsd.cfg>
+#elif defined(__SOLARIS__)
+# include <md/_solaris.cfg>
 #else
-# include <_l4v2cfg.h>
+# error "Define the correct platform identifier / Port me."
 #endif