From 8f5c15d4dc6a6f592a09e1d5ed80516d5deb8100 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Thu, 22 Aug 2019 13:26:30 -0400 Subject: buildcommands: Match DECL_X names to the actual C macro names Signed-off-by: Kevin O'Connor --- src/command.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/command.h') diff --git a/src/command.h b/src/command.h index 892d1aad..e7551ed7 100644 --- a/src/command.h +++ b/src/command.h @@ -7,8 +7,9 @@ #include "ctr.h" // DECL_CTR // Declare a function to run when the specified command is received -#define DECL_COMMAND_FLAGS(FUNC, FLAGS, MSG) \ - DECL_CTR("_DECL_COMMAND " __stringify(FUNC) " " __stringify(FLAGS) " " MSG) +#define DECL_COMMAND_FLAGS(FUNC, FLAGS, MSG) \ + DECL_CTR("DECL_COMMAND_FLAGS " __stringify(FUNC) " " \ + __stringify(FLAGS) " " MSG) #define DECL_COMMAND(FUNC, MSG) \ DECL_COMMAND_FLAGS(FUNC, 0, MSG) @@ -17,15 +18,15 @@ // Declare a constant exported to the host #define DECL_CONSTANT(NAME, VALUE) \ - DECL_CTR_INT("_DECL_CONSTANT " NAME, 1, CTR_INT(VALUE)) + DECL_CTR_INT("DECL_CONSTANT " NAME, 1, CTR_INT(VALUE)) #define DECL_CONSTANT_STR(NAME, VALUE) \ - DECL_CTR("_DECL_CONSTANT_STR " NAME " " VALUE) + DECL_CTR("DECL_CONSTANT_STR " NAME " " VALUE) // Declare an enumeration #define DECL_ENUMERATION(ENUM, NAME, VALUE) \ - DECL_CTR_INT("_DECL_ENUMERATION " ENUM " " NAME, 1, CTR_INT(VALUE)) + DECL_CTR_INT("DECL_ENUMERATION " ENUM " " NAME, 1, CTR_INT(VALUE)) #define DECL_ENUMERATION_RANGE(ENUM, NAME, VALUE, COUNT) \ - DECL_CTR_INT("_DECL_ENUMERATION_RANGE " ENUM " " NAME, \ + DECL_CTR_INT("DECL_ENUMERATION_RANGE " ENUM " " NAME, \ 2, CTR_INT(VALUE), CTR_INT(COUNT)) // Send an output message (and declare a static message type for it) -- cgit v1.2.3-70-g09d2