mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-29 05:40:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

scanner: use separate guards for validator functions

Browse source 
Generated XXX_is_valid() functions for enums are guarded behind the
same #define as the enum itself. This worked fine until recently,
but since fbd7460737 ("scanner: add new enum-header mode") we're
also generating enum-only headers.

When including the enum-only header first, and then the server
header, the validator functions are missing.

Define a separate guard to fix this.

Signed-off-by: Simon Ser <contact@emersion.fr>
This commit is contained in:
Simon Ser 2025-02-23 23:38:15 +01:00
parent 1ab6b693b1
commit dbfa8d784e
4 changed files with 151 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/scanner.c
View file

@ -1383,6 +1383,11 @@ emit_validator(struct interface *interface, struct enumeration *e)
{ {
struct entry *entry; struct entry *entry;
printf("#ifndef %s_%s_ENUM_IS_VALID\n",
interface->uppercase_name, e->uppercase_name);
printf("#define %s_%s_ENUM_IS_VALID\n",
interface->uppercase_name, e->uppercase_name);
printf("/**\n" printf("/**\n"
" * @ingroup iface_%s\n" " * @ingroup iface_%s\n"
" * Validate a %s %s value.\n" " * Validate a %s %s value.\n"
@ -1420,6 +1425,9 @@ emit_validator(struct interface *interface, struct enumeration *e)
" }\n"); " }\n");
} }
printf("}\n"); printf("}\n");
printf("#endif /* %s_%s_ENUM_IS_VALID */\n\n",
interface->uppercase_name, e->uppercase_name);
} }
static void static void
@ -1483,11 +1491,11 @@ emit_enumerations(struct interface *interface, bool with_validators)
} }
if (with_validators)
emit_validator(interface, e);
printf("#endif /* %s_%s_ENUM */\n\n", printf("#endif /* %s_%s_ENUM */\n\n",
interface->uppercase_name, e->uppercase_name); interface->uppercase_name, e->uppercase_name);
if (with_validators)
emit_validator(interface, e);
} }
} }

144
tests/data/example-server.h
View file

