summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-06-17 11:55:51 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-06-17 11:55:51 +0000
commitefaa569c3b0e131cc760138f3c4bc27972a21dc1 (patch)
tree6d79994bf5a7e4a0bf2f981614c1d53d2b4c872d /apps
parent15684f58c2e1237ae074f22cba4a61418fd01d3d (diff)
PR: 1943
Submitted by: Guenter <lists@gknw.net> Approved by: steve@openssl.org Rename uni2asc and asc2uni on Netware to avoid a name clash.
Diffstat (limited to 'apps')
-rw-r--r--apps/pkcs12.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 248bc1154d..0db0b79765 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -68,6 +68,12 @@
#include <openssl/pem.h>
#include <openssl/pkcs12.h>
+#ifdef OPENSSL_SYS_NETWARE
+/* Rename these functions to avoid name clashes on NetWare OS */
+#define uni2asc OPENSSL_uni2asc
+#define asc2uni OPENSSL_asc2uni
+#endif
+
#define PROG pkcs12_main
const EVP_CIPHER *enc;