aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/glcpp/glcpp-lex.l
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-03-05 16:07:07 +0000
committermarha <marha@users.sourceforge.net>2011-03-05 16:07:07 +0000
commitf027c29436a689abc94b720c2efebeddd449a61f (patch)
treee3179c623fdf42025ad9adbc401ccb111608036e /mesalib/src/glsl/glcpp/glcpp-lex.l
parent3592ad31cfc72ffff3c9024eecea7d3b987c7954 (diff)
parent98e55fbde340d17fdd0b1cbc408af5fecb4b7a0e (diff)
downloadvcxsrv-f027c29436a689abc94b720c2efebeddd449a61f.tar.gz
vcxsrv-f027c29436a689abc94b720c2efebeddd449a61f.tar.bz2
vcxsrv-f027c29436a689abc94b720c2efebeddd449a61f.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/glsl/glcpp/glcpp-lex.l')
-rw-r--r--mesalib/src/glsl/glcpp/glcpp-lex.l4
1 files changed, 4 insertions, 0 deletions
diff --git a/mesalib/src/glsl/glcpp/glcpp-lex.l b/mesalib/src/glsl/glcpp/glcpp-lex.l
index 576e53c44..596c6db70 100644
--- a/mesalib/src/glsl/glcpp/glcpp-lex.l
+++ b/mesalib/src/glsl/glcpp/glcpp-lex.l
@@ -34,6 +34,10 @@
int glcpp_get_column (yyscan_t yyscanner);
void glcpp_set_column (int column_no , yyscan_t yyscanner);
+#ifdef _MSC_VER
+#define YY_NO_UNISTD_H
+#endif
+
#define YY_NO_INPUT
#define YY_USER_ACTION \