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/engine/enginetest.c | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/engine/enginetest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/engine/enginetest.c b/src/lib/libcrypto/engine/enginetest.c index c2d0297392..cf82f490db 100644 --- a/src/lib/libcrypto/engine/enginetest.c +++ b/src/lib/libcrypto/engine/enginetest.c | |||
| @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) | |||
| 72 | #include <openssl/engine.h> | 72 | #include <openssl/engine.h> |
| 73 | #include <openssl/err.h> | 73 | #include <openssl/err.h> |
| 74 | 74 | ||
| 75 | static void display_engine_list() | 75 | static void display_engine_list(void) |
| 76 | { | 76 | { |
| 77 | ENGINE *h; | 77 | ENGINE *h; |
| 78 | int loop; | 78 | int loop; |