summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2014-06-24 19:33:11 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2014-06-24 19:33:11 +0000
commit8d32be8aaf907154bfd46e4996ad78c6beed0ef0 (patch)
tree6decd9f80a59c2e282e36394e31ce62b05d441a9
parentefdb574aa6ad452b47817e5bde1bb440685d93da (diff)
Remove ancient workaround for previous century's compilers in the declaration
of CRYPTO_EX_DATA; riding upon the libcrypto major bump.
-rw-r--r--lib/libssl/src/crypto/crypto.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/libssl/src/crypto/crypto.h b/lib/libssl/src/crypto/crypto.h
index 78e828fa2e2..5bf87c9e2e4 100644
--- a/lib/libssl/src/crypto/crypto.h
+++ b/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)