X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fbio%2Fbss_null.c;h=aee18e3ada46f50d8739e9da5f40124928e87ac8;hb=c04949e97877c7e9e362ab3022b2e7d4988b3e37;hp=52f5da8b123cc4bbbaed6425e6fca065f017a97d;hpb=6b691a5c85ddc4e407e32781841fee5c029506cd;p=oweals%2Fopenssl.git

diff --git a/crypto/bio/bss_null.c b/crypto/bio/bss_null.c
index 52f5da8b12..aee18e3ada 100644
--- a/crypto/bio/bss_null.c
+++ b/crypto/bio/bss_null.c
@@ -59,9 +59,8 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "bio.h"
+#include <openssl/bio.h>
 
-#ifndef NOPROTO
 static int null_write(BIO *h,char *buf,int num);
 static int null_read(BIO *h,char *buf,int size);
 static int null_puts(BIO *h,char *str);
@@ -69,16 +68,6 @@ static int null_gets(BIO *h,char *str,int size);
 static long null_ctrl(BIO *h,int cmd,long arg1,char *arg2);
 static int null_new(BIO *h);
 static int null_free(BIO *data);
-#else
-static int null_write();
-static int null_read();
-static int null_puts();
-static int null_gets();
-static long null_ctrl();
-static int null_new();
-static int null_free();
-#endif
-
 static BIO_METHOD null_method=
 	{
 	BIO_TYPE_NULL,
@@ -90,6 +79,7 @@ static BIO_METHOD null_method=
 	null_ctrl,
 	null_new,
 	null_free,
+	NULL,
 	};
 
 BIO_METHOD *BIO_s_null(void)