From 660e7bd8cca1ea33bed3079e64294c89372d4575 Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Mon, 26 Jul 2021 14:19:05 +0200 Subject: [PATCH] gvc: remove multiple declarations of two functions from gvcproc.h These are already declared in gvc.h with Windows storage-class attributes. Without this change, an upcoming commit that defines GVDLL also for CMake builds, would cause the following errors with native Windows: C:\Users\magja\graphviz\lib\gvc/gvc.h(67,13): error C2375: 'gvLayoutJobs': redefinition; different linkage [C:\Users\magja\graphviz\build\lib\gvc\gvc.vcxproj] C:\Users\magja\graphviz\lib\gvc/gvcproc.h(117): message : see declaration of 'gvLayoutJobs' [C:\Users\magja\graphviz\build\lib\gvc\gvc.vcxproj] C:\Users\magja\graphviz\lib\gvc/gvc.h(91,13): error C2375: 'gvFreeLayout': redefinition; different linkage [C:\Users\magja\graphviz\build\lib\gvc\gvc.vcxproj] C:\Users\magja\graphviz\lib\gvc/gvcproc.h(116): message : see declaration of 'gvFreeLayout' [C:\Users\magja\graphviz\build\lib\gvc\gvc.vcxproj] --- lib/gvc/gvcproc.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/gvc/gvcproc.h b/lib/gvc/gvcproc.h index b6a27a77d..04ba2195f 100644 --- a/lib/gvc/gvcproc.h +++ b/lib/gvc/gvcproc.h @@ -113,8 +113,6 @@ /* layout */ int gvlayout_select(GVC_t * gvc, const char *str); - int gvFreeLayout(GVC_t * gvc, Agraph_t * g); - int gvLayoutJobs(GVC_t * gvc, Agraph_t * g); /* argvlist */ gv_argvlist_t *gvNEWargvlist(void); -- 2.40.0