diff --git a/build-scripts/wikiheaders.pl b/build-scripts/wikiheaders.pl index b81025e56..6de0518d1 100755 --- a/build-scripts/wikiheaders.pl +++ b/build-scripts/wikiheaders.pl @@ -858,6 +858,21 @@ while (my $d = readdir(DH)) { } next; } + + # We assume any `#define`s directly after the typedef are related to it: probably bitflags for an integer typedef. Even a blank line will signify an end! + my $lastpos = tell(FH); + my $additional_decl = ''; + while () { + chomp; + if (not /\A\s*\#define\s+/) { + seek(FH, $lastpos, 0); # re-read this line again next time. + last; + } + $additional_decl .= "$_\n"; + push @decllines, $_; + $lastpos = tell(FH); + } + $decl .= "\n$additional_decl" if ($additional_decl ne ''); } else { die("Unexpected symtype $symtype"); } diff --git a/include/SDL3/SDL_keycode.h b/include/SDL3/SDL_keycode.h index 0dbd0a051..a4461903e 100644 --- a/include/SDL3/SDL_keycode.h +++ b/include/SDL3/SDL_keycode.h @@ -47,13 +47,8 @@ * \sa SDL_KeyCode */ typedef Sint32 SDL_Keycode; - #define SDLK_SCANCODE_MASK (1<<30) #define SDL_SCANCODE_TO_KEYCODE(X) (X | SDLK_SCANCODE_MASK) - -/** - * A subset of possible virtual key values. - */ #define SDLK_UNKNOWN 0 #define SDLK_RETURN '\r' #define SDLK_ESCAPE '\x1B' diff --git a/include/SDL3/SDL_video.h b/include/SDL3/SDL_video.h index f5e8d8e72..e47da978b 100644 --- a/include/SDL3/SDL_video.h +++ b/include/SDL3/SDL_video.h @@ -131,7 +131,6 @@ typedef struct SDL_Window SDL_Window; * \sa SDL_GetWindowFlags */ typedef Uint32 SDL_WindowFlags; - #define SDL_WINDOW_FULLSCREEN 0x00000001U /**< window is in fullscreen mode */ #define SDL_WINDOW_OPENGL 0x00000002U /**< window usable with OpenGL context */ #define SDL_WINDOW_OCCLUDED 0x00000004U /**< window is occluded */