Merge remote-tracking branch 'origin/master' into pipe-video

[mesa.git] / src / glsl / glsl_lexer.ll

diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll
index e4c469f9e0af8be3185bb0a64426dafc21b32ab7..cfd892617577f61b2e17f014cf8766c4f551227a 100644 (file)
--- a/src/glsl/glsl_lexer.ll
+++ b/src/glsl/glsl_lexer.ll
@@ -29,6 +29,10 @@
 
 static int classify_identifier(struct _mesa_glsl_parse_state *, const char *);
 
+#ifdef _MSC_VER
+#define YY_NO_UNISTD_H
+#endif
+
 #define YY_USER_ACTION                                         \
    do {                                                                \
       yylloc->source = 0;                                      \