geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added SDL_VARIABLE_LENGTH_ARRAY so this #ifdef is localized to one place.

Ryan C. Gordon 2016-12-06 02:20:58 -05:00
parent 68d7be3949
commit 8b960d4e0f
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/SDL_internal.h
View File

@ -26,6 +26,15 @@
#define _GNU_SOURCE #define _GNU_SOURCE
#endif #endif
/* This is for a variable-length array at the end of a struct:
struct x { int y; char z[SDL_VARIABLE_LENGTH_ARRAY]; };
Use this because GCC 2 needs different magic than other compilers. */
#if (defined(__GNUC__) && (__GNUC__ <= 2))
#define SDL_VARIABLE_LENGTH_ARRAY 1
#else
#define SDL_VARIABLE_LENGTH_ARRAY
#endif
#include "dynapi/SDL_dynapi.h" #include "dynapi/SDL_dynapi.h"
#if SDL_DYNAMIC_API #if SDL_DYNAMIC_API

6
src/audio/SDL_sysaudio.h
View File

@ -105,11 +105,7 @@ typedef struct SDL_AudioDeviceItem
{ {
void *handle; void *handle;
struct SDL_AudioDeviceItem *next; struct SDL_AudioDeviceItem *next;
#if (defined(__GNUC__) && (__GNUC__ <= 2)) char name[SDL_VARIABLE_LENGTH_ARRAY];
char name[1]; /* actually variable length. */
#else
char name[];
#endif
} SDL_AudioDeviceItem; } SDL_AudioDeviceItem;