diff options
| author | José Fonseca <jfonseca@vmware.com> | 2013-06-27 07:41:36 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2013-06-27 07:44:11 +0100 |
| commit | 15085b477b092ba4315d13b96112a8d714de8e27 (patch) | |
| tree | 25d7cf3b5d46bf810bf8ec67a884c29042e29651 /src/glsl/glsl_types.h | |
| parent | bcd6f3b23c906befd5f0351eaec908dc9496147a (diff) | |
| download | external_mesa3d-15085b477b092ba4315d13b96112a8d714de8e27.zip external_mesa3d-15085b477b092ba4315d13b96112a8d714de8e27.tar.gz external_mesa3d-15085b477b092ba4315d13b96112a8d714de8e27.tar.bz2 | |
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
Diffstat (limited to 'src/glsl/glsl_types.h')
| -rw-r--r-- | src/glsl/glsl_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h index b7ddb1c..cb52080 100644 --- 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" |