aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/stack
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2006-12-06 13:36:48 +0000
committerDr. Stephen Henson <steve@openssl.org>2006-12-06 13:36:48 +0000
commit10ca15f3fa50726a838fc8a61026dea2c303d218 (patch)
treec7a9c07d62ecac71c2dabd817bd498a4751f1007 /crypto/stack
parentda736b31b22aa5c06aa14135dbf337389b5d3c3a (diff)
downloadopenssl-10ca15f3fa50726a838fc8a61026dea2c303d218.tar.gz
Fix change to OPENSSL_NO_RFC3779
Diffstat (limited to 'crypto/stack')
-rw-r--r--crypto/stack/safestack.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h
index 575745e235..5da6d9a16f 100644
--- a/crypto/stack/safestack.h
+++ b/crypto/stack/safestack.h
@@ -297,7 +297,6 @@ STACK_OF(type) \
#define sk_ACCESS_DESCRIPTION_sort(st) SKM_sk_sort(ACCESS_DESCRIPTION, (st))
#define sk_ACCESS_DESCRIPTION_is_sorted(st) SKM_sk_is_sorted(ACCESS_DESCRIPTION, (st))
-#ifdef OPENSSL_RFC3779
#define sk_ASIdOrRange_new(st) SKM_sk_new(ASIdOrRange, (st))
#define sk_ASIdOrRange_new_null() SKM_sk_new_null(ASIdOrRange)
#define sk_ASIdOrRange_free(st) SKM_sk_free(ASIdOrRange, (st))
@@ -319,7 +318,6 @@ STACK_OF(type) \
#define sk_ASIdOrRange_pop(st) SKM_sk_pop(ASIdOrRange, (st))
#define sk_ASIdOrRange_sort(st) SKM_sk_sort(ASIdOrRange, (st))
#define sk_ASIdOrRange_is_sorted(st) SKM_sk_is_sorted(ASIdOrRange, (st))
-#endif /* def OPENSSL_RFC3779 */
#define sk_ASN1_GENERALSTRING_new(st) SKM_sk_new(ASN1_GENERALSTRING, (st))
#define sk_ASN1_GENERALSTRING_new_null() SKM_sk_new_null(ASN1_GENERALSTRING)
@@ -805,7 +803,7 @@ STACK_OF(type) \
#define sk_GENERAL_SUBTREE_sort(st) SKM_sk_sort(GENERAL_SUBTREE, (st))
#define sk_GENERAL_SUBTREE_is_sorted(st) SKM_sk_is_sorted(GENERAL_SUBTREE, (st))
-#ifdef OPENSSL_RFC3779
+#ifndef OPENSSL_NO_RFC3779
#define sk_IPAddressFamily_new(st) SKM_sk_new(IPAddressFamily, (st))
#define sk_IPAddressFamily_new_null() SKM_sk_new_null(IPAddressFamily)
#define sk_IPAddressFamily_free(st) SKM_sk_free(IPAddressFamily, (st))
@@ -849,7 +847,7 @@ STACK_OF(type) \
#define sk_IPAddressOrRange_pop(st) SKM_sk_pop(IPAddressOrRange, (st))
#define sk_IPAddressOrRange_sort(st) SKM_sk_sort(IPAddressOrRange, (st))
#define sk_IPAddressOrRange_is_sorted(st) SKM_sk_is_sorted(IPAddressOrRange, (st))
-#endif /* def OPENSSL_RFC3779 */
+#endif /* OPENSSL_NO_RFC3779 */
#define sk_KRB5_APREQBODY_new(st) SKM_sk_new(KRB5_APREQBODY, (st))
#define sk_KRB5_APREQBODY_new_null() SKM_sk_new_null(KRB5_APREQBODY)