Adding a way, if desired, for us to use the static NSPR libraries. Do not expect that this patch ever merges back into the offical releases. NPODB/Branch only NSPRPUB_PRE_4_2_WINCE_BRANCH
authordougt%meer.net
Sat, 03 Dec 2005 05:35:42 +0000
branchNSPRPUB_PRE_4_2_WINCE_BRANCH
changeset 3512 3e9d14b80c941108d92193ce92c12389268b2e7c
parent 3424 770f91cf95814ea6ed2e6cf855da39d872890ccc
push idunknown
push userunknown
push dateunknown
Adding a way, if desired, for us to use the static NSPR libraries. Do not expect that this patch ever merges back into the offical releases. NPODB/Branch only
pr/include/prtypes.h
--- a/pr/include/prtypes.h
+++ b/pr/include/prtypes.h
@@ -195,19 +195,24 @@
 #define PR_EXTERN_DATA(__type) extern PR_VISIBILITY_DEFAULT __type
 #define PR_IMPLEMENT_DATA(__type) PR_VISIBILITY_DEFAULT __type
 #define PR_CALLBACK
 #define PR_CALLBACK_DECL
 #define PR_STATIC_CALLBACK(__x) static __x
 
 #endif
 
-#if defined(_NSPR_BUILD_)
+#if defined (_BUILD_NSPR_STATIC_)
+#define NSPR_API(__type) __type
+#define NSPR_DATA_API(__type) __type
+
+#elif defined(_NSPR_BUILD_)
 #define NSPR_API(__type) PR_EXPORT(__type)
 #define NSPR_DATA_API(__type) PR_EXPORT_DATA(__type)
+
 #else
 #define NSPR_API(__type) PR_IMPORT(__type)
 #define NSPR_DATA_API(__type) PR_IMPORT_DATA(__type)
 #endif
 
 /***********************************************************************
 ** MACROS:      PR_BEGIN_MACRO
 **              PR_END_MACRO