lib/gvpr: replace header guards with more modern #pragma once

diff --git a/lib/gvpr/actions.h b/lib/gvpr/actions.h
index 8273b4a69fff5d411ad965e9700b5ab0f3739b47..ab2123e84493a590a07f45e31004a977827b9332 100644 (file)
--- a/lib/gvpr/actions.h
+++ b/lib/gvpr/actions.h
@@ -8,13 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef ACTIONS_H
-#define ACTIONS_H
-
 #include "cgraph.h"
 #include <expr/expr.h>
 
@@ -50,8 +49,6 @@ extern "C" {
     extern void gvstart_timer(void);
     extern double gvelapsed_sec(void);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/gvpr/compile.h b/lib/gvpr/compile.h
index a4a1bfcd2c851e8a1050547e634004125342c2b8..36412f97c7907a5f1f4f5c84fae1f8d2ed85b849 100644 (file)
--- a/lib/gvpr/compile.h
+++ b/lib/gvpr/compile.h
@@ -8,13 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef COMPILE_H
-#define COMPILE_H
-
 #include <sfio/sfio.h>
 #include <parse.h>
 #include <gprstate.h>
@@ -92,8 +91,6 @@ extern "C" {
     extern Agnode_t *openNode(Agraph_t * g, char *name);
     extern Agedge_t *openEdge(Agraph_t* g, Agnode_t * t, Agnode_t * h, char *key);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/gvpr/gprstate.h b/lib/gvpr/gprstate.h
index 5e808ca05311f1b4826c57ea65275cc37dea3fc7..d9fb051f2475249dbb147934ee5434fc2bcdd3f2 100644 (file)
--- a/lib/gvpr/gprstate.h
+++ b/lib/gvpr/gprstate.h
@@ -8,13 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef GPRSTATE_H
-#define GPRSTATE_H
-
 #include <sfio/sfio.h>
 #include "cgraph.h"
 #include <ast/ast.h>
@@ -79,8 +78,6 @@ extern "C" {
     extern void initGPRState(Gpr_t *, Vmalloc_t *);
     extern int validTVT(int);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/gvpr/gvpr.h b/lib/gvpr/gvpr.h
index 922016b4d641b0965fc38c31a5d6e617520669c1..816ffe4120da768d3c155107cb6ca7befae9dd15 100644 (file)
--- a/lib/gvpr/gvpr.h
+++ b/lib/gvpr/gvpr.h
@@ -8,13 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef GVPR_H
-#define GVPR_H
-
 #ifdef _WIN32
 #   ifdef GVDLL
 #       ifdef EXPORT_GVPR
@@ -67,8 +66,6 @@ typedef struct {
 
 GVPR_API extern int gvpr (int argc, char *argv[], gvpropts* opts);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/gvpr/parse.h b/lib/gvpr/parse.h
index 6a2827cb8567dd6493e0b5002947bb4d756cc89c..c2d19e4516c77c24a070177244acfd5b7dd4d712 100644 (file)
--- a/lib/gvpr/parse.h
+++ b/lib/gvpr/parse.h
@@ -8,13 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef PARSE_H
-#define PARSE_H
-
     typedef enum { Begin =
            0, End, BeginG, EndG, Node, Edge, Eof, Error } case_t;
 
@@ -49,8 +48,6 @@ extern "C" {
     extern parse_prog *parseProg(char *, int);
     extern void freeParseProg (parse_prog *);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/gvpr/queue.h b/lib/gvpr/queue.h
index e097ffa1b6980502467850f76f9168db801a8d90..506aa1aeef06a7b0e156e37965d8c294ee4e6fff 100644 (file)
--- a/lib/gvpr/queue.h
+++ b/lib/gvpr/queue.h
@@ -8,13 +8,12 @@
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
 
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef QUEUE_H
-#define QUEUE_H
-
 #include "cgraph.h"
 
     typedef Dt_t queue;
@@ -36,8 +35,6 @@ extern void* head(queue*);
 #define pull(q)  (pop(q,1))
 #define head(q)  (pop(q,0))
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif