On 25 January 2017 at 15:17, Mike Holmes <mike.hol...@linaro.org> wrote:
> Yes, it should be < > I think
>
> From stackoverflow
> For #include "filename" the preprocessor searches in the same
> directory as the file containing the directive. This method is
> normally used to include programmer-defined header files.
>
> For #include <filename> the preprocessor searches in an implementation
> dependent manner, normally in search directories pre-designated by the
> compiler/IDE. This method is normally used to include standard library
> header files.
I understand. using <> will confuse CPP if we have filename matching
the standart linux names. I remember having issues with errno.h in the
past. I cannot remember how I fixed it :-). Anyway not really part of
this patchset.
>
> On 25 January 2017 at 09:09, Christophe Milard
> <christophe.mil...@linaro.org> wrote:
>> On 23 January 2017 at 20:46, Mike Holmes <mike.hol...@linaro.org> wrote:
>>> Adding the previously missing table functions to the public helper api
>>> allows the tests to use just odph_api.h
>>>
>>> Signed-off-by: Mike Holmes <mike.hol...@linaro.org>
>>> ---
>>> helper/Makefile.am | 10 +++++-----
>>> helper/cuckootable.c | 2 +-
>>> helper/hashtable.c | 2 +-
>>> helper/include/odp/helper/odph_api.h | 4 ++++
>>> helper/{ => include/odp/helper}/odph_cuckootable.h | 0
>>> helper/{ => include/odp/helper}/odph_hashtable.h | 0
>>> helper/{ => include/odp/helper}/odph_iplookuptable.h | 0
>>> helper/{ => include/odp/helper}/odph_lineartable.h | 0
>>> helper/iplookuptable.c | 2 +-
>>> helper/lineartable.c | 2 +-
>>> helper/test/cuckootable.c | 2 +-
>>> helper/test/iplookuptable.c | 2 +-
>>> helper/test/table.c | 3 +--
>>> 13 files changed, 16 insertions(+), 13 deletions(-)
>>> rename helper/{ => include/odp/helper}/odph_cuckootable.h (100%)
>>> rename helper/{ => include/odp/helper}/odph_hashtable.h (100%)
>>> rename helper/{ => include/odp/helper}/odph_iplookuptable.h (100%)
>>> rename helper/{ => include/odp/helper}/odph_lineartable.h (100%)
>>>
>>> diff --git a/helper/Makefile.am b/helper/Makefile.am
>>> index 76cad1b..4d24a69 100644
>>> --- a/helper/Makefile.am
>>> +++ b/helper/Makefile.am
>>> @@ -20,6 +20,10 @@ helperinclude_HEADERS = \
>>> $(srcdir)/include/odp/helper/ip.h\
>>> $(srcdir)/include/odp/helper/ipsec.h\
>>> $(srcdir)/include/odp/helper/odph_api.h\
>>> + $(srcdir)/include/odp/helper/odph_cuckootable.h\
>>> + $(srcdir)/include/odp/helper/odph_hashtable.h\
>>> + $(srcdir)/include/odp/helper/odph_iplookuptable.h\
>>> + $(srcdir)/include/odp/helper/odph_lineartable.h\
>>> $(srcdir)/include/odp/helper/strong_types.h\
>>> $(srcdir)/include/odp/helper/tcp.h\
>>> $(srcdir)/include/odp/helper/table.h\
>>> @@ -33,11 +37,7 @@ endif
>>>
>>> noinst_HEADERS = \
>>> $(srcdir)/odph_debug.h \
>>> - $(srcdir)/odph_hashtable.h \
>>> - $(srcdir)/odph_lineartable.h \
>>> - $(srcdir)/odph_cuckootable.h \
>>> - $(srcdir)/odph_list_internal.h \
>>> - $(srcdir)/odph_iplookuptable.h
>>> + $(srcdir)/odph_list_internal.h
>>>
>>> __LIB__libodphelper_@with_platform@_la_SOURCES = \
>>> eth.c \
>>> diff --git a/helper/cuckootable.c b/helper/cuckootable.c
>>> index b4fce6c..83647ec 100644
>>> --- a/helper/cuckootable.c
>>> +++ b/helper/cuckootable.c
>>> @@ -42,7 +42,7 @@
>>> #include <errno.h>
>>> #include <stdio.h>
>>>
>>> -#include "odph_cuckootable.h"
>>> +#include "odp/helper/odph_cuckootable.h"
>>> #include "odph_debug.h"
>>> #include <odp_api.h>
>>>
>>> diff --git a/helper/hashtable.c b/helper/hashtable.c
>>> index 8bb1ae5..983b3da 100644
>>> --- a/helper/hashtable.c
>>> +++ b/helper/hashtable.c
>>> @@ -7,7 +7,7 @@
>>> #include <string.h>
>>> #include <malloc.h>
>>>
>>> -#include "odph_hashtable.h"
>>> +#include "odp/helper/odph_hashtable.h"
>>> #include "odph_list_internal.h"
>>> #include "odph_debug.h"
>>> #include <odp_api.h>
>>> diff --git a/helper/include/odp/helper/odph_api.h
>>> b/helper/include/odp/helper/odph_api.h
>>> index ae6e77b..7ed0e77 100644
>>> --- a/helper/include/odp/helper/odph_api.h
>>> +++ b/helper/include/odp/helper/odph_api.h
>>> @@ -19,10 +19,14 @@ extern "C" {
>>> #endif
>>>
>>> #include <odp/helper/chksum.h>
>>> +#include <odp/helper/odph_cuckootable.h>
>>> #include <odp/helper/eth.h>
>>> +#include <odp/helper/odph_hashtable.h>
>>> #include <odp/helper/icmp.h>
>>> #include <odp/helper/ip.h>
>>> #include <odp/helper/ipsec.h>
>>> +#include <odp/helper/odph_lineartable.h>
>>> +#include <odp/helper/odph_iplookuptable.h>
>>> #include <odp/helper/strong_types.h>
>>> #include <odp/helper/tcp.h>
>>> #include <odp/helper/table.h>
>>> diff --git a/helper/odph_cuckootable.h
>>> b/helper/include/odp/helper/odph_cuckootable.h
>>> similarity index 100%
>>> rename from helper/odph_cuckootable.h
>>> rename to helper/include/odp/helper/odph_cuckootable.h
>>> diff --git a/helper/odph_hashtable.h
>>> b/helper/include/odp/helper/odph_hashtable.h
>>> similarity index 100%
>>> rename from helper/odph_hashtable.h
>>> rename to helper/include/odp/helper/odph_hashtable.h
>>> diff --git a/helper/odph_iplookuptable.h
>>> b/helper/include/odp/helper/odph_iplookuptable.h
>>> similarity index 100%
>>> rename from helper/odph_iplookuptable.h
>>> rename to helper/include/odp/helper/odph_iplookuptable.h
>>> diff --git a/helper/odph_lineartable.h
>>> b/helper/include/odp/helper/odph_lineartable.h
>>> similarity index 100%
>>> rename from helper/odph_lineartable.h
>>> rename to helper/include/odp/helper/odph_lineartable.h
>>> diff --git a/helper/iplookuptable.c b/helper/iplookuptable.c
>>> index 5f80743..f6d6f88 100644
>>> --- a/helper/iplookuptable.c
>>> +++ b/helper/iplookuptable.c
>>> @@ -9,7 +9,7 @@
>>> #include <errno.h>
>>> #include <stdio.h>
>>>
>>> -#include "odph_iplookuptable.h"
>>> +#include <odp/helper/odph_iplookuptable.h>
>>
>> Do we have any rule regarding the usage of #include"file" vs #include <file>?
>>
>>> #include "odph_list_internal.h"
>>> #include "odph_debug.h"
>>> #include <odp_api.h>
>>> diff --git a/helper/lineartable.c b/helper/lineartable.c
>>> index e82c165..8917901 100644
>>> --- a/helper/lineartable.c
>>> +++ b/helper/lineartable.c
>>> @@ -8,7 +8,7 @@
>>> #include <string.h>
>>> #include <malloc.h>
>>>
>>> -#include "odph_lineartable.h"
>>> +#include "odp/helper/odph_lineartable.h"
>>> #include "odph_debug.h"
>>> #include <odp_api.h>
>>>
>>> diff --git a/helper/test/cuckootable.c b/helper/test/cuckootable.c
>>> index 6736f2b..002e52e 100644
>>> --- a/helper/test/cuckootable.c
>>> +++ b/helper/test/cuckootable.c
>>> @@ -49,7 +49,7 @@
>>>
>>> #include <odp_api.h>
>>> #include <odph_debug.h>
>>> -#include <../odph_cuckootable.h>
>>> +#include <odp/helper/odph_api.h>
>>>
>>>
>>> /*******************************************************************************
>>> * Hash function performance test configuration section.
>>> diff --git a/helper/test/iplookuptable.c b/helper/test/iplookuptable.c
>>> index 86aa1b3..b5d774c 100644
>>> --- a/helper/test/iplookuptable.c
>>> +++ b/helper/test/iplookuptable.c
>>> @@ -12,7 +12,7 @@
>>>
>>> #include <odp_api.h>
>>> #include <odph_debug.h>
>>> -#include <../odph_iplookuptable.h>
>>> +#include <odp/helper/odph_api.h>
>>> #include <odp/helper/ip.h>
>>>
>>> static void print_prefix_info(
>>> diff --git a/helper/test/table.c b/helper/test/table.c
>>> index 3b74b22..ac454da 100644
>>> --- a/helper/test/table.c
>>> +++ b/helper/test/table.c
>>> @@ -5,8 +5,7 @@
>>> */
>>>
>>> #include <odph_debug.h>
>>> -#include <../odph_hashtable.h>
>>> -#include <../odph_lineartable.h>
>>> +#include <odp/helper/odph_api.h>
>>> #include <odp_api.h>
>>>
>>> /**
>>> --
>>> 2.9.3
>>>
>
>
>
> --
> Mike Holmes
> Program Manager - Linaro Networking Group
> Linaro.org │ Open source software for ARM SoCs
> "Work should be fun and collaborative, the rest follows"
