summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2018-02-06 07:15:53 +1000
committerPauli <paul.dale@oracle.com>2018-02-07 10:08:15 +1000
commit2ad2281a8005dbc9046059693995c78a04ed9e37 (patch)
treeaa984cd6f2ffc76ec4b63f02aa0c440bebaa2b37 /include
parent7ff3a3b9e98104e3d080e652712c42b0dff915dd (diff)
Make the OPENSSL_CPUID_OBJ define internal.
Patch by @levitte. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> (Merged from https://github.com/openssl/openssl/pull/5231)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/opensslconf.h.in4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in
index 2603247df2..16aa82e631 100644
--- a/include/openssl/opensslconf.h.in
+++ b/include/openssl/opensslconf.h.in
@@ -1,7 +1,7 @@
/*
* {- join("\n * ", @autowarntext) -}
*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -119,8 +119,6 @@ extern "C" {
# define DEPRECATEDIN_0_9_8(f)
#endif
-{- $target{cpuid_obj} ne "mem_clr.o" ? "#define OPENSSL_CPUID_OBJ" : "" -}
-
/* Generate 80386 code? */
{- $config{processor} eq "386" ? "#define" : "#undef" -} I386_ONLY