summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs12/p12_utl.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-06-17 12:04:56 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-06-17 12:04:56 +0000
commitc05353c50a438d86e030da82f024870358c95edb (patch)
tree076bb54dc44513e53bf0b66833123aa4f4d12608 /crypto/pkcs12/p12_utl.c
parent73ea41607004bd39bf56730b875549f765107e95 (diff)
Rename asc2uni and uni2asc functions to avoid clashes.
Diffstat (limited to 'crypto/pkcs12/p12_utl.c')
-rw-r--r--crypto/pkcs12/p12_utl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/pkcs12/p12_utl.c b/crypto/pkcs12/p12_utl.c
index ca30ac4f6d..59c6f453f6 100644
--- a/crypto/pkcs12/p12_utl.c
+++ b/crypto/pkcs12/p12_utl.c
@@ -62,7 +62,7 @@
/* Cheap and nasty Unicode stuff */
-unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen)
+unsigned char *OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen)
{
int ulen, i;
unsigned char *unitmp;
@@ -81,7 +81,7 @@ unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *un
return unitmp;
}
-char *uni2asc(unsigned char *uni, int unilen)
+char *OPENSSL_uni2asc(unsigned char *uni, int unilen)
{
int asclen, i;
char *asctmp;