From: Magnus Jacobsson Date: Sun, 2 Jan 2022 15:02:47 +0000 (+0100) Subject: lib/gvpr: use GVDLL instead of _WIN32 to control gprDisc init in compile.c X-Git-Tag: 3.0.0~87^2~21 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=086d5bf757f87b276c9632e7529d49e3e2e36b79;p=graphviz lib/gvpr: use GVDLL instead of _WIN32 to control gprDisc init in compile.c Without this change, an upcoming commit that changes cgraph.h to use GVDLL instead of _WIN32 to control storage-class attributes would cause this error: compile.c:85:29: error: initializer element is not constant 85 | static Agdisc_t gprDisc = { &AgMemDisc, &AgIdDisc, &gprIoDisc }; | ^ compile.c:85:29: note: (near initialization for ‘gprDisc.mem’) Towards https://gitlab.com/graphviz/graphviz/-/issues/2173. --- diff --git a/lib/gvpr/compile.c b/lib/gvpr/compile.c index 0c06bfeb7..acdd987f2 100644 --- a/lib/gvpr/compile.c +++ b/lib/gvpr/compile.c @@ -79,7 +79,7 @@ static int ioflush(void *chan) static Agiodisc_t gprIoDisc = { iofread, ioputstr, ioflush }; -#ifdef _WIN32 +#ifdef GVDLL static Agdisc_t gprDisc = { 0, 0, &gprIoDisc }; #else static Agdisc_t gprDisc = { &AgMemDisc, &AgIdDisc, &gprIoDisc };