]> granicus.if.org Git - graphviz/commitdiff
gvc: remove multiple declarations of two functions from gvcproc.h
authorMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Mon, 26 Jul 2021 12:19:05 +0000 (14:19 +0200)
committerMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Sun, 26 Sep 2021 06:36:52 +0000 (08:36 +0200)
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

index b6a27a77d8208342e948484086324b7ad2627a1a..04ba2195f4bc8f06bb0f4fa99332f5f1e4c38281 100644 (file)
 /* 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);