Avoid double defining DEFAULT_THREAD_PRIORITY and PATH_LENGTH and move DEFAULT_THREAD_PRIORITY, DEFAULT_THREAD_NICE & PATH_LENGTH to src/rt-app_types.h.
Signed-off-by: Dietmar Eggemann dietmar.eggemann@arm.com --- src/rt-app_args.h | 3 --- src/rt-app_parse_config.h | 4 ---- src/rt-app_types.h | 7 ++++++- 3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/rt-app_args.h b/src/rt-app_args.h index 23ba50c5f343..116423335327 100644 --- a/src/rt-app_args.h +++ b/src/rt-app_args.h @@ -38,9 +38,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #endif #include "rt-app_parse_config.h"
-#define DEFAULT_THREAD_PRIORITY 10 -#define PATH_LENGTH 256 - void usage (const char* msg, int ex_code);
diff --git a/src/rt-app_parse_config.h b/src/rt-app_parse_config.h index 9b0e5faf425d..1589dde6dc59 100644 --- a/src/rt-app_parse_config.h +++ b/src/rt-app_parse_config.h @@ -39,10 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #endif #include <json-c/json.h>
-#define DEFAULT_THREAD_PRIORITY 10 -#define DEFAULT_THREAD_NICE 0 -#define PATH_LENGTH 256 - void parse_config(const char *filename, rtapp_options_t *opts); void diff --git a/src/rt-app_types.h b/src/rt-app_types.h index 5b8345fcf6aa..b9da66a3af34 100644 --- a/src/rt-app_types.h +++ b/src/rt-app_types.h @@ -33,8 +33,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define RTAPP_POLICY_DESCR_LENGTH 16 #define RTAPP_RESOURCE_DESCR_LENGTH 16 #define RTAPP_FTRACE_PATH_LENGTH 256 -/* exit codes */
+#define DEFAULT_THREAD_PRIORITY 10 +#define DEFAULT_THREAD_NICE 0 + +#define PATH_LENGTH 256 + +/* exit codes */ #define EXIT_SUCCESS 0 #define EXIT_FAILURE 1 #define EXIT_INV_CONFIG 2