We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Add SDL_ENUM and SDL_OPTIONS, more aggressively v2

sdlenumV2.diff (text/plain), 72.42 KB, created by C.W. Betts on 2018-09-10 21:32:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: C.W. Betts

Created: 2018-09-10 21:32:15 UTC

Size: 72.42 KB

patch

obsolete

>diff --git a/include/SDL.h b/include/SDL.h
>index fc35a419e..461d6b514 100644
>--- a/include/SDL.h
>+++ b/include/SDL.h
>@@ -74,25 +74,28 @@ extern "C" {
>  *  specify the subsystems which you will be using in your application.
>  */
> /* @{ */
>-#define SDL_INIT_TIMER          0x00000001u
>-#define SDL_INIT_AUDIO          0x00000010u
>-#define SDL_INIT_VIDEO          0x00000020u  /**< SDL_INIT_VIDEO implies SDL_INIT_EVENTS */
>-#define SDL_INIT_JOYSTICK       0x00000200u  /**< SDL_INIT_JOYSTICK implies SDL_INIT_EVENTS */
>-#define SDL_INIT_HAPTIC         0x00001000u
>-#define SDL_INIT_GAMECONTROLLER 0x00002000u  /**< SDL_INIT_GAMECONTROLLER implies SDL_INIT_JOYSTICK */
>-#define SDL_INIT_EVENTS         0x00004000u
>-#define SDL_INIT_SENSOR         0x00008000u
>-#define SDL_INIT_NOPARACHUTE    0x00100000u  /**< compatibility; this flag is ignored. */
>-#define SDL_INIT_EVERYTHING ( \
>-                SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS | \
>-                SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER | SDL_INIT_SENSOR \
>+typedef SDL_OPTIONS(Uint32, SDL_InitFlags)
>+{
>+    SDL_INIT_TIMER          = 0x00000001u,
>+    SDL_INIT_AUDIO          = 0x00000010u,
>+    SDL_INIT_VIDEO          = 0x00000020u,  /**< SDL_INIT_VIDEO implies SDL_INIT_EVENTS */
>+    SDL_INIT_JOYSTICK       = 0x00000200u,  /**< SDL_INIT_JOYSTICK implies SDL_INIT_EVENTS */
>+    SDL_INIT_HAPTIC         = 0x00001000u,
>+    SDL_INIT_GAMECONTROLLER = 0x00002000u,  /**< SDL_INIT_GAMECONTROLLER implies SDL_INIT_JOYSTICK */
>+    SDL_INIT_EVENTS         = 0x00004000u,
>+    SDL_INIT_SENSOR         = 0x00008000u,
>+    SDL_INIT_NOPARACHUTE    = 0x00100000u,  /**< compatibility; this flag is ignored. */
>+    SDL_INIT_EVERYTHING = (
>+            SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS |
>+            SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER | SDL_INIT_SENSOR
>             )
>+};
> /* @} */
> 
> /**
>  *  This function initializes  the subsystems specified by \c flags
>  */
>-extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags);
>+extern DECLSPEC int SDLCALL SDL_Init(SDL_InitFlags flags);
> 
> /**
>  *  This function initializes specific SDL subsystems
>@@ -103,12 +106,12 @@ extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags);
>  *  If a subsystem is already loaded then this call will
>  *  increase the ref-count and return.
>  */
>-extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags);
>+extern DECLSPEC int SDLCALL SDL_InitSubSystem(SDL_InitFlags flags);
> 
> /**
>  *  This function cleans up specific SDL subsystems
>  */
>-extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);
>+extern DECLSPEC void SDLCALL SDL_QuitSubSystem(SDL_InitFlags flags);
> 
> /**
>  *  This function returns a mask of the specified subsystems which have
>@@ -116,7 +119,7 @@ extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);
>  *
>  *  If \c flags is 0, it returns a mask of all initialized subsystems.
>  */
>-extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags);
>+extern DECLSPEC SDL_InitFlags SDLCALL SDL_WasInit(SDL_InitFlags flags);
> 
> /**
>  *  This function cleans up all initialized subsystems. You should
>diff --git a/include/SDL_audio.h b/include/SDL_audio.h
>index d6ea68954..7ed6311eb 100644
>--- a/include/SDL_audio.h
>+++ b/include/SDL_audio.h
>@@ -61,17 +61,17 @@ extern "C" {
>  *
>  *  There are macros in SDL 2.0 and later to query these bits.
>  */
>-typedef Uint16 SDL_AudioFormat;
>+typedef SDL_OPTIONS(Uint16, SDL_AudioFormat) {
> 
> /**
>  *  \name Audio flags
>  */
> /* @{ */
> 
>-#define SDL_AUDIO_MASK_BITSIZE       (0xFF)
>-#define SDL_AUDIO_MASK_DATATYPE      (1<<8)
>-#define SDL_AUDIO_MASK_ENDIAN        (1<<12)
>-#define SDL_AUDIO_MASK_SIGNED        (1<<15)
>+    SDL_AUDIO_MASK_BITSIZE       = (0xFF),
>+    SDL_AUDIO_MASK_DATATYPE      = (1<<8),
>+    SDL_AUDIO_MASK_ENDIAN        = (1<<12),
>+    SDL_AUDIO_MASK_SIGNED        = (1<<15),
> #define SDL_AUDIO_BITSIZE(x)         (x & SDL_AUDIO_MASK_BITSIZE)
> #define SDL_AUDIO_ISFLOAT(x)         (x & SDL_AUDIO_MASK_DATATYPE)
> #define SDL_AUDIO_ISBIGENDIAN(x)     (x & SDL_AUDIO_MASK_ENDIAN)
>@@ -86,32 +86,32 @@ typedef Uint16 SDL_AudioFormat;
>  *  Defaults to LSB byte order.
>  */
> /* @{ */
>-#define AUDIO_U8        0x0008  /**< Unsigned 8-bit samples */
>-#define AUDIO_S8        0x8008  /**< Signed 8-bit samples */
>-#define AUDIO_U16LSB    0x0010  /**< Unsigned 16-bit samples */
>-#define AUDIO_S16LSB    0x8010  /**< Signed 16-bit samples */
>-#define AUDIO_U16MSB    0x1010  /**< As above, but big-endian byte order */
>-#define AUDIO_S16MSB    0x9010  /**< As above, but big-endian byte order */
>-#define AUDIO_U16       AUDIO_U16LSB
>-#define AUDIO_S16       AUDIO_S16LSB
>+    AUDIO_U8        = 0x0008,  /**< Unsigned 8-bit samples */
>+    AUDIO_S8        = 0x8008,  /**< Signed 8-bit samples */
>+    AUDIO_U16LSB    = 0x0010,  /**< Unsigned 16-bit samples */
>+    AUDIO_S16LSB    = 0x8010,  /**< Signed 16-bit samples */
>+    AUDIO_U16MSB    = 0x1010,  /**< As above, but big-endian byte order */
>+    AUDIO_S16MSB    = 0x9010,  /**< As above, but big-endian byte order */
>+    AUDIO_U16       = AUDIO_U16LSB,
>+    AUDIO_S16       = AUDIO_S16LSB,
> /* @} */
> 
> /**
>  *  \name int32 support
>  */
> /* @{ */
>-#define AUDIO_S32LSB    0x8020  /**< 32-bit integer samples */
>-#define AUDIO_S32MSB    0x9020  /**< As above, but big-endian byte order */
>-#define AUDIO_S32       AUDIO_S32LSB
>+    AUDIO_S32LSB    = 0x8020,  /**< 32-bit integer samples */
>+    AUDIO_S32MSB    = 0x9020,  /**< As above, but big-endian byte order */
>+    AUDIO_S32       = AUDIO_S32LSB,
> /* @} */
> 
> /**
>  *  \name float32 support
>  */
> /* @{ */
>-#define AUDIO_F32LSB    0x8120  /**< 32-bit floating point samples */
>-#define AUDIO_F32MSB    0x9120  /**< As above, but big-endian byte order */
>-#define AUDIO_F32       AUDIO_F32LSB
>+    AUDIO_F32LSB    = 0x8120,  /**< 32-bit floating point samples */
>+    AUDIO_F32MSB    = 0x9120,  /**< As above, but big-endian byte order */
>+    AUDIO_F32       = AUDIO_F32LSB,
> /* @} */
> 
> /**
>@@ -119,17 +119,18 @@ typedef Uint16 SDL_AudioFormat;
>  */
> /* @{ */
> #if SDL_BYTEORDER == SDL_LIL_ENDIAN
>-#define AUDIO_U16SYS    AUDIO_U16LSB
>-#define AUDIO_S16SYS    AUDIO_S16LSB
>-#define AUDIO_S32SYS    AUDIO_S32LSB
>-#define AUDIO_F32SYS    AUDIO_F32LSB
>+    AUDIO_U16SYS    = AUDIO_U16LSB,
>+    AUDIO_S16SYS    = AUDIO_S16LSB,
>+    AUDIO_S32SYS    = AUDIO_S32LSB,
>+    AUDIO_F32SYS    = AUDIO_F32LSB
> #else
>-#define AUDIO_U16SYS    AUDIO_U16MSB
>-#define AUDIO_S16SYS    AUDIO_S16MSB
>-#define AUDIO_S32SYS    AUDIO_S32MSB
>-#define AUDIO_F32SYS    AUDIO_F32MSB
>+    AUDIO_U16SYS    = AUDIO_U16MSB,
>+    AUDIO_S16SYS    = AUDIO_S16MSB,
>+    AUDIO_S32SYS    = AUDIO_S32MSB,
>+    AUDIO_F32SYS    = AUDIO_F32MSB
> #endif
> /* @} */
>+};
> 
> /**
>  *  \name Allow change flags
>@@ -137,10 +138,12 @@ typedef Uint16 SDL_AudioFormat;
>  *  Which audio format changes are allowed when opening a device.
>  */
> /* @{ */
>-#define SDL_AUDIO_ALLOW_FREQUENCY_CHANGE    0x00000001
>-#define SDL_AUDIO_ALLOW_FORMAT_CHANGE       0x00000002
>-#define SDL_AUDIO_ALLOW_CHANNELS_CHANGE     0x00000004
>-#define SDL_AUDIO_ALLOW_ANY_CHANGE          (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE)
>+typedef SDL_OPTIONS(int, SDL_AudioAllowedChanges) {
>+    SDL_AUDIO_ALLOW_FREQUENCY_CHANGE    = 0x00000001,
>+    SDL_AUDIO_ALLOW_FORMAT_CHANGE       = 0x00000002,
>+    SDL_AUDIO_ALLOW_CHANNELS_CHANGE     = 0x00000004,
>+    SDL_AUDIO_ALLOW_ANY_CHANGE          = (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE)
>+};
> /* @} */
> 
> /* @} *//* Audio flags */
>@@ -380,7 +383,7 @@ extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice(const char
>                                                               desired,
>                                                               SDL_AudioSpec *
>                                                               obtained,
>-                                                              int
>+                                                              SDL_AudioAllowedChanges
>                                                               allowed_changes);
> 
> 
>@@ -391,12 +394,12 @@ extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice(const char
>  *  Get the current audio state.
>  */
> /* @{ */
>-typedef enum
>+typedef SDL_ENUM(int, SDL_AudioStatus)
> {
>     SDL_AUDIO_STOPPED = 0,
>     SDL_AUDIO_PLAYING,
>     SDL_AUDIO_PAUSED
>-} SDL_AudioStatus;
>+};
> extern DECLSPEC SDL_AudioStatus SDLCALL SDL_GetAudioStatus(void);
> 
> extern DECLSPEC SDL_AudioStatus SDLCALL
>diff --git a/include/SDL_blendmode.h b/include/SDL_blendmode.h
>index 36a5ea76f..16e83af43 100644
>--- a/include/SDL_blendmode.h
>+++ b/include/SDL_blendmode.h
>@@ -37,7 +37,7 @@ extern "C" {
> /**
>  *  \brief The blend mode used in SDL_RenderCopy() and drawing operations.
>  */
>-typedef enum
>+typedef SDL_OPTIONS(Uint32, SDL_BlendMode)
> {
>     SDL_BLENDMODE_NONE = 0x00000000,     /**< no blending
>                                               dstRGBA = srcRGBA */
>@@ -54,12 +54,12 @@ typedef enum
> 
>     /* Additional custom blend modes can be returned by SDL_ComposeCustomBlendMode() */
> 
>-} SDL_BlendMode;
>+};
> 
> /**
>  *  \brief The blend operation used when combining source and destination pixel components
>  */
>-typedef enum
>+typedef SDL_ENUM(int, SDL_BlendOperation)
> {
>     SDL_BLENDOPERATION_ADD              = 0x1,  /**< dst + src: supported by all renderers */
>     SDL_BLENDOPERATION_SUBTRACT         = 0x2,  /**< dst - src : supported by D3D9, D3D11, OpenGL, OpenGLES */
>@@ -67,12 +67,12 @@ typedef enum
>     SDL_BLENDOPERATION_MINIMUM          = 0x4,  /**< min(dst, src) : supported by D3D11 */
>     SDL_BLENDOPERATION_MAXIMUM          = 0x5   /**< max(dst, src) : supported by D3D11 */
> 
>-} SDL_BlendOperation;
>+};
> 
> /**
>  *  \brief The normalized factor used to multiply pixel components
>  */
>-typedef enum
>+typedef SDL_ENUM(int, SDL_BlendFactor)
> {
>     SDL_BLENDFACTOR_ZERO                = 0x1,  /**< 0, 0, 0, 0 */
>     SDL_BLENDFACTOR_ONE                 = 0x2,  /**< 1, 1, 1, 1 */
>@@ -85,7 +85,7 @@ typedef enum
>     SDL_BLENDFACTOR_DST_ALPHA           = 0x9,  /**< dstA, dstA, dstA, dstA */
>     SDL_BLENDFACTOR_ONE_MINUS_DST_ALPHA = 0xA   /**< 1-dstA, 1-dstA, 1-dstA, 1-dstA */
> 
>-} SDL_BlendFactor;
>+};
> 
> /**
>  *  \brief Create a custom blend mode, which may or may not be supported by a given renderer
>diff --git a/include/SDL_error.h b/include/SDL_error.h
>index c0e46298e..6866b9731 100644
>--- a/include/SDL_error.h
>+++ b/include/SDL_error.h
>@@ -52,7 +52,7 @@ extern DECLSPEC void SDLCALL SDL_ClearError(void);
> #define SDL_OutOfMemory()   SDL_Error(SDL_ENOMEM)
> #define SDL_Unsupported()   SDL_Error(SDL_UNSUPPORTED)
> #define SDL_InvalidParamError(param)    SDL_SetError("Parameter '%s' is invalid", (param))
>-typedef enum
>+typedef SDL_ENUM(int, SDL_errorcode)
> {
>     SDL_ENOMEM,
>     SDL_EFREAD,
>@@ -60,7 +60,7 @@ typedef enum
>     SDL_EFSEEK,
>     SDL_UNSUPPORTED,
>     SDL_LASTERROR
>-} SDL_errorcode;
>+};
> /* SDL_Error() unconditionally returns -1. */
> extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code);
> /* @} *//* Internal error functions */
>diff --git a/include/SDL_events.h b/include/SDL_events.h
>index af22eb646..50e1f2888 100644
>--- a/include/SDL_events.h
>+++ b/include/SDL_events.h
>@@ -46,13 +46,16 @@ extern "C" {
> #endif
> 
> /* General keyboard/mouse state definitions */
>-#define SDL_RELEASED    0
>-#define SDL_PRESSED 1
>+typedef SDL_ENUM(Uint8, SDL_EventStateGeneric)
>+{
>+    SDL_RELEASED = 0,
>+    SDL_PRESSED = 1
>+};
> 
> /**
>  * \brief The types of events that can be delivered.
>  */
>-typedef enum
>+typedef SDL_ENUM(Uint32, SDL_EventType)
> {
>     SDL_FIRSTEVENT     = 0,     /**< Unused (do not remove) */
> 
>@@ -163,14 +166,14 @@ typedef enum
>      *  This last event is only for bounding internal arrays
>      */
>     SDL_LASTEVENT    = 0xFFFF
>-} SDL_EventType;
>+};
> 
> /**
>  *  \brief Fields shared by every event
>  */
> typedef struct SDL_CommonEvent
> {
>-    Uint32 type;
>+    SDL_EventType type;
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
> } SDL_CommonEvent;
> 
>@@ -194,10 +197,10 @@ typedef struct SDL_DisplayEvent
>  */
> typedef struct SDL_WindowEvent
> {
>-    Uint32 type;        /**< ::SDL_WINDOWEVENT */
>+    SDL_EventType type; /**< ::SDL_WINDOWEVENT */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     Uint32 windowID;    /**< The associated window */
>-    Uint8 event;        /**< ::SDL_WindowEventID */
>+    SDL_WindowEventID event; /**< ::SDL_WindowEventID */
>     Uint8 padding1;
>     Uint8 padding2;
>     Uint8 padding3;
>@@ -210,10 +213,10 @@ typedef struct SDL_WindowEvent
>  */
> typedef struct SDL_KeyboardEvent
> {
>-    Uint32 type;        /**< ::SDL_KEYDOWN or ::SDL_KEYUP */
>+    SDL_EventType type; /**< ::SDL_KEYDOWN or ::SDL_KEYUP */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     Uint32 windowID;    /**< The window with keyboard focus, if any */
>-    Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
>+    SDL_EventStateGeneric state; /**< ::SDL_PRESSED or ::SDL_RELEASED */
>     Uint8 repeat;       /**< Non-zero if this is a key repeat */
>     Uint8 padding2;
>     Uint8 padding3;
>@@ -226,7 +229,7 @@ typedef struct SDL_KeyboardEvent
>  */
> typedef struct SDL_TextEditingEvent
> {
>-    Uint32 type;                                /**< ::SDL_TEXTEDITING */
>+    SDL_EventType type;                         /**< ::SDL_TEXTEDITING */
>     Uint32 timestamp;                           /**< In milliseconds, populated using SDL_GetTicks() */
>     Uint32 windowID;                            /**< The window with keyboard focus, if any */
>     char text[SDL_TEXTEDITINGEVENT_TEXT_SIZE];  /**< The editing text */
>@@ -241,7 +244,7 @@ typedef struct SDL_TextEditingEvent
>  */
> typedef struct SDL_TextInputEvent
> {
>-    Uint32 type;                              /**< ::SDL_TEXTINPUT */
>+    SDL_EventType type;                       /**< ::SDL_TEXTINPUT */
>     Uint32 timestamp;                         /**< In milliseconds, populated using SDL_GetTicks() */
>     Uint32 windowID;                          /**< The window with keyboard focus, if any */
>     char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];  /**< The input text */
>@@ -252,7 +255,7 @@ typedef struct SDL_TextInputEvent
>  */
> typedef struct SDL_MouseMotionEvent
> {
>-    Uint32 type;        /**< ::SDL_MOUSEMOTION */
>+    SDL_EventType type; /**< ::SDL_MOUSEMOTION */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     Uint32 windowID;    /**< The window with mouse focus, if any */
>     Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
>@@ -268,12 +271,12 @@ typedef struct SDL_MouseMotionEvent
>  */
> typedef struct SDL_MouseButtonEvent
> {
>-    Uint32 type;        /**< ::SDL_MOUSEBUTTONDOWN or ::SDL_MOUSEBUTTONUP */
>+    SDL_EventType type; /**< ::SDL_MOUSEBUTTONDOWN or ::SDL_MOUSEBUTTONUP */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     Uint32 windowID;    /**< The window with mouse focus, if any */
>     Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
>     Uint8 button;       /**< The mouse button index */
>-    Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
>+    SDL_EventStateGeneric state; /**< ::SDL_PRESSED or ::SDL_RELEASED */
>     Uint8 clicks;       /**< 1 for single-click, 2 for double-click, etc. */
>     Uint8 padding1;
>     Sint32 x;           /**< X coordinate, relative to window */
>@@ -285,13 +288,13 @@ typedef struct SDL_MouseButtonEvent
>  */
> typedef struct SDL_MouseWheelEvent
> {
>-    Uint32 type;        /**< ::SDL_MOUSEWHEEL */
>+    SDL_EventType type; /**< ::SDL_MOUSEWHEEL */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     Uint32 windowID;    /**< The window with mouse focus, if any */
>     Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
>     Sint32 x;           /**< The amount scrolled horizontally, positive to the right and negative to the left */
>     Sint32 y;           /**< The amount scrolled vertically, positive away from the user and negative toward the user */
>-    Uint32 direction;   /**< Set to one of the SDL_MOUSEWHEEL_* defines. When FLIPPED the values in X and Y will be opposite. Multiply by -1 to change them back */
>+    SDL_MouseWheelDirection direction; /**< Set to one of the SDL_MOUSEWHEEL_* defines. When FLIPPED the values in X and Y will be opposite. Multiply by -1 to change them back */
> } SDL_MouseWheelEvent;
> 
> /**
>@@ -299,7 +302,7 @@ typedef struct SDL_MouseWheelEvent
>  */
> typedef struct SDL_JoyAxisEvent
> {
>-    Uint32 type;        /**< ::SDL_JOYAXISMOTION */
>+    SDL_EventType type; /**< ::SDL_JOYAXISMOTION */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     SDL_JoystickID which; /**< The joystick instance id */
>     Uint8 axis;         /**< The joystick axis index */
>@@ -315,7 +318,7 @@ typedef struct SDL_JoyAxisEvent
>  */
> typedef struct SDL_JoyBallEvent
> {
>-    Uint32 type;        /**< ::SDL_JOYBALLMOTION */
>+    SDL_EventType type; /**< ::SDL_JOYBALLMOTION */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     SDL_JoystickID which; /**< The joystick instance id */
>     Uint8 ball;         /**< The joystick trackball index */
>@@ -331,11 +334,11 @@ typedef struct SDL_JoyBallEvent
>  */
> typedef struct SDL_JoyHatEvent
> {
>-    Uint32 type;        /**< ::SDL_JOYHATMOTION */
>+    SDL_EventType type; /**< ::SDL_JOYHATMOTION */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     SDL_JoystickID which; /**< The joystick instance id */
>     Uint8 hat;          /**< The joystick hat index */
>-    Uint8 value;        /**< The hat position value.
>+    SDL_HatPosition value; /**< The hat position value.
>                          *   \sa ::SDL_HAT_LEFTUP ::SDL_HAT_UP ::SDL_HAT_RIGHTUP
>                          *   \sa ::SDL_HAT_LEFT ::SDL_HAT_CENTERED ::SDL_HAT_RIGHT
>                          *   \sa ::SDL_HAT_LEFTDOWN ::SDL_HAT_DOWN ::SDL_HAT_RIGHTDOWN
>@@ -351,11 +354,11 @@ typedef struct SDL_JoyHatEvent
>  */
> typedef struct SDL_JoyButtonEvent
> {
>-    Uint32 type;        /**< ::SDL_JOYBUTTONDOWN or ::SDL_JOYBUTTONUP */
>+    SDL_EventType type; /**< ::SDL_JOYBUTTONDOWN or ::SDL_JOYBUTTONUP */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     SDL_JoystickID which; /**< The joystick instance id */
>     Uint8 button;       /**< The joystick button index */
>-    Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
>+    SDL_EventStateGeneric state; /**< ::SDL_PRESSED or ::SDL_RELEASED */
>     Uint8 padding1;
>     Uint8 padding2;
> } SDL_JoyButtonEvent;
>@@ -365,7 +368,7 @@ typedef struct SDL_JoyButtonEvent
>  */
> typedef struct SDL_JoyDeviceEvent
> {
>-    Uint32 type;        /**< ::SDL_JOYDEVICEADDED or ::SDL_JOYDEVICEREMOVED */
>+    SDL_EventType type; /**< ::SDL_JOYDEVICEADDED or ::SDL_JOYDEVICEREMOVED */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     Sint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED event */
> } SDL_JoyDeviceEvent;
>@@ -376,7 +379,7 @@ typedef struct SDL_JoyDeviceEvent
>  */
> typedef struct SDL_ControllerAxisEvent
> {
>-    Uint32 type;        /**< ::SDL_CONTROLLERAXISMOTION */
>+    SDL_EventType type; /**< ::SDL_CONTROLLERAXISMOTION */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     SDL_JoystickID which; /**< The joystick instance id */
>     Uint8 axis;         /**< The controller axis (SDL_GameControllerAxis) */
>@@ -393,11 +396,11 @@ typedef struct SDL_ControllerAxisEvent
>  */
> typedef struct SDL_ControllerButtonEvent
> {
>-    Uint32 type;        /**< ::SDL_CONTROLLERBUTTONDOWN or ::SDL_CONTROLLERBUTTONUP */
>+    SDL_EventType type; /**< ::SDL_CONTROLLERBUTTONDOWN or ::SDL_CONTROLLERBUTTONUP */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     SDL_JoystickID which; /**< The joystick instance id */
>     Uint8 button;       /**< The controller button (SDL_GameControllerButton) */
>-    Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
>+    SDL_EventStateGeneric state; /**< ::SDL_PRESSED or ::SDL_RELEASED */
>     Uint8 padding1;
>     Uint8 padding2;
> } SDL_ControllerButtonEvent;
>@@ -408,7 +411,7 @@ typedef struct SDL_ControllerButtonEvent
>  */
> typedef struct SDL_ControllerDeviceEvent
> {
>-    Uint32 type;        /**< ::SDL_CONTROLLERDEVICEADDED, ::SDL_CONTROLLERDEVICEREMOVED, or ::SDL_CONTROLLERDEVICEREMAPPED */
>+    SDL_EventType type; /**< ::SDL_CONTROLLERDEVICEADDED, ::SDL_CONTROLLERDEVICEREMOVED, or ::SDL_CONTROLLERDEVICEREMAPPED */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     Sint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED or REMAPPED event */
> } SDL_ControllerDeviceEvent;
>@@ -418,7 +421,7 @@ typedef struct SDL_ControllerDeviceEvent
>  */
> typedef struct SDL_AudioDeviceEvent
> {
>-    Uint32 type;        /**< ::SDL_AUDIODEVICEADDED, or ::SDL_AUDIODEVICEREMOVED */
>+    SDL_EventType type; /**< ::SDL_AUDIODEVICEADDED, or ::SDL_AUDIODEVICEREMOVED */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     Uint32 which;       /**< The audio device index for the ADDED event (valid until next SDL_GetNumAudioDevices() call), SDL_AudioDeviceID for the REMOVED event */
>     Uint8 iscapture;    /**< zero if an output device, non-zero if a capture device. */
>@@ -433,7 +436,7 @@ typedef struct SDL_AudioDeviceEvent
>  */
> typedef struct SDL_TouchFingerEvent
> {
>-    Uint32 type;        /**< ::SDL_FINGERMOTION or ::SDL_FINGERDOWN or ::SDL_FINGERUP */
>+    SDL_EventType type;  /**< ::SDL_FINGERMOTION or ::SDL_FINGERDOWN or ::SDL_FINGERUP */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     SDL_TouchID touchId; /**< The touch device id */
>     SDL_FingerID fingerId;
>@@ -450,7 +453,7 @@ typedef struct SDL_TouchFingerEvent
>  */
> typedef struct SDL_MultiGestureEvent
> {
>-    Uint32 type;        /**< ::SDL_MULTIGESTURE */
>+    SDL_EventType type;  /**< ::SDL_MULTIGESTURE */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     SDL_TouchID touchId; /**< The touch device id */
>     float dTheta;
>@@ -467,7 +470,7 @@ typedef struct SDL_MultiGestureEvent
>  */
> typedef struct SDL_DollarGestureEvent
> {
>-    Uint32 type;        /**< ::SDL_DOLLARGESTURE or ::SDL_DOLLARRECORD */
>+    SDL_EventType type;  /**< ::SDL_DOLLARGESTURE or ::SDL_DOLLARRECORD */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     SDL_TouchID touchId; /**< The touch device id */
>     SDL_GestureID gestureId;
>@@ -485,7 +488,7 @@ typedef struct SDL_DollarGestureEvent
>  */
> typedef struct SDL_DropEvent
> {
>-    Uint32 type;        /**< ::SDL_DROPBEGIN or ::SDL_DROPFILE or ::SDL_DROPTEXT or ::SDL_DROPCOMPLETE */
>+    SDL_EventType type; /**< ::SDL_DROPBEGIN or ::SDL_DROPFILE or ::SDL_DROPTEXT or ::SDL_DROPCOMPLETE */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     char *file;         /**< The file name, which should be freed with SDL_free(), is NULL on begin/complete */
>     Uint32 windowID;    /**< The window that was dropped on, if any */
>@@ -508,7 +511,7 @@ typedef struct SDL_SensorEvent
>  */
> typedef struct SDL_QuitEvent
> {
>-    Uint32 type;        /**< ::SDL_QUIT */
>+    SDL_EventType type; /**< ::SDL_QUIT */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
> } SDL_QuitEvent;
> 
>@@ -517,7 +520,7 @@ typedef struct SDL_QuitEvent
>  */
> typedef struct SDL_OSEvent
> {
>-    Uint32 type;        /**< ::SDL_QUIT */
>+    SDL_EventType type; /**< ::SDL_QUIT */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
> } SDL_OSEvent;
> 
>@@ -526,7 +529,7 @@ typedef struct SDL_OSEvent
>  */
> typedef struct SDL_UserEvent
> {
>-    Uint32 type;        /**< ::SDL_USEREVENT through ::SDL_LASTEVENT-1 */
>+    SDL_EventType type; /**< ::SDL_USEREVENT through ::SDL_LASTEVENT-1 */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     Uint32 windowID;    /**< The associated window if any */
>     Sint32 code;        /**< User defined event code */
>@@ -546,7 +549,7 @@ typedef struct SDL_SysWMmsg SDL_SysWMmsg;
>  */
> typedef struct SDL_SysWMEvent
> {
>-    Uint32 type;        /**< ::SDL_SYSWMEVENT */
>+    SDL_EventType type; /**< ::SDL_SYSWMEVENT */
>     Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
>     SDL_SysWMmsg *msg;  /**< driver dependent data, defined in SDL_syswm.h */
> } SDL_SysWMEvent;
>@@ -556,7 +559,7 @@ typedef struct SDL_SysWMEvent
>  */
> typedef union SDL_Event
> {
>-    Uint32 type;                    /**< Event type, shared with all events */
>+    SDL_EventType type;             /**< Event type, shared with all events */
>     SDL_CommonEvent common;         /**< Common event data */
>     SDL_DisplayEvent display;       /**< Window event data */
>     SDL_WindowEvent window;         /**< Window event data */
>@@ -607,12 +610,12 @@ typedef union SDL_Event
> extern DECLSPEC void SDLCALL SDL_PumpEvents(void);
> 
> /* @{ */
>-typedef enum
>+typedef SDL_ENUM(int, SDL_eventaction)
> {
>     SDL_ADDEVENT,
>     SDL_PEEKEVENT,
>     SDL_GETEVENT
>-} SDL_eventaction;
>+};
> 
> /**
>  *  Checks the event queue for messages and optionally returns them.
>@@ -634,14 +637,14 @@ typedef enum
>  */
> extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents,
>                                            SDL_eventaction action,
>-                                           Uint32 minType, Uint32 maxType);
>+                                           SDL_EventType minType, SDL_EventType maxType);
> /* @} */
> 
> /**
>  *  Checks to see if certain event types are in the event queue.
>  */
>-extern DECLSPEC SDL_bool SDLCALL SDL_HasEvent(Uint32 type);
>-extern DECLSPEC SDL_bool SDLCALL SDL_HasEvents(Uint32 minType, Uint32 maxType);
>+extern DECLSPEC SDL_bool SDLCALL SDL_HasEvent(SDL_EventType type);
>+extern DECLSPEC SDL_bool SDLCALL SDL_HasEvents(SDL_EventType minType, SDL_EventType maxType);
> 
> /**
>  *  This function clears events from the event queue
>@@ -649,8 +652,8 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasEvents(Uint32 minType, Uint32 maxType);
>  *  sure that all pending OS events are flushed, you can call SDL_PumpEvents()
>  *  on the main thread immediately before the flush call.
>  */
>-extern DECLSPEC void SDLCALL SDL_FlushEvent(Uint32 type);
>-extern DECLSPEC void SDLCALL SDL_FlushEvents(Uint32 minType, Uint32 maxType);
>+extern DECLSPEC void SDLCALL SDL_FlushEvent(SDL_EventType type);
>+extern DECLSPEC void SDLCALL SDL_FlushEvents(SDL_EventType minType, SDL_EventType maxType);
> 
> /**
>  *  \brief Polls for currently pending events.
>@@ -750,10 +753,12 @@ extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter,
>                                               void *userdata);
> 
> /* @{ */
>-#define SDL_QUERY   -1
>-#define SDL_IGNORE   0
>-#define SDL_DISABLE  0
>-#define SDL_ENABLE   1
>+SDL_ENUM(int) {
>+    SDL_QUERY   = -1,
>+    SDL_IGNORE  =  0,
>+    SDL_DISABLE =  0,
>+    SDL_ENABLE  =  1
>+};
> 
> /**
>  *  This function allows you to set the state of processing certain events.
>@@ -764,7 +769,7 @@ extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter,
>  *   - If \c state is set to ::SDL_QUERY, SDL_EventState() will return the
>  *     current processing state of the specified event.
>  */
>-extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint32 type, int state);
>+extern DECLSPEC Uint8 SDLCALL SDL_EventState(SDL_EventType type, int state);
> /* @} */
> #define SDL_GetEventState(type) SDL_EventState(type, SDL_QUERY)
> 
>diff --git a/include/SDL_gamecontroller.h b/include/SDL_gamecontroller.h
>index fb8a7a525..f8d195286 100644
>--- a/include/SDL_gamecontroller.h
>+++ b/include/SDL_gamecontroller.h
>@@ -58,13 +58,13 @@ struct _SDL_GameController;
> typedef struct _SDL_GameController SDL_GameController;
> 
> 
>-typedef enum
>+typedef SDL_ENUM(int, SDL_GameControllerBindType)
> {
>     SDL_CONTROLLER_BINDTYPE_NONE = 0,
>     SDL_CONTROLLER_BINDTYPE_BUTTON,
>     SDL_CONTROLLER_BINDTYPE_AXIS,
>     SDL_CONTROLLER_BINDTYPE_HAT
>-} SDL_GameControllerBindType;
>+};
> 
> /**
>  *  Get the SDL joystick layer binding for this controller button/axis mapping
>@@ -262,7 +262,7 @@ extern DECLSPEC void SDLCALL SDL_GameControllerUpdate(void);
>  *
>  *  Trigger axis values range from 0 to SDL_JOYSTICK_AXIS_MAX.
>  */
>-typedef enum
>+typedef SDL_ENUM(int, SDL_GameControllerAxis)
> {
>     SDL_CONTROLLER_AXIS_INVALID = -1,
>     SDL_CONTROLLER_AXIS_LEFTX,
>@@ -272,7 +272,7 @@ typedef enum
>     SDL_CONTROLLER_AXIS_TRIGGERLEFT,
>     SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
>     SDL_CONTROLLER_AXIS_MAX
>-} SDL_GameControllerAxis;
>+};
> 
> /**
>  *  turn this string into a axis mapping
>@@ -306,7 +306,7 @@ SDL_GameControllerGetAxis(SDL_GameController *gamecontroller,
> /**
>  *  The list of buttons available from a controller
>  */
>-typedef enum
>+typedef SDL_ENUM(int, SDL_GameControllerButton)
> {
>     SDL_CONTROLLER_BUTTON_INVALID = -1,
>     SDL_CONTROLLER_BUTTON_A,
>@@ -325,7 +325,7 @@ typedef enum
>     SDL_CONTROLLER_BUTTON_DPAD_LEFT,
>     SDL_CONTROLLER_BUTTON_DPAD_RIGHT,
>     SDL_CONTROLLER_BUTTON_MAX
>-} SDL_GameControllerButton;
>+};
> 
> /**
>  *  turn this string into a button mapping
>diff --git a/include/SDL_haptic.h b/include/SDL_haptic.h
>index cfb91c531..a814e1111 100644
>--- a/include/SDL_haptic.h
>+++ b/include/SDL_haptic.h
>@@ -142,188 +142,191 @@ typedef struct _SDL_Haptic SDL_Haptic;
>  */
> /* @{ */
> 
>-/**
>- *  \brief Constant effect supported.
>- *
>- *  Constant haptic effect.
>- *
>- *  \sa SDL_HapticCondition
>- */
>-#define SDL_HAPTIC_CONSTANT   (1u<<0)
>-
>-/**
>- *  \brief Sine wave effect supported.
>- *
>- *  Periodic haptic effect that simulates sine waves.
>- *
>- *  \sa SDL_HapticPeriodic
>- */
>-#define SDL_HAPTIC_SINE       (1u<<1)
>-
>-/**
>- *  \brief Left/Right effect supported.
>- *
>- *  Haptic effect for direct control over high/low frequency motors.
>- *
>- *  \sa SDL_HapticLeftRight
>- * \warning this value was SDL_HAPTIC_SQUARE right before 2.0.0 shipped. Sorry,
>- *          we ran out of bits, and this is important for XInput devices.
>- */
>-#define SDL_HAPTIC_LEFTRIGHT     (1u<<2)
>-
>-/* !!! FIXME: put this back when we have more bits in 2.1 */
>-/* #define SDL_HAPTIC_SQUARE     (1<<2) */
>-
>-/**
>- *  \brief Triangle wave effect supported.
>- *
>- *  Periodic haptic effect that simulates triangular waves.
>- *
>- *  \sa SDL_HapticPeriodic
>- */
>-#define SDL_HAPTIC_TRIANGLE   (1u<<3)
>-
>-/**
>- *  \brief Sawtoothup wave effect supported.
>- *
>- *  Periodic haptic effect that simulates saw tooth up waves.
>- *
>- *  \sa SDL_HapticPeriodic
>- */
>-#define SDL_HAPTIC_SAWTOOTHUP (1u<<4)
>-
>-/**
>- *  \brief Sawtoothdown wave effect supported.
>- *
>- *  Periodic haptic effect that simulates saw tooth down waves.
>- *
>- *  \sa SDL_HapticPeriodic
>- */
>-#define SDL_HAPTIC_SAWTOOTHDOWN (1u<<5)
>-
>-/**
>- *  \brief Ramp effect supported.
>- *
>- *  Ramp haptic effect.
>- *
>- *  \sa SDL_HapticRamp
>- */
>-#define SDL_HAPTIC_RAMP       (1u<<6)
>-
>-/**
>- *  \brief Spring effect supported - uses axes position.
>- *
>- *  Condition haptic effect that simulates a spring.  Effect is based on the
>- *  axes position.
>- *
>- *  \sa SDL_HapticCondition
>- */
>-#define SDL_HAPTIC_SPRING     (1u<<7)
>-
>-/**
>- *  \brief Damper effect supported - uses axes velocity.
>- *
>- *  Condition haptic effect that simulates dampening.  Effect is based on the
>- *  axes velocity.
>- *
>- *  \sa SDL_HapticCondition
>- */
>-#define SDL_HAPTIC_DAMPER     (1u<<8)
>-
>-/**
>- *  \brief Inertia effect supported - uses axes acceleration.
>- *
>- *  Condition haptic effect that simulates inertia.  Effect is based on the axes
>- *  acceleration.
>- *
>- *  \sa SDL_HapticCondition
>- */
>-#define SDL_HAPTIC_INERTIA    (1u<<9)
>-
>-/**
>- *  \brief Friction effect supported - uses axes movement.
>- *
>- *  Condition haptic effect that simulates friction.  Effect is based on the
>- *  axes movement.
>- *
>- *  \sa SDL_HapticCondition
>- */
>-#define SDL_HAPTIC_FRICTION   (1u<<10)
>-
>-/**
>- *  \brief Custom effect is supported.
>- *
>- *  User defined custom haptic effect.
>- */
>-#define SDL_HAPTIC_CUSTOM     (1u<<11)
>-
>-/* @} *//* Haptic effects */
>-
>-/* These last few are features the device has, not effects */
>-
>-/**
>- *  \brief Device can set global gain.
>- *
>- *  Device supports setting the global gain.
>- *
>- *  \sa SDL_HapticSetGain
>- */
>-#define SDL_HAPTIC_GAIN       (1u<<12)
>-
>-/**
>- *  \brief Device can set autocenter.
>- *
>- *  Device supports setting autocenter.
>- *
>- *  \sa SDL_HapticSetAutocenter
>- */
>-#define SDL_HAPTIC_AUTOCENTER (1u<<13)
>-
>-/**
>- *  \brief Device can be queried for effect status.
>- *
>- *  Device supports querying effect status.
>- *
>- *  \sa SDL_HapticGetEffectStatus
>- */
>-#define SDL_HAPTIC_STATUS     (1u<<14)
>-
>-/**
>- *  \brief Device can be paused.
>- *
>- *  Devices supports being paused.
>- *
>- *  \sa SDL_HapticPause
>- *  \sa SDL_HapticUnpause
>- */
>-#define SDL_HAPTIC_PAUSE      (1u<<15)
>-
>+typedef SDL_OPTIONS(Uint16, SDL_HapticEffectType) {
>+    /**
>+     *  \brief Constant effect supported.
>+     *
>+     *  Constant haptic effect.
>+     *
>+     *  \sa SDL_HapticCondition
>+     */
>+    SDL_HAPTIC_CONSTANT   = (1u<<0),
>+    
>+    /**
>+     *  \brief Sine wave effect supported.
>+     *
>+     *  Periodic haptic effect that simulates sine waves.
>+     *
>+     *  \sa SDL_HapticPeriodic
>+     */
>+    SDL_HAPTIC_SINE      = (1u<<1),
>+    
>+    /**
>+     *  \brief Left/Right effect supported.
>+     *
>+     *  Haptic effect for direct control over high/low frequency motors.
>+     *
>+     *  \sa SDL_HapticLeftRight
>+     * \warning this value was SDL_HAPTIC_SQUARE right before 2.0.0 shipped. Sorry,
>+     *          we ran out of bits, and this is important for XInput devices.
>+     */
>+    SDL_HAPTIC_LEFTRIGHT    = (1u<<2),
>+    
>+    /* !!! FIXME: put this back when we have more bits in 2.1 */
>+    /* #define SDL_HAPTIC_SQUARE     (1<<2) */
>+    
>+    /**
>+     *  \brief Triangle wave effect supported.
>+     *
>+     *  Periodic haptic effect that simulates triangular waves.
>+     *
>+     *  \sa SDL_HapticPeriodic
>+     */
>+    SDL_HAPTIC_TRIANGLE  = (1u<<3),
>+    
>+    /**
>+     *  \brief Sawtoothup wave effect supported.
>+     *
>+     *  Periodic haptic effect that simulates saw tooth up waves.
>+     *
>+     *  \sa SDL_HapticPeriodic
>+     */
>+    SDL_HAPTIC_SAWTOOTHUP = (1u<<4),
>+    
>+    /**
>+     *  \brief Sawtoothdown wave effect supported.
>+     *
>+     *  Periodic haptic effect that simulates saw tooth down waves.
>+     *
>+     *  \sa SDL_HapticPeriodic
>+     */
>+    SDL_HAPTIC_SAWTOOTHDOWN = (1u<<5),
>+    
>+    /**
>+     *  \brief Ramp effect supported.
>+     *
>+     *  Ramp haptic effect.
>+     *
>+     *  \sa SDL_HapticRamp
>+     */
>+    SDL_HAPTIC_RAMP      = (1u<<6),
>+    
>+    /**
>+     *  \brief Spring effect supported - uses axes position.
>+     *
>+     *  Condition haptic effect that simulates a spring.  Effect is based on the
>+     *  axes position.
>+     *
>+     *  \sa SDL_HapticCondition
>+     */
>+    SDL_HAPTIC_SPRING    = (1u<<7),
>+    
>+    /**
>+     *  \brief Damper effect supported - uses axes velocity.
>+     *
>+     *  Condition haptic effect that simulates dampening.  Effect is based on the
>+     *  axes velocity.
>+     *
>+     *  \sa SDL_HapticCondition
>+     */
>+    SDL_HAPTIC_DAMPER    = (1u<<8),
>+    
>+    /**
>+     *  \brief Inertia effect supported - uses axes acceleration.
>+     *
>+     *  Condition haptic effect that simulates inertia.  Effect is based on the axes
>+     *  acceleration.
>+     *
>+     *  \sa SDL_HapticCondition
>+     */
>+    SDL_HAPTIC_INERTIA    = (1u<<9),
>+    
>+    /**
>+     *  \brief Friction effect supported - uses axes movement.
>+     *
>+     *  Condition haptic effect that simulates friction.  Effect is based on the
>+     *  axes movement.
>+     *
>+     *  \sa SDL_HapticCondition
>+     */
>+    SDL_HAPTIC_FRICTION  = (1u<<10),
>+    
>+    /**
>+     *  \brief Custom effect is supported.
>+     *
>+     *  User defined custom haptic effect.
>+     */
>+    SDL_HAPTIC_CUSTOM    = (1u<<11),
>+    
>+    /* @} *//* Haptic effects */
>+    
>+    /* These last few are features the device has, not effects */
>+    
>+    /**
>+     *  \brief Device can set global gain.
>+     *
>+     *  Device supports setting the global gain.
>+     *
>+     *  \sa SDL_HapticSetGain
>+     */
>+    SDL_HAPTIC_GAIN      = (1u<<12),
>+    
>+    /**
>+     *  \brief Device can set autocenter.
>+     *
>+     *  Device supports setting autocenter.
>+     *
>+     *  \sa SDL_HapticSetAutocenter
>+     */
>+    SDL_HAPTIC_AUTOCENTER = (1u<<13),
>+    
>+    /**
>+     *  \brief Device can be queried for effect status.
>+     *
>+     *  Device supports querying effect status.
>+     *
>+     *  \sa SDL_HapticGetEffectStatus
>+     */
>+    SDL_HAPTIC_STATUS    = (1u<<14),
>+    
>+    /**
>+     *  \brief Device can be paused.
>+     *
>+     *  Devices supports being paused.
>+     *
>+     *  \sa SDL_HapticPause
>+     *  \sa SDL_HapticUnpause
>+     */
>+    SDL_HAPTIC_PAUSE     = (1u<<15)
>+};
> 
> /**
>  * \name Direction encodings
>  */
> /* @{ */
> 
>-/**
>- *  \brief Uses polar coordinates for the direction.
>- *
>- *  \sa SDL_HapticDirection
>- */
>-#define SDL_HAPTIC_POLAR      0
>-
>-/**
>- *  \brief Uses cartesian coordinates for the direction.
>- *
>- *  \sa SDL_HapticDirection
>- */
>-#define SDL_HAPTIC_CARTESIAN  1
>-
>-/**
>- *  \brief Uses spherical coordinates for the direction.
>- *
>- *  \sa SDL_HapticDirection
>- */
>-#define SDL_HAPTIC_SPHERICAL  2
>+typedef SDL_ENUM(Uint8, SDL_HapticDirectionType) {
>+    /**
>+     *  \brief Uses polar coordinates for the direction.
>+     *
>+     *  \sa SDL_HapticDirection
>+     */
>+    SDL_HAPTIC_POLAR     = 0,
>+    
>+    /**
>+     *  \brief Uses cartesian coordinates for the direction.
>+     *
>+     *  \sa SDL_HapticDirection
>+     */
>+    SDL_HAPTIC_CARTESIAN = 1,
>+    
>+    /**
>+     *  \brief Uses spherical coordinates for the direction.
>+     *
>+     *  \sa SDL_HapticDirection
>+     */
>+    SDL_HAPTIC_SPHERICAL = 2
>+};
> 
> /* @} *//* Direction encodings */
> 
>@@ -338,7 +341,9 @@ typedef struct _SDL_Haptic SDL_Haptic;
>  *
>  * \sa SDL_HapticRunEffect
>  */
>-#define SDL_HAPTIC_INFINITY   4294967295U
>+SDL_ENUM(Uint32) {
>+    SDL_HAPTIC_INFINITY  = 4294967295U
>+};
> 
> 
> /**
>@@ -438,7 +443,7 @@ typedef struct _SDL_Haptic SDL_Haptic;
>  */
> typedef struct SDL_HapticDirection
> {
>-    Uint8 type;         /**< The type of encoding. */
>+    SDL_HapticDirectionType type; /**< The type of encoding. */
>     Sint32 dir[3];      /**< The encoded direction. */
> } SDL_HapticDirection;
> 
>@@ -457,7 +462,7 @@ typedef struct SDL_HapticDirection
> typedef struct SDL_HapticConstant
> {
>     /* Header */
>-    Uint16 type;            /**< ::SDL_HAPTIC_CONSTANT */
>+    SDL_HapticEffectType type;      /**< ::SDL_HAPTIC_CONSTANT */
>     SDL_HapticDirection direction;  /**< Direction of the effect. */
> 
>     /* Replay */
>@@ -538,7 +543,7 @@ typedef struct SDL_HapticConstant
> typedef struct SDL_HapticPeriodic
> {
>     /* Header */
>-    Uint16 type;        /**< ::SDL_HAPTIC_SINE, ::SDL_HAPTIC_LEFTRIGHT,
>+    SDL_HapticEffectType type; /**< ::SDL_HAPTIC_SINE, ::SDL_HAPTIC_LEFTRIGHT,
>                              ::SDL_HAPTIC_TRIANGLE, ::SDL_HAPTIC_SAWTOOTHUP or
>                              ::SDL_HAPTIC_SAWTOOTHDOWN */
>     SDL_HapticDirection direction;  /**< Direction of the effect. */
>@@ -591,7 +596,7 @@ typedef struct SDL_HapticPeriodic
> typedef struct SDL_HapticCondition
> {
>     /* Header */
>-    Uint16 type;            /**< ::SDL_HAPTIC_SPRING, ::SDL_HAPTIC_DAMPER,
>+    SDL_HapticEffectType type; /**< ::SDL_HAPTIC_SPRING, ::SDL_HAPTIC_DAMPER,
>                                  ::SDL_HAPTIC_INERTIA or ::SDL_HAPTIC_FRICTION */
>     SDL_HapticDirection direction;  /**< Direction of the effect - Not used ATM. */
> 
>@@ -628,7 +633,7 @@ typedef struct SDL_HapticCondition
> typedef struct SDL_HapticRamp
> {
>     /* Header */
>-    Uint16 type;            /**< ::SDL_HAPTIC_RAMP */
>+    SDL_HapticEffectType type;      /**< ::SDL_HAPTIC_RAMP */
>     SDL_HapticDirection direction;  /**< Direction of the effect. */
> 
>     /* Replay */
>@@ -665,7 +670,7 @@ typedef struct SDL_HapticRamp
> typedef struct SDL_HapticLeftRight
> {
>     /* Header */
>-    Uint16 type;            /**< ::SDL_HAPTIC_LEFTRIGHT */
>+    SDL_HapticEffectType type; /**< ::SDL_HAPTIC_LEFTRIGHT */
> 
>     /* Replay */
>     Uint32 length;          /**< Duration of the effect in milliseconds. */
>@@ -693,7 +698,7 @@ typedef struct SDL_HapticLeftRight
> typedef struct SDL_HapticCustom
> {
>     /* Header */
>-    Uint16 type;            /**< ::SDL_HAPTIC_CUSTOM */
>+    SDL_HapticEffectType type;      /**< ::SDL_HAPTIC_CUSTOM */
>     SDL_HapticDirection direction;  /**< Direction of the effect. */
> 
>     /* Replay */
>@@ -789,7 +794,7 @@ typedef struct SDL_HapticCustom
> typedef union SDL_HapticEffect
> {
>     /* Common for all force feedback effects */
>-    Uint16 type;                    /**< Effect type. */
>+    SDL_HapticEffectType type;      /**< Effect type. */
>     SDL_HapticConstant constant;    /**< Constant effect. */
>     SDL_HapticPeriodic periodic;    /**< Periodic effect. */
>     SDL_HapticCondition condition;  /**< Condition effect. */
>@@ -972,6 +977,7 @@ extern DECLSPEC int SDLCALL SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic);
>  *  \sa SDL_HapticEffectSupported
>  */
> extern DECLSPEC unsigned int SDLCALL SDL_HapticQuery(SDL_Haptic * haptic);
>+/*TODO: change return type to SDL_HapticEffectType in 2.1 */
> 
> 
> /**
>diff --git a/include/SDL_hints.h b/include/SDL_hints.h
>index 07a911338..d900c8e69 100644
>--- a/include/SDL_hints.h
>+++ b/include/SDL_hints.h
>@@ -1032,12 +1032,12 @@ extern "C" {
> /**
>  *  \brief  An enumeration of hint priorities
>  */
>-typedef enum
>+typedef SDL_ENUM(int, SDL_HintPriority)
> {
>     SDL_HINT_DEFAULT,
>     SDL_HINT_NORMAL,
>     SDL_HINT_OVERRIDE
>-} SDL_HintPriority;
>+};
> 
> 
> /**
>diff --git a/include/SDL_joystick.h b/include/SDL_joystick.h
>index 8303c5e86..036681020 100644
>--- a/include/SDL_joystick.h
>+++ b/include/SDL_joystick.h
>@@ -80,7 +80,7 @@ typedef struct {
>  */
> typedef Sint32 SDL_JoystickID;
> 
>-typedef enum
>+typedef SDL_ENUM(int, SDL_JoystickType)
> {
>     SDL_JOYSTICK_TYPE_UNKNOWN,
>     SDL_JOYSTICK_TYPE_GAMECONTROLLER,
>@@ -92,9 +92,9 @@ typedef enum
>     SDL_JOYSTICK_TYPE_DRUM_KIT,
>     SDL_JOYSTICK_TYPE_ARCADE_PAD,
>     SDL_JOYSTICK_TYPE_THROTTLE
>-} SDL_JoystickType;
>+};
> 
>-typedef enum
>+typedef SDL_ENUM(int, SDL_JoystickPowerLevel)
> {
>     SDL_JOYSTICK_POWER_UNKNOWN = -1,
>     SDL_JOYSTICK_POWER_EMPTY,   /* <= 5% */
>@@ -103,7 +103,7 @@ typedef enum
>     SDL_JOYSTICK_POWER_FULL,    /* <= 100% */
>     SDL_JOYSTICK_POWER_WIRED,
>     SDL_JOYSTICK_POWER_MAX
>-} SDL_JoystickPowerLevel;
>+};
> 
> /* Function prototypes */
> 
>@@ -313,15 +313,18 @@ extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAxisInitialState(SDL_Joystick *
>  *  \name Hat positions
>  */
> /* @{ */
>-#define SDL_HAT_CENTERED    0x00
>-#define SDL_HAT_UP          0x01
>-#define SDL_HAT_RIGHT       0x02
>-#define SDL_HAT_DOWN        0x04
>-#define SDL_HAT_LEFT        0x08
>-#define SDL_HAT_RIGHTUP     (SDL_HAT_RIGHT|SDL_HAT_UP)
>-#define SDL_HAT_RIGHTDOWN   (SDL_HAT_RIGHT|SDL_HAT_DOWN)
>-#define SDL_HAT_LEFTUP      (SDL_HAT_LEFT|SDL_HAT_UP)
>-#define SDL_HAT_LEFTDOWN    (SDL_HAT_LEFT|SDL_HAT_DOWN)
>+typedef SDL_OPTIONS(Uint8, SDL_HatPosition)
>+{
>+    SDL_HAT_CENTERED    = 0x00,
>+    SDL_HAT_UP          = 0x01,
>+    SDL_HAT_RIGHT       = 0x02,
>+    SDL_HAT_DOWN        = 0x04,
>+    SDL_HAT_LEFT        = 0x08,
>+    SDL_HAT_RIGHTUP     = (SDL_HAT_RIGHT|SDL_HAT_UP),
>+    SDL_HAT_RIGHTDOWN   = (SDL_HAT_RIGHT|SDL_HAT_DOWN),
>+    SDL_HAT_LEFTUP      = (SDL_HAT_LEFT|SDL_HAT_UP),
>+    SDL_HAT_LEFTDOWN    = (SDL_HAT_LEFT|SDL_HAT_DOWN)
>+};
> /* @} */
> 
> /**
>@@ -340,8 +343,8 @@ extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAxisInitialState(SDL_Joystick *
>  *           - ::SDL_HAT_LEFTUP
>  *           - ::SDL_HAT_LEFTDOWN
>  */
>-extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick * joystick,
>-                                                 int hat);
>+extern DECLSPEC SDL_HatPosition SDLCALL SDL_JoystickGetHat(SDL_Joystick * joystick,
>+                                                           int hat);
> 
> /**
>  *  Get the ball axis change since the last poll.
>diff --git a/include/SDL_keyboard.h b/include/SDL_keyboard.h
>index 874823171..b4a253962 100644
>--- a/include/SDL_keyboard.h
>+++ b/include/SDL_keyboard.h
>@@ -48,7 +48,7 @@ typedef struct SDL_Keysym
> {
>     SDL_Scancode scancode;      /**< SDL physical key code - see ::SDL_Scancode for details */
>     SDL_Keycode sym;            /**< SDL virtual key code - see ::SDL_Keycode for details */
>-    Uint16 mod;                 /**< current key modifiers */
>+    SDL_Keymod mod;             /**< current key modifiers */
>     Uint32 unused;
> } SDL_Keysym;
> 
>diff --git a/include/SDL_keycode.h b/include/SDL_keycode.h
>index d7d5b1dbc..8cf3bffaf 100644
>--- a/include/SDL_keycode.h
>+++ b/include/SDL_keycode.h
>@@ -47,7 +47,7 @@ typedef Sint32 SDL_Keycode;
> #define SDLK_SCANCODE_MASK (1<<30)
> #define SDL_SCANCODE_TO_KEYCODE(X)  (X | SDLK_SCANCODE_MASK)
> 
>-enum
>+SDL_ENUM(SDL_Keycode)
> {
>     SDLK_UNKNOWN = 0,
> 
>@@ -322,7 +322,7 @@ enum
> /**
>  * \brief Enumeration of valid key mods (possibly OR'd together).
>  */
>-typedef enum
>+typedef SDL_OPTIONS(Uint16, SDL_Keymod)
> {
>     KMOD_NONE = 0x0000,
>     KMOD_LSHIFT = 0x0001,
>@@ -336,13 +336,13 @@ typedef enum
>     KMOD_NUM = 0x1000,
>     KMOD_CAPS = 0x2000,
>     KMOD_MODE = 0x4000,
>-    KMOD_RESERVED = 0x8000
>-} SDL_Keymod;
>-
>-#define KMOD_CTRL   (KMOD_LCTRL|KMOD_RCTRL)
>-#define KMOD_SHIFT  (KMOD_LSHIFT|KMOD_RSHIFT)
>-#define KMOD_ALT    (KMOD_LALT|KMOD_RALT)
>-#define KMOD_GUI    (KMOD_LGUI|KMOD_RGUI)
>+    KMOD_RESERVED = 0x8000,
>+    
>+    KMOD_CTRL = (KMOD_LCTRL|KMOD_RCTRL),
>+    KMOD_SHIFT = (KMOD_LSHIFT|KMOD_RSHIFT),
>+    KMOD_ALT = (KMOD_LALT|KMOD_RALT),
>+    KMOD_GUI = (KMOD_LGUI|KMOD_RGUI)
>+};
> 
> #endif /* SDL_keycode_h_ */
> 
>diff --git a/include/SDL_log.h b/include/SDL_log.h
>index e12b65886..0b9d10806 100644
>--- a/include/SDL_log.h
>+++ b/include/SDL_log.h
>@@ -61,7 +61,7 @@ extern "C" {
>  *  at the VERBOSE level and all other categories are enabled at the
>  *  CRITICAL level.
>  */
>-enum
>+SDL_ENUM(int)
> {
>     SDL_LOG_CATEGORY_APPLICATION,
>     SDL_LOG_CATEGORY_ERROR,
>@@ -99,7 +99,7 @@ enum
> /**
>  *  \brief The predefined log priorities
>  */
>-typedef enum
>+typedef SDL_ENUM(int, SDL_LogPriority)
> {
>     SDL_LOG_PRIORITY_VERBOSE = 1,
>     SDL_LOG_PRIORITY_DEBUG,
>@@ -108,7 +108,7 @@ typedef enum
>     SDL_LOG_PRIORITY_ERROR,
>     SDL_LOG_PRIORITY_CRITICAL,
>     SDL_NUM_LOG_PRIORITIES
>-} SDL_LogPriority;
>+};
> 
> 
> /**
>diff --git a/include/SDL_messagebox.h b/include/SDL_messagebox.h
>index b7be59d88..cb4f4d004 100644
>--- a/include/SDL_messagebox.h
>+++ b/include/SDL_messagebox.h
>@@ -34,28 +34,28 @@ extern "C" {
> /**
>  * \brief SDL_MessageBox flags. If supported will display warning icon, etc.
>  */
>-typedef enum
>+typedef SDL_OPTIONS(Uint32, SDL_MessageBoxFlags)
> {
>     SDL_MESSAGEBOX_ERROR        = 0x00000010,   /**< error dialog */
>     SDL_MESSAGEBOX_WARNING      = 0x00000020,   /**< warning dialog */
>     SDL_MESSAGEBOX_INFORMATION  = 0x00000040    /**< informational dialog */
>-} SDL_MessageBoxFlags;
>+};
> 
> /**
>  * \brief Flags for SDL_MessageBoxButtonData.
>  */
>-typedef enum
>+typedef SDL_OPTIONS(Uint32, SDL_MessageBoxButtonFlags)
> {
>     SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT = 0x00000001,  /**< Marks the default button when return is hit */
>     SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT = 0x00000002   /**< Marks the default button when escape is hit */
>-} SDL_MessageBoxButtonFlags;
>+};
> 
> /**
>  *  \brief Individual button data.
>  */
> typedef struct
> {
>-    Uint32 flags;       /**< ::SDL_MessageBoxButtonFlags */
>+    SDL_MessageBoxButtonFlags flags; /**< ::SDL_MessageBoxButtonFlags */
>     int buttonid;       /**< User defined button id (value returned via SDL_ShowMessageBox) */
>     const char * text;  /**< The UTF-8 button text */
> } SDL_MessageBoxButtonData;
>@@ -68,7 +68,7 @@ typedef struct
>     Uint8 r, g, b;
> } SDL_MessageBoxColor;
> 
>-typedef enum
>+typedef SDL_ENUM(int, SDL_MessageBoxColorType)
> {
>     SDL_MESSAGEBOX_COLOR_BACKGROUND,
>     SDL_MESSAGEBOX_COLOR_TEXT,
>@@ -76,7 +76,7 @@ typedef enum
>     SDL_MESSAGEBOX_COLOR_BUTTON_BACKGROUND,
>     SDL_MESSAGEBOX_COLOR_BUTTON_SELECTED,
>     SDL_MESSAGEBOX_COLOR_MAX
>-} SDL_MessageBoxColorType;
>+};
> 
> /**
>  * \brief A set of colors to use for message box dialogs
>@@ -91,7 +91,7 @@ typedef struct
>  */
> typedef struct
> {
>-    Uint32 flags;                       /**< ::SDL_MessageBoxFlags */
>+    SDL_MessageBoxFlags flags;          /**< ::SDL_MessageBoxFlags */
>     SDL_Window *window;                 /**< Parent window, can be NULL */
>     const char *title;                  /**< UTF-8 title */
>     const char *message;                /**< UTF-8 message text */
>@@ -130,7 +130,7 @@ extern DECLSPEC int SDLCALL SDL_ShowMessageBox(const SDL_MessageBoxData *message
>  *
>  *  \sa SDL_ShowMessageBox
>  */
>-extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(Uint32 flags, const char *title, const char *message, SDL_Window *window);
>+extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(SDL_MessageBoxFlags flags, const char *title, const char *message, SDL_Window *window);
> 
> 
> /* Ends C function definitions when using C++ */
>diff --git a/include/SDL_mouse.h b/include/SDL_mouse.h
>index d3c9f6156..bd8ecfa4c 100644
>--- a/include/SDL_mouse.h
>+++ b/include/SDL_mouse.h
>@@ -43,7 +43,7 @@ typedef struct SDL_Cursor SDL_Cursor;   /**< Implementation dependent */
> /**
>  * \brief Cursor types for SDL_CreateSystemCursor().
>  */
>-typedef enum
>+typedef SDL_ENUM(int, SDL_SystemCursor)
> {
>     SDL_SYSTEM_CURSOR_ARROW,     /**< Arrow */
>     SDL_SYSTEM_CURSOR_IBEAM,     /**< I-beam */
>@@ -58,16 +58,16 @@ typedef enum
>     SDL_SYSTEM_CURSOR_NO,        /**< Slashed circle or crossbones */
>     SDL_SYSTEM_CURSOR_HAND,      /**< Hand */
>     SDL_NUM_SYSTEM_CURSORS
>-} SDL_SystemCursor;
>+};
> 
> /**
>  * \brief Scroll direction types for the Scroll event
>  */
>-typedef enum
>+typedef SDL_ENUM(Uint32, SDL_MouseWheelDirection)
> {
>     SDL_MOUSEWHEEL_NORMAL,    /**< The scroll direction is normal */
>     SDL_MOUSEWHEEL_FLIPPED    /**< The scroll direction is flipped / natural */
>-} SDL_MouseWheelDirection;
>+};
> 
> /* Function prototypes */
> 
>diff --git a/include/SDL_pixels.h b/include/SDL_pixels.h
>index 0b4364b18..2cdf27c42 100644
>--- a/include/SDL_pixels.h
>+++ b/include/SDL_pixels.h
>@@ -168,7 +168,7 @@ enum
>     ((format) && (SDL_PIXELFLAG(format) != 1))
> 
> /* Note: If you modify this list, update SDL_GetPixelFormatName() */
>-enum
>+SDL_ENUM(Uint32)
> {
>     SDL_PIXELFORMAT_UNKNOWN,
>     SDL_PIXELFORMAT_INDEX1LSB =
>diff --git a/include/SDL_power.h b/include/SDL_power.h
>index a4fe8a935..f80fed7ca 100644
>--- a/include/SDL_power.h
>+++ b/include/SDL_power.h
>@@ -39,14 +39,14 @@ extern "C" {
> /**
>  *  \brief The basic state for the system's power supply.
>  */
>-typedef enum
>+typedef SDL_ENUM(int, SDL_PowerState)
> {
>     SDL_POWERSTATE_UNKNOWN,      /**< cannot determine power status */
>     SDL_POWERSTATE_ON_BATTERY,   /**< Not plugged in, running on the battery */
>     SDL_POWERSTATE_NO_BATTERY,   /**< Plugged in, no battery available */
>     SDL_POWERSTATE_CHARGING,     /**< Plugged in, charging battery */
>     SDL_POWERSTATE_CHARGED       /**< Plugged in, battery charged */
>-} SDL_PowerState;
>+};
> 
> 
> /**
>diff --git a/include/SDL_render.h b/include/SDL_render.h
>index d33619297..be42c61c4 100644
>--- a/include/SDL_render.h
>+++ b/include/SDL_render.h
>@@ -61,7 +61,7 @@ extern "C" {
> /**
>  *  \brief Flags used when creating a rendering context
>  */
>-typedef enum
>+typedef SDL_OPTIONS(Uint32, SDL_RendererFlags)
> {
>     SDL_RENDERER_SOFTWARE = 0x00000001,         /**< The renderer is a software fallback */
>     SDL_RENDERER_ACCELERATED = 0x00000002,      /**< The renderer uses hardware
>@@ -70,7 +70,7 @@ typedef enum
>                                                      with the refresh rate */
>     SDL_RENDERER_TARGETTEXTURE = 0x00000008     /**< The renderer supports
>                                                      rendering to texture */
>-} SDL_RendererFlags;
>+};
> 
> /**
>  *  \brief Information on the capabilities of a render driver or context.
>@@ -78,7 +78,7 @@ typedef enum
> typedef struct SDL_RendererInfo
> {
>     const char *name;           /**< The name of the renderer */
>-    Uint32 flags;               /**< Supported ::SDL_RendererFlags */
>+    SDL_RendererFlags flags;    /**< Supported ::SDL_RendererFlags */
>     Uint32 num_texture_formats; /**< The number of available texture formats */
>     Uint32 texture_formats[16]; /**< The available texture formats */
>     int max_texture_width;      /**< The maximum texture width */
>@@ -88,32 +88,32 @@ typedef struct SDL_RendererInfo
> /**
>  *  \brief The access pattern allowed for a texture.
>  */
>-typedef enum
>+typedef SDL_ENUM(int, SDL_TextureAccess)
> {
>     SDL_TEXTUREACCESS_STATIC,    /**< Changes rarely, not lockable */
>     SDL_TEXTUREACCESS_STREAMING, /**< Changes frequently, lockable */
>     SDL_TEXTUREACCESS_TARGET     /**< Texture can be used as a render target */
>-} SDL_TextureAccess;
>+};
> 
> /**
>  *  \brief The texture channel modulation used in SDL_RenderCopy().
>  */
>-typedef enum
>+typedef SDL_OPTIONS(int, SDL_TextureModulate)
> {
>     SDL_TEXTUREMODULATE_NONE = 0x00000000,     /**< No modulation */
>     SDL_TEXTUREMODULATE_COLOR = 0x00000001,    /**< srcC = srcC * color */
>     SDL_TEXTUREMODULATE_ALPHA = 0x00000002     /**< srcA = srcA * alpha */
>-} SDL_TextureModulate;
>+};
> 
> /**
>  *  \brief Flip constants for SDL_RenderCopyEx
>  */
>-typedef enum
>+typedef SDL_OPTIONS(int, SDL_RendererFlip)
> {
>     SDL_FLIP_NONE = 0x00000000,     /**< Do not flip */
>     SDL_FLIP_HORIZONTAL = 0x00000001,    /**< flip horizontally */
>     SDL_FLIP_VERTICAL = 0x00000002     /**< flip vertically */
>-} SDL_RendererFlip;
>+};
> 
> /**
>  *  \brief A structure representing rendering state
>@@ -170,7 +170,7 @@ extern DECLSPEC int SDLCALL SDL_GetRenderDriverInfo(int index,
>  *  \return 0 on success, or -1 on error
>  */
> extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer(
>-                                int width, int height, Uint32 window_flags,
>+                                int width, int height, SDL_WindowFlags window_flags,
>                                 SDL_Window **window, SDL_Renderer **renderer);
> 
> 
>@@ -189,7 +189,7 @@ extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer(
>  *  \sa SDL_DestroyRenderer()
>  */
> extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateRenderer(SDL_Window * window,
>-                                               int index, Uint32 flags);
>+                                               int index, SDL_RendererFlags flags);
> 
> /**
>  *  \brief Create a 2D software rendering context for a surface.
>@@ -241,7 +241,7 @@ extern DECLSPEC int SDLCALL SDL_GetRendererOutputSize(SDL_Renderer * renderer,
>  */
> extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTexture(SDL_Renderer * renderer,
>                                                         Uint32 format,
>-                                                        int access, int w,
>+                                                        SDL_TextureAccess access, int w,
>                                                         int h);
> 
> /**
>@@ -273,7 +273,7 @@ extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTextureFromSurface(SDL_Renderer
>  *  \return 0 on success, or -1 if the texture is not valid.
>  */
> extern DECLSPEC int SDLCALL SDL_QueryTexture(SDL_Texture * texture,
>-                                             Uint32 * format, int *access,
>+                                             Uint32 * format, SDL_TextureAccess *access,
>                                              int *w, int *h);
> 
> /**
>diff --git a/include/SDL_scancode.h b/include/SDL_scancode.h
>index 63871aa3b..de3473e23 100644
>--- a/include/SDL_scancode.h
>+++ b/include/SDL_scancode.h
>@@ -40,7 +40,7 @@
>  *  The values in this enumeration are based on the USB usage page standard:
>  *  http://www.usb.org/developers/hidpage/Hut1_12v2.pdf
>  */
>-typedef enum
>+typedef SDL_ENUM(int, SDL_Scancode)
> {
>     SDL_SCANCODE_UNKNOWN = 0,
> 
>@@ -406,7 +406,7 @@ typedef enum
> 
>     SDL_NUM_SCANCODES = 512 /**< not a key, just marks the number of scancodes
>                                  for array bounds */
>-} SDL_Scancode;
>+};
> 
> #endif /* SDL_scancode_h_ */
> 
>diff --git a/include/SDL_sensor.h b/include/SDL_sensor.h
>index fa19c41ff..f8c63f4cb 100644
>--- a/include/SDL_sensor.h
>+++ b/include/SDL_sensor.h
>@@ -66,13 +66,13 @@ typedef Sint32 SDL_SensorID;
>  * Hare are the additional Android sensors:
>  * https://developer.android.com/reference/android/hardware/SensorEvent.html#values
>  */
>-typedef enum
>+typedef SDL_ENUM(int, SDL_SensorType)
> {
>     SDL_SENSOR_INVALID = -1,    /**< Returned for an invalid sensor */
>     SDL_SENSOR_UNKNOWN,         /**< Unknown sensor type */
>     SDL_SENSOR_ACCEL,           /**< Accelerometer */
>     SDL_SENSOR_GYRO             /**< Gyroscope */
>-} SDL_SensorType;
>+};
> 
> /**
>  * Accelerometer sensor
>diff --git a/include/SDL_shape.h b/include/SDL_shape.h
>index 40a6baaae..7a61e5a9d 100644
>--- a/include/SDL_shape.h
>+++ b/include/SDL_shape.h
>@@ -39,9 +39,12 @@ extern "C" {
>  * Header file for the shaped window API.
>  */
> 
>-#define SDL_NONSHAPEABLE_WINDOW -1
>-#define SDL_INVALID_SHAPE_ARGUMENT -2
>-#define SDL_WINDOW_LACKS_SHAPE -3
>+SDL_ENUM(int)
>+{
>+    SDL_NONSHAPEABLE_WINDOW = -1,
>+    SDL_INVALID_SHAPE_ARGUMENT = -2,
>+    SDL_WINDOW_LACKS_SHAPE = -3
>+};
> 
> /**
>  *  \brief Create a window that can be shaped with the specified position, dimensions, and flags.
>@@ -63,7 +66,7 @@ extern "C" {
>  *
>  *  \sa SDL_DestroyWindow()
>  */
>-extern DECLSPEC SDL_Window * SDLCALL SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags);
>+extern DECLSPEC SDL_Window * SDLCALL SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,SDL_WindowFlags flags);
> 
> /**
>  * \brief Return whether the given window is a shaped window.
>@@ -77,7 +80,7 @@ extern DECLSPEC SDL_Window * SDLCALL SDL_CreateShapedWindow(const char *title,un
> extern DECLSPEC SDL_bool SDLCALL SDL_IsShapedWindow(const SDL_Window *window);
> 
> /** \brief An enum denoting the specific type of contents present in an SDL_WindowShapeParams union. */
>-typedef enum {
>+typedef SDL_ENUM(int, WindowShapeMode) {
>     /** \brief The default mode, a binarized alpha cutoff of 1. */
>     ShapeModeDefault,
>     /** \brief A binarized alpha cutoff with a given integer value. */
>@@ -86,7 +89,7 @@ typedef enum {
>     ShapeModeReverseBinarizeAlpha,
>     /** \brief A color key is applied. */
>     ShapeModeColorKey
>-} WindowShapeMode;
>+};
> 
> #define SDL_SHAPEMODEALPHA(mode) (mode == ShapeModeDefault || mode == ShapeModeBinarizeAlpha || mode == ShapeModeReverseBinarizeAlpha)
> 
>diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h
>index e373bc380..6ddef755a 100644
>--- a/include/SDL_stdinc.h
>+++ b/include/SDL_stdinc.h
>@@ -122,6 +122,37 @@ char *alloca();
>  */
> #define SDL_STRINGIFY_ARG(arg)  #arg
> 
>+/**
>+ *  \name Fixed-sized enum declaration
>+ *
>+ *  Defines the size of the enums, so the compiler doesn't have to guess.
>+ */
>+/* @{ */
>+#if __has_attribute(enum_extensibility)
>+#define __SDL_ENUM_ATTRIBUTES __attribute__((enum_extensibility(open)))
>+#define __SDL_OPTIONS_ATTRIBUTES __attribute__((flag_enum,enum_extensibility(open)))
>+#else
>+#define __SDL_ENUM_ATTRIBUTES
>+#define __SDL_OPTIONS_ATTRIBUTES
>+#endif
>+
>+#define __SDL_ENUM_GET_MACRO(_1, _2, NAME, ...) NAME
>+#if (__cplusplus && __cplusplus >= 201103L && (__has_extension(cxx_strong_enums) || __has_feature(objc_fixed_enum))) || (!__cplusplus && __has_feature(objc_fixed_enum))
>+#define __SDL_NAMED_ENUM(_type, _name)     enum __SDL_ENUM_ATTRIBUTES _name : _type _name; enum _name : _type
>+#define __SDL_ANON_ENUM(_type)             enum __SDL_ENUM_ATTRIBUTES : _type
>+#if (__cplusplus)
>+#define SDL_OPTIONS(_type, _name) _type _name; enum __SDL_OPTIONS_ATTRIBUTES : _type
>+#else
>+#define SDL_OPTIONS(_type, _name) enum __SDL_OPTIONS_ATTRIBUTES _name : _type _name; enum _name : _type
>+#endif
>+#else
>+#define __SDL_NAMED_ENUM(_type, _name) _type _name; enum
>+#define __SDL_ANON_ENUM(_type) enum
>+#define SDL_OPTIONS(_type, _name) _type _name; enum
>+#endif
>+#define SDL_ENUM(...) __SDL_ENUM_GET_MACRO(__VA_ARGS__, __SDL_NAMED_ENUM, __SDL_ANON_ENUM, )(__VA_ARGS__)
>+/* @} *//* Fixed-sized enum declaration */
>+
> /**
>  *  \name Cast operators
>  *
>@@ -158,11 +189,13 @@ char *alloca();
> #define SDL_TRUE 1
> typedef int SDL_bool;
> #else
>-typedef enum
>+// int to maintain compatibility with existing code.
>+// could be changed to a char or unsigned char instead.
>+typedef SDL_ENUM(int, SDL_bool)
> {
>     SDL_FALSE = 0,
>     SDL_TRUE = 1
>-} SDL_bool;
>+};
> #endif
> 
> /**
>diff --git a/include/SDL_surface.h b/include/SDL_surface.h
>index 45e5366fe..91bc6f004 100644
>--- a/include/SDL_surface.h
>+++ b/include/SDL_surface.h
>@@ -49,10 +49,12 @@ extern "C" {
>  *  Used internally (read-only).
>  */
> /* @{ */
>-#define SDL_SWSURFACE       0           /**< Just here for compatibility */
>-#define SDL_PREALLOC        0x00000001  /**< Surface uses preallocated memory */
>-#define SDL_RLEACCEL        0x00000002  /**< Surface is RLE encoded */
>-#define SDL_DONTFREE        0x00000004  /**< Surface is referenced internally */
>+typedef SDL_OPTIONS(Uint32, SDL_SurfaceFlag) {
>+    SDL_SWSURFACE       = 0u,           /**< Just here for compatibility */
>+    SDL_PREALLOC        = 0x00000001u,  /**< Surface uses preallocated memory */
>+    SDL_RLEACCEL        = 0x00000002u,  /**< Surface is RLE encoded */
>+    SDL_DONTFREE        = 0x00000004u   /**< Surface is referenced internally */
>+};
> /* @} *//* Surface flags */
> 
> /**
>@@ -68,7 +70,7 @@ extern "C" {
>  */
> typedef struct SDL_Surface
> {
>-    Uint32 flags;               /**< Read-only */
>+    SDL_SurfaceFlag flags;      /**< Read-only */
>     SDL_PixelFormat *format;    /**< Read-only */
>     int w, h;                   /**< Read-only */
>     int pitch;                  /**< Read-only */
>@@ -100,13 +102,13 @@ typedef int (SDLCALL *SDL_blit) (struct SDL_Surface * src, SDL_Rect * srcrect,
> /**
>  * \brief The formula used for converting between YUV and RGB
>  */
>-typedef enum
>+typedef SDL_ENUM(int, SDL_YUV_CONVERSION_MODE)
> {
>     SDL_YUV_CONVERSION_JPEG,        /**< Full range JPEG */
>     SDL_YUV_CONVERSION_BT601,       /**< BT.601 (the default) */
>     SDL_YUV_CONVERSION_BT709,       /**< BT.709 */
>     SDL_YUV_CONVERSION_AUTOMATIC    /**< BT.601 for SD content, BT.709 for HD content */
>-} SDL_YUV_CONVERSION_MODE;
>+};
> 
> /**
>  *  Allocate and free an RGB surface.
>@@ -127,12 +129,12 @@ typedef enum
>  *  \param Amask The alpha mask of the surface to create.
>  */
> extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurface
>-    (Uint32 flags, int width, int height, int depth,
>+    (SDL_SurfaceFlag flags, int width, int height, int depth,
>      Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
> 
> /* !!! FIXME for 2.1: why does this ask for depth? Format provides that. */
> extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceWithFormat
>-    (Uint32 flags, int width, int height, int depth, Uint32 format);
>+    (SDL_SurfaceFlag flags, int width, int height, int depth, Uint32 format);
> 
> extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels,
>                                                               int width,
>@@ -386,9 +388,9 @@ extern DECLSPEC SDL_Surface *SDLCALL SDL_DuplicateSurface(SDL_Surface * surface)
>  *  surface.
>  */
> extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurface
>-    (SDL_Surface * src, const SDL_PixelFormat * fmt, Uint32 flags);
>+    (SDL_Surface * src, const SDL_PixelFormat * fmt, SDL_SurfaceFlag flags);
> extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurfaceFormat
>-    (SDL_Surface * src, Uint32 pixel_format, Uint32 flags);
>+    (SDL_Surface * src, Uint32 pixel_format, SDL_SurfaceFlag flags);
> 
> /**
>  * \brief Copy a block of pixels of one format to another format
>diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h
>index f1c4021cc..655625582 100644
>--- a/include/SDL_syswm.h
>+++ b/include/SDL_syswm.h
>@@ -113,7 +113,7 @@ extern "C" {
> /**
>  *  These are the various supported windowing subsystems
>  */
>-typedef enum
>+typedef SDL_ENUM(int, SDL_SYSWM_TYPE)
> {
>     SDL_SYSWM_UNKNOWN,
>     SDL_SYSWM_WINDOWS,
>@@ -127,7 +127,7 @@ typedef enum
>     SDL_SYSWM_ANDROID,
>     SDL_SYSWM_VIVANTE,
>     SDL_SYSWM_OS2
>-} SDL_SYSWM_TYPE;
>+};
> 
> /**
>  *  The custom event structure.
>diff --git a/include/SDL_thread.h b/include/SDL_thread.h
>index 5d01d5a52..a5df53684 100644
>--- a/include/SDL_thread.h
>+++ b/include/SDL_thread.h
>@@ -56,12 +56,12 @@ typedef unsigned int SDL_TLSID;
>  *
>  *  \note On many systems you require special privileges to set high or time critical priority.
>  */
>-typedef enum {
>+typedef SDL_ENUM(int, SDL_ThreadPriority) {
>     SDL_THREAD_PRIORITY_LOW,
>     SDL_THREAD_PRIORITY_NORMAL,
>     SDL_THREAD_PRIORITY_HIGH,
>     SDL_THREAD_PRIORITY_TIME_CRITICAL
>-} SDL_ThreadPriority;
>+};
> 
> /**
>  *  The function passed to SDL_CreateThread().
>diff --git a/include/SDL_video.h b/include/SDL_video.h
>index 461f13805..3f153b992 100644
>--- a/include/SDL_video.h
>+++ b/include/SDL_video.h
>@@ -94,7 +94,7 @@ typedef struct SDL_Window SDL_Window;
>  *
>  *  \sa SDL_GetWindowFlags()
>  */
>-typedef enum
>+typedef SDL_OPTIONS(Uint32, SDL_WindowFlags)
> {
>     /* !!! FIXME: change this to name = (1<<x). */
>     SDL_WINDOW_FULLSCREEN = 0x00000001,         /**< fullscreen window */
>@@ -120,7 +120,7 @@ typedef enum
>     SDL_WINDOW_TOOLTIP       = 0x00040000,      /**< window should be treated as a tooltip */
>     SDL_WINDOW_POPUP_MENU    = 0x00080000,      /**< window should be treated as a popup menu */
>     SDL_WINDOW_VULKAN        = 0x10000000       /**< window usable for Vulkan surface */
>-} SDL_WindowFlags;
>+};
> 
> /**
>  *  \brief Used to indicate that you don't care what the window position is.
>@@ -143,7 +143,7 @@ typedef enum
> /**
>  *  \brief Event subtype for window events
>  */
>-typedef enum
>+typedef SDL_ENUM(Uint8, SDL_WindowEventID)
> {
>     SDL_WINDOWEVENT_NONE,           /**< Never used */
>     SDL_WINDOWEVENT_SHOWN,          /**< Window has been shown */
>@@ -167,7 +167,7 @@ typedef enum
>     SDL_WINDOWEVENT_CLOSE,          /**< The window manager requests that the window be closed */
>     SDL_WINDOWEVENT_TAKE_FOCUS,     /**< Window is being offered a focus (should SetWindowInputFocus() on itself or a subwindow, or ignore) */
>     SDL_WINDOWEVENT_HIT_TEST        /**< Window had a hit test that wasn't SDL_HITTEST_NORMAL. */
>-} SDL_WindowEventID;
>+};
> 
> /**
>  *  \brief Event subtype for display events
>@@ -195,7 +195,7 @@ typedef void *SDL_GLContext;
> /**
>  *  \brief OpenGL configuration attributes
>  */
>-typedef enum
>+typedef SDL_ENUM(int, SDL_GLattr)
> {
>     SDL_GL_RED_SIZE,
>     SDL_GL_GREEN_SIZE,
>@@ -224,34 +224,34 @@ typedef enum
>     SDL_GL_CONTEXT_RELEASE_BEHAVIOR,
>     SDL_GL_CONTEXT_RESET_NOTIFICATION,
>     SDL_GL_CONTEXT_NO_ERROR
>-} SDL_GLattr;
>+};
> 
>-typedef enum
>+typedef SDL_OPTIONS(int, SDL_GLprofile)
> {
>     SDL_GL_CONTEXT_PROFILE_CORE           = 0x0001,
>     SDL_GL_CONTEXT_PROFILE_COMPATIBILITY  = 0x0002,
>     SDL_GL_CONTEXT_PROFILE_ES             = 0x0004 /**< GLX_CONTEXT_ES2_PROFILE_BIT_EXT */
>-} SDL_GLprofile;
>+};
> 
>-typedef enum
>+typedef SDL_OPTIONS(Uint32, SDL_GLcontextFlag)
> {
>     SDL_GL_CONTEXT_DEBUG_FLAG              = 0x0001,
>     SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG = 0x0002,
>     SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG      = 0x0004,
>     SDL_GL_CONTEXT_RESET_ISOLATION_FLAG    = 0x0008
>-} SDL_GLcontextFlag;
>+};
> 
>-typedef enum
>+typedef SDL_OPTIONS(int, SDL_GLcontextReleaseFlag)
> {
>     SDL_GL_CONTEXT_RELEASE_BEHAVIOR_NONE   = 0x0000,
>     SDL_GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH  = 0x0001
>-} SDL_GLcontextReleaseFlag;
>+};
> 
>-typedef enum
>+typedef SDL_ENUM(int, SDL_GLContextResetNotification)
> {
>     SDL_GL_CONTEXT_RESET_NO_NOTIFICATION = 0x0000,
>     SDL_GL_CONTEXT_RESET_LOSE_CONTEXT    = 0x0001
>-} SDL_GLContextResetNotification;
>+};
> 
> /* Function prototypes */
> 
>@@ -514,7 +514,7 @@ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window);
>  */
> extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindow(const char *title,
>                                                       int x, int y, int w,
>-                                                      int h, Uint32 flags);
>+                                                      int h, SDL_WindowFlags flags);
> 
> /**
>  *  \brief Create an SDL window from an existing native window.
>@@ -827,7 +827,7 @@ extern DECLSPEC void SDLCALL SDL_RestoreWindow(SDL_Window * window);
>  *  \sa SDL_GetWindowDisplayMode()
>  */
> extern DECLSPEC int SDLCALL SDL_SetWindowFullscreen(SDL_Window * window,
>-                                                    Uint32 flags);
>+                                                    SDL_WindowFlags flags);
> 
> /**
>  *  \brief Get the SDL surface associated with the window.
>@@ -1017,7 +1017,7 @@ extern DECLSPEC int SDLCALL SDL_GetWindowGammaRamp(SDL_Window * window,
>  *
>  *  \sa SDL_HitTest
>  */
>-typedef enum
>+typedef SDL_ENUM(int, SDL_HitTestResult)
> {
>     SDL_HITTEST_NORMAL,  /**< Region is normal. No special properties. */
>     SDL_HITTEST_DRAGGABLE,  /**< Region can drag entire window. */
>@@ -1029,7 +1029,7 @@ typedef enum
>     SDL_HITTEST_RESIZE_BOTTOM,
>     SDL_HITTEST_RESIZE_BOTTOMLEFT,
>     SDL_HITTEST_RESIZE_LEFT
>-} SDL_HitTestResult;
>+};
> 
> /**
>  *  \brief Callback used for hit-testing.
>diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
>index 23daf002a..e01ec6803 100644
>--- a/src/audio/SDL_audio.c
>+++ b/src/audio/SDL_audio.c
>@@ -1161,7 +1161,7 @@ prepare_audiospec(const SDL_AudioSpec * orig, SDL_AudioSpec * prepared)
> static SDL_AudioDeviceID
> open_audio_device(const char *devname, int iscapture,
>                   const SDL_AudioSpec * desired, SDL_AudioSpec * obtained,
>-                  int allowed_changes, int min_id)
>+                  SDL_AudioAllowedChanges allowed_changes, int min_id)
> {
>     const SDL_bool is_internal_thread = (desired->callback == NULL);
>     SDL_AudioDeviceID id = 0;
>@@ -1445,7 +1445,7 @@ SDL_OpenAudio(SDL_AudioSpec * desired, SDL_AudioSpec * obtained)
> SDL_AudioDeviceID
> SDL_OpenAudioDevice(const char *device, int iscapture,
>                     const SDL_AudioSpec * desired, SDL_AudioSpec * obtained,
>-                    int allowed_changes)
>+                    SDL_AudioAllowedChanges allowed_changes)
> {
>     return open_audio_device(device, iscapture, desired, obtained,
>                              allowed_changes, 2);
>diff --git a/src/events/SDL_keyboard.c b/src/events/SDL_keyboard.c
>index e1295764e..2f858c1a5 100644
>--- a/src/events/SDL_keyboard.c
>+++ b/src/events/SDL_keyboard.c
>@@ -39,7 +39,7 @@ struct SDL_Keyboard
> {
>     /* Data common to all keyboards */
>     SDL_Window *focus;
>-    Uint16 modstate;
>+    SDL_Keymod modstate;
>     Uint8 keystate[SDL_NUM_SCANCODES];
>     SDL_Keycode keymap[SDL_NUM_SCANCODES];
> };
>diff --git a/src/haptic/SDL_syshaptic.h b/src/haptic/SDL_syshaptic.h
>index 4f4cd9fef..0414e4d1b 100644
>--- a/src/haptic/SDL_syshaptic.h
>+++ b/src/haptic/SDL_syshaptic.h
>@@ -43,7 +43,7 @@ struct _SDL_Haptic
>     struct haptic_effect *effects;      /* Allocated effects */
>     int neffects;               /* Maximum amount of effects */
>     int nplaying;               /* Maximum amount of effects to play at the same time */
>-    unsigned int supported;     /* Supported effects */
>+    SDL_HapticEffectType supported;     /* Supported effects */
>     int naxes;                  /* Number of axes on the device. */
> 
>     struct haptic_hwdata *hwdata;       /* Driver dependent */
>diff --git a/src/render/metal/SDL_render_metal.m b/src/render/metal/SDL_render_metal.m
>index 10c585b20..8aa34bf29 100644
>--- a/src/render/metal/SDL_render_metal.m
>+++ b/src/render/metal/SDL_render_metal.m
>@@ -121,13 +121,13 @@ static const size_t CONSTANTS_OFFSET_DECODE_BT709 = ALIGN_CONSTANTS(CONSTANTS_OF
> static const size_t CONSTANTS_OFFSET_CLEAR_VERTS = ALIGN_CONSTANTS(CONSTANTS_OFFSET_DECODE_BT709 + sizeof(float) * 4 * 4);
> static const size_t CONSTANTS_LENGTH = CONSTANTS_OFFSET_CLEAR_VERTS + sizeof(float) * 6;
> 
>-typedef enum SDL_MetalVertexFunction
>+typedef SDL_ENUM(int, SDL_MetalVertexFunction)
> {
>     SDL_METAL_VERTEX_SOLID,
>     SDL_METAL_VERTEX_COPY,
>-} SDL_MetalVertexFunction;
>+};
> 
>-typedef enum SDL_MetalFragmentFunction
>+typedef SDL_ENUM(int, SDL_MetalFragmentFunction)
> {
>     SDL_METAL_FRAGMENT_SOLID = 0,
>     SDL_METAL_FRAGMENT_COPY,
>@@ -135,7 +135,7 @@ typedef enum SDL_MetalFragmentFunction
>     SDL_METAL_FRAGMENT_NV12,
>     SDL_METAL_FRAGMENT_NV21,
>     SDL_METAL_FRAGMENT_COUNT,
>-} SDL_MetalFragmentFunction;
>+};
> 
> typedef struct METAL_PipelineState
> {
>diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h
>index 25862ca1b..fdde4d437 100644
>--- a/src/video/SDL_sysvideo.h
>+++ b/src/video/SDL_sysvideo.h
>@@ -80,8 +80,8 @@ struct SDL_Window
>     int w, h;
>     int min_w, min_h;
>     int max_w, max_h;
>-    Uint32 flags;
>-    Uint32 last_fullscreen_flags;
>+    SDL_WindowFlags flags;
>+    SDL_WindowFlags last_fullscreen_flags;
> 
>     /* Stored position and size for windowed mode */
>     SDL_Rect windowed;
>@@ -343,10 +343,10 @@ struct SDL_VideoDevice
>         int major_version;
>         int minor_version;
>         int flags;
>-        int profile_mask;
>+        SDL_GLprofile profile_mask;
>         int share_with_current_context;
>-        int release_behavior;
>-        int reset_notification;
>+        SDL_GLcontextReleaseFlag release_behavior;
>+        SDL_GLContextResetNotification reset_notification;
>         int framebuffer_srgb_capable;
>         int no_error;
>         int retained_backing;

Actions: View | Diff

Attachments on bug 3104: 3278 | 3282 | 3284 | 3301

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.