From: Jasper Lievisse Adriaanse <jasper@openbsd.org>
Date: Tue, 5 Sep 2017 11:07:25 +0000 (+0200)
Subject: valadoc: Don't use 'stderr' as variable name
X-Git-Tag: 0.38.1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09bbbfb62654f4c94b587656c3f3bc278effdd42;p=thirdparty%2Fvala.git

valadoc: Don't use 'stderr' as variable name

It might clash with the definition in stdio.h, e.g. on OpenBSD.

https://bugzilla.gnome.org/show_bug.cgi?id=787305
---

diff --git a/valadoc/doclets/gtkdoc/doclet.vala b/valadoc/doclets/gtkdoc/doclet.vala
index 2d000f6eb..d567d6fe8 100644
--- a/valadoc/doclets/gtkdoc/doclet.vala
+++ b/valadoc/doclets/gtkdoc/doclet.vala
@@ -283,21 +283,21 @@ public class Gtkdoc.Director : Valadoc.Doclet, Object {
 		pc_libs += "--libs";
 
 		try {
-			string stderr;
+			string stderr_buf;
 			int status;
 
 			string cflags;
-			Process.spawn_sync (null, pc_cflags, null, SpawnFlags.SEARCH_PATH, null, out cflags, out stderr, out status);
+			Process.spawn_sync (null, pc_cflags, null, SpawnFlags.SEARCH_PATH, null, out cflags, out stderr_buf, out status);
 			if (status != 0) {
-				reporter.simple_error ("GtkDoc", "pkg-config cflags error: %s", stderr);
+				reporter.simple_error ("GtkDoc", "pkg-config cflags error: %s", stderr_buf);
 				return false;
 			}
 			cflags = cflags.strip ();
 
 			string libs;
-			Process.spawn_sync (null, pc_libs, null, SpawnFlags.SEARCH_PATH, null, out libs, out stderr, out status);
+			Process.spawn_sync (null, pc_libs, null, SpawnFlags.SEARCH_PATH, null, out libs, out stderr_buf, out status);
 			if (status != 0) {
-				reporter.simple_error ("GtkDoc", "pkg-config libs error: %s", stderr);
+				reporter.simple_error ("GtkDoc", "pkg-config libs error: %s", stderr_buf);
 				return false;
 			}