From 77fe6381e201dc07dd375c797c511d77613a9336 Mon Sep 17 00:00:00 2001
From: doug <>
Date: Sat, 20 Jun 2015 01:17:27 +0000
Subject: 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@
---
 src/lib/libcrypto/bio/bio.h         | 8 ++++----
 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 @@
-/* $OpenBSD: bio.h,v 1.28 2015/02/09 10:55:33 jsing Exp $ */
+/* $OpenBSD: bio.h,v 1.29 2015/06/20 01:17:27 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -625,11 +625,11 @@ BIO_METHOD *BIO_s_datagram(void);
 /* BIO_METHOD *BIO_f_ber(void); */
 
 int BIO_sock_should_retry(int i);
-int BIO_sock_non_fatal_error(int error);
-int BIO_dgram_non_fatal_error(int error);
+int BIO_sock_non_fatal_error(int _error);
+int BIO_dgram_non_fatal_error(int _error);
 
 int BIO_fd_should_retry(int i);
-int BIO_fd_non_fatal_error(int error);
+int BIO_fd_non_fatal_error(int _error);
 int
 BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u),
 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 @@
-/* $OpenBSD: bio.h,v 1.28 2015/02/09 10:55:33 jsing Exp $ */
+/* $OpenBSD: bio.h,v 1.29 2015/06/20 01:17:27 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -625,11 +625,11 @@ BIO_METHOD *BIO_s_datagram(void);
 /* BIO_METHOD *BIO_f_ber(void); */
 
 int BIO_sock_should_retry(int i);
-int BIO_sock_non_fatal_error(int error);
-int BIO_dgram_non_fatal_error(int error);
+int BIO_sock_non_fatal_error(int _error);
+int BIO_dgram_non_fatal_error(int _error);
 
 int BIO_fd_should_retry(int i);
-int BIO_fd_non_fatal_error(int error);
+int BIO_fd_non_fatal_error(int _error);
 int
 BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u),
 void *u, const char *s, int len);
-- 
cgit v1.2.3-55-g6feb