replace neatogen header guards with more modern #pragma once

diff --git a/lib/neatogen/adjust.h b/lib/neatogen/adjust.h
index 562414de10dd4d8af4fbe0c2683f734563a2dfe2..33daf3849b9ce824b8322922d535282ea3e17c2f 100644 (file)
--- a/lib/neatogen/adjust.h
+++ b/lib/neatogen/adjust.h
@@ -8,10 +8,7 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-
-
-#ifndef ADJUST_H
-#define ADJUST_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -57,4 +54,3 @@ typedef struct {
 #ifdef __cplusplus
 }
 #endif
-#endif

diff --git a/lib/neatogen/bfs.h b/lib/neatogen/bfs.h
index dc5590ea693d9c69b4f69cc09ca9190863b36521..60169e1799d544053d9ed4db581dcaa20b1a5a2c 100644 (file)
--- a/lib/neatogen/bfs.h
+++ b/lib/neatogen/bfs.h
@@ -8,13 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef _BFS_H_
-#define _BFS_H_
-
 #include <neatogen/defs.h>
 
     typedef struct {
@@ -34,8 +33,6 @@ extern "C" {
     extern int bfs_bounded(int, vtx_data *, int, DistType *, Queue *, int,
                           int *);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/call_tri.h b/lib/neatogen/call_tri.h
index 43d19f1edbc6cc58fc0c3e6269c41bb6c5cf4067..a87af2f14175fe513f10ccde49dd9fdd85f06cf2 100644 (file)
--- a/lib/neatogen/call_tri.h
+++ b/lib/neatogen/call_tri.h
@@ -8,11 +8,7 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#ifndef CALL_TRI_H
-#define CALL_TRI_H
+#pragma once
 
 SparseMatrix call_tri(int n, int dim, real * x);
 SparseMatrix call_tri2(int n, int dim, real * x);
-
-#endif
- 

diff --git a/lib/neatogen/closest.h b/lib/neatogen/closest.h
index 886abdb624e2d825e26cc0be33ddda7ccec5193f..83dc4c85e1189baaeaf834cc16f2296f510897be 100644 (file)
--- a/lib/neatogen/closest.h
+++ b/lib/neatogen/closest.h
@@ -8,21 +8,16 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-
-#ifndef CLOSEST_H
-#define CLOSEST_H
-
 #include <neatogen/defs.h>
 
     extern void closest_pairs2graph(double *, int, int, vtx_data **);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/conjgrad.h b/lib/neatogen/conjgrad.h
index c2327132b4682d05e040dd05e328a0a9ca4983c5..6c1e679aab34764631e87f9371ef1258e9c80409 100644 (file)
--- a/lib/neatogen/conjgrad.h
+++ b/lib/neatogen/conjgrad.h
@@ -8,15 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-
-#ifndef _CG_H_
-#define _CG_H_
-
 #include <neatogen/defs.h>
 
 /*************************
@@ -36,8 +33,6 @@ extern "C" {
     extern int conjugate_gradient_mkernel(float *, float *, float *, int,
                                           double, int);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/defs.h b/lib/neatogen/defs.h
index f49d96cc9347c995fcadeef19fc841f4416e7931..758cabde481058c5707756e0c2eb05586b62b3cf 100644 (file)
--- a/lib/neatogen/defs.h
+++ b/lib/neatogen/defs.h
@@ -8,13 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef _DEFS_H_
-#define _DEFS_H_
-
 #include <neatogen/neato.h>
 
 #include <neatogen/sparsegraph.h>
@@ -37,5 +36,3 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-
-#endif

diff --git a/lib/neatogen/delaunay.h b/lib/neatogen/delaunay.h
index cf3e34b9dc3740a7b6865c22a6a70bc562c0e410..54b4e4d1e28178d9a7562c2f91dadf34767c2a2a 100644 (file)
--- a/lib/neatogen/delaunay.h
+++ b/lib/neatogen/delaunay.h
@@ -8,8 +8,7 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#ifndef DELAUNAY_H
-#define DELAUNAY_H
+#pragma once
 
 #include <neatogen/sparsegraph.h>
 
@@ -32,5 +31,3 @@ v_data *UG_graph(double *x, double *y, int n, int accurate_computation);
 surface_t* mkSurface (double *x, double *y, int n, int* segs, int nsegs);
 
 void freeSurface (surface_t* s);
-
-#endif

diff --git a/lib/neatogen/digcola.h b/lib/neatogen/digcola.h
index cae37959681cc65d184f3f66b74021aa1ed1671b..0ed2f228e18ff84ecfbdf7f2effa6783a7e4adfd 100644 (file)
--- a/lib/neatogen/digcola.h
+++ b/lib/neatogen/digcola.h
@@ -8,13 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef DIGCOLA_H
-#define DIGCOLA_H
-
 #include <neatogen/defs.h>
 #ifdef DIGCOLA
 extern int compute_y_coords(vtx_data*, int, double*, int);
@@ -44,7 +43,6 @@ typedef struct ipsep_options {
 extern int stress_majorization_cola(vtx_data*, int, int, double**, node_t**, int, int, int, ipsep_options*);
 #endif
 #endif
-#endif
 
 #ifdef __cplusplus
 }

diff --git a/lib/neatogen/dijkstra.h b/lib/neatogen/dijkstra.h
index d4dd797786becd384b72520585c0fc37d98d9268..76fd1bb2313d8b86d155787bea872bd21719f4f6 100644 (file)
--- a/lib/neatogen/dijkstra.h
+++ b/lib/neatogen/dijkstra.h
@@ -8,15 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-
-#ifndef _DIJKSTRA_H_
-#define _DIJKSTRA_H_
-
 #include <neatogen/defs.h>
 #include <neatogen/sgd.h>
 
@@ -28,8 +25,6 @@ extern "C" {
                                int *);
     extern int dijkstra_sgd(graph_sgd *, int, term_sgd *);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/edges.h b/lib/neatogen/edges.h
index ddda3f77fcaec985785768ef3d980e2d11099965..ceb162407634876db607d0178374c27b30f32293 100644 (file)
--- a/lib/neatogen/edges.h
+++ b/lib/neatogen/edges.h
@@ -8,15 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-
-#ifndef EDGES_H
-#define EDGES_H
-
 #include <neatogen/site.h>
 
     typedef struct Edge {
@@ -35,8 +32,6 @@ extern "C" {
     extern void clip_line(Edge * e);
     extern Edge *gvbisect(Site *, Site *);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/embed_graph.h b/lib/neatogen/embed_graph.h
index e8a73d1e52005843945396eedb61825889507ff8..85e6276b42807cdd111706341ee014363a8227ee 100644 (file)
--- a/lib/neatogen/embed_graph.h
+++ b/lib/neatogen/embed_graph.h
@@ -8,23 +8,18 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-
-#ifndef EMBED_GRAPH_H_
-#define EMBED_GRAPH_H_
-
 #include <neatogen/defs.h>
 
     extern void embed_graph(vtx_data * graph, int n, int dim, DistType ***,
                            int);
     extern void center_coordinate(DistType **, int, int);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/geometry.h b/lib/neatogen/geometry.h
index 217fb1c7e0ad0f465f62471e984228cb45605380..010e23dd6cea0e9ebff984a1d20e580fe0b919bb 100644 (file)
--- a/lib/neatogen/geometry.h
+++ b/lib/neatogen/geometry.h
@@ -8,15 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-
-#ifndef GEOMETRY_H
-#define GEOMETRY_H
-
 #ifdef HAVE_POINTF_S
     typedef pointf Point;
 #else
@@ -41,9 +38,6 @@ extern "C" {
     extern int leftOf(Point a, Point b, Point c);
     extern int intersection(Point a, Point b, Point c, Point d, Point * p);
 
-#endif
-
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/heap.h b/lib/neatogen/heap.h
index c3d4055c845a74a913bf446cdd72f101e8beb219..adac235d1c576bfa53e3b5955c7b226e1fd3f647 100644 (file)
--- a/lib/neatogen/heap.h
+++ b/lib/neatogen/heap.h
@@ -8,15 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-
-#ifndef HEAP_H
-#define HEAP_H
-
 #include <neatogen/hedges.h>
 
     extern void PQinitialize(void);
@@ -27,8 +24,6 @@ extern "C" {
     extern void PQdelete(Halfedge *);
     extern void PQinsert(Halfedge *, Site *, double);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/hedges.h b/lib/neatogen/hedges.h
index 5c28d84e7e566b693b1f2d58f4296664bc9ac1f1..273db68925459fdb53180895ec531abb8046d1d8 100644 (file)
--- a/lib/neatogen/hedges.h
+++ b/lib/neatogen/hedges.h
@@ -8,15 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-
-#ifndef HEDGES_H
-#define HEDGES_H
-
 #include <neatogen/site.h>
 #include <neatogen/edges.h>
 
@@ -44,8 +41,6 @@ extern "C" {
     extern Halfedge *ELleftbnd(Point *);
     extern Site *leftreg(Halfedge *), *rightreg(Halfedge *);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/info.h b/lib/neatogen/info.h
index d926fc6ea30680f7e8505463f90a8f0ccb86b6f0..0f7d9e2d9c306e5118753b0910c7405fecb53318 100644 (file)
--- a/lib/neatogen/info.h
+++ b/lib/neatogen/info.h
@@ -8,14 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-#ifndef INFO_H
-#define INFO_H
-
 #include <neatogen/voronoi.h>
 #include <neatogen/poly.h>
 
@@ -38,7 +36,6 @@ extern "C" {
     extern void infoinit(void);
     /* Insert vertex into sorted list */
     extern void addVertex(Site *, double, double);
-#endif
 
 #ifdef __cplusplus
 }

diff --git a/lib/neatogen/kkutils.h b/lib/neatogen/kkutils.h
index 9f64257d23499db881b2b76086dde9be856392e6..1dbda480766af91d9c701c5f29d7c3f3d25d3074 100644 (file)
--- a/lib/neatogen/kkutils.h
+++ b/lib/neatogen/kkutils.h
@@ -8,15 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-
-#ifndef KKUTILS_H_
-#define KKUTILS_H_
-
 #include <neatogen/defs.h>
 
     extern void fill_neighbors_vec_unweighted(vtx_data *, int vtx,
@@ -33,8 +30,6 @@ extern "C" {
     extern void restore_old_weights(vtx_data * graph, int n,
                                    float *old_weights);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/matrix_ops.h b/lib/neatogen/matrix_ops.h
index b566d14c941217155985ad2405984fd9c3100a18..cb9832186fafb135f622c74ef9715b92a501157c 100644 (file)
--- a/lib/neatogen/matrix_ops.h
+++ b/lib/neatogen/matrix_ops.h
@@ -8,15 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-
-#ifndef _MATRIX_OPS_H_
-#define _MATRIX_OPS_H_
-
 #include <neatogen/sparsegraph.h>
 
     extern void cpvec(double *, int, int, double *);
@@ -79,7 +76,6 @@ extern "C" {
     extern void sqrt_vec(int n, float *vec);
     extern void sqrt_vecf(int n, float *source, float *target);
     extern void invert_sqrt_vec(int n, float *vec);
-#endif
 
 #ifdef __cplusplus
 }

diff --git a/lib/neatogen/mem.h b/lib/neatogen/mem.h
index 3a2fb4b30f710e6d81df3d4212811614a05b1c0c..c4ad8d55d6b1fef57c39de9a51c24ae7c03de95b 100644 (file)
--- a/lib/neatogen/mem.h
+++ b/lib/neatogen/mem.h
@@ -8,15 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-
-#ifndef MEMORY_H
-#define MEMORY_H
-
 #include <stddef.h>
 
     /* Support for freelists */
@@ -31,9 +28,6 @@ extern "C" {
     extern void freeinit(Freelist *, int);
     extern void makefree(void *, Freelist *);
 
-#endif
-
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/mosek_quad_solve.h b/lib/neatogen/mosek_quad_solve.h
index 8c04da81466bfbc564ea8fca7311fa4cb7634c9b..86e3441ad4499a81dd3d12e081a19d1c2fadd728 100644 (file)
--- a/lib/neatogen/mosek_quad_solve.h
+++ b/lib/neatogen/mosek_quad_solve.h
@@ -14,9 +14,9 @@
  * Adaptagrams repository.
  */
 
+#pragma once
+
 #ifdef MOSEK
-#ifndef _QSOLVE_H_
-#define _QSOLVE_H_
 
 #include <mosek.h> /* Include the MOSEK definition file. */
 #include "types.h"
@@ -38,6 +38,4 @@ MosekEnv* mosek_init_sep(float* lap, int nv, int ndv, Constraint** cs, int m);
 void mosek_quad_solve_sep(MosekEnv*,int n,float *b,float* coords);
 void mosek_delete(MosekEnv*);
 
-
-#endif /* _QSOLVE_H_ */
 #endif /* MOSEK */

diff --git a/lib/neatogen/multispline.h b/lib/neatogen/multispline.h
index 50255391af3e23022a78233d7fd42009949c96ed..ec32fdbca9726dc249c39005b5347563f06b3163 100644 (file)
--- a/lib/neatogen/multispline.h
+++ b/lib/neatogen/multispline.h
@@ -8,8 +8,7 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#ifndef MULTISPLINE_H
-#define MULTISPLINE_H
+#pragma once
 
 #include <render.h>
 #include <pathutil.h>
@@ -19,5 +18,3 @@ typedef struct router_s router_t;
 extern void freeRouter (router_t* rtr);
 extern router_t* mkRouter (Ppoly_t** obs, int npoly);
 extern int makeMultiSpline(graph_t* g, edge_t* e, router_t * rtr, int);
-
-#endif

diff --git a/lib/neatogen/neato.h b/lib/neatogen/neato.h
index e46b12ba19e0178b66fa2fb39cf931813eba67be..909ca01651772e0f4aee0c8eda12d20e9e061a99 100644 (file)
--- a/lib/neatogen/neato.h
+++ b/lib/neatogen/neato.h
@@ -8,9 +8,7 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-
-#ifndef         NEATO_H
-#define         NEATO_H
+#pragma once
 
 #include "config.h"
 
@@ -34,5 +32,3 @@
 #include       "pathplan.h"
 #include       <neatogen/neatoprocs.h>
 #include       <neatogen/adjust.h>
-
-#endif                         /* NEATO_H */

diff --git a/lib/neatogen/neatoprocs.h b/lib/neatogen/neatoprocs.h
index 7541c7f39e3fd45dde4db25f376f4e51ceb47c5a..51ea9532b74eef19e199ec56a9bcb252906e3bc9 100644 (file)
--- a/lib/neatogen/neatoprocs.h
+++ b/lib/neatogen/neatoprocs.h
@@ -8,8 +8,7 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#ifndef NEATOPROCS_H
-#define NEATOPROCS_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -72,4 +71,3 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif

diff --git a/lib/neatogen/overlap.h b/lib/neatogen/overlap.h
index fec6c6dedab04e31ef65f353aa1cfed507b083c2..13e03c37abe63de40e4908b1daa8b8a1e1ba0e8d 100644 (file)
--- a/lib/neatogen/overlap.h
+++ b/lib/neatogen/overlap.h
@@ -8,8 +8,7 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
-#ifndef OVERLAP_H
-#define OVERLAP_H
+#pragma once
 
 #include <sfdpgen/post_process.h>
 
@@ -52,4 +51,3 @@ real OverlapSmoother_smooth(OverlapSmoother sm, int dim, real *x);
 void remove_overlap(int dim, SparseMatrix A, real *x, real *label_sizes, int ntry, real initial_scaling, 
                    int edge_labeling_scheme, int n_constr_nodes, int *constr_nodes, SparseMatrix A_constr, int doShrink, int *flag);
 real overlap_scaling(int dim, int m, real *x, real *width, real scale_sta, real scale_sto, real epsilon, int maxiter);
-#endif

diff --git a/lib/neatogen/pca.h b/lib/neatogen/pca.h
index bc3c5b2b7468247b236322b9366580cf664b97cf..c13f3b3edef6e74cc7950fa30c4168df13bb9ffc 100644 (file)
--- a/lib/neatogen/pca.h
+++ b/lib/neatogen/pca.h
@@ -8,22 +8,17 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-
-#ifndef PCA_H
-#define PCA_H
-
 #include <neatogen/defs.h>
 
     extern void PCA_alloc(DistType **, int, int, double **, int);
     extern boolean iterativePCA_1D(double **, int, int, double *);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/poly.h b/lib/neatogen/poly.h
index 73c3e4edd807ec3e501c01bb74346d03f5b481cf..b401b7f451e5d16fd4687454619b33085ac45829 100644 (file)
--- a/lib/neatogen/poly.h
+++ b/lib/neatogen/poly.h
@@ -8,13 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef POLY_H
-#define POLY_H
-
 #include <neatogen/geometry.h>
 
     typedef struct {
@@ -31,8 +30,6 @@ extern "C" {
     extern int makeAddPoly(Poly *, Agnode_t *, float, float);
     extern void breakPoly(Poly *);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/quad_prog_solver.h b/lib/neatogen/quad_prog_solver.h
index 0ab89e0920499fc1285e32286903777eaa40546f..efe42f10b7e30c6b899b58b60e66183c9d423052 100644 (file)
--- a/lib/neatogen/quad_prog_solver.h
+++ b/lib/neatogen/quad_prog_solver.h
@@ -8,13 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef _CMAJ_H_
-#define _CMAJ_H_
-
 #ifdef DIGCOLA
 
 typedef struct {
@@ -53,8 +52,6 @@ extern float** unpackMatrix(float * packedMat, int n);
 
 #endif 
 
-#endif /* _CMAJ_H_ */
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/quad_prog_vpsc.h b/lib/neatogen/quad_prog_vpsc.h
index 9c5c321026c860c5974ee3a56c5e5a7aa96b050f..f9a57372de3173452a30d117862f0d9e8db56aa8 100644 (file)
--- a/lib/neatogen/quad_prog_vpsc.h
+++ b/lib/neatogen/quad_prog_vpsc.h
@@ -19,13 +19,12 @@
 *                                                         *
 **********************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef _QUAD_PROG_VPSC_H_
-#define _QUAD_PROG_VPSC_H_
-
 #ifdef DIGCOLA
 
 #include <neatogen/defs.h>
@@ -85,8 +84,6 @@ extern void print_digcola_levels(FILE* logfile, DigColaLevel *levels, int num_le
 int get_num_digcola_constraints(DigColaLevel *levels, int num_levels);
 #endif 
 
-#endif /* _QUAD_PROG_VPSC_H_ */
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/randomkit.h b/lib/neatogen/randomkit.h
index 899ab8233fad94f56bfd4114f92c89070c753d26..8d4373036193e45dda852c6cffc5f4b2ee9e4181 100644 (file)
--- a/lib/neatogen/randomkit.h
+++ b/lib/neatogen/randomkit.h
@@ -54,10 +54,9 @@
  *                 defaults to "/dev/urandom"
  */
 
-#include <stddef.h>
+#pragma once
 
-#ifndef _RANDOMKIT_
-#define _RANDOMKIT_
+#include <stddef.h>
 
 #define RK_STATE_LEN 624
 
@@ -144,5 +143,3 @@ extern double rk_double(rk_state *state);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* _RANDOMKIT_ */

diff --git a/lib/neatogen/sgd.h b/lib/neatogen/sgd.h
index fcad8d091aa1799706496cf18929d7e7db16eb44..feed10a3aa6c88cfc8b125b470d84f9ee339793e 100644 (file)
--- a/lib/neatogen/sgd.h
+++ b/lib/neatogen/sgd.h
@@ -1,10 +1,9 @@
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef SGD_H
-#define SGD_H
-
 typedef struct term_sgd {
     int i, j;
     float d, w;
@@ -21,8 +20,6 @@ typedef struct graph_sgd {
 
 extern void sgd(graph_t *, int);
 
-#endif /* SGD_H */
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/site.h b/lib/neatogen/site.h
index 75591723fb27c2fa6d7c386250a74ecb88e82bd2..7cad63e21d9f824368831f19a9148a672eb06092 100644 (file)
--- a/lib/neatogen/site.h
+++ b/lib/neatogen/site.h
@@ -8,15 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-
-#ifndef SITE_H
-#define SITE_H
-
 #include <neatogen/geometry.h>
 
     /* Sites are also used as vertices on line segments */
@@ -35,7 +32,6 @@ extern "C" {
     extern void deref(Site *); /* Increment refcnt of site  */
     extern void ref(Site *);   /* Decrement refcnt of site  */
     extern void makevertex(Site *);    /* Transform a site into a vertex */
-#endif
 
 #ifdef __cplusplus
 }

diff --git a/lib/neatogen/sparsegraph.h b/lib/neatogen/sparsegraph.h
index d7fc4ada6d3bc64859ddcdc2f887cafd4f7262c8..c463337e1be8386693d99f782b648520aa2813e3 100644 (file)
--- a/lib/neatogen/sparsegraph.h
+++ b/lib/neatogen/sparsegraph.h
@@ -8,13 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef SPARSEGRAPH_H
-#define SPARSEGRAPH_H
-
 #include "config.h"
 
 #ifdef USE_STYLES
@@ -44,8 +43,6 @@ extern "C" {
 extern void freeGraphData(vtx_data * graph);
 extern void freeGraph(v_data * graph);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/stress.h b/lib/neatogen/stress.h
index 41602b7b6ee6ee47f78629d96f72b79368c2bee6..3e1d85a357af200ecec3715a34ca7c4f928a1fe0 100644 (file)
--- a/lib/neatogen/stress.h
+++ b/lib/neatogen/stress.h
@@ -8,14 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-#ifndef STRESS_H
-#define STRESS_H
-
 #include <neatogen/defs.h>
 
 #define tolerance_cg 1e-3
@@ -59,8 +57,6 @@ extern float* circuitModel(vtx_data * graph, int nG);
 extern float* mdsModel (vtx_data * graph, int nG);
 extern int initLayout(vtx_data * graph, int n, int dim, double **coords, node_t** nodes);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/neatogen/voronoi.h b/lib/neatogen/voronoi.h
index f50c8a1ca3356bbb4dfd2307eb66942a6eb7ebad..7ee78456dbd34ae7be029126f0ce05c8e3a4ddd8 100644 (file)
--- a/lib/neatogen/voronoi.h
+++ b/lib/neatogen/voronoi.h
@@ -8,22 +8,16 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-
-#ifndef VORONOI_H
-#define VORONOI_H
-
 #include <neatogen/site.h>
 
     extern void voronoi(int, Site * (*)(void));
 
-#endif
-
-
 #ifdef __cplusplus
 }
 #endif