diff options
author | Richard Levitte <levitte@openssl.org> | 2001-02-19 16:06:34 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2001-02-19 16:06:34 +0000 |
commit | cf1b7d96647d55e533f779e476e3d4371f40445a (patch) | |
tree | f7d6534cf77223190eaefe68d9e192d3d1246206 /crypto/asn1/asn1.h | |
parent | 649c5a2b096e89692b07dbbe19d2dbb12a9db075 (diff) |
Make all configuration macros available for application by making
sure they are available in opensslconf.h, by giving them names starting
with "OPENSSL_" to avoid conflicts with other packages and by making
sure e_os2.h will cover all platform-specific cases together with
opensslconf.h.
I've checked fairly well that nothing breaks with this (apart from
external software that will adapt if they have used something like
NO_KRB5), but I can't guarantee it completely, so a review of this
change would be a good thing.
Diffstat (limited to 'crypto/asn1/asn1.h')
-rw-r--r-- | crypto/asn1/asn1.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index 51d2e16f84..0a95fec077 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -60,7 +60,7 @@ #define HEADER_ASN1_H #include <time.h> -#ifndef NO_BIO +#ifndef OPENSSL_NO_BIO #include <openssl/bio.h> #endif #include <openssl/e_os2.h> @@ -699,7 +699,7 @@ int ASN1_BIT_STRING_set(ASN1_BIT_STRING *a, unsigned char *d, int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value); int ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n); -#ifndef NO_BIO +#ifndef OPENSSL_NO_BIO int ASN1_BIT_STRING_name_print(BIO *out, ASN1_BIT_STRING *bs, BIT_STRING_BITNAME *tbl, int indent); #endif @@ -767,7 +767,7 @@ STACK * d2i_ASN1_SET(STACK **a, unsigned char **pp, long length, char *(*func)(), void (*free_func)(void *), int ex_tag, int ex_class); -#ifndef NO_BIO +#ifndef OPENSSL_NO_BIO int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a); int a2i_ASN1_INTEGER(BIO *bp,ASN1_INTEGER *bs,char *buf,int size); int i2a_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *a); @@ -820,7 +820,7 @@ char *ASN1_dup(int (*i2d)(),char *(*d2i)(),char *x); void *ASN1_item_dup(const ASN1_ITEM *it, void *x); -#ifndef NO_FP_API +#ifndef OPENSSL_NO_FP_API char *ASN1_d2i_fp(char *(*xnew)(),char *(*d2i)(),FILE *fp,unsigned char **x); void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x); int ASN1_i2d_fp(int (*i2d)(),FILE *out,unsigned char *x); @@ -830,7 +830,7 @@ int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags); int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in); -#ifndef NO_BIO +#ifndef OPENSSL_NO_BIO char *ASN1_d2i_bio(char *(*xnew)(),char *(*d2i)(),BIO *bp,unsigned char **x); void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x); int ASN1_i2d_bio(int (*i2d)(),BIO *out,unsigned char *x); |