diff options
| author | djm <> | 2010-10-01 22:59:01 +0000 |
|---|---|---|
| committer | djm <> | 2010-10-01 22:59:01 +0000 |
| commit | 8922d4bc4a8b8893d72a48deb2cdf58215f98505 (patch) | |
| tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/dso/dso_null.c | |
| parent | 76262f7bf9262f965142b1b2b2105cb279c5c696 (diff) | |
| download | openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.gz openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.bz2 openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.zip | |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/dso/dso_null.c')
| -rw-r--r-- | src/lib/libcrypto/dso/dso_null.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libcrypto/dso/dso_null.c b/src/lib/libcrypto/dso/dso_null.c index 4972984651..49d842d1f5 100644 --- a/src/lib/libcrypto/dso/dso_null.c +++ b/src/lib/libcrypto/dso/dso_null.c | |||
| @@ -78,7 +78,9 @@ static DSO_METHOD dso_meth_null = { | |||
| 78 | NULL, /* dso_name_converter */ | 78 | NULL, /* dso_name_converter */ |
| 79 | NULL, /* dso_merger */ | 79 | NULL, /* dso_merger */ |
| 80 | NULL, /* init */ | 80 | NULL, /* init */ |
| 81 | NULL /* finish */ | 81 | NULL, /* finish */ |
| 82 | NULL, /* pathbyaddr */ | ||
| 83 | NULL /* globallookup */ | ||
| 82 | }; | 84 | }; |
| 83 | 85 | ||
| 84 | DSO_METHOD *DSO_METHOD_null(void) | 86 | DSO_METHOD *DSO_METHOD_null(void) |