diff options
| author | djm <> | 2008-09-06 12:17:54 +0000 |
|---|---|---|
| committer | djm <> | 2008-09-06 12:17:54 +0000 |
| commit | 38ce604e3cc97706b876b0525ddff0121115456d (patch) | |
| tree | 7ccc28afe1789ea3dbedf72365f955d5b8e105b5 /src/lib/libcrypto/stack/stack.h | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/stack/stack.h')
| -rw-r--r-- | src/lib/libcrypto/stack/stack.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/libcrypto/stack/stack.h b/src/lib/libcrypto/stack/stack.h index 7570b85fe8..5cbb116a8b 100644 --- a/src/lib/libcrypto/stack/stack.h +++ b/src/lib/libcrypto/stack/stack.h | |||
| @@ -89,6 +89,7 @@ int sk_insert(STACK *sk,char *data,int where); | |||
| 89 | char *sk_delete(STACK *st,int loc); | 89 | char *sk_delete(STACK *st,int loc); |
| 90 | char *sk_delete_ptr(STACK *st, char *p); | 90 | char *sk_delete_ptr(STACK *st, char *p); |
| 91 | int sk_find(STACK *st,char *data); | 91 | int sk_find(STACK *st,char *data); |
| 92 | int sk_find_ex(STACK *st,char *data); | ||
| 92 | int sk_push(STACK *st,char *data); | 93 | int sk_push(STACK *st,char *data); |
| 93 | int sk_unshift(STACK *st,char *data); | 94 | int sk_unshift(STACK *st,char *data); |
| 94 | char *sk_shift(STACK *st); | 95 | char *sk_shift(STACK *st); |