diff options
| author | doug <> | 2015-06-20 01:17:27 +0000 |
|---|---|---|
| committer | doug <> | 2015-06-20 01:17:27 +0000 |
| commit | d63a5f3583c065cc98250e7d8100b84dd8e7bfe7 (patch) | |
| tree | 84e7eb87016dcde1777b3b17e9a6cb6fe16a76fa | |
| parent | bedaa1810c5bb6d8b84e1bec8033245abf6e95dc (diff) | |
| download | openbsd-d63a5f3583c065cc98250e7d8100b84dd8e7bfe7.tar.gz openbsd-d63a5f3583c065cc98250e7d8100b84dd8e7bfe7.tar.bz2 openbsd-d63a5f3583c065cc98250e7d8100b84dd8e7bfe7.zip | |
Fix warning on vax due to old gcc.
Old gcc warns when parameters have the same names as functions. Noticed
by deraadt@.
ok deraadt@ jsing@
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/bio/bio.h | 8 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/bio/bio.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h index 339a5c456b..5243367073 100644 --- a/src/lib/libcrypto/bio/bio.h +++ b/src/lib/libcrypto/bio/bio.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bio.h,v 1.28 2015/02/09 10:55:33 jsing Exp $ */ | 1 | /* $OpenBSD: bio.h,v 1.29 2015/06/20 01:17:27 doug Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -625,11 +625,11 @@ BIO_METHOD *BIO_s_datagram(void); | |||
| 625 | /* BIO_METHOD *BIO_f_ber(void); */ | 625 | /* BIO_METHOD *BIO_f_ber(void); */ |
| 626 | 626 | ||
| 627 | int BIO_sock_should_retry(int i); | 627 | int BIO_sock_should_retry(int i); |
| 628 | int BIO_sock_non_fatal_error(int error); | 628 | int BIO_sock_non_fatal_error(int _error); |
| 629 | int BIO_dgram_non_fatal_error(int error); | 629 | int BIO_dgram_non_fatal_error(int _error); |
| 630 | 630 | ||
| 631 | int BIO_fd_should_retry(int i); | 631 | int BIO_fd_should_retry(int i); |
| 632 | int BIO_fd_non_fatal_error(int error); | 632 | int BIO_fd_non_fatal_error(int _error); |
| 633 | int | 633 | int |
| 634 | BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u), | 634 | BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u), |
| 635 | void *u, const char *s, int len); | 635 | void *u, const char *s, int len); |
diff --git a/src/lib/libssl/src/crypto/bio/bio.h b/src/lib/libssl/src/crypto/bio/bio.h index 339a5c456b..5243367073 100644 --- a/src/lib/libssl/src/crypto/bio/bio.h +++ b/src/lib/libssl/src/crypto/bio/bio.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bio.h,v 1.28 2015/02/09 10:55:33 jsing Exp $ */ | 1 | /* $OpenBSD: bio.h,v 1.29 2015/06/20 01:17:27 doug Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -625,11 +625,11 @@ BIO_METHOD *BIO_s_datagram(void); | |||
| 625 | /* BIO_METHOD *BIO_f_ber(void); */ | 625 | /* BIO_METHOD *BIO_f_ber(void); */ |
| 626 | 626 | ||
| 627 | int BIO_sock_should_retry(int i); | 627 | int BIO_sock_should_retry(int i); |
| 628 | int BIO_sock_non_fatal_error(int error); | 628 | int BIO_sock_non_fatal_error(int _error); |
| 629 | int BIO_dgram_non_fatal_error(int error); | 629 | int BIO_dgram_non_fatal_error(int _error); |
| 630 | 630 | ||
| 631 | int BIO_fd_should_retry(int i); | 631 | int BIO_fd_should_retry(int i); |
| 632 | int BIO_fd_non_fatal_error(int error); | 632 | int BIO_fd_non_fatal_error(int _error); |
| 633 | int | 633 | int |
| 634 | BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u), | 634 | BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u), |
| 635 | void *u, const char *s, int len); | 635 | void *u, const char *s, int len); |
