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

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/libs/xpcom18a4/xpcom

Files:

• base/nscore.h (modified) (1 diff)
• reflect/xptcall/public/xptcall.h (modified) (2 diffs)
• reflect/xptcall/src/md/os2/xptcinvoke_gcc_x86_os2.cpp (added)
• reflect/xptcall/src/md/os2/xptcstubs_gcc_x86_os2.cpp (added)
• reflect/xptinfo/public/xptinfo.h (modified) (1 diff)
• typelib/xpt/tests/PrimitiveTest.c (modified) (2 diffs)
• typelib/xpt/tests/SimpleTypeLib.c (modified) (1 diff)

trunk/src/libs/xpcom18a4/xpcom/base/nscore.h

@@ -176 +176 @@
 #define NS_EXPORT_(type) __declspec(export) type
 #define NS_IMETHOD_(type) virtual type
+#define NS_IMETHODIMP_(type) type
+#define NS_METHOD_(type) type
+#define NS_CALLBACK_(_type, _name) _type (* _name)
+#define NS_STDCALL
+
+#elif defined(XP_OS2) && defined(__declspec)
+
+#define NS_IMPORT __declspec(dllimport)
+#define NS_IMPORT_(type) type __declspec(dllimport) __stdcall
+#define NS_EXPORT __declspec(dllexport)
+#define NS_EXPORT_(type) type __declspec(dllexport) __stdcall
+#define NS_IMETHOD_(type) virtual IMETHOD_VISIBILITY type NS_DEFCALL
 #define NS_IMETHODIMP_(type) type
 #define NS_METHOD_(type) type

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/public/xptcall.h

@@ -58 +58 @@
 #define XPTC_PUBLIC_API(t)    PR_IMPLEMENT(t)
 #define XPTC_PUBLIC_DATA(t)   PR_IMPLEMENT_DATA(t)
-#ifdef _WIN32
+#if defined(_WIN32)
 #    define XPTC_EXPORT           __declspec(dllexport)
+#elif defined(XP_OS2) && defined(__declspec)
+#    define XPTC_EXPORT           __declspec(dllexport)
+#elif defined(XP_OS2_VACPP)
+#    define XPTC_EXPORT           extern
 #else
 #  ifdef VBOX_HAVE_VISIBILITY_HIDDEN
@@ -68 +72 @@
 #endif
 #else
-#ifdef _WIN32
+#if defined(_WIN32)
 #    define XPTC_PUBLIC_API(t)    __declspec(dllimport) t
 #    define XPTC_PUBLIC_DATA(t)   __declspec(dllimport) t
 #    define XPTC_EXPORT           __declspec(dllimport)
+#elif defined(XP_OS2) && defined(__declspec)
+#    define XPTC_PUBLIC_API(t)    __declspec(dllimport) t
+#    define XPTC_PUBLIC_DATA(t)   __declspec(dllimport) t
+#    define XPTC_EXPORT           __declspec(dllimport)
+#elif defined(XP_OS2_VACPP)
+#    define XPTC_PUBLIC_API(t)    extern t
+#    define XPTC_PUBLIC_DATA(t)   extern t
+#    define XPTC_EXPORT           extern
 #else
 #    define XPTC_PUBLIC_API(t)    PR_IMPLEMENT(t)

trunk/src/libs/xpcom18a4/xpcom/reflect/xptinfo/public/xptinfo.h

@@ -53 +53 @@
 #define XPTI_PUBLIC_API(t)    PR_IMPLEMENT(t)
 #define XPTI_PUBLIC_DATA(t)   PR_IMPLEMENT_DATA(t)
-#ifdef _WIN32
+#if defined(_WIN32)
 #    define XPTI_EXPORT           __declspec(dllexport)
+#elif defined(XP_OS2) && defined(__declspec)
+#    define XPTI_EXPORT           __declspec(dllexport)
+#elif defined(XP_OS2_VACPP)
+#    define XPTI_EXPORT           extern
 #else
 #    define XPTI_EXPORT
 #endif
 #else
-#ifdef _WIN32
+#if defined(_WIN32)
 #    define XPTI_PUBLIC_API(t)    __declspec(dllimport) t
 #    define XPTI_PUBLIC_DATA(t)   __declspec(dllimport) t
 #    define XPTI_EXPORT           __declspec(dllimport)
+#elif defined(XP_OS2) && defined(__declspec)
+#    define XPTI_PUBLIC_API(t)    __declspec(dllimport) t
+#    define XPTI_PUBLIC_DATA(t)   __declspec(dllimport) t
+#    define XPTI_EXPORT           __declspec(dllimport)
+#elif defined(XP_OS2_VACPP)
+#    define XPTI_PUBLIC_API(t)    extern t
+#    define XPTI_PUBLIC_DATA(t)   extern t
+#    define XPTI_EXPORT           extern
 #else
 #    define XPTI_PUBLIC_API(t)    PR_IMPLEMENT(t)

trunk/src/libs/xpcom18a4/xpcom/typelib/xpt/tests/PrimitiveTest.c

@@ -62 +62 @@
 
 struct TestData {
-    uint32      bit32;
-    uint16      bit16;
-    uint8       bit8[2];
+    PRUint32    bit32;
+    PRUint16    bit16;
+    PRUint8     bit8[2];
     char        *cstr;
     XPTString   *str;
@@ -97 +97 @@
     XPTCursor curs, *cursor = &curs;
     char *header, *data, *whole;
-    uint32 hlen, dlen, i;
+    PRUint32 hlen, dlen, i;
 
     TRY("XPT_NewArena", (arena = XPT_NewArena(1024, sizeof(double), "main")));

trunk/src/libs/xpcom18a4/xpcom/typelib/xpt/tests/SimpleTypeLib.c

@@ -81 +81 @@
     char *data, *head;
     FILE *out;
-    uint32 len, header_sz;
+    PRUint32 len, header_sz;
 
     PRBool ok;