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/dso/dso_null.c | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/dso/dso_null.c')
| -rw-r--r-- | src/lib/libcrypto/dso/dso_null.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/libcrypto/dso/dso_null.c b/src/lib/libcrypto/dso/dso_null.c index fa13a7cb0f..4972984651 100644 --- a/src/lib/libcrypto/dso/dso_null.c +++ b/src/lib/libcrypto/dso/dso_null.c | |||
| @@ -75,6 +75,8 @@ static DSO_METHOD dso_meth_null = { | |||
| 75 | NULL, /* unbind_func */ | 75 | NULL, /* unbind_func */ |
| 76 | #endif | 76 | #endif |
| 77 | NULL, /* ctrl */ | 77 | NULL, /* ctrl */ |
| 78 | NULL, /* dso_name_converter */ | ||
| 79 | NULL, /* dso_merger */ | ||
| 78 | NULL, /* init */ | 80 | NULL, /* init */ |
| 79 | NULL /* finish */ | 81 | NULL /* finish */ |
| 80 | }; | 82 | }; |