Use CPU_FEATURES_ prefix for namespace macros.
diff --git a/include/cpu_features_macros.h b/include/cpu_features_macros.h
index 055a15e..d0e9a28 100644
--- a/include/cpu_features_macros.h
+++ b/include/cpu_features_macros.h
@@ -78,15 +78,15 @@
////////////////////////////////////////////////////////////////////////////////
#if defined(__cplusplus)
-#define START_CPP_NAMESPACE \
+#define CPU_FEATURES_START_CPP_NAMESPACE \
namespace cpu_features { \
extern "C" {
-#define END_CPP_NAMESPACE \
+#define CPU_FEATURES_END_CPP_NAMESPACE \
} \
}
#else
-#define START_CPP_NAMESPACE
-#define END_CPP_NAMESPACE
+#define CPU_FEATURES_START_CPP_NAMESPACE
+#define CPU_FEATURES_END_CPP_NAMESPACE
#endif
////////////////////////////////////////////////////////////////////////////////
diff --git a/include/cpuinfo_aarch64.h b/include/cpuinfo_aarch64.h
index c9d87d7..b8826ed 100644
--- a/include/cpuinfo_aarch64.h
+++ b/include/cpuinfo_aarch64.h
@@ -17,7 +17,7 @@
#include "cpu_features_macros.h"
-START_CPP_NAMESPACE
+CPU_FEATURES_START_CPP_NAMESPACE
typedef struct {
int fp : 1; // Floating-point.
@@ -60,6 +60,6 @@
const char* GetAarch64FeaturesEnumName(Aarch64FeaturesEnum);
-END_CPP_NAMESPACE
+CPU_FEATURES_END_CPP_NAMESPACE
#endif // CPU_FEATURES_INCLUDE_CPUINFO_AARCH64_H_
diff --git a/include/cpuinfo_arm.h b/include/cpuinfo_arm.h
index d885b70..7a94bb0 100644
--- a/include/cpuinfo_arm.h
+++ b/include/cpuinfo_arm.h
@@ -17,7 +17,7 @@
#include "cpu_features_macros.h"
-START_CPP_NAMESPACE
+CPU_FEATURES_START_CPP_NAMESPACE
typedef struct {
int vfp : 1; // Vector Floating Point.
@@ -75,6 +75,6 @@
const char* GetArmFeaturesEnumName(ArmFeaturesEnum);
-END_CPP_NAMESPACE
+CPU_FEATURES_END_CPP_NAMESPACE
#endif // CPU_FEATURES_INCLUDE_CPUINFO_ARM_H_
diff --git a/include/cpuinfo_mips.h b/include/cpuinfo_mips.h
index 2b9bd4d..48c23a1 100644
--- a/include/cpuinfo_mips.h
+++ b/include/cpuinfo_mips.h
@@ -17,7 +17,7 @@
#include "cpu_features_macros.h"
-START_CPP_NAMESPACE
+CPU_FEATURES_START_CPP_NAMESPACE
typedef struct {
int msa : 1; // MIPS SIMD Architecture
@@ -48,6 +48,6 @@
const char* GetMipsFeaturesEnumName(MipsFeaturesEnum);
-END_CPP_NAMESPACE
+CPU_FEATURES_END_CPP_NAMESPACE
#endif // CPU_FEATURES_INCLUDE_CPUINFO_MIPS_H_
diff --git a/include/cpuinfo_x86.h b/include/cpuinfo_x86.h
index 43675c1..0c235d6 100644
--- a/include/cpuinfo_x86.h
+++ b/include/cpuinfo_x86.h
@@ -17,7 +17,7 @@
#include "cpu_features_macros.h"
-START_CPP_NAMESPACE
+CPU_FEATURES_START_CPP_NAMESPACE
// See https://en.wikipedia.org/wiki/CPUID for a list of x86 cpu features.
typedef struct {
@@ -142,6 +142,6 @@
const char* GetX86MicroarchitectureName(X86Microarchitecture);
-END_CPP_NAMESPACE
+CPU_FEATURES_END_CPP_NAMESPACE
#endif // CPU_FEATURES_INCLUDE_CPUINFO_X86_H_
diff --git a/include/internal/bit_utils.h b/include/internal/bit_utils.h
index a0e85c2..75f0cdd 100644
--- a/include/internal/bit_utils.h
+++ b/include/internal/bit_utils.h
@@ -20,7 +20,7 @@
#include <stdint.h>
#include "cpu_features_macros.h"
-START_CPP_NAMESPACE
+CPU_FEATURES_START_CPP_NAMESPACE
inline static bool IsBitSet(uint32_t reg, uint32_t bit) {
return (reg >> bit) & 0x1;
@@ -34,6 +34,6 @@
return (reg >> lsb) & mask;
}
-END_CPP_NAMESPACE
+CPU_FEATURES_END_CPP_NAMESPACE
#endif // CPU_FEATURES_INCLUDE_INTERNAL_BIT_UTILS_H_
diff --git a/include/internal/cpuid_x86.h b/include/internal/cpuid_x86.h
index 24adeb3..9dcee0d 100644
--- a/include/internal/cpuid_x86.h
+++ b/include/internal/cpuid_x86.h
@@ -19,7 +19,7 @@
#include "cpu_features_macros.h"
-START_CPP_NAMESPACE
+CPU_FEATURES_START_CPP_NAMESPACE
// A struct to hold the result of a call to cpuid.
typedef struct {
@@ -32,6 +32,6 @@
// Returns the eax value of the XCR0 register.
uint32_t GetXCR0Eax(void);
-END_CPP_NAMESPACE
+CPU_FEATURES_END_CPP_NAMESPACE
#endif // CPU_FEATURES_INCLUDE_INTERNAL_CPUID_X86_H_
diff --git a/include/internal/filesystem.h b/include/internal/filesystem.h
index a8056b6..2c862e5 100644
--- a/include/internal/filesystem.h
+++ b/include/internal/filesystem.h
@@ -21,7 +21,7 @@
#include <stdint.h>
#include "cpu_features_macros.h"
-START_CPP_NAMESPACE
+CPU_FEATURES_START_CPP_NAMESPACE
// Same as linux "open(filename, O_RDONLY)", retries automatically on EINTR.
int OpenFile(const char* filename);
@@ -33,6 +33,6 @@
// Same as linux "close(file_descriptor)".
void CloseFile(int file_descriptor);
-END_CPP_NAMESPACE
+CPU_FEATURES_END_CPP_NAMESPACE
#endif // CPU_FEATURES_INCLUDE_INTERNAL_FILESYSTEM_H_
diff --git a/include/internal/hwcaps.h b/include/internal/hwcaps.h
index 5f25f9d..5c5223b 100644
--- a/include/internal/hwcaps.h
+++ b/include/internal/hwcaps.h
@@ -20,7 +20,7 @@
#include <stdint.h>
#include "cpu_features_macros.h"
-START_CPP_NAMESPACE
+CPU_FEATURES_START_CPP_NAMESPACE
// To avoid depending on the linux kernel we reproduce the architecture specific
// constants here.
@@ -68,6 +68,6 @@
HardwareCapabilities GetHardwareCapabilities(void);
-END_CPP_NAMESPACE
+CPU_FEATURES_END_CPP_NAMESPACE
#endif // CPU_FEATURES_INCLUDE_INTERNAL_HWCAPS_H_
diff --git a/include/internal/linux_features_aggregator.h b/include/internal/linux_features_aggregator.h
index a41c6e3..1fb1566 100644
--- a/include/internal/linux_features_aggregator.h
+++ b/include/internal/linux_features_aggregator.h
@@ -24,7 +24,7 @@
#include "internal/hwcaps.h"
#include "internal/string_view.h"
-START_CPP_NAMESPACE
+CPU_FEATURES_START_CPP_NAMESPACE
// Use the following macro to declare setter functions to be used in
// CapabilityConfig.
@@ -54,5 +54,5 @@
const HardwareCapabilities hwcaps,
void* const features);
-END_CPP_NAMESPACE
+CPU_FEATURES_END_CPP_NAMESPACE
#endif // CPU_FEATURES_INCLUDE_INTERNAL_LINUX_FEATURES_AGGREGATOR_H_
diff --git a/include/internal/stack_line_reader.h b/include/internal/stack_line_reader.h
index affc28a..c540f6b 100644
--- a/include/internal/stack_line_reader.h
+++ b/include/internal/stack_line_reader.h
@@ -22,7 +22,7 @@
#include "cpu_features_macros.h"
#include "internal/string_view.h"
-START_CPP_NAMESPACE
+CPU_FEATURES_START_CPP_NAMESPACE
typedef struct {
char buffer[STACK_LINE_READER_BUFFER_SIZE];
@@ -44,6 +44,6 @@
// Reads the file pointed to by fd and tries to read a full line.
LineResult StackLineReader_NextLine(StackLineReader* reader);
-END_CPP_NAMESPACE
+CPU_FEATURES_END_CPP_NAMESPACE
#endif // CPU_FEATURES_INCLUDE_INTERNAL_STACK_LINE_READER_H_
diff --git a/include/internal/string_view.h b/include/internal/string_view.h
index 6fbd442..dc6e0b5 100644
--- a/include/internal/string_view.h
+++ b/include/internal/string_view.h
@@ -21,7 +21,7 @@
#include <string.h>
#include "cpu_features_macros.h"
-START_CPP_NAMESPACE
+CPU_FEATURES_START_CPP_NAMESPACE
typedef struct {
const char* ptr;
@@ -96,6 +96,6 @@
bool GetAttributeKeyValue(const StringView line, StringView* key,
StringView* value);
-END_CPP_NAMESPACE
+CPU_FEATURES_END_CPP_NAMESPACE
#endif // CPU_FEATURES_INCLUDE_INTERNAL_STRING_VIEW_H_
