diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-07-10 20:02:59 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-07-10 20:02:59 +0000 |
| commit | 33e91fcd71ed98ebbc59555d6f1acd79a5104820 (patch) | |
| tree | 8e20c8812e50da959cc7043241b26fd51cfe76b8 | |
| parent | 30a9b49f03e72d3730f3c2413195319242fbb8ec (diff) | |
Nuke OPENSSL_NONPIC_relocated since nothing uses it.
ok miod@
| -rw-r--r-- | lib/libssl/src/crypto/cryptlib.c | 3 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/cryptlib.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/libssl/src/crypto/cryptlib.c b/lib/libssl/src/crypto/cryptlib.c index 221a50b70ae..86f51917e29 100644 --- a/lib/libssl/src/crypto/cryptlib.c +++ b/lib/libssl/src/crypto/cryptlib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cryptlib.c,v 1.28 2014/07/10 13:58:21 jsing Exp $ */ +/* $OpenBSD: cryptlib.c,v 1.29 2014/07/10 20:02:58 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. * @@ -680,7 +680,6 @@ OPENSSL_ia32cap_loc(void) return NULL; } #endif -int OPENSSL_NONPIC_relocated = 0; #if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ) void diff --git a/lib/libssl/src/crypto/cryptlib.h b/lib/libssl/src/crypto/cryptlib.h index b45f2c03b47..bd4c4da3aaf 100644 --- a/lib/libssl/src/crypto/cryptlib.h +++ b/lib/libssl/src/crypto/cryptlib.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cryptlib.h,v 1.20 2014/07/10 13:58:21 jsing Exp $ */ +/* $OpenBSD: cryptlib.h,v 1.21 2014/07/10 20:02:58 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -84,7 +84,6 @@ void OPENSSL_cpuid_setup(void); extern unsigned int OPENSSL_ia32cap_P[]; void OPENSSL_showfatal(const char *fmta,...); void *OPENSSL_stderr(void); -extern int OPENSSL_NONPIC_relocated; #ifdef __cplusplus } |