summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrichard.freedman%sun.com <devnull@localhost>2006-05-19 18:39:15 +0000
committerrichard.freedman%sun.com <devnull@localhost>2006-05-19 18:39:15 +0000
commitd8bd74d2a13235c8fb22e55763f38521e82fe25e (patch)
treea1383b9b7adb17d32e3e59acfcf8b2ff58a71890
parentb1037396ed6f1a104685d1066f4322f3f09f6e69 (diff)
downloadnss-hg-d8bd74d2a13235c8fb22e55763f38521e82fe25e.tar.gz
Replace function that exports array address with appropriate declarations
that do the same, even on Windows platforms.
-rwxr-xr-xsecurity/nss/lib/libpkix/pkix/util/pkix_tools.h4
-rw-r--r--security/nss/lib/nss/nss.def3
2 files changed, 5 insertions, 2 deletions
diff --git a/security/nss/lib/libpkix/pkix/util/pkix_tools.h b/security/nss/lib/libpkix/pkix/util/pkix_tools.h
index e3fdc71e2..baa428aec 100755
--- a/security/nss/lib/libpkix/pkix/util/pkix_tools.h
+++ b/security/nss/lib/libpkix/pkix/util/pkix_tools.h
@@ -1266,7 +1266,11 @@ struct pkix_ClassTable_EntryStruct {
* descriptive name for an error code. This is used by the default
* PKIX_PL_Error_ToString function.
*/
+#ifdef _WIN32
+extern __declspec(dllimport) const char *PKIX_ERRORNAMES[PKIX_NUMERRORS];
+#else
extern const char *PKIX_ERRORNAMES[PKIX_NUMERRORS];
+#endif
#define PKIX_MAGIC_HEADER (PKIX_UInt32) 0xBEEFC0DE
diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def
index 7fb5d2e06..5ad6af2d8 100644
--- a/security/nss/lib/nss/nss.def
+++ b/security/nss/lib/nss/nss.def
@@ -954,8 +954,7 @@ PKIX_Error_GetCause;
PKIX_Error_GetDescription;
PKIX_Error_GetErrorCode;
PKIX_Error_GetSupplementaryInfo;
-PKIX_Error_GetErrorString;
-PKIX_ERRORNAMES;
+PKIX_ERRORNAMES DATA ;
PKIX_Initialize;
PKIX_Initialize_SetConfigDir;
PKIX_List_AppendItem;