[dpdk-dev] [PATCH 1/2] Revert "eal: fix C++ app build"

[David Marchand]

This reverts commit 621389bbbe0860d41538aeac893b6d74e714530c.

Signed-off-by: David Marchand <david.marchand at 6wind.com>
---
 lib/librte_eal/common/include/arch/ppc_64/rte_cpuflags.h |  4 ++--
 lib/librte_eal/common/include/arch/tile/rte_cpuflags.h   |  4 ++--
 lib/librte_eal/common/include/arch/x86/rte_cpuflags.h    |  4 ++--
 lib/librte_eal/common/include/generic/rte_cpuflags.h     | 12 ++----------
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/lib/librte_eal/common/include/arch/ppc_64/rte_cpuflags.h 
b/lib/librte_eal/common/include/arch/ppc_64/rte_cpuflags.h
index f1cfc4f..df45047 100644
--- a/lib/librte_eal/common/include/arch/ppc_64/rte_cpuflags.h
+++ b/lib/librte_eal/common/include/arch/ppc_64/rte_cpuflags.h
@@ -49,7 +49,7 @@ extern "C" {
 #define AT_HWCAP2 26

 /* software based registers */
-enum cpu_register_t __RTE_REGISTER_UNDERLYING_TYPE {
+enum cpu_register_t {
        REG_HWCAP = 0,
        REG_HWCAP2,
 };
@@ -57,7 +57,7 @@ enum cpu_register_t __RTE_REGISTER_UNDERLYING_TYPE {
 /**
  * Enumeration of all CPU features supported
  */
-enum rte_cpu_flag_t __RTE_CPUFLAG_UNDERLYING_TYPE {
+enum rte_cpu_flag_t {
        RTE_CPUFLAG_PPC_LE = 0,
        RTE_CPUFLAG_TRUE_LE,
        RTE_CPUFLAG_PSERIES_PERFMON_COMPAT,
diff --git a/lib/librte_eal/common/include/arch/tile/rte_cpuflags.h 
b/lib/librte_eal/common/include/arch/tile/rte_cpuflags.h
index d6696d3..08aa957 100644
--- a/lib/librte_eal/common/include/arch/tile/rte_cpuflags.h
+++ b/lib/librte_eal/common/include/arch/tile/rte_cpuflags.h
@@ -45,14 +45,14 @@ extern "C" {
 #include "generic/rte_cpuflags.h"

 /* software based registers */
-enum cpu_register_t __RTE_REGISTER_UNDERLYING_TYPE {
+enum cpu_register_t {
        REG_DUMMY = 0
 };

 /**
  * Enumeration of all CPU features supported
  */
-enum rte_cpu_flag_t __RTE_CPUFLAG_UNDERLYING_TYPE {
+enum rte_cpu_flag_t {
        RTE_CPUFLAG_NUMFLAGS /**< This should always be the last! */
 };

diff --git a/lib/librte_eal/common/include/arch/x86/rte_cpuflags.h 
b/lib/librte_eal/common/include/arch/x86/rte_cpuflags.h
index df1834c..dd56553 100644
--- a/lib/librte_eal/common/include/arch/x86/rte_cpuflags.h
+++ b/lib/librte_eal/common/include/arch/x86/rte_cpuflags.h
@@ -45,7 +45,7 @@ extern "C" {

 #include "generic/rte_cpuflags.h"

-enum rte_cpu_flag_t __RTE_CPUFLAG_UNDERLYING_TYPE {
+enum rte_cpu_flag_t {
        /* (EAX 01h) ECX features*/
        RTE_CPUFLAG_SSE3 = 0,               /**< SSE3 */
        RTE_CPUFLAG_PCLMULQDQ,              /**< PCLMULQDQ */
@@ -150,7 +150,7 @@ enum rte_cpu_flag_t __RTE_CPUFLAG_UNDERLYING_TYPE {
        RTE_CPUFLAG_NUMFLAGS,               /**< This should always be the 
last! */
 };

-enum cpu_register_t __RTE_REGISTER_UNDERLYING_TYPE {
+enum cpu_register_t {
        RTE_REG_EAX = 0,
        RTE_REG_EBX,
        RTE_REG_ECX,
diff --git a/lib/librte_eal/common/include/generic/rte_cpuflags.h 
b/lib/librte_eal/common/include/generic/rte_cpuflags.h
index 5352cbc..61c4db1 100644
--- a/lib/librte_eal/common/include/generic/rte_cpuflags.h
+++ b/lib/librte_eal/common/include/generic/rte_cpuflags.h
@@ -44,23 +44,15 @@
 #include <errno.h>
 #include <stdint.h>

-#ifdef __cplusplus
-#define __RTE_CPUFLAG_UNDERLYING_TYPE  : unsigned int
-#define __RTE_REGISTER_UNDERLYING_TYPE : unsigned int
-#else
-#define __RTE_CPUFLAG_UNDERLYING_TYPE
-#define __RTE_REGISTER_UNDERLYING_TYPE
-#endif
-
 /**
  * Enumeration of all CPU features supported
  */
-enum rte_cpu_flag_t __RTE_CPUFLAG_UNDERLYING_TYPE;
+enum rte_cpu_flag_t;

 /**
  * Enumeration of CPU registers
  */
-enum cpu_register_t __RTE_REGISTER_UNDERLYING_TYPE;
+enum cpu_register_t;

 typedef uint32_t cpuid_registers_t[4];

-- 
1.9.1