Merge freedesktop/master into otc-private/master

[android-x86/external-mesa.git] / src / glsl / glcpp / pp.c

diff --git a/src/glsl/glcpp/pp.c b/src/glsl/glcpp/pp.c
index 789f7f9..7e1b6c6 100644 (file)
--- a/src/glsl/glcpp/pp.c
+++ b/src/glsl/glcpp/pp.c
@@ -97,8 +97,10 @@ remove_line_continuations(glcpp_parser_t *ctx, const char *shader)
                        {
                                ralloc_strncat(&clean, shader,
                                               newline - shader + 1);
-                               while (collapsed_newlines--)
+                               while (collapsed_newlines) {
                                        ralloc_strcat(&clean, "\n");
+                                       collapsed_newlines--;
+                               }
                                shader = newline + 1;
                                search_start = shader;
                        }