From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Fri, 15 Apr 2022 00:28:00 +0000 (-0700)
Subject: gvpack: mark 'gvplugin_neato_layout_LTX_library' as having C linkage
X-Git-Tag: 4.0.0~67^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87399248a60f53c62420b0822c60d58cbf169cf3;p=graphviz

gvpack: mark 'gvplugin_neato_layout_LTX_library' as having C linkage

gvpack.c is currently compiled as C, so this symbol already has C linkage by
default. However an upcoming commit converts it to C++, which then results in
link failures due to this defaulting to C++ linkage. To pre-empt that, we note
its linkage explicitly for now. These guards will be removed in a future commit.

Gitlab: #2154
---

diff --git a/cmd/tools/gvpack.c b/cmd/tools/gvpack.c
index 0fad73b36..7caf6d75e 100644
--- a/cmd/tools/gvpack.c
+++ b/cmd/tools/gvpack.c
@@ -29,11 +29,19 @@
 #include <stddef.h>
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef GVDLL
   __declspec(dllimport)
 #endif
 extern gvplugin_library_t gvplugin_neato_layout_LTX_library;
 
+#ifdef __cplusplus
+}
+#endif
+
 lt_symlist_t lt_preloaded_symbols[] = {
 #ifdef GVDLL
 	{ "gvplugin_neato_layout_LTX_library", 0 },