From: Brian Paul <brianp@vmware.com>
Date: Mon, 9 Sep 2013 23:02:52 +0000 (-0600)
Subject: glsl: fix variadic macro for MSVC
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=395b9410860371a64d6b5f2d50679f29eb41729e;p=mesa.git

glsl: fix variadic macro for MSVC

MSVC doesn't accept the rest... syntax.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp
index eca41aacefb..5d8f171b9a8 100644
--- a/src/glsl/builtin_functions.cpp
+++ b/src/glsl/builtin_functions.cpp
@@ -1935,9 +1935,9 @@ builtin_builder::new_sig(const glsl_type *return_type,
    return sig;
 }
 
-#define MAKE_SIG(return_type, avail, rest...) \
+#define MAKE_SIG(return_type, avail, ...)  \
    ir_function_signature *sig =               \
-      new_sig(return_type, avail, rest);      \
+      new_sig(return_type, avail, __VA_ARGS__);      \
    ir_factory body(&sig->body, mem_ctx);
 
 ir_function_signature *