summaryrefslogtreecommitdiffstats
path: root/crypto/bio
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-06-25 17:11:48 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-06-25 17:11:48 +0000
commite16818108f2fb851930789f29622c0cb2d574398 (patch)
treed845a67938e3be10f0f259264ad87ed773dd27ef /crypto/bio
parent0cb76e79df31e8c6ef9dbbfb92330f90243766be (diff)
Fix from HEAD.
Diffstat (limited to 'crypto/bio')
-rw-r--r--crypto/bio/bio.h2
1 files changed, 1 insertions, 1 deletions
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