aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/utils/cpuid
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2020-11-28 07:23:51 -0500
committerJack Lloyd <[email protected]>2020-11-28 08:04:03 -0500
commit7ed45bc0da169349ae42450e07a4f2c07be5af14 (patch)
tree1dfddc26893fa3f2272e9b14eabf48da576388c8 /src/lib/utils/cpuid
parentb00cd7cea9233b782697f645a5aa54fd59ecacd9 (diff)
Make scan_name.h, cpuid.h and http_util.h internal
Diffstat (limited to 'src/lib/utils/cpuid')
-rw-r--r--src/lib/utils/cpuid/cpuid.cpp2
-rw-r--r--src/lib/utils/cpuid/cpuid.h2
-rw-r--r--src/lib/utils/cpuid/cpuid_arm.cpp2
-rw-r--r--src/lib/utils/cpuid/cpuid_ppc.cpp2
-rw-r--r--src/lib/utils/cpuid/cpuid_x86.cpp2
-rw-r--r--src/lib/utils/cpuid/info.txt4
6 files changed, 4 insertions, 10 deletions
diff --git a/src/lib/utils/cpuid/cpuid.cpp b/src/lib/utils/cpuid/cpuid.cpp
index a85960e71..e75df3900 100644
--- a/src/lib/utils/cpuid/cpuid.cpp
+++ b/src/lib/utils/cpuid/cpuid.cpp
@@ -5,7 +5,7 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
#include <botan/types.h>
#include <botan/exceptn.h>
#include <botan/internal/parsing.h>
diff --git a/src/lib/utils/cpuid/cpuid.h b/src/lib/utils/cpuid/cpuid.h
index 468b004b5..db0bfe1a9 100644
--- a/src/lib/utils/cpuid/cpuid.h
+++ b/src/lib/utils/cpuid/cpuid.h
@@ -13,8 +13,6 @@
#include <string>
#include <iosfwd>
-BOTAN_FUTURE_INTERNAL_HEADER(cpuid.h)
-
namespace Botan {
/**
diff --git a/src/lib/utils/cpuid/cpuid_arm.cpp b/src/lib/utils/cpuid/cpuid_arm.cpp
index 0711dfdf3..ab968cb96 100644
--- a/src/lib/utils/cpuid/cpuid_arm.cpp
+++ b/src/lib/utils/cpuid/cpuid_arm.cpp
@@ -5,7 +5,7 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
#if defined(BOTAN_TARGET_CPU_IS_ARM_FAMILY)
diff --git a/src/lib/utils/cpuid/cpuid_ppc.cpp b/src/lib/utils/cpuid/cpuid_ppc.cpp
index 604b97947..dbaf802ad 100644
--- a/src/lib/utils/cpuid/cpuid_ppc.cpp
+++ b/src/lib/utils/cpuid/cpuid_ppc.cpp
@@ -5,7 +5,7 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
#include <botan/internal/os_utils.h>
#if defined(BOTAN_TARGET_CPU_IS_PPC_FAMILY)
diff --git a/src/lib/utils/cpuid/cpuid_x86.cpp b/src/lib/utils/cpuid/cpuid_x86.cpp
index 6d07ca198..b8ae54f87 100644
--- a/src/lib/utils/cpuid/cpuid_x86.cpp
+++ b/src/lib/utils/cpuid/cpuid_x86.cpp
@@ -5,7 +5,7 @@
* Botan is released under the Simplified BSD License (see license.txt)
*/
-#include <botan/cpuid.h>
+#include <botan/internal/cpuid.h>
#include <botan/mem_ops.h>
#include <botan/internal/loadstor.h>
diff --git a/src/lib/utils/cpuid/info.txt b/src/lib/utils/cpuid/info.txt
index 987d7eae4..3dd65d76e 100644
--- a/src/lib/utils/cpuid/info.txt
+++ b/src/lib/utils/cpuid/info.txt
@@ -1,7 +1,3 @@
<defines>
CPUID -> 20170917
</defines>
-
-<header:public>
-cpuid.h
-</header:public>