From e5198bd29d73d2351c36dc8c02efd8e231b6a694 Mon Sep 17 00:00:00 2001 From: Sylvain Becker Date: Fri, 11 Oct 2019 06:18:24 +0200 Subject: [PATCH] Remove 'Enum' suffixes (bug 4813) --- include/SDL_keycode.h | 2 +- include/SDL_log.h | 2 +- include/SDL_pixels.h | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/SDL_keycode.h b/include/SDL_keycode.h index 850119ce7fc58..64b72dd3ad515 100644 --- a/include/SDL_keycode.h +++ b/include/SDL_keycode.h @@ -317,7 +317,7 @@ typedef enum SDLK_AUDIOREWIND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOREWIND), SDLK_AUDIOFASTFORWARD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOFASTFORWARD) -} SDL_KeyCodeEnum; +} SDL_KeyCode; /** * \brief Enumeration of valid key mods (possibly OR'd together). diff --git a/include/SDL_log.h b/include/SDL_log.h index febc69a3725b6..430e4fd025891 100644 --- a/include/SDL_log.h +++ b/include/SDL_log.h @@ -94,7 +94,7 @@ typedef enum }; */ SDL_LOG_CATEGORY_CUSTOM -} SDL_LogCategoryEnum; +} SDL_LogCategory; /** * \brief The predefined log priorities diff --git a/include/SDL_pixels.h b/include/SDL_pixels.h index ac1e6cc416ebe..2e2b05c781c74 100644 --- a/include/SDL_pixels.h +++ b/include/SDL_pixels.h @@ -62,7 +62,7 @@ typedef enum SDL_PIXELTYPE_ARRAYU32, SDL_PIXELTYPE_ARRAYF16, SDL_PIXELTYPE_ARRAYF32 -} SDL_PixelTypeEnum; +} SDL_PixelType; /** Bitmap pixel order, high bit -> low bit. */ typedef enum @@ -70,7 +70,7 @@ typedef enum SDL_BITMAPORDER_NONE, SDL_BITMAPORDER_4321, SDL_BITMAPORDER_1234 -} SDL_BitmapOrderEnum; +} SDL_BitmapOrder; /** Packed component order, high bit -> low bit. */ typedef enum @@ -84,7 +84,7 @@ typedef enum SDL_PACKEDORDER_BGRX, SDL_PACKEDORDER_ABGR, SDL_PACKEDORDER_BGRA -} SDL_PackedOrderEnum; +} SDL_PackedOrder; /** Array component order, low byte -> high byte. */ /* !!! FIXME: in 2.1, make these not overlap differently with @@ -98,7 +98,7 @@ typedef enum SDL_ARRAYORDER_BGR, SDL_ARRAYORDER_BGRA, SDL_ARRAYORDER_ABGR -} SDL_ArrayOrderEnum; +} SDL_ArrayOrder; /** Packed component layout. */ typedef enum @@ -112,7 +112,7 @@ typedef enum SDL_PACKEDLAYOUT_8888, SDL_PACKEDLAYOUT_2101010, SDL_PACKEDLAYOUT_1010102 -} SDL_PackedLayoutEnum; +} SDL_PackedLayout; #define SDL_DEFINE_PIXELFOURCC(A, B, C, D) SDL_FOURCC(A, B, C, D)