glsl: Use the C99 variadic macro syntax.

MSVC does not support the old GCC syntax.

See also
http://gcc.gnu.org/onlinedocs/gcc/Variadic-Macros.html

diff --git a/src/glsl/builtin_types.cpp b/src/glsl/builtin_types.cpp
index 93c2d3885dcdac640925e142a2528ac7135bc528..722eda2da1e5e2fc872c95b424eb1aa97df8762c 100644 (file)
--- a/src/glsl/builtin_types.cpp
+++ b/src/glsl/builtin_types.cpp
@@ -42,8 +42,8 @@
  * convenience pointers (glsl_type::foo_type).
  * @{
  */
-#define DECL_TYPE(NAME, REST...)                                \
-   const glsl_type glsl_type::_##NAME##_type = glsl_type(REST, #NAME); \
+#define DECL_TYPE(NAME, ...)                                    \
+   const glsl_type glsl_type::_##NAME##_type = glsl_type(__VA_ARGS__, #NAME); \
    const glsl_type *const glsl_type::NAME##_type = &glsl_type::_##NAME##_type;
 
 #define STRUCT_TYPE(NAME)                                       \

diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h
index b7ddb1c2dd8b543e619947e76ba635992ea84133..cb5208029f79cf9c5599624b9e6efe038b88a3d4 100644 (file)
--- a/src/glsl/glsl_types.h
+++ b/src/glsl/glsl_types.h
@@ -158,7 +158,7 @@ struct glsl_type {
     */
    /*@{*/
 #undef  DECL_TYPE
-#define DECL_TYPE(NAME, REST...) \
+#define DECL_TYPE(NAME, ...) \
    static const glsl_type *const NAME##_type;
 #undef  STRUCT_TYPE
 #define STRUCT_TYPE(NAME) \
@@ -534,7 +534,7 @@ private:
     */
    /*@{*/
 #undef  DECL_TYPE
-#define DECL_TYPE(NAME, REST...) static const glsl_type _##NAME##_type;
+#define DECL_TYPE(NAME, ...) static const glsl_type _##NAME##_type;
 #undef  STRUCT_TYPE
 #define STRUCT_TYPE(NAME)        static const glsl_type _struct_##NAME##_type;
 #include "builtin_type_macros.h"