glsl/pp: Avoid using `__VERSION__' as an identifier.

diff --git a/src/glsl/pp/sl_pp_dict.c b/src/glsl/pp/sl_pp_dict.c
index 0e1fa36857793da418afe4bfe20b02b49b7f4855..82fb9127b5095796f361f20a2bed04f6991d7b76 100644 (file)
--- 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 683752e000a973fb51c1520d642a6d65deed0620..49f0e0bf9fa337d3f7fd9d8b30e80841d9615e64 100644 (file)
--- 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 3956ba3b5743c89b2ff2bb0ca5ec7aaac1d6df47..a4e78861d69563a24d29f36f180006c8f364a960 100644 (file)
--- 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;
       }