From: Jakob Nixdorf <flocke@shadowice.org>
Date: Fri, 22 Jan 2016 21:32:32 +0000 (+0100)
Subject: Fix build for all ghostscript versions.
X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~27^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f97c86e975aa472272d0a5b5a042b96eb77ebbc0;p=graphviz

Fix build for all ghostscript versions.
---

diff --git a/plugin/gs/gvloadimage_gs.c b/plugin/gs/gvloadimage_gs.c
index 62dd3c933..6d9ed3de5 100644
--- a/plugin/gs/gvloadimage_gs.c
+++ b/plugin/gs/gvloadimage_gs.c
@@ -32,6 +32,21 @@
 #include <ghostscript/ierrors.h>
 #include <cairo/cairo.h>
 
+
+/** Ensure compatibility with Ghostscipt versions newer than 9.16 **/
+
+#ifndef e_VMerror
+#define e_VMerror gs_error_VMerror
+#endif
+
+#ifndef e_unregistered
+#define e_unregistered gs_error_unregistered
+#endif
+
+#ifndef e_invalidid
+#define e_invalidid gs_error_invalidid
+#endif
+
 #ifdef WIN32
 #define NUL_FILE "nul"
 #else
@@ -72,11 +87,11 @@ static void gs_error(GVJ_t * job, const char *name, const char *funstr, int err)
 
     assert (err < 0);
 
-    if (err >= gs_error_VMerror) 
+    if (err >= e_VMerror) 
 	errsrc = "PostScript Level 1"; 
-    else if (err >= gs_error_unregistered)
+    else if (err >= e_unregistered)
 	errsrc = "PostScript Level 2";
-    else if (err >= gs_error_invalidid)
+    else if (err >= e_invalidid)
 	errsrc = "DPS error";
     else
 	errsrc = "Ghostscript internal error";