diff options
| author | Michal Krol <michal@vmware.com> | 2009-09-24 10:57:32 +0200 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-09-24 10:57:32 +0200 |
| commit | 69fec23251740c3071ffc3fefc8981599bdb22ef (patch) | |
| tree | 99dea4721a562a3e9918d55248a156edd829df49 /src/glsl/pp | |
| parent | 7a95a3c7c4ba49ec174681c36951e3c0672df06c (diff) | |
glsl/pp: Avoid using `__VERSION__' as an identifier.
Diffstat (limited to 'src/glsl/pp')
| -rw-r--r-- | src/glsl/pp/sl_pp_dict.c | 2 | ||||
| -rw-r--r-- | src/glsl/pp/sl_pp_dict.h | 5 | ||||
| -rw-r--r-- | src/glsl/pp/sl_pp_macro.c | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/glsl/pp/sl_pp_dict.c b/src/glsl/pp/sl_pp_dict.c index 0e1fa36857..82fb9127b5 100644 --- a/src/glsl/pp/sl_pp_dict.c +++ b/src/glsl/pp/sl_pp_dict.c @@ -56,7 +56,7 @@ sl_pp_dict_init(struct sl_pp_context *context) ADD_NAME_STR(context, ___LINE__, "__LINE__"); ADD_NAME_STR(context, ___FILE__, "__FILE__"); - ADD_NAME(context, __VERSION__); + ADD_NAME_STR(context, ___VERSION__, "__VERSION__"); ADD_NAME(context, optimize); ADD_NAME(context, debug); diff --git a/src/glsl/pp/sl_pp_dict.h b/src/glsl/pp/sl_pp_dict.h index 683752e000..49f0e0bf9f 100644 --- a/src/glsl/pp/sl_pp_dict.h +++ b/src/glsl/pp/sl_pp_dict.h @@ -28,6 +28,9 @@ #ifndef SL_PP_DICT_H #define SL_PP_DICT_H + +struct sl_pp_context; + struct sl_pp_dict { int all; int _GL_ARB_draw_buffers; @@ -42,7 +45,7 @@ struct sl_pp_dict { int ___LINE__; int ___FILE__; - int __VERSION__; + int ___VERSION__; int optimize; int debug; diff --git a/src/glsl/pp/sl_pp_macro.c b/src/glsl/pp/sl_pp_macro.c index 3956ba3b57..a4e78861d6 100644 --- a/src/glsl/pp/sl_pp_macro.c +++ b/src/glsl/pp/sl_pp_macro.c @@ -27,6 +27,7 @@ #include <stdlib.h> #include <stdio.h> +#include <string.h> #include "sl_pp_macro.h" #include "sl_pp_process.h" @@ -149,7 +150,7 @@ sl_pp_macro_expand(struct sl_pp_context *context, (*pi)++; return 0; } - if (macro_name == context->dict.__VERSION__) { + if (macro_name == context->dict.___VERSION__) { if (!mute && _out_number(context, state, 110)) { return -1; } |