From f7a1b4761cf3f798e1b42d703d38221b47ce1eec Mon Sep 17 00:00:00 2001
From: "Simon L. B. Nielsen" <simon@FreeBSD.org>
Date: Sun, 28 Feb 2010 18:49:43 +0000
Subject: Import OpenSSL 0.9.8m.

---
 apps/pkcs12.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'apps/pkcs12.c')

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 248bc1154d3c..0db0b79765a8 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;
-- 
cgit v1.2.3