#301064 NSPRPUB_PRE_4_2_CLIENT_BRANCH
authormkaply%us.ibm.com
Wed, 15 Mar 2006 20:48:27 +0000
branchNSPRPUB_PRE_4_2_CLIENT_BRANCH
changeset 3614 cdfce24e1926e7759fa97ddb085622c67e85abe3
parent 3612 cffaa580ebfba0b4f4627e15babcafe1278f1ed5
child 3615 bcdcdfe2b86e720c8a883ed69631ec75db4653f5
child 3618 13d7f0c2d0c01e34b161497647a7189230ee2fc6
push idunknown
push userunknown
push dateunknown
bugs301064
#301064 r=wtc, sr=mkaply (OS/2 only) Patch from Andy Willis - add _declspec(dllexport/dllimport) for OS/2
pr/include/prtypes.h
--- a/pr/include/prtypes.h
+++ b/pr/include/prtypes.h
@@ -156,16 +156,32 @@
 #define PR_IMPLEMENT(__type) __declspec(export) __type
 #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) extern  __declspec(dllimport) __type
+#define PR_IMPORT_DATA(__type) extern __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
+#define PR_CALLBACK_DECL
+#define PR_STATIC_CALLBACK(__x) static __x
+
 #elif defined(XP_OS2_VACPP) 
 
 #define PR_EXPORT(__type) extern __type
 #define PR_EXPORT_DATA(__type) extern __type
 #define PR_IMPORT(__type) extern __type
 #define PR_IMPORT_DATA(__type) extern __type
 
 #define PR_EXTERN(__type) extern __type