linux-dpdk: fix invalid ODP_ABI_COMPAT '#if' directives

Message ID 1477901059-21589-1-git-send-email-matias.elo@nokia.com
State New
Headers show

Commit Message

Elo, Matias (Nokia - FI/Espoo) Oct. 31, 2016, 8:04 a.m.
Signed-off-by: Matias Elo <matias.elo@nokia.com>
---

This patch applies on top of 'linux-dpdk: clean inline files and make build
success' patch.

Build with 'disable-abi-compat' doesn't currently work without also using
'disable-shared' flag.

 platform/linux-dpdk/odp_packet.c       | 2 +-
 platform/linux-dpdk/odp_packet_flags.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Krishna Garapati Oct. 31, 2016, 10:05 a.m. | #1
reviewed-and-tested-by: balakrishna garapati

On 31 October 2016 at 09:04, Matias Elo <matias.elo@nokia.com> wrote:

> Signed-off-by: Matias Elo <matias.elo@nokia.com>
> ---
>
> This patch applies on top of 'linux-dpdk: clean inline files and make build
> success' patch.
>
> Build with 'disable-abi-compat' doesn't currently work without also using
> 'disable-shared' flag.
>
>  platform/linux-dpdk/odp_packet.c       | 2 +-
>  platform/linux-dpdk/odp_packet_flags.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/platform/linux-dpdk/odp_packet.c b/platform/linux-dpdk/odp_
> packet.c
> index fe00c26..7cb294e 100644
> --- a/platform/linux-dpdk/odp_packet.c
> +++ b/platform/linux-dpdk/odp_packet.c
> @@ -61,7 +61,7 @@ ODP_STATIC_ASSERT(sizeof(dummy.hash.rss) ==
> sizeof(uint32_t),
>  ODP_STATIC_ASSERT(sizeof(dummy.ol_flags) == sizeof(uint64_t),
>                   "ol_flags should be uint64_t");
>
> -#if ODP_ABI_COMPAT == 0
> +#if ODP_ABI_COMPAT == 1
>  #include <odp/api/plat/packet_inlines.h>
>  #endif
>
> diff --git a/platform/linux-dpdk/odp_packet_flags.c
> b/platform/linux-dpdk/odp_packet_flags.c
> index 57357c7..964f45e 100644
> --- a/platform/linux-dpdk/odp_packet_flags.c
> +++ b/platform/linux-dpdk/odp_packet_flags.c
> @@ -7,7 +7,7 @@
>  #include <odp/api/packet_flags.h>
>  #include <odp_packet_internal.h>
>
> -#if ODP_ABI_COMPAT == 0
> +#if ODP_ABI_COMPAT == 1
>  #include <odp/api/plat/packet_flags_inlines.h>
>  #endif
>
> --
> 2.9.3 (Apple Git-75)
>
> _______________________________________________
> lng-odp-dpdk mailing list
> lng-odp-dpdk@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/lng-odp-dpdk
>
Krishna Garapati Nov. 1, 2016, 9:59 a.m. | #2
After Matias suggestion, this patch is now part of "linux-dpdk: clean
inline files and make build success" patch series.

/Krishna

On 31 October 2016 at 11:05, Krishna Garapati <
balakrishna.garapati@linaro.org> wrote:

> reviewed-and-tested-by: balakrishna garapati
>
> On 31 October 2016 at 09:04, Matias Elo <matias.elo@nokia.com> wrote:
>
>> Signed-off-by: Matias Elo <matias.elo@nokia.com>
>> ---
>>
>> This patch applies on top of 'linux-dpdk: clean inline files and make
>> build
>> success' patch.
>>
>> Build with 'disable-abi-compat' doesn't currently work without also using
>> 'disable-shared' flag.
>>
>>  platform/linux-dpdk/odp_packet.c       | 2 +-
>>  platform/linux-dpdk/odp_packet_flags.c | 2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/platform/linux-dpdk/odp_packet.c
>> b/platform/linux-dpdk/odp_packet.c
>> index fe00c26..7cb294e 100644
>> --- a/platform/linux-dpdk/odp_packet.c
>> +++ b/platform/linux-dpdk/odp_packet.c
>> @@ -61,7 +61,7 @@ ODP_STATIC_ASSERT(sizeof(dummy.hash.rss) ==
>> sizeof(uint32_t),
>>  ODP_STATIC_ASSERT(sizeof(dummy.ol_flags) == sizeof(uint64_t),
>>                   "ol_flags should be uint64_t");
>>
>> -#if ODP_ABI_COMPAT == 0
>> +#if ODP_ABI_COMPAT == 1
>>  #include <odp/api/plat/packet_inlines.h>
>>  #endif
>>
>> diff --git a/platform/linux-dpdk/odp_packet_flags.c
>> b/platform/linux-dpdk/odp_packet_flags.c
>> index 57357c7..964f45e 100644
>> --- a/platform/linux-dpdk/odp_packet_flags.c
>> +++ b/platform/linux-dpdk/odp_packet_flags.c
>> @@ -7,7 +7,7 @@
>>  #include <odp/api/packet_flags.h>
>>  #include <odp_packet_internal.h>
>>
>> -#if ODP_ABI_COMPAT == 0
>> +#if ODP_ABI_COMPAT == 1
>>  #include <odp/api/plat/packet_flags_inlines.h>
>>  #endif
>>
>> --
>> 2.9.3 (Apple Git-75)
>>
>> _______________________________________________
>> lng-odp-dpdk mailing list
>> lng-odp-dpdk@lists.linaro.org
>> https://lists.linaro.org/mailman/listinfo/lng-odp-dpdk
>>
>
>

Patch

diff --git a/platform/linux-dpdk/odp_packet.c b/platform/linux-dpdk/odp_packet.c
index fe00c26..7cb294e 100644
--- a/platform/linux-dpdk/odp_packet.c
+++ b/platform/linux-dpdk/odp_packet.c
@@ -61,7 +61,7 @@  ODP_STATIC_ASSERT(sizeof(dummy.hash.rss) == sizeof(uint32_t),
 ODP_STATIC_ASSERT(sizeof(dummy.ol_flags) == sizeof(uint64_t),
 		  "ol_flags should be uint64_t");
 
-#if ODP_ABI_COMPAT == 0
+#if ODP_ABI_COMPAT == 1
 #include <odp/api/plat/packet_inlines.h>
 #endif
 
diff --git a/platform/linux-dpdk/odp_packet_flags.c b/platform/linux-dpdk/odp_packet_flags.c
index 57357c7..964f45e 100644
--- a/platform/linux-dpdk/odp_packet_flags.c
+++ b/platform/linux-dpdk/odp_packet_flags.c
@@ -7,7 +7,7 @@ 
 #include <odp/api/packet_flags.h>
 #include <odp_packet_internal.h>
 
-#if ODP_ABI_COMPAT == 0
+#if ODP_ABI_COMPAT == 1
 #include <odp/api/plat/packet_flags_inlines.h>
 #endif