diff options
| author | djm <> | 2005-04-29 05:39:33 +0000 |
|---|---|---|
| committer | djm <> | 2005-04-29 05:39:33 +0000 |
| commit | 68edd00d9258df93b1366c71ac124e0cadf7bc08 (patch) | |
| tree | 3ce4ae2a9747bbc11aed1f95f9bbea92c41f8683 /src/lib/libcrypto/stack/stack.h | |
| parent | f396ed0f5ce0af56bfde2e75e15cf1f52924c779 (diff) | |
| download | openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.gz openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.bz2 openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.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 8b436ca4b9..7570b85fe8 100644 --- a/src/lib/libcrypto/stack/stack.h +++ b/src/lib/libcrypto/stack/stack.h | |||
| @@ -99,6 +99,7 @@ int (*sk_set_cmp_func(STACK *sk, int (*c)(const char * const *, | |||
| 99 | (const char * const *, const char * const *); | 99 | (const char * const *, const char * const *); |
| 100 | STACK *sk_dup(STACK *st); | 100 | STACK *sk_dup(STACK *st); |
| 101 | void sk_sort(STACK *st); | 101 | void sk_sort(STACK *st); |
| 102 | int sk_is_sorted(const STACK *st); | ||
| 102 | 103 | ||
| 103 | #ifdef __cplusplus | 104 | #ifdef __cplusplus |
| 104 | } | 105 | } |