From 4fcf65c5c59fcf6124cf9f1fd81aa546850f974c Mon Sep 17 00:00:00 2001 From: djm Date: Sat, 6 Sep 2008 12:17:47 +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 7570b85fe85..5cbb116a8b2 100644 --- a/lib/libssl/src/crypto/stack/stack.h +++ b/lib/libssl/src/crypto/stack/stack.h @@ -89,6 +89,7 @@ int sk_insert(STACK *sk,char *data,int where); char *sk_delete(STACK *st,int loc); char *sk_delete_ptr(STACK *st, char *p); int sk_find(STACK *st,char *data); +int sk_find_ex(STACK *st,char *data); int sk_push(STACK *st,char *data); int sk_unshift(STACK *st,char *data); char *sk_shift(STACK *st); -- cgit v1.2.3-59-g8ed1b