From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 25 Jun 2009 17:11:48 +0000 (+0000)
Subject: Fix from HEAD.
X-Git-Tag: OpenSSL_1_0_0-beta3~40
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e16818108f2fb851930789f29622c0cb2d574398;p=oweals%2Fopenssl.git

Fix from HEAD.
---

diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index ab5d5c0923..1c7173c38a 100644
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -411,7 +411,7 @@ typedef int asn1_ps_func(BIO *b, unsigned char **pbuf, int *plen, void *parg);
 #define BIO_set_accept_port(b,name) BIO_ctrl(b,BIO_C_SET_ACCEPT,0,(char *)name)
 #define BIO_get_accept_port(b)	BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,0)
 /* #define BIO_set_nbio(b,n)	BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL) */
-#define BIO_set_nbio_accept(b,n) BIO_ctrl(b,BIO_C_SET_ACCEPT,1,(n)?"a":NULL)
+#define BIO_set_nbio_accept(b,n) BIO_ctrl(b,BIO_C_SET_ACCEPT,1,(n)?(void *)"a":NULL)
 #define BIO_set_accept_bios(b,bio) BIO_ctrl(b,BIO_C_SET_ACCEPT,2,(char *)bio)
 
 #define BIO_BIND_NORMAL			0