diff options
| author | kris <kris@FreeBSD.org> | 2000-04-13 07:15:03 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-04-13 07:15:03 +0000 |
| commit | 6b5aa791691598fc101d47b4b016e597d4e604c4 (patch) | |
| tree | 6c76d880ce419c2a70941c0634805027ea31fc80 /crypto/openssl/ssl/s2_pkt.c | |
| parent | 254febffb998a2a1fd6e6be57dcb73d57335fa14 (diff) | |
| download | FreeBSD-src-6b5aa791691598fc101d47b4b016e597d4e604c4.zip FreeBSD-src-6b5aa791691598fc101d47b4b016e597d4e604c4.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssl/ssl/s2_pkt.c')
| -rw-r--r-- | crypto/openssl/ssl/s2_pkt.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crypto/openssl/ssl/s2_pkt.c b/crypto/openssl/ssl/s2_pkt.c index 5330d79..7eb4673 100644 --- a/crypto/openssl/ssl/s2_pkt.c +++ b/crypto/openssl/ssl/s2_pkt.c @@ -58,12 +58,11 @@ * $FreeBSD$ */ +#include "ssl_locl.h" #ifndef NO_SSL2 - #include <stdio.h> #include <errno.h> #define USE_SOCKETS -#include "ssl_locl.h" static int read_n(SSL *s,unsigned int n,unsigned int max,unsigned int extend); static int do_ssl_write(SSL *s, const unsigned char *buf, unsigned int len); @@ -642,5 +641,10 @@ static int ssl_mt_error(int n) } return(ret); } +#else /* !NO_SSL2 */ + +# if PEDANTIC +static void *dummy=&dummy; +# endif #endif |
