Remove 'Enum' suffixes (bug 4813)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75
diff --git a/include/SDL_keycode.h b/include/SDL_keycode.h
index 850119c..64b72dd 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 febc69a..430e4fd 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 ac1e6cc..2e2b05c 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)