A few more ``#ifndef NO_FP_API / #endif'' pairs for consistency.

Hint from: Andrija Antonijevic <TheAntony2@bigfoot.com>

diff --git a/CHANGES b/CHANGES
index 6dd3eddee470a46c2b78ec03b89b502de3942e1d..f298e40b2ebc84d683e2585e6d0bfe315e9f94c0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 0.9.3a and 0.9.4  [xx Aug 1999]
 
+  *) A few more ``#ifndef NO_FP_API / #endif'' pairs for consistency.
+     [Andrija Antonijevic <TheAntony2@bigfoot.com>]
+
   *) Fix -startdate and -enddate (which was missing) arguments to 'ca'
      program.
      [Steve Henson]

diff --git a/crypto/pkcs12/p12_utl.c b/crypto/pkcs12/p12_utl.c
index 8dccd9e97c4620ac328a9370b260a61067e3459c..2adcbc95e1a87f90eb00323522f157f982febcbb 100644 (file)
--- a/crypto/pkcs12/p12_utl.c
+++ b/crypto/pkcs12/p12_utl.c
@@ -96,19 +96,23 @@ int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12)
        return ASN1_i2d_bio((int(*)())i2d_PKCS12, bp, (unsigned char *)p12);
 }
 
+#ifndef NO_FP_API
 int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12)
 {
        return ASN1_i2d_fp((int(*)())i2d_PKCS12, fp, (unsigned char *)p12);
 }
+#endif
 
 PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12)
 {
        return (PKCS12 *)ASN1_d2i_bio((char *(*)())PKCS12_new,
          (char *(*)())d2i_PKCS12, bp, (unsigned char **)p12);
 }
+#ifndef NO_FP_API
 PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12)
 {
         return (PKCS12 *)ASN1_d2i_fp((char *(*)())PKCS12_new, 
          (char *(*)())d2i_PKCS12, fp, (unsigned char **)(p12));
 }
+#endif
 

diff --git a/crypto/x509v3/v3_prn.c b/crypto/x509v3/v3_prn.c
index 74cad7d90b7ef9629016bac9a4984da442f9a3fb..dc20c6bdba60752c1b73f5c7378687aa7e9d4031 100644 (file)
--- a/crypto/x509v3/v3_prn.c
+++ b/crypto/x509v3/v3_prn.c
@@ -122,6 +122,7 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, int flag, int indent)
                return ok;
 }
 
+#ifndef NO_FP_API
 int X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
 {
        BIO *bio_tmp;
@@ -131,3 +132,4 @@ int X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
        BIO_free(bio_tmp);
        return ret;
 }
+#endif