Changeset 3149 in vbox for trunk/src/libs/xpcom18a4/nsprpub

Timestamp:

Jun 18, 2007 10:24:11 PM (18 years ago)

Author:

vboxsync

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

22063

Message:

XPCOM: Ported necessary bits of IPC/DConnect tp OS/2.

Location:

trunk/src/libs/xpcom18a4/nsprpub/pr

Files:

• include/md/_os2.h (modified) (1 diff)
• include/md/_vbox.cfg (modified) (1 diff)
• include/obsolete/protypes.h (modified) (1 diff)
• include/prtypes.h (modified) (1 diff)
• src/md/os2/os2sock.c (modified) (2 diffs)

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

@@ -370 +370 @@
 #define _PR_LOCK                      _MD_LOCK
 #define _PR_UNLOCK                                        _MD_UNLOCK
-
+extern void
+md_UnlockAndPostNotifies(struct _MDLock *lock, PRThread *waitThred, struct _MDCVar *waitCV);
 #ifdef USE_RAMSEM
 #define _MD_NEW_LOCK                  (_PR_MD_NEW_LOCK)

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

@@ -54 +54 @@
 #elif defined(__SOLARIS__)
 # include <md/_solaris.cfg>
+#elif defined(__OS2__)
+# include <md/_os2.cfg>
 #else
 # error "Define the correct platform identifier / Port me."

trunk/src/libs/xpcom18a4/nsprpub/pr/include/obsolete/protypes.h

@@ -97 +97 @@
 
 #if !defined(XP_BEOS) && !defined(VMS) \
+    && !defined(XP_OS2_EMX) \
     && !defined(XP_UNIX) || defined(NTO)
 typedef PRUintn uint;

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prtypes.h

@@ -157 +157 @@
 #define PR_EXTERN_DATA(__type) extern __declspec(export) __type
 #define PR_IMPLEMENT_DATA(__type) __declspec(export) __type
+
+#define PR_CALLBACK
+#define PR_CALLBACK_DECL
+#define PR_STATIC_CALLBACK(__x) static __x
+
+#elif defined(XP_OS2) && defined(__declspec)
+
+#define PR_EXPORT(__type) extern __declspec(dllexport) __type
+#define PR_EXPORT_DATA(__type) extern __declspec(dllexport) __type
+#define PR_IMPORT(__type) __declspec(dllimport) __type
+#define PR_IMPORT_DATA(__type) __declspec(dllimport) __type
+
+#define PR_EXTERN(__type) extern __declspec(dllexport) __type
+#define PR_IMPLEMENT(__type) __declspec(dllexport) __type
+#define PR_EXTERN_DATA(__type) extern __declspec(dllexport) __type
+#define PR_IMPLEMENT_DATA(__type) __declspec(dllexport) __type
 
 #define PR_CALLBACK

trunk/src/libs/xpcom18a4/nsprpub/pr/src/md/os2/os2sock.c

@@ -60 +60 @@
 #define _OS2_WRITEV writev
 #define _OS2_IOCTL ioctl
+#define _OS2_const const
 #else
 #define _OS2_WRITEV so_writev
 #define _OS2_IOCTL so_ioctl
+#define _OS2_const
 #endif
 
@@ -551 +553 @@
     }
 
-    while ((rv = _OS2_WRITEV(osfd, (const struct iovec*)iov, iov_size)) == -1) {
+    while ((rv = _OS2_WRITEV(osfd, (_OS2_const struct iovec*)iov, iov_size)) == -1) {
         err = sock_errno();
         if ((err == EWOULDBLOCK))    {