Update HPUX config, work around HPUX library incompatibility.

[openssl.git] / crypto / asn1 / a_bmp.c

diff --git a/crypto/asn1/a_bmp.c b/crypto/asn1/a_bmp.c
index 32a4fc215803bd29c161a99fa3065ce830ba617e..6075871984f599daa3c06e81f2489f9aab884c51 100644 (file)
--- a/crypto/asn1/a_bmp.c
+++ b/crypto/asn1/a_bmp.c
@@ -58,23 +58,16 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1.h"
+#include <openssl/asn1.h>
 
-/* ASN1err(ASN1_F_D2I_ASN1_BMPSTRING,ASN1_R_EXPECTING_AN_INTEGER);
- */
-
-int i2d_ASN1_BMPSTRING(a, pp)
-ASN1_BMPSTRING *a;
-unsigned char **pp;
+int i2d_ASN1_BMPSTRING(ASN1_BMPSTRING *a, unsigned char **pp)
        {
        return(i2d_ASN1_bytes((ASN1_STRING *)a,pp,
                V_ASN1_BMPSTRING,V_ASN1_UNIVERSAL));
        }
 
-ASN1_BMPSTRING *d2i_ASN1_BMPSTRING(a, pp, length)
-ASN1_BMPSTRING **a;
-unsigned char **pp;
-long length;
+ASN1_BMPSTRING *d2i_ASN1_BMPSTRING(ASN1_BMPSTRING **a, unsigned char **pp,
+            long length)
        {
        ASN1_BMPSTRING *ret=NULL;