From 40d8aef356a70d0b13395f0805e3044b85d91347 Mon Sep 17 00:00:00 2001 From: djm Date: Fri, 29 Apr 2005 05:39:09 +0000 Subject: resolve conflicts --- lib/libssl/src/crypto/stack/stack.h | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/libssl/src/crypto/stack/stack.h') diff --git a/lib/libssl/src/crypto/stack/stack.h b/lib/libssl/src/crypto/stack/stack.h index 8b436ca4b98..7570b85fe85 100644 --- a/lib/libssl/src/crypto/stack/stack.h +++ b/lib/libssl/src/crypto/stack/stack.h @@ -99,6 +99,7 @@ int (*sk_set_cmp_func(STACK *sk, int (*c)(const char * const *, (const char * const *, const char * const *); STACK *sk_dup(STACK *st); void sk_sort(STACK *st); +int sk_is_sorted(const STACK *st); #ifdef __cplusplus } -- cgit v1.2.3-59-g8ed1b