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/util/mkstack.pl | |
| parent | f396ed0f5ce0af56bfde2e75e15cf1f52924c779 (diff) | |
| download | openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.gz openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.bz2 openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/util/mkstack.pl')
| -rw-r--r-- | src/lib/libcrypto/util/mkstack.pl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/libcrypto/util/mkstack.pl b/src/lib/libcrypto/util/mkstack.pl index 085c50f790..0ca9eb6a76 100644 --- a/src/lib/libcrypto/util/mkstack.pl +++ b/src/lib/libcrypto/util/mkstack.pl | |||
| @@ -84,6 +84,7 @@ while(<IN>) { | |||
| 84 | #define sk_${type_thing}_shift(st) SKM_sk_shift($type_thing, (st)) | 84 | #define sk_${type_thing}_shift(st) SKM_sk_shift($type_thing, (st)) |
| 85 | #define sk_${type_thing}_pop(st) SKM_sk_pop($type_thing, (st)) | 85 | #define sk_${type_thing}_pop(st) SKM_sk_pop($type_thing, (st)) |
| 86 | #define sk_${type_thing}_sort(st) SKM_sk_sort($type_thing, (st)) | 86 | #define sk_${type_thing}_sort(st) SKM_sk_sort($type_thing, (st)) |
| 87 | #define sk_${type_thing}_is_sorted(st) SKM_sk_is_sorted($type_thing, (st)) | ||
| 87 | EOF | 88 | EOF |
| 88 | } | 89 | } |
| 89 | foreach $type_thing (sort @asn1setlst) { | 90 | foreach $type_thing (sort @asn1setlst) { |