diff options
| author | Jere Leppänen <jere.leppanen@nokia.com> | 2022-09-12 13:22:13 +0300 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2022-09-12 14:40:18 +0300 |
| commit | 7fc151473b9a1327d1b07b0074fed260ae7ebc48 (patch) | |
| tree | 5c9c45e1c31c158ab755b2e41c72d3637670925c /helper | |
| parent | ad262f8699ca72dd13e4e215fe87fc6d660972b4 (diff) | |
Revert "helper: allow cli.h to be included individually"
This reverts commit 65a7f559c173ddbe9738c9c03bf9dbfc52279bc0.
cli.h is optional, so it cannot be included unconditionally.
Signed-off-by: Jere Leppänen <jere.leppanen@nokia.com>
Reviewed-by: Matias Elo <matias.elo@nokia.com>
Diffstat (limited to 'helper')
| -rw-r--r-- | helper/include/odp/helper/cli.h | 6 | ||||
| -rw-r--r-- | helper/include/odp/helper/odph_api.h | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/helper/include/odp/helper/cli.h b/helper/include/odp/helper/cli.h index 74cca7809..e9351147f 100644 --- a/helper/include/odp/helper/cli.h +++ b/helper/include/odp/helper/cli.h @@ -21,10 +21,6 @@ extern "C" { #endif -#include <odp/helper/autoheader_external.h> - -#if defined ODPH_CLI && ODPH_CLI - #include <stdint.h> #include <stdarg.h> @@ -178,8 +174,6 @@ int odph_cli_term(void); * @} */ -#endif - #ifdef __cplusplus } #endif diff --git a/helper/include/odp/helper/odph_api.h b/helper/include/odp/helper/odph_api.h index 01ae72a05..3c321b9d4 100644 --- a/helper/include/odp/helper/odph_api.h +++ b/helper/include/odp/helper/odph_api.h @@ -22,7 +22,6 @@ extern "C" { #include <odp/helper/odph_debug.h> #include <odp/helper/chksum.h> -#include <odp/helper/cli.h> #include <odp/helper/odph_cuckootable.h> #include <odp/helper/eth.h> #include <odp/helper/gtp.h> @@ -41,6 +40,10 @@ extern "C" { #include <odp/helper/udp.h> #include <odp/helper/version.h> +#ifdef ODPH_CLI +#include <odp/helper/cli.h> +#endif + #ifdef __cplusplus } #endif |