diff options
| -rw-r--r-- | m4/odp_dpdk.m4 | 2 | ||||
| -rw-r--r-- | m4/odp_pcap.m4 | 3 | ||||
| -rw-r--r-- | platform/linux-generic/include/odp_packet_io_internal.h | 2 | ||||
| -rw-r--r-- | platform/linux-generic/pktio/dpdk.c | 2 | ||||
| -rw-r--r-- | platform/linux-generic/pktio/io_ops.c | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 07acb8fcf..320d6c8f5 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -54,7 +54,7 @@ AS_IF([test "x$DPDK_SHARED" = "xyes"], [dnl OLD_LIBS=$LIBS LIBS="-lnuma" AC_TRY_LINK_FUNC([numa_num_configured_nodes], - [AC_DEFINE([HAVE_NUMA_LIBRARY], [1], + [AC_DEFINE([_ODP_HAVE_NUMA_LIBRARY], [1], [Define to 1 if numa library is usable]) AS_VAR_APPEND([DPDK_LIBS_LIBODP], [" -lnuma"])]) LIBS=$OLD_LIBS diff --git a/m4/odp_pcap.m4 b/m4/odp_pcap.m4 index 239ce385f..dd1c16e69 100644 --- a/m4/odp_pcap.m4 +++ b/m4/odp_pcap.m4 @@ -13,7 +13,8 @@ AC_CHECK_HEADER(pcap/pcap.h, []) if test "$have_pcap" = "yes"; then - AC_DEFINE([HAVE_PCAP], 1, [Define to 1 if you have pcap library]) + AC_DEFINE([_ODP_PKTIO_PCAP], 1, + [Define to 1 to enable pcap packet I/O support]) PCAP_LIBS="-lpcap" else PCAP_LIBS="" diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index 645b27907..b36000d78 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -216,7 +216,7 @@ extern const pktio_if_ops_t dpdk_pktio_ops; extern const pktio_if_ops_t sock_mmsg_pktio_ops; extern const pktio_if_ops_t sock_mmap_pktio_ops; extern const pktio_if_ops_t loopback_pktio_ops; -#ifdef HAVE_PCAP +#ifdef _ODP_PKTIO_PCAP extern const pktio_if_ops_t pcap_pktio_ops; #endif extern const pktio_if_ops_t tap_pktio_ops; diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 23fae748b..948ffda8f 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -55,7 +55,7 @@ #include <rte_version.h> /* NUMA is not supported on all platforms */ -#ifdef HAVE_NUMA_LIBRARY +#ifdef _ODP_HAVE_NUMA_LIBRARY #include <numa.h> #else #define numa_num_configured_nodes() 1 diff --git a/platform/linux-generic/pktio/io_ops.c b/platform/linux-generic/pktio/io_ops.c index e183058d8..9e1ab74ce 100644 --- a/platform/linux-generic/pktio/io_ops.c +++ b/platform/linux-generic/pktio/io_ops.c @@ -19,7 +19,7 @@ const pktio_if_ops_t * const pktio_if_ops[] = { #ifdef ODP_NETMAP &netmap_pktio_ops, #endif -#ifdef HAVE_PCAP +#ifdef _ODP_PKTIO_PCAP &pcap_pktio_ops, #endif &ipc_pktio_ops, |