aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/stack
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-04-20 01:10:33 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-04-20 01:10:33 +0000
commitf5fedc0497ef4a7b4d60d404f9b37020967eab94 (patch)
tree2a11ceff0837be591b43c2c10936bdd8c921c524 /crypto/stack
parente4aac1cb684a630d4e55bf5960d4fd8d1dbcccd1 (diff)
downloadopenssl-f5fedc0497ef4a7b4d60d404f9b37020967eab94.tar.gz
Various fixes so Win32 compile may work. Convert GeneralNames to use safe stack.
Diffstat (limited to 'crypto/stack')
-rw-r--r--crypto/stack/safestack.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h
index 87bc9221a7..4ba9dab912 100644
--- a/crypto/stack/safestack.h
+++ b/crypto/stack/safestack.h
@@ -78,7 +78,8 @@ void sk_##type##_delete_ptr(STACK_OF(type) *sk,type *v); \
void sk_##type##_set_cmp_func(STACK_OF(type) *sk,int (*cmp)(type **,type **)); \
STACK_OF(type) *sk_##type##_dup(STACK_OF(type) *sk); \
void sk_##type##_pop_free(STACK_OF(type) *sk,void (*func)(type *)); \
-type *sk_##type##_shift(STACK_OF(type) *sk);
+type *sk_##type##_shift(STACK_OF(type) *sk); \
+type *sk_##type##_pop(STACK_OF(type) *sk);
#define IMPLEMENT_STACK_OF(type) \
STACK_OF(type) *sk_##type##_new(int (*cmp)(type **,type **)) \
@@ -110,6 +111,8 @@ STACK_OF(type) *sk_##type##_dup(STACK_OF(type) *sk) \
void sk_##type##_pop_free(STACK_OF(type) *sk,void (*func)(type *)) \
{ sk_pop_free((STACK *)sk,func); } \
type *sk_##type##_shift(STACK_OF(type) *sk) \
- { return (type *)sk_shift((STACK *)sk); }
+ { return (type *)sk_shift((STACK *)sk); } \
+type *sk_##type##_pop(STACK_OF(type) *sk) \
+ { return (type *)sk_pop((STACK *)sk); }
#endif /* ndef HEADER_SAFESTACK_H */