summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-06-25 17:12:26 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-06-25 17:12:26 +0000
commitb8a4a5bcba1545b5b22fed0ab7fcd5dc37598052 (patch)
tree578b0afb3a51d08452ebd18b71b33629d110c35f /crypto
parent6daac534d7733879bdb6b48fdd2fd6a911a3fbe4 (diff)
Fix from HEAD.
Diffstat (limited to 'crypto')
-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 c8717fdcfa..86a07ac272 100644
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -416,7 +416,7 @@ typedef struct bio_f_buffer_ctx_struct
#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