From 3692369997cf415ee57b6b7a8a6855d99812ad92 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Tue, 24 Jun 2014 19:33:10 +0000
Subject: Remove ancient workaround for previous century's compilers in the
 declaration of CRYPTO_EX_DATA; riding upon the libcrypto major bump.

---
 src/lib/libcrypto/crypto.h         | 3 +--
 src/lib/libssl/src/crypto/crypto.h | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h
index 78e828fa2e..5bf87c9e2e 100644
--- a/src/lib/libcrypto/crypto.h
+++ b/src/lib/libcrypto/crypto.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: crypto.h,v 1.30 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: crypto.h,v 1.31 2014/06/24 19:33:10 miod Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -272,7 +272,6 @@ typedef struct bio_st BIO_dummy;
 
 struct crypto_ex_data_st {
 	STACK_OF(void) *sk;
-	int dummy; /* gcc is screwing up this data structure :-( */
 };
 DECLARE_STACK_OF(void)
 
diff --git a/src/lib/libssl/src/crypto/crypto.h b/src/lib/libssl/src/crypto/crypto.h
index 78e828fa2e..5bf87c9e2e 100644
--- a/src/lib/libssl/src/crypto/crypto.h
+++ b/src/lib/libssl/src/crypto/crypto.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: crypto.h,v 1.30 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: crypto.h,v 1.31 2014/06/24 19:33:10 miod Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -272,7 +272,6 @@ typedef struct bio_st BIO_dummy;
 
 struct crypto_ex_data_st {
 	STACK_OF(void) *sk;
-	int dummy; /* gcc is screwing up this data structure :-( */
 };
 DECLARE_STACK_OF(void)
 
-- 
cgit v1.2.3-55-g6feb