Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
Fixed bug #467
Browse files Browse the repository at this point in the history
Remove trailing commas from enums
  • Loading branch information
slouken committed Jul 22, 2007
1 parent b6e675e commit 9075c1b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions include/SDL_pixels.h
Expand Up @@ -50,14 +50,14 @@ enum
SDL_PIXELTYPE_ARRAYU16,
SDL_PIXELTYPE_ARRAYU32,
SDL_PIXELTYPE_ARRAYF16,
SDL_PIXELTYPE_ARRAYF32,
SDL_PIXELTYPE_ARRAYF32
};

enum
{ /* bitmap pixel order, high bit -> low bit */
SDL_BITMAPORDER_NONE,
SDL_BITMAPORDER_4321,
SDL_BITMAPORDER_1234,
SDL_BITMAPORDER_1234
};
enum
{ /* packed component order, high bit -> low bit */
Expand All @@ -69,7 +69,7 @@ enum
SDL_PACKEDORDER_XBGR,
SDL_PACKEDORDER_BGRX,
SDL_PACKEDORDER_ABGR,
SDL_PACKEDORDER_BGRA,
SDL_PACKEDORDER_BGRA
};
enum
{ /* array component order, low byte -> high byte */
Expand All @@ -79,7 +79,7 @@ enum
SDL_ARRAYORDER_ARGB,
SDL_ARRAYORDER_BGR,
SDL_ARRAYORDER_BGRA,
SDL_ARRAYORDER_ABGR,
SDL_ARRAYORDER_ABGR
};

enum
Expand All @@ -92,7 +92,7 @@ enum
SDL_PACKEDLAYOUT_565,
SDL_PACKEDLAYOUT_8888,
SDL_PACKEDLAYOUT_2101010,
SDL_PACKEDLAYOUT_1010102,
SDL_PACKEDLAYOUT_1010102
};

#define SDL_DEFINE_PIXELFOURCC(A, B, C, D) \
Expand Down Expand Up @@ -188,7 +188,7 @@ enum
SDL_PIXELFORMAT_UYVY = /* Packed mode: U0+Y0+V0+Y1 (1 plane) */
SDL_DEFINE_PIXELFOURCC('U', 'Y', 'V', 'Y'),
SDL_PIXELFORMAT_YVYU = /* Packed mode: Y0+V0+Y1+U0 (1 plane) */
SDL_DEFINE_PIXELFOURCC('Y', 'V', 'Y', 'U'),
SDL_DEFINE_PIXELFOURCC('Y', 'V', 'Y', 'U')
};

typedef struct SDL_Color
Expand Down
14 changes: 7 additions & 7 deletions include/SDL_video.h
Expand Up @@ -126,7 +126,7 @@ typedef enum
SDL_WINDOW_MAXIMIZED = 0x00000040, /**< maximized */
SDL_WINDOW_INPUT_GRABBED = 0x00000100, /**< window has grabbed input focus */
SDL_WINDOW_INPUT_FOCUS = 0x00000200, /**< window has input focus */
SDL_WINDOW_MOUSE_FOCUS = 0x00000400, /**< window has mouse focus */
SDL_WINDOW_MOUSE_FOCUS = 0x00000400 /**< window has mouse focus */
} SDL_WindowFlags;

/**
Expand Down Expand Up @@ -160,7 +160,7 @@ typedef enum
SDL_WINDOWEVENT_LEAVE, /**< The window has lost mouse focus */
SDL_WINDOWEVENT_FOCUS_GAINED, /**< The window has gained keyboard focus */
SDL_WINDOWEVENT_FOCUS_LOST, /**< The window has lost keyboard focus */
SDL_WINDOWEVENT_CLOSE, /**< The window manager requests that the window be closed */
SDL_WINDOWEVENT_CLOSE /**< The window manager requests that the window be closed */
} SDL_WindowEventID;

/**
Expand All @@ -176,7 +176,7 @@ typedef enum
SDL_RENDERER_PRESENTFLIP3 = 0x00000008, /**< Present uses a flip, rotating between two back buffers and a front buffer */
SDL_RENDERER_PRESENTDISCARD = 0x00000010, /**< Present leaves the contents of the backbuffer undefined */
SDL_RENDERER_PRESENTVSYNC = 0x00000020, /**< Present is synchronized with the refresh rate */
SDL_RENDERER_ACCELERATED = 0x00000040, /**< The renderer uses hardware acceleration */
SDL_RENDERER_ACCELERATED = 0x00000040 /**< The renderer uses hardware acceleration */
} SDL_RendererFlags;

/**
Expand Down Expand Up @@ -205,7 +205,7 @@ typedef struct SDL_RendererInfo
typedef enum
{
SDL_TEXTUREACCESS_LOCAL, /**< Lockable system memory */
SDL_TEXTUREACCESS_REMOTE, /**< Unlockable video memory */
SDL_TEXTUREACCESS_REMOTE /**< Unlockable video memory */
} SDL_TextureAccess;

/**
Expand All @@ -217,7 +217,7 @@ typedef enum
{
SDL_TEXTUREMODULATE_NONE = 0x00000000, /**< No modulation */
SDL_TEXTUREMODULATE_COLOR = 0x00000001, /**< srcC = srcC * color */
SDL_TEXTUREMODULATE_ALPHA = 0x00000002, /**< srcA = srcA * alpha */
SDL_TEXTUREMODULATE_ALPHA = 0x00000002 /**< srcA = srcA * alpha */
} SDL_TextureModulate;

/**
Expand All @@ -231,7 +231,7 @@ typedef enum
SDL_TEXTUREBLENDMODE_MASK = 0x00000001, /**< dst = A ? src : dst (alpha is mask) */
SDL_TEXTUREBLENDMODE_BLEND = 0x00000002, /**< dst = (src * A) + (dst * (1-A)) */
SDL_TEXTUREBLENDMODE_ADD = 0x00000004, /**< dst = (src * A) + dst */
SDL_TEXTUREBLENDMODE_MOD = 0x00000008, /**< dst = src * dst */
SDL_TEXTUREBLENDMODE_MOD = 0x00000008 /**< dst = src * dst */
} SDL_TextureBlendMode;

/**
Expand All @@ -244,7 +244,7 @@ typedef enum
SDL_TEXTURESCALEMODE_NONE = 0x00000000, /**< No scaling, rectangles must match dimensions */
SDL_TEXTURESCALEMODE_FAST = 0x00000001, /**< Point sampling or equivalent algorithm */
SDL_TEXTURESCALEMODE_SLOW = 0x00000002, /**< Linear filtering or equivalent algorithm */
SDL_TEXTURESCALEMODE_BEST = 0x00000004, /**< Bicubic filtering or equivalent algorithm */
SDL_TEXTURESCALEMODE_BEST = 0x00000004 /**< Bicubic filtering or equivalent algorithm */
} SDL_TextureScaleMode;

/**
Expand Down

0 comments on commit 9075c1b

Please sign in to comment.