diff options
| author | Tim Angus <tim@ngus.net> | 2013-08-20 18:30:56 +0100 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2014-08-28 11:03:18 +0100 |
| commit | 675c6f2daa7ba85d6e5cddbcbfdd01aaaa8c3601 (patch) | |
| tree | 2ee3322d87431f3fada83cb8341b69edc38b4504 /src/SDL2/include/SDL_test_images.h | |
| parent | 4780cef266bfcad933e10129544a0eb5583991b6 (diff) | |
Update SDL2 headers... oops
Diffstat (limited to 'src/SDL2/include/SDL_test_images.h')
| -rw-r--r-- | src/SDL2/include/SDL_test_images.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/SDL2/include/SDL_test_images.h b/src/SDL2/include/SDL_test_images.h index 4aea8542..21cf39ff 100644 --- a/src/SDL2/include/SDL_test_images.h +++ b/src/SDL2/include/SDL_test_images.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org> + Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org> This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -21,16 +21,16 @@ /** * \file SDL_test_images.h - * + * * Include file for SDL test framework. * * This code is a part of the SDL2_test library, not the main SDL library. */ -/* +/* Defines some images for tests. - + */ #ifndef _SDL_test_images_h @@ -41,9 +41,7 @@ #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ #ifdef __cplusplus -/* *INDENT-OFF* */ extern "C" { -/* *INDENT-ON* */ #endif /** @@ -52,12 +50,8 @@ extern "C" { typedef struct SDLTest_SurfaceImage_s { int width; int height; - unsigned int bytes_per_pixel; /* 3:RGB, 4:RGBA */ -#if (defined(__GNUC__) && (__GNUC__ <= 2)) - unsigned char pixel_data[0]; -#else - unsigned char pixel_data[]; -#endif + unsigned int bytes_per_pixel; /* 3:RGB, 4:RGBA */ + const char *pixel_data; } SDLTest_SurfaceImage_t; /* Test images */ @@ -75,9 +69,7 @@ SDL_Surface *SDLTest_ImagePrimitivesBlend(); /* Ends C function definitions when using C++ */ #ifdef __cplusplus -/* *INDENT-OFF* */ } -/* *INDENT-ON* */ #endif #include "close_code.h" |