diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-02-11 11:11:23 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-02-11 11:11:23 -0800 |
| commit | c69ee87c10818267f991236201150b1fa51ae519 (patch) | |
| tree | abea72de06ca718ef0296b88ee84a1bf889fed8c /lib/stream-ssl.c | |
| parent | 62ee3464d99c0e37f38b503321cd46181c5c7617 (diff) | |
| parent | 67a4917b07031b387beafaedce413b4207214059 (diff) | |
| download | openvswitch-c69ee87c10818267f991236201150b1fa51ae519.tar.gz | |
Merge "master" into "next".
The main change here is the need to update all of the uses of UNUSED in
the next branch to OVS_UNUSED as it is now spelled on "master".
Diffstat (limited to 'lib/stream-ssl.c')
| -rw-r--r-- | lib/stream-ssl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c index 941f77914..51ce30635 100644 --- a/lib/stream-ssl.c +++ b/lib/stream-ssl.c @@ -155,7 +155,7 @@ static void ssl_close(struct stream *); static void ssl_clear_txbuf(struct ssl_stream *); static int interpret_ssl_error(const char *function, int ret, int error, int *want); -static DH *tmp_dh_callback(SSL *ssl, int is_export UNUSED, int keylength); +static DH *tmp_dh_callback(SSL *ssl, int is_export OVS_UNUSED, int keylength); static void log_ca_cert(const char *file_name, X509 *cert); static short int @@ -719,7 +719,7 @@ pssl_pstream_cast(struct pstream *pstream) } static int -pssl_open(const char *name UNUSED, char *suffix, struct pstream **pstreamp) +pssl_open(const char *name OVS_UNUSED, char *suffix, struct pstream **pstreamp) { struct pssl_pstream *pssl; struct sockaddr_in sin; @@ -855,7 +855,7 @@ do_ssl_init(void) } static DH * -tmp_dh_callback(SSL *ssl UNUSED, int is_export UNUSED, int keylength) +tmp_dh_callback(SSL *ssl OVS_UNUSED, int is_export OVS_UNUSED, int keylength) { struct dh { int keylength; |