@ -901,6 +901,10 @@ enum wl_display_error {
*/ */
WL_DISPLAY_ERROR_NO_MEMORY = 2, WL_DISPLAY_ERROR_NO_MEMORY = 2,
}; };
#endif /* WL_DISPLAY_ERROR_ENUM */
#ifndef WL_DISPLAY_ERROR_ENUM_IS_VALID
#define WL_DISPLAY_ERROR_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_display * @ingroup iface_wl_display
* Validate a wl_display error value. * Validate a wl_display error value.
@ -921,7 +925,7 @@ wl_display_error_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_DISPLAY_ERROR_ENUM */ #endif /* WL_DISPLAY_ERROR_ENUM_IS_VALID */
/** /**
* @ingroup iface_wl_display * @ingroup iface_wl_display
@ -1194,6 +1198,10 @@ enum wl_shm_error {
*/ */
WL_SHM_ERROR_INVALID_FD = 2, WL_SHM_ERROR_INVALID_FD = 2,
}; };
#endif /* WL_SHM_ERROR_ENUM */
#ifndef WL_SHM_ERROR_ENUM_IS_VALID
#define WL_SHM_ERROR_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_shm * @ingroup iface_wl_shm
* Validate a wl_shm error value. * Validate a wl_shm error value.
@ -1214,7 +1222,7 @@ wl_shm_error_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_SHM_ERROR_ENUM */ #endif /* WL_SHM_ERROR_ENUM_IS_VALID */
#ifndef WL_SHM_FORMAT_ENUM #ifndef WL_SHM_FORMAT_ENUM
#define WL_SHM_FORMAT_ENUM #define WL_SHM_FORMAT_ENUM
@ -1466,6 +1474,10 @@ enum wl_shm_format {
*/ */
WL_SHM_FORMAT_YVU444 = 0x34325659, WL_SHM_FORMAT_YVU444 = 0x34325659,
}; };
#endif /* WL_SHM_FORMAT_ENUM */
#ifndef WL_SHM_FORMAT_ENUM_IS_VALID
#define WL_SHM_FORMAT_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_shm * @ingroup iface_wl_shm
* Validate a wl_shm format value. * Validate a wl_shm format value.
@ -1596,7 +1608,7 @@ wl_shm_format_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_SHM_FORMAT_ENUM */ #endif /* WL_SHM_FORMAT_ENUM_IS_VALID */
/** /**
* @ingroup iface_wl_shm * @ingroup iface_wl_shm
@ -1706,6 +1718,10 @@ enum wl_data_offer_error {
*/ */
WL_DATA_OFFER_ERROR_INVALID_OFFER = 3, WL_DATA_OFFER_ERROR_INVALID_OFFER = 3,
}; };
#endif /* WL_DATA_OFFER_ERROR_ENUM */
#ifndef WL_DATA_OFFER_ERROR_ENUM_IS_VALID
#define WL_DATA_OFFER_ERROR_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_data_offer * @ingroup iface_wl_data_offer
* Validate a wl_data_offer error value. * Validate a wl_data_offer error value.
@ -1728,7 +1744,7 @@ wl_data_offer_error_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_DATA_OFFER_ERROR_ENUM */ #endif /* WL_DATA_OFFER_ERROR_ENUM_IS_VALID */
/** /**
* @ingroup iface_wl_data_offer * @ingroup iface_wl_data_offer
@ -1940,6 +1956,10 @@ enum wl_data_source_error {
*/ */
WL_DATA_SOURCE_ERROR_INVALID_SOURCE = 1, WL_DATA_SOURCE_ERROR_INVALID_SOURCE = 1,
}; };
#endif /* WL_DATA_SOURCE_ERROR_ENUM */
#ifndef WL_DATA_SOURCE_ERROR_ENUM_IS_VALID
#define WL_DATA_SOURCE_ERROR_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_data_source * @ingroup iface_wl_data_source
* Validate a wl_data_source error value. * Validate a wl_data_source error value.
@ -1958,7 +1978,7 @@ wl_data_source_error_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_DATA_SOURCE_ERROR_ENUM */ #endif /* WL_DATA_SOURCE_ERROR_ENUM_IS_VALID */
/** /**
* @ingroup iface_wl_data_source * @ingroup iface_wl_data_source
@ -2130,6 +2150,10 @@ enum wl_data_device_error {
*/ */
WL_DATA_DEVICE_ERROR_ROLE = 0, WL_DATA_DEVICE_ERROR_ROLE = 0,
}; };
#endif /* WL_DATA_DEVICE_ERROR_ENUM */
#ifndef WL_DATA_DEVICE_ERROR_ENUM_IS_VALID
#define WL_DATA_DEVICE_ERROR_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_data_device * @ingroup iface_wl_data_device
* Validate a wl_data_device error value. * Validate a wl_data_device error value.
@ -2146,7 +2170,7 @@ wl_data_device_error_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_DATA_DEVICE_ERROR_ENUM */ #endif /* WL_DATA_DEVICE_ERROR_ENUM_IS_VALID */
/** /**
* @ingroup iface_wl_data_device * @ingroup iface_wl_data_device
@ -2387,6 +2411,10 @@ enum wl_data_device_manager_dnd_action {
*/ */
WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK = 4, WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK = 4,
}; };
#endif /* WL_DATA_DEVICE_MANAGER_DND_ACTION_ENUM */
#ifndef WL_DATA_DEVICE_MANAGER_DND_ACTION_ENUM_IS_VALID
#define WL_DATA_DEVICE_MANAGER_DND_ACTION_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_data_device_manager * @ingroup iface_wl_data_device_manager
* Validate a wl_data_device_manager dnd_action value. * Validate a wl_data_device_manager dnd_action value.
@ -2407,7 +2435,7 @@ wl_data_device_manager_dnd_action_is_valid(uint32_t value, uint32_t version) {
valid |= WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK; valid |= WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK;
return (value & ~valid) == 0; return (value & ~valid) == 0;
} }
#endif /* WL_DATA_DEVICE_MANAGER_DND_ACTION_ENUM */ #endif /* WL_DATA_DEVICE_MANAGER_DND_ACTION_ENUM_IS_VALID */
/** /**
* @ingroup iface_wl_data_device_manager * @ingroup iface_wl_data_device_manager
@ -2454,6 +2482,10 @@ enum wl_shell_error {
*/ */
WL_SHELL_ERROR_ROLE = 0, WL_SHELL_ERROR_ROLE = 0,
}; };
#endif /* WL_SHELL_ERROR_ENUM */
#ifndef WL_SHELL_ERROR_ENUM_IS_VALID
#define WL_SHELL_ERROR_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_shell * @ingroup iface_wl_shell
* Validate a wl_shell error value. * Validate a wl_shell error value.
@ -2470,7 +2502,7 @@ wl_shell_error_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_SHELL_ERROR_ENUM */ #endif /* WL_SHELL_ERROR_ENUM_IS_VALID */
/** /**
* @ingroup iface_wl_shell * @ingroup iface_wl_shell
@ -2549,6 +2581,10 @@ enum wl_shell_surface_resize {
*/ */
WL_SHELL_SURFACE_RESIZE_BOTTOM_RIGHT = 10, WL_SHELL_SURFACE_RESIZE_BOTTOM_RIGHT = 10,
}; };
#endif /* WL_SHELL_SURFACE_RESIZE_ENUM */
#ifndef WL_SHELL_SURFACE_RESIZE_ENUM_IS_VALID
#define WL_SHELL_SURFACE_RESIZE_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_shell_surface * @ingroup iface_wl_shell_surface
* Validate a wl_shell_surface resize value. * Validate a wl_shell_surface resize value.
@ -2579,7 +2615,7 @@ wl_shell_surface_resize_is_valid(uint32_t value, uint32_t version) {
valid |= WL_SHELL_SURFACE_RESIZE_BOTTOM_RIGHT; valid |= WL_SHELL_SURFACE_RESIZE_BOTTOM_RIGHT;
return (value & ~valid) == 0; return (value & ~valid) == 0;
} }
#endif /* WL_SHELL_SURFACE_RESIZE_ENUM */ #endif /* WL_SHELL_SURFACE_RESIZE_ENUM_IS_VALID */
#ifndef WL_SHELL_SURFACE_TRANSIENT_ENUM #ifndef WL_SHELL_SURFACE_TRANSIENT_ENUM
#define WL_SHELL_SURFACE_TRANSIENT_ENUM #define WL_SHELL_SURFACE_TRANSIENT_ENUM
@ -2596,6 +2632,10 @@ enum wl_shell_surface_transient {
*/ */
WL_SHELL_SURFACE_TRANSIENT_INACTIVE = 0x1, WL_SHELL_SURFACE_TRANSIENT_INACTIVE = 0x1,
}; };
#endif /* WL_SHELL_SURFACE_TRANSIENT_ENUM */
#ifndef WL_SHELL_SURFACE_TRANSIENT_ENUM_IS_VALID
#define WL_SHELL_SURFACE_TRANSIENT_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_shell_surface * @ingroup iface_wl_shell_surface
* Validate a wl_shell_surface transient value. * Validate a wl_shell_surface transient value.
@ -2610,7 +2650,7 @@ wl_shell_surface_transient_is_valid(uint32_t value, uint32_t version) {
valid |= WL_SHELL_SURFACE_TRANSIENT_INACTIVE; valid |= WL_SHELL_SURFACE_TRANSIENT_INACTIVE;
return (value & ~valid) == 0; return (value & ~valid) == 0;
} }
#endif /* WL_SHELL_SURFACE_TRANSIENT_ENUM */ #endif /* WL_SHELL_SURFACE_TRANSIENT_ENUM_IS_VALID */
#ifndef WL_SHELL_SURFACE_FULLSCREEN_METHOD_ENUM #ifndef WL_SHELL_SURFACE_FULLSCREEN_METHOD_ENUM
#define WL_SHELL_SURFACE_FULLSCREEN_METHOD_ENUM #define WL_SHELL_SURFACE_FULLSCREEN_METHOD_ENUM
@ -2640,6 +2680,10 @@ enum wl_shell_surface_fullscreen_method {
*/ */
WL_SHELL_SURFACE_FULLSCREEN_METHOD_FILL = 3, WL_SHELL_SURFACE_FULLSCREEN_METHOD_FILL = 3,
}; };
#endif /* WL_SHELL_SURFACE_FULLSCREEN_METHOD_ENUM */
#ifndef WL_SHELL_SURFACE_FULLSCREEN_METHOD_ENUM_IS_VALID
#define WL_SHELL_SURFACE_FULLSCREEN_METHOD_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_shell_surface * @ingroup iface_wl_shell_surface
* Validate a wl_shell_surface fullscreen_method value. * Validate a wl_shell_surface fullscreen_method value.
@ -2662,7 +2706,7 @@ wl_shell_surface_fullscreen_method_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_SHELL_SURFACE_FULLSCREEN_METHOD_ENUM */ #endif /* WL_SHELL_SURFACE_FULLSCREEN_METHOD_ENUM_IS_VALID */
/** /**
* @ingroup iface_wl_shell_surface * @ingroup iface_wl_shell_surface
@ -2994,6 +3038,10 @@ enum wl_surface_error {
*/ */
WL_SURFACE_ERROR_INVALID_TRANSFORM = 1, WL_SURFACE_ERROR_INVALID_TRANSFORM = 1,
}; };
#endif /* WL_SURFACE_ERROR_ENUM */
#ifndef WL_SURFACE_ERROR_ENUM_IS_VALID
#define WL_SURFACE_ERROR_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_surface * @ingroup iface_wl_surface
* Validate a wl_surface error value. * Validate a wl_surface error value.
@ -3012,7 +3060,7 @@ wl_surface_error_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_SURFACE_ERROR_ENUM */ #endif /* WL_SURFACE_ERROR_ENUM_IS_VALID */
/** /**
* @ingroup iface_wl_surface * @ingroup iface_wl_surface
@ -3471,6 +3519,10 @@ enum wl_seat_capability {
*/ */
WL_SEAT_CAPABILITY_TOUCH = 4, WL_SEAT_CAPABILITY_TOUCH = 4,
}; };
#endif /* WL_SEAT_CAPABILITY_ENUM */
#ifndef WL_SEAT_CAPABILITY_ENUM_IS_VALID
#define WL_SEAT_CAPABILITY_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_seat * @ingroup iface_wl_seat
* Validate a wl_seat capability value. * Validate a wl_seat capability value.
@ -3489,7 +3541,7 @@ wl_seat_capability_is_valid(uint32_t value, uint32_t version) {
valid |= WL_SEAT_CAPABILITY_TOUCH; valid |= WL_SEAT_CAPABILITY_TOUCH;
return (value & ~valid) == 0; return (value & ~valid) == 0;
} }
#endif /* WL_SEAT_CAPABILITY_ENUM */ #endif /* WL_SEAT_CAPABILITY_ENUM_IS_VALID */
/** /**
* @ingroup iface_wl_seat * @ingroup iface_wl_seat
@ -3613,6 +3665,10 @@ enum wl_pointer_error {
*/ */
WL_POINTER_ERROR_ROLE = 0, WL_POINTER_ERROR_ROLE = 0,
}; };
#endif /* WL_POINTER_ERROR_ENUM */
#ifndef WL_POINTER_ERROR_ENUM_IS_VALID
#define WL_POINTER_ERROR_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_pointer * @ingroup iface_wl_pointer
* Validate a wl_pointer error value. * Validate a wl_pointer error value.
@ -3629,7 +3685,7 @@ wl_pointer_error_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_POINTER_ERROR_ENUM */ #endif /* WL_POINTER_ERROR_ENUM_IS_VALID */
#ifndef WL_POINTER_BUTTON_STATE_ENUM #ifndef WL_POINTER_BUTTON_STATE_ENUM
#define WL_POINTER_BUTTON_STATE_ENUM #define WL_POINTER_BUTTON_STATE_ENUM
@ -3650,6 +3706,10 @@ enum wl_pointer_button_state {
*/ */
WL_POINTER_BUTTON_STATE_PRESSED = 1, WL_POINTER_BUTTON_STATE_PRESSED = 1,
}; };
#endif /* WL_POINTER_BUTTON_STATE_ENUM */
#ifndef WL_POINTER_BUTTON_STATE_ENUM_IS_VALID
#define WL_POINTER_BUTTON_STATE_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_pointer * @ingroup iface_wl_pointer
* Validate a wl_pointer button_state value. * Validate a wl_pointer button_state value.
@ -3668,7 +3728,7 @@ wl_pointer_button_state_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_POINTER_BUTTON_STATE_ENUM */ #endif /* WL_POINTER_BUTTON_STATE_ENUM_IS_VALID */
#ifndef WL_POINTER_AXIS_ENUM #ifndef WL_POINTER_AXIS_ENUM
#define WL_POINTER_AXIS_ENUM #define WL_POINTER_AXIS_ENUM
@ -3688,6 +3748,10 @@ enum wl_pointer_axis {
*/ */
WL_POINTER_AXIS_HORIZONTAL_SCROLL = 1, WL_POINTER_AXIS_HORIZONTAL_SCROLL = 1,
}; };
#endif /* WL_POINTER_AXIS_ENUM */
#ifndef WL_POINTER_AXIS_ENUM_IS_VALID
#define WL_POINTER_AXIS_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_pointer * @ingroup iface_wl_pointer
* Validate a wl_pointer axis value. * Validate a wl_pointer axis value.
@ -3706,7 +3770,7 @@ wl_pointer_axis_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_POINTER_AXIS_ENUM */ #endif /* WL_POINTER_AXIS_ENUM_IS_VALID */
#ifndef WL_POINTER_AXIS_SOURCE_ENUM #ifndef WL_POINTER_AXIS_SOURCE_ENUM
#define WL_POINTER_AXIS_SOURCE_ENUM #define WL_POINTER_AXIS_SOURCE_ENUM
@ -3754,6 +3818,10 @@ enum wl_pointer_axis_source {
* @ingroup iface_wl_pointer * @ingroup iface_wl_pointer
*/ */
#define WL_POINTER_AXIS_SOURCE_WHEEL_TILT_SINCE_VERSION 6 #define WL_POINTER_AXIS_SOURCE_WHEEL_TILT_SINCE_VERSION 6
#endif /* WL_POINTER_AXIS_SOURCE_ENUM */
#ifndef WL_POINTER_AXIS_SOURCE_ENUM_IS_VALID
#define WL_POINTER_AXIS_SOURCE_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_pointer * @ingroup iface_wl_pointer
* Validate a wl_pointer axis_source value. * Validate a wl_pointer axis_source value.
@ -3776,7 +3844,7 @@ wl_pointer_axis_source_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_POINTER_AXIS_SOURCE_ENUM */ #endif /* WL_POINTER_AXIS_SOURCE_ENUM_IS_VALID */
/** /**
* @ingroup iface_wl_pointer * @ingroup iface_wl_pointer
@ -4037,6 +4105,10 @@ enum wl_keyboard_keymap_format {
*/ */
WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1 = 1, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1 = 1,
}; };
#endif /* WL_KEYBOARD_KEYMAP_FORMAT_ENUM */
#ifndef WL_KEYBOARD_KEYMAP_FORMAT_ENUM_IS_VALID
#define WL_KEYBOARD_KEYMAP_FORMAT_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_keyboard * @ingroup iface_wl_keyboard
* Validate a wl_keyboard keymap_format value. * Validate a wl_keyboard keymap_format value.
@ -4055,7 +4127,7 @@ wl_keyboard_keymap_format_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_KEYBOARD_KEYMAP_FORMAT_ENUM */ #endif /* WL_KEYBOARD_KEYMAP_FORMAT_ENUM_IS_VALID */
#ifndef WL_KEYBOARD_KEY_STATE_ENUM #ifndef WL_KEYBOARD_KEY_STATE_ENUM
#define WL_KEYBOARD_KEY_STATE_ENUM #define WL_KEYBOARD_KEY_STATE_ENUM
@ -4075,6 +4147,10 @@ enum wl_keyboard_key_state {
*/ */
WL_KEYBOARD_KEY_STATE_PRESSED = 1, WL_KEYBOARD_KEY_STATE_PRESSED = 1,
}; };
#endif /* WL_KEYBOARD_KEY_STATE_ENUM */
#ifndef WL_KEYBOARD_KEY_STATE_ENUM_IS_VALID
#define WL_KEYBOARD_KEY_STATE_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_keyboard * @ingroup iface_wl_keyboard
* Validate a wl_keyboard key_state value. * Validate a wl_keyboard key_state value.
@ -4093,7 +4169,7 @@ wl_keyboard_key_state_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_KEYBOARD_KEY_STATE_ENUM */ #endif /* WL_KEYBOARD_KEY_STATE_ENUM_IS_VALID */
/** /**
* @ingroup iface_wl_keyboard * @ingroup iface_wl_keyboard
@ -4419,6 +4495,10 @@ enum wl_output_subpixel {
*/ */
WL_OUTPUT_SUBPIXEL_VERTICAL_BGR = 5, WL_OUTPUT_SUBPIXEL_VERTICAL_BGR = 5,
}; };
#endif /* WL_OUTPUT_SUBPIXEL_ENUM */
#ifndef WL_OUTPUT_SUBPIXEL_ENUM_IS_VALID
#define WL_OUTPUT_SUBPIXEL_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_output * @ingroup iface_wl_output
* Validate a wl_output subpixel value. * Validate a wl_output subpixel value.
@ -4445,7 +4525,7 @@ wl_output_subpixel_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_OUTPUT_SUBPIXEL_ENUM */ #endif /* WL_OUTPUT_SUBPIXEL_ENUM_IS_VALID */
#ifndef WL_OUTPUT_TRANSFORM_ENUM #ifndef WL_OUTPUT_TRANSFORM_ENUM
#define WL_OUTPUT_TRANSFORM_ENUM #define WL_OUTPUT_TRANSFORM_ENUM
@ -4499,6 +4579,10 @@ enum wl_output_transform {
*/ */
WL_OUTPUT_TRANSFORM_FLIPPED_270 = 7, WL_OUTPUT_TRANSFORM_FLIPPED_270 = 7,
}; };
#endif /* WL_OUTPUT_TRANSFORM_ENUM */
#ifndef WL_OUTPUT_TRANSFORM_ENUM_IS_VALID
#define WL_OUTPUT_TRANSFORM_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_output * @ingroup iface_wl_output
* Validate a wl_output transform value. * Validate a wl_output transform value.
@ -4529,7 +4613,7 @@ wl_output_transform_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_OUTPUT_TRANSFORM_ENUM */ #endif /* WL_OUTPUT_TRANSFORM_ENUM_IS_VALID */
#ifndef WL_OUTPUT_MODE_ENUM #ifndef WL_OUTPUT_MODE_ENUM
#define WL_OUTPUT_MODE_ENUM #define WL_OUTPUT_MODE_ENUM
@ -4550,6 +4634,10 @@ enum wl_output_mode {
*/ */
WL_OUTPUT_MODE_PREFERRED = 0x2, WL_OUTPUT_MODE_PREFERRED = 0x2,
}; };
#endif /* WL_OUTPUT_MODE_ENUM */
#ifndef WL_OUTPUT_MODE_ENUM_IS_VALID
#define WL_OUTPUT_MODE_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_output * @ingroup iface_wl_output
* Validate a wl_output mode value. * Validate a wl_output mode value.
@ -4566,7 +4654,7 @@ wl_output_mode_is_valid(uint32_t value, uint32_t version) {
valid |= WL_OUTPUT_MODE_PREFERRED; valid |= WL_OUTPUT_MODE_PREFERRED;
return (value & ~valid) == 0; return (value & ~valid) == 0;
} }
#endif /* WL_OUTPUT_MODE_ENUM */ #endif /* WL_OUTPUT_MODE_ENUM_IS_VALID */
/** /**
* @ingroup iface_wl_output * @ingroup iface_wl_output
@ -4734,6 +4822,10 @@ enum wl_subcompositor_error {
*/ */
WL_SUBCOMPOSITOR_ERROR_BAD_SURFACE = 0, WL_SUBCOMPOSITOR_ERROR_BAD_SURFACE = 0,
}; };
#endif /* WL_SUBCOMPOSITOR_ERROR_ENUM */
#ifndef WL_SUBCOMPOSITOR_ERROR_ENUM_IS_VALID
#define WL_SUBCOMPOSITOR_ERROR_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_subcompositor * @ingroup iface_wl_subcompositor
* Validate a wl_subcompositor error value. * Validate a wl_subcompositor error value.
@ -4750,7 +4842,7 @@ wl_subcompositor_error_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_SUBCOMPOSITOR_ERROR_ENUM */ #endif /* WL_SUBCOMPOSITOR_ERROR_ENUM_IS_VALID */
/** /**
* @ingroup iface_wl_subcompositor * @ingroup iface_wl_subcompositor
@ -4805,6 +4897,10 @@ enum wl_subsurface_error {
*/ */
WL_SUBSURFACE_ERROR_BAD_SURFACE = 0, WL_SUBSURFACE_ERROR_BAD_SURFACE = 0,
}; };
#endif /* WL_SUBSURFACE_ERROR_ENUM */
#ifndef WL_SUBSURFACE_ERROR_ENUM_IS_VALID
#define WL_SUBSURFACE_ERROR_ENUM_IS_VALID
/** /**
* @ingroup iface_wl_subsurface * @ingroup iface_wl_subsurface
* Validate a wl_subsurface error value. * Validate a wl_subsurface error value.
@ -4821,7 +4917,7 @@ wl_subsurface_error_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* WL_SUBSURFACE_ERROR_ENUM */ #endif /* WL_SUBSURFACE_ERROR_ENUM_IS_VALID */
/** /**
* @ingroup iface_wl_subsurface * @ingroup iface_wl_subsurface

12
tests/data/small-server-core.h
View file

@ -107,6 +107,10 @@ enum intf_A_foo {
* @ingroup iface_intf_A * @ingroup iface_intf_A
*/ */
#define INTF_A_FOO_DEPRECATED_SINCE_VERSION 2 #define INTF_A_FOO_DEPRECATED_SINCE_VERSION 2
#endif /* INTF_A_FOO_ENUM */
#ifndef INTF_A_FOO_ENUM_IS_VALID
#define INTF_A_FOO_ENUM_IS_VALID
/** /**
* @ingroup iface_intf_A * @ingroup iface_intf_A
* Validate a intf_A foo value. * Validate a intf_A foo value.
@ -131,7 +135,7 @@ intf_A_foo_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* INTF_A_FOO_ENUM */ #endif /* INTF_A_FOO_ENUM_IS_VALID */
#ifndef INTF_A_BAR_ENUM #ifndef INTF_A_BAR_ENUM
#define INTF_A_BAR_ENUM #define INTF_A_BAR_ENUM
@ -154,6 +158,10 @@ enum intf_A_bar {
* @ingroup iface_intf_A * @ingroup iface_intf_A
*/ */
#define INTF_A_BAR_THIRD_SINCE_VERSION 2 #define INTF_A_BAR_THIRD_SINCE_VERSION 2
#endif /* INTF_A_BAR_ENUM */
#ifndef INTF_A_BAR_ENUM_IS_VALID
#define INTF_A_BAR_ENUM_IS_VALID
/** /**
* @ingroup iface_intf_A * @ingroup iface_intf_A
* Validate a intf_A bar value. * Validate a intf_A bar value.
@ -172,7 +180,7 @@ intf_A_bar_is_valid(uint32_t value, uint32_t version) {
valid |= INTF_A_BAR_THIRD; valid |= INTF_A_BAR_THIRD;
return (value & ~valid) == 0; return (value & ~valid) == 0;
} }
#endif /* INTF_A_BAR_ENUM */ #endif /* INTF_A_BAR_ENUM_IS_VALID */
/** /**
* @ingroup iface_intf_A * @ingroup iface_intf_A

12
tests/data/small-server.h
View file

@ -107,6 +107,10 @@ enum intf_A_foo {
* @ingroup iface_intf_A * @ingroup iface_intf_A
*/ */
#define INTF_A_FOO_DEPRECATED_SINCE_VERSION 2 #define INTF_A_FOO_DEPRECATED_SINCE_VERSION 2
#endif /* INTF_A_FOO_ENUM */
#ifndef INTF_A_FOO_ENUM_IS_VALID
#define INTF_A_FOO_ENUM_IS_VALID
/** /**
* @ingroup iface_intf_A * @ingroup iface_intf_A
* Validate a intf_A foo value. * Validate a intf_A foo value.
@ -131,7 +135,7 @@ intf_A_foo_is_valid(uint32_t value, uint32_t version) {
return false; return false;
} }
} }
#endif /* INTF_A_FOO_ENUM */ #endif /* INTF_A_FOO_ENUM_IS_VALID */
#ifndef INTF_A_BAR_ENUM #ifndef INTF_A_BAR_ENUM
#define INTF_A_BAR_ENUM #define INTF_A_BAR_ENUM
@ -154,6 +158,10 @@ enum intf_A_bar {
* @ingroup iface_intf_A * @ingroup iface_intf_A
*/ */
#define INTF_A_BAR_THIRD_SINCE_VERSION 2 #define INTF_A_BAR_THIRD_SINCE_VERSION 2
#endif /* INTF_A_BAR_ENUM */
#ifndef INTF_A_BAR_ENUM_IS_VALID
#define INTF_A_BAR_ENUM_IS_VALID
/** /**
* @ingroup iface_intf_A * @ingroup iface_intf_A
* Validate a intf_A bar value. * Validate a intf_A bar value.
@ -172,7 +180,7 @@ intf_A_bar_is_valid(uint32_t value, uint32_t version) {
valid |= INTF_A_BAR_THIRD; valid |= INTF_A_BAR_THIRD;
return (value & ~valid) == 0; return (value & ~valid) == 0;
} }
#endif /* INTF_A_BAR_ENUM */ #endif /* INTF_A_BAR_ENUM_IS_VALID */
/** /**
* @ingroup iface_intf_A * @ingroup iface_intf_A