Mesa (master): glsl: Use the C99 variadic macro syntax.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Jun 27 06:45:50 UTC 2013
Module: Mesa
Branch: master
Commit: 15085b477b092ba4315d13b96112a8d714de8e27
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=15085b477b092ba4315d13b96112a8d714de8e27
Author: José Fonseca <jfonseca at vmware.com>
Date: Thu Jun 27 07:41:36 2013 +0100
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
---
src/glsl/builtin_types.cpp | 4 ++--
src/glsl/glsl_types.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/glsl/builtin_types.cpp b/src/glsl/builtin_types.cpp
index 93c2d38..722eda2 100644
--- 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 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"
More information about the mesa-commit
mailing list