diff options
| author | Bodo Möller <bodo@openssl.org> | 2001-10-17 20:44:25 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2001-10-17 20:44:25 +0000 |
| commit | 31fe950d2b3fad3ac7ca2922c2af2104514a9496 (patch) | |
| tree | 7bd0d69a90e84742d097fbfe439895c0549b71c4 | |
| parent | db6a87d8cccfbb2802c4116655a3221756405fd8 (diff) | |
| download | openssl-31fe950d2b3fad3ac7ca2922c2af2104514a9496.zip openssl-31fe950d2b3fad3ac7ca2922c2af2104514a9496.tar.gz openssl-31fe950d2b3fad3ac7ca2922c2af2104514a9496.tar.bz2 | |
gcc complained about "write" being shadowed even though the "write"
variable name occured just in a function *prototype* -- so rename it
| -rw-r--r-- | ssl/ssl.h | 4 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -586,7 +586,7 @@ struct ssl_ctx_st int read_ahead; /* callback that allows applications to peek at protocol messages */ - void (*msg_callback)(int write, int version, int content_type, size_t len, const char *buf, SSL *ssl, void *arg); + void (*msg_callback)(int write_p, int version, int content_type, size_t len, const char *buf, SSL *ssl, void *arg); void *msg_callback_arg; int verify_mode; @@ -732,7 +732,7 @@ struct ssl_st * (for non-blocking reads) */ /* callback that allows applications to peek at protocol messages */ - void (*msg_callback)(int write, int version, int content_type, size_t len, const char *buf, SSL *ssl, void *arg); + void (*msg_callback)(int write_p, int version, int content_type, size_t len, const char *buf, SSL *ssl, void *arg); void *msg_callback_arg; int hit; /* reusing a previous session */ diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 67fccc5..1a434a5 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -939,7 +939,7 @@ long SSL_callback_ctrl(SSL *s, int cmd, void (*fp)()) switch(cmd) { case SSL_CTRL_SET_MSG_CALLBACK: - s->msg_callback = (void (*)(int write, int version, int content_type, size_t len, const char *buf, SSL *ssl, void *arg))(fp); + s->msg_callback = (void (*)(int write_p, int version, int content_type, size_t len, const char *buf, SSL *ssl, void *arg))(fp); return 1; default: @@ -1027,7 +1027,7 @@ long SSL_CTX_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)()) switch(cmd) { case SSL_CTRL_SET_MSG_CALLBACK: - ctx->msg_callback = (void (*)(int write, int version, int content_type, size_t len, const char *buf, SSL *ssl, void *arg))(fp); + ctx->msg_callback = (void (*)(int write_p, int version, int content_type, size_t len, const char *buf, SSL *ssl, void *arg))(fp); return 1; default: |