From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 15 Jan 2022 21:41:51 +0000 (-0800)
Subject: lib/mingle headers: drop 'extern "C"'
X-Git-Tag: 3.0.0~63^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f5c35905ab473cd24b0512acc717f8a9ab76afb;p=graphviz

lib/mingle headers: drop 'extern "C"'

These headers are only used by C++ code, so they no longer need to fallback to C
linkage.

Gitlab: #2154
---

diff --git a/lib/mingle/agglomerative_bundling.h b/lib/mingle/agglomerative_bundling.h
index c1c90fa1c..d3c6222a8 100644
--- a/lib/mingle/agglomerative_bundling.h
+++ b/lib/mingle/agglomerative_bundling.h
@@ -10,10 +10,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct Agglomerative_Ink_Bundling_struct *Agglomerative_Ink_Bundling;
 
 struct Agglomerative_Ink_Bundling_struct {
@@ -33,7 +29,3 @@ struct Agglomerative_Ink_Bundling_struct {
 };
 
 pedge* agglomerative_ink_bundling(int dim, SparseMatrix A, pedge* edges, int nneighbor, int max_recursion, double angle_param, double angle, int open_gl, int *flag);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/lib/mingle/edge_bundling.h b/lib/mingle/edge_bundling.h
index 76c313881..e95a096ff 100644
--- a/lib/mingle/edge_bundling.h
+++ b/lib/mingle/edge_bundling.h
@@ -12,10 +12,6 @@
 
 #include <sparse/SparseMatrix.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct pedge_struct {
   double wgt; /* weight, telling how many original edges this edge represent. If this edge consists of multiple sections of different weights then this is a lower bound. This only applied for agglomerative bundling */
   int npoints;/* number of poly points */
@@ -37,7 +33,3 @@ enum {COMPATIBILITY_DIST = 0, COMPATIBILITY_FULL};
 pedge pedge_new(int np, int dim, double *x);
 pedge pedge_wgt_new(int np, int dim, double *x, double wgt);
 pedge pedge_double(pedge e);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/lib/mingle/ink.h b/lib/mingle/ink.h
index 1cbba4843..2f8c2ba85 100644
--- a/lib/mingle/ink.h
+++ b/lib/mingle/ink.h
@@ -12,10 +12,6 @@
 
 #include <mingle/edge_bundling.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct {
   double x, y;
 } point_t;
@@ -36,7 +32,3 @@ double ink(pedge* edges, int numEdges, int *pick, double *ink0, point_t *meet1,
 double ink1(pedge e);
 
 extern double ink_count;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/lib/mingle/nearest_neighbor_graph.h b/lib/mingle/nearest_neighbor_graph.h
index e4fad4a5b..6d26cb76d 100644
--- a/lib/mingle/nearest_neighbor_graph.h
+++ b/lib/mingle/nearest_neighbor_graph.h
@@ -10,12 +10,4 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 SparseMatrix nearest_neighbor_graph(int nPts, int num_neigbors, double *x, double eps);
-
-#ifdef __cplusplus
-}
-#endif