Skip to content

Commit d411421

Browse files
gschwaerfabiobaltieri
authored andcommitted
input: fix missing namespace prefix for named input callbacks
Using INPUT_CALLBACK_DEFINE_NAMED would not add the _input_callback__ prefix to the given callback name. This can result in namespace clashes. Signed-off-by: Gero Schwäricke <[email protected]>
1 parent 5bcb524 commit d411421

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

include/zephyr/input/input.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ struct input_callback {
137137
* same callback function.
138138
*/
139139
#define INPUT_CALLBACK_DEFINE_NAMED(_dev, _callback, _user_data, name) \
140-
static const STRUCT_SECTION_ITERABLE(input_callback, name) = { \
140+
static const STRUCT_SECTION_ITERABLE(input_callback, \
141+
_input_callback__##name) = { \
141142
.dev = _dev, \
142143
.callback = _callback, \
143144
.user_data = _user_data, \
@@ -155,8 +156,7 @@ struct input_callback {
155156
* @param _user_data Pointer to user specified data.
156157
*/
157158
#define INPUT_CALLBACK_DEFINE(_dev, _callback, _user_data) \
158-
INPUT_CALLBACK_DEFINE_NAMED(_dev, _callback, _user_data, \
159-
_input_callback__##_callback)
159+
INPUT_CALLBACK_DEFINE_NAMED(_dev, _callback, _user_data, _callback)
160160

161161
#ifdef __cplusplus
162162
}

0 commit comments

Comments
 (0)