diff options
| author | Brian Paul <[email protected]> | 2015-03-11 16:54:15 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2015-03-12 07:52:45 -0600 |
| commit | 6d3b86c3afe4ee1bfb29c322b3d36131139cbab9 (patch) | |
| tree | 0bd6f07866daefaba06fc4e4dcbef71dd455de7c | |
| parent | f8ed0bbfef7b8e8098cb3263a196689dbd280758 (diff) | |
mesa: move LONGSTRING into generated enums.c
enums.c is the only place this directive is needed.
Reviewed-by: Matt Turner <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/gl_enums.py | 6 | ||||
| -rw-r--r-- | src/mesa/main/compiler.h | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/mapi/glapi/gen/gl_enums.py b/src/mapi/glapi/gen/gl_enums.py index d61618f4da0..f45782df85f 100644 --- a/src/mapi/glapi/gen/gl_enums.py +++ b/src/mapi/glapi/gen/gl_enums.py @@ -157,6 +157,12 @@ _mesa_lookup_prim_by_nr(GLuint nr) string_offsets = {} i = 0; + print '#if defined(__GNUC__)' + print '# define LONGSTRING __extension__' + print '#else' + print '# define LONGSTRING' + print '#endif' + print '' print 'LONGSTRING static const char enum_string_table[] = ' for enum, name in enum_table: print ' "%s\\0"' % (name) diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index b9f808efb36..5c6039132b4 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -113,15 +113,6 @@ extern "C" { #define LE32_TO_CPU( x ) CPU_TO_LE32( x ) -/** - * LONGSTRING macro - * gcc -pedantic warns about long string literals, LONGSTRING silences that. - */ -#if !defined(__GNUC__) -# define LONGSTRING -#else -# define LONGSTRING __extension__ -#endif #define IEEE_ONE 0x3f800000 |