r22576 by jghali - Fix build error: apparently major and minor are macros in GNU C Library

[scribus-commit]

Author: jghali
Date: Tue Jun  5 11:38:48 2018
New Revision: 22576

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22576
Log:
Fix build error: apparently major and minor are macros in GNU C Library

Modified:
    trunk/Scribus/scribus/util_ghostscript.cpp

Modified: trunk/Scribus/scribus/util_ghostscript.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22576&path=/trunk/Scribus/scribus/util_ghostscript.cpp
==============================================================================
--- trunk/Scribus/scribus/util_ghostscript.cpp	(original)
+++ trunk/Scribus/scribus/util_ghostscript.cpp	Tue Jun  5 11:38:48 2018
@@ -247,11 +247,11 @@
 
 bool getNumericGSVersion(int &version)
 {
+	int gsMajor(0), gsMinor(0);
 	version = 0;
-	int major(0), minor(0);
-	if (getNumericGSVersion(major, minor))
-	{
-		version = 100 * major + minor;
+	if (getNumericGSVersion(gsMajor, gsMinor))
+	{
+		version = 100 * gsMajor + gsMinor;
 		return true;
 	}
 	return false;