summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormiod <>2014-06-24 19:33:10 +0000
committermiod <>2014-06-24 19:33:10 +0000
commit3692369997cf415ee57b6b7a8a6855d99812ad92 (patch)
treeff423ca5150df1d0fe84157792a00a2df8dbcf9c /src
parent4456e95308ef034635c0e6d9209deeaeeb0ba506 (diff)
downloadopenbsd-3692369997cf415ee57b6b7a8a6855d99812ad92.tar.gz
openbsd-3692369997cf415ee57b6b7a8a6855d99812ad92.tar.bz2
openbsd-3692369997cf415ee57b6b7a8a6855d99812ad92.zip
Remove ancient workaround for previous century's compilers in the declaration
of CRYPTO_EX_DATA; riding upon the libcrypto major bump.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/crypto.h3
-rw-r--r--src/lib/libssl/src/crypto/crypto.h3
2 files changed, 2 insertions, 4 deletions
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 @@
1/* $OpenBSD: crypto.h,v 1.30 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: crypto.h,v 1.31 2014/06/24 19:33:10 miod Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -272,7 +272,6 @@ typedef struct bio_st BIO_dummy;
272 272
273struct crypto_ex_data_st { 273struct crypto_ex_data_st {
274 STACK_OF(void) *sk; 274 STACK_OF(void) *sk;
275 int dummy; /* gcc is screwing up this data structure :-( */
276}; 275};
277DECLARE_STACK_OF(void) 276DECLARE_STACK_OF(void)
278 277
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 @@
1/* $OpenBSD: crypto.h,v 1.30 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: crypto.h,v 1.31 2014/06/24 19:33:10 miod Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -272,7 +272,6 @@ typedef struct bio_st BIO_dummy;
272 272
273struct crypto_ex_data_st { 273struct crypto_ex_data_st {
274 STACK_OF(void) *sk; 274 STACK_OF(void) *sk;
275 int dummy; /* gcc is screwing up this data structure :-( */
276}; 275};
277DECLARE_STACK_OF(void) 276DECLARE_STACK_OF(void)
278 277