<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <style type="text/css" style="display:none;"></style> </head> <body dir="ltr"> <div id="divtagdefaultwrapper" style="font-size:12pt;color:#000000;font-family:Calibri,Helvetica,sans-serif;" dir="ltr"> <div id="divtagdefaultwrapper" style="font-size: 12pt; color: rgb(0, 0, 0); font-family: Calibri, Helvetica, sans-serif, "EmojiFont", "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols;" dir="ltr"> <p style="margin-top:0;margin-bottom:0">For the series,</p> <p style="margin-top:0;margin-bottom:0"><br> </p> <p style="margin-top:0;margin-bottom:0">Reviewed-by: Neha Bhende<bhenden@vmware.com><br> </p> <p style="margin-top:0;margin-bottom:0"><br> </p> <div id="Signature"> <div id="divtagdefaultwrapper" style="font-size: 12pt; color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); font-family: Calibri, Arial, Helvetica, sans-serif, "EmojiFont", "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols;"> <p>Regards,</p> <p>Neha<br> </p> </div> </div> </div> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr"><font style="font-size:11pt" color="#000000" face="Calibri, sans-serif"><b>From:</b> Brian Paul <brianp@vmware.com><br> <b>Sent:</b> Friday, April 13, 2018 9:03:41 AM<br> <b>To:</b> mesa-dev@lists.freedesktop.org<br> <b>Cc:</b> Charmaine Lee; Neha Bhende<br> <b>Subject:</b> [PATCH 3/3] glsl: #undef THIS macro to fix MSVC build</font> <div> </div> </div> <div class="BodyFragment"><font size="2"><span style="font-size:11pt;"> <div class="PlainText">THIS is a macro in one of the MSVC header files. It's also a token<br> in the GLSL lexer. This causes a compilation failure with MSVC.<br> This issue seems to be newly exposed after the recent mtypes.h removal<br> patches.<br> ---<br> src/compiler/glsl/glsl_parser_extras.h | 5 +++++<br> 1 file changed, 5 insertions(+)<br> <br> diff --git a/src/compiler/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h<br> index 66bd1a3..5b9b6cc 100644<br> --- a/src/compiler/glsl/glsl_parser_extras.h<br> +++ b/src/compiler/glsl/glsl_parser_extras.h<br> @@ -33,6 +33,11 @@<br> #include <stdlib.h><br> #include "glsl_symbol_table.h"<br> <br> +/* THIS is a macro defined somewhere deep in the Windows MSVC header files.<br> + * Undefine it here to avoid collision with the lexer's THIS token.<br> + */<br> +#undef THIS<br> +<br> struct gl_context;<br> <br> struct glsl_switch_state {<br> -- <br> 2.7.4<br> <br> </div> </span></font></div> </div> </body> </html>