From b071050b9eda9d5e5185e582dbe9f4adba863ccc Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 18 Jun 2013 08:23:14 +0200
Subject: libX11 libXmu libxcb/xcb-proto mesa mkfontscale pixman
 xkeyboard-config git update 18 June 2013

libxcb/xcb-proto commit e5f7c750815cb5170db363a2e5b09639b7354733
xkeyboard-config commit 30d804538462213ed01e8efc0b44a8e5a0aff990
libX11           commit 9dfb0f3c0a761590bcdc1f3396b1e064da4e18e8
pixman           commit 279bdcda7ec3af8ac06312f4514b1b082a279544
mkfontscale      commit f731c5c36f28ddd0f25f474d2991c96f9a7a915c
libXmu           commit e46ecb4e02b7f919b11efa79448d4db71d1deb69
mesa             commit eb2021507556633cd6ba64cda26653e3c43e80df
---
 mesalib/src/glsl/glsl_parser.yy | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'mesalib/src/glsl/glsl_parser.yy')

diff --git a/mesalib/src/glsl/glsl_parser.yy b/mesalib/src/glsl/glsl_parser.yy
index 6e92c2651..56367f8c6 100644
--- a/mesalib/src/glsl/glsl_parser.yy
+++ b/mesalib/src/glsl/glsl_parser.yy
@@ -267,10 +267,16 @@ version_statement:
 	| VERSION_TOK INTCONSTANT EOL
 	{
            state->process_version_directive(&@2, $2, NULL);
+	   if (state->error) {
+	      YYERROR;
+	   }
 	}
         | VERSION_TOK INTCONSTANT any_identifier EOL
         {
            state->process_version_directive(&@2, $2, $3);
+	   if (state->error) {
+	      YYERROR;
+	   }
         }
 	;
 
-- 
cgit v1.2.3