cpp: Use #pragma once instead of #ifndef guards

This both says what we mean and silences a bunch of spurious CPP linting
warnings. This pragma is supported by all CPP implementations which we
support.

Reviewers: austin, erikd, simonmar, hvr

Reviewed By: simonmar

Subscribers: rwbarton, thomie

Differential Revision: https://phabricator.haskell.org/D3482

19 files changed, 19 insertions, 76 deletions

diff --git a/utils/hp2ps/AreaBelow.h b/utils/hp2ps/AreaBelow.h
index d7f713f2b4..05333f389f 100644
--- a/utils/hp2ps/AreaBelow.h
+++ b/utils/hp2ps/AreaBelow.h
@@ -1,6 +1,3 @@
-#ifndef AREA_BELOW_H
-#define AREA_BELOW_H
+#pragma once
 
 floatish AreaBelow PROTO((void));
-
-#endif /* AREA_BELOW_H */
diff --git a/utils/hp2ps/AuxFile.h b/utils/hp2ps/AuxFile.h
index 6e962c492e..68ba367a75 100644
--- a/utils/hp2ps/AuxFile.h
+++ b/utils/hp2ps/AuxFile.h
@@ -1,7 +1,4 @@
-#ifndef AUX_FILE_H
-#define AUX_FILE_H
+#pragma once
 
 void PutAuxFile PROTO((FILE *));
 void GetAuxFile PROTO((FILE *));
-
-#endif /* AUX_FILE_H */
diff --git a/utils/hp2ps/Axes.h b/utils/hp2ps/Axes.h
index e4be505dfb..930c072655 100644
--- a/utils/hp2ps/Axes.h
+++ b/utils/hp2ps/Axes.h
@@ -1,6 +1,3 @@
-#ifndef AXES_H
-#define AXES_H
+#pragma once
 
 void Axes PROTO((void));
-
-#endif /* AXES_H */
diff --git a/utils/hp2ps/Curves.h b/utils/hp2ps/Curves.h
index 0aa397f42c..b3409877b0 100644
--- a/utils/hp2ps/Curves.h
+++ b/utils/hp2ps/Curves.h
@@ -1,10 +1,7 @@
-#ifndef CURVES_H
-#define CURVES_H
+#pragma once
 
 void Curves PROTO((void));
 void CurvesInit PROTO((void));
 
 floatish xpage PROTO((floatish));
 floatish ypage PROTO((floatish));
-
-#endif /* CURVES_H */
diff --git a/utils/hp2ps/Defines.h b/utils/hp2ps/Defines.h
index ae620f4183..8b4dd3b06c 100644
--- a/utils/hp2ps/Defines.h
+++ b/utils/hp2ps/Defines.h
@@ -1,5 +1,4 @@
-#ifndef DEFINES_H
-#define DEFINES_H
+#pragma once
 
 /* 
  * Things that can be altered.
@@ -57,5 +56,3 @@ extern int _twenty_;
 #define VERSION			"0.25"		/* as of 95/03/21	 */
 
 #define max(x,y) ((x) > (y) ? (x) : (y))	/* not everyone has this */
-
-#endif /* DEFINES_H */
diff --git a/utils/hp2ps/Deviation.h b/utils/hp2ps/Deviation.h
index 14e4df1ad0..3d97d3cee1 100644
--- a/utils/hp2ps/Deviation.h
+++ b/utils/hp2ps/Deviation.h
@@ -1,7 +1,4 @@
-#ifndef DEVIATION_H
-#define DEVIATION_H
+#pragma once
 
 void Deviation  PROTO((void));
 void Identorder PROTO((int));
-
-#endif /* DEVIATION_H */
diff --git a/utils/hp2ps/Dimensions.h b/utils/hp2ps/Dimensions.h
index 7bcc05beee..50c2a42b0f 100644
--- a/utils/hp2ps/Dimensions.h
+++ b/utils/hp2ps/Dimensions.h
@@ -1,5 +1,4 @@
-#ifndef DIMENSIONS_H
-#define DIMENSIONS_H
+#pragma once
 
 extern floatish borderheight; 
 extern floatish borderwidth; 
@@ -18,5 +17,3 @@ extern floatish graphwidth;
 
 void     Dimensions PROTO((void));
 floatish StringSize PROTO((char *));
-
-#endif /* DIMENSIONS_H */
diff --git a/utils/hp2ps/Error.h b/utils/hp2ps/Error.h
index c1cdede415..94d5c2d4c9 100644
--- a/utils/hp2ps/Error.h
+++ b/utils/hp2ps/Error.h
@@ -1,8 +1,5 @@
-#ifndef ERROR_H
-#define ERROR_H
+#pragma once
 
 extern void Error    PROTO((const char *, ...));
 extern void Disaster PROTO((const char *, ...));
 extern void Usage    PROTO((const char *));
-
-#endif /* ERROR_H */
diff --git a/utils/hp2ps/HpFile.h b/utils/hp2ps/HpFile.h
index 6e01d1edca..ff5a91632a 100644
--- a/utils/hp2ps/HpFile.h
+++ b/utils/hp2ps/HpFile.h
@@ -1,5 +1,4 @@
-#ifndef HP_FILE_H
-#define HP_FILE_H
+#pragma once
 
 typedef enum {
         /* These tokens are found in ".hp" files */ 
@@ -71,5 +70,3 @@ extern char *datestring;
  
 extern char *sampleunitstring;
 extern char *valueunitstring;
-
-#endif /* HP_FILE_H */
diff --git a/utils/hp2ps/Key.h b/utils/hp2ps/Key.h
index d2a7b8eae3..3773220da5 100644
--- a/utils/hp2ps/Key.h
+++ b/utils/hp2ps/Key.h
@@ -1,6 +1,3 @@
-#ifndef KEY_H
-#define KEY_H
+#pragma once
 
 void Key PROTO((void));
-
-#endif /* KEY_H */
diff --git a/utils/hp2ps/Main.h b/utils/hp2ps/Main.h
index 7a8626b375..b023d42656 100644
--- a/utils/hp2ps/Main.h
+++ b/utils/hp2ps/Main.h
@@ -1,5 +1,4 @@
-#ifndef MAIN_H
-#define MAIN_H
+#pragma once
 
 #include "ghcconfig.h"
 #include <stdio.h>
@@ -71,5 +70,3 @@ extern char *auxfile;
 
 extern FILE *hpfp;
 extern FILE *psfp;
-
-#endif /* MAIN_H */
diff --git a/utils/hp2ps/Marks.h b/utils/hp2ps/Marks.h
index 41956f6e83..fe536e809f 100644
--- a/utils/hp2ps/Marks.h
+++ b/utils/hp2ps/Marks.h
@@ -1,6 +1,3 @@
-#ifndef MARKS_H
-#define MARKS_H
+#pragma once
 
 void Marks PROTO((void));
-
-#endif /* MARKS_H */
diff --git a/utils/hp2ps/PsFile.h b/utils/hp2ps/PsFile.h
index 07d3ed2859..4f04297a57 100644
--- a/utils/hp2ps/PsFile.h
+++ b/utils/hp2ps/PsFile.h
@@ -1,7 +1,4 @@
-#ifndef PS_FILE_H
-#define PS_FILE_H
+#pragma once
 
 void PutPsFile PROTO((void));
 void NextPage PROTO((void)); // for Key.c
-
-#endif /* PS_FILE_H */
diff --git a/utils/hp2ps/Reorder.h b/utils/hp2ps/Reorder.h
index ec3ec98b0a..89457596d5 100644
--- a/utils/hp2ps/Reorder.h
+++ b/utils/hp2ps/Reorder.h
@@ -1,7 +1,4 @@
-#ifndef REORDER_H
-#define REORDER_H
+#pragma once
 
 void Reorder  PROTO((void));
 void OrderFor PROTO((char *, int));
-
-#endif /* REORDER_H */
diff --git a/utils/hp2ps/Scale.h b/utils/hp2ps/Scale.h
index 0c19d6c3c0..da28a33133 100644
--- a/utils/hp2ps/Scale.h
+++ b/utils/hp2ps/Scale.h
@@ -1,7 +1,4 @@
-#ifndef SCALE_H
-#define SCALE_H
+#pragma once
 
 floatish MaxCombinedHeight PROTO((void));
 void     Scale PROTO((void));
-
-#endif /* SCALE_H */
diff --git a/utils/hp2ps/Shade.h b/utils/hp2ps/Shade.h
index 0e49c90d04..20738fbaf2 100644
--- a/utils/hp2ps/Shade.h
+++ b/utils/hp2ps/Shade.h
@@ -1,8 +1,5 @@
-#ifndef SHADE_H
-#define SHADE_H
+#pragma once
 
 floatish ShadeOf  PROTO((char *));
 void     ShadeFor PROTO((char *, floatish));
 void     SetPSColour PROTO((floatish));
-
-#endif /* SHADE_H */
diff --git a/utils/hp2ps/TopTwenty.h b/utils/hp2ps/TopTwenty.h
index 53a7aed509..4e6d01c958 100644
--- a/utils/hp2ps/TopTwenty.h
+++ b/utils/hp2ps/TopTwenty.h
@@ -1,6 +1,3 @@
-#ifndef TOP_TWENTY_H
-#define TOP_TWENTY_H
+#pragma once
 
 void TopTwenty PROTO((void));
-
-#endif /* TOP_TWENTY_H */
diff --git a/utils/hp2ps/TraceElement.h b/utils/hp2ps/TraceElement.h
index d843392a23..92ab117f4c 100644
--- a/utils/hp2ps/TraceElement.h
+++ b/utils/hp2ps/TraceElement.h
@@ -1,6 +1,3 @@
-#ifndef TRACE_ELEMENT_H
-#define TRACE_ELEMENT_H
+#pragma once
 
 void TraceElement PROTO((void));
-
-#endif /* TRACE_ELEMENT_H */
diff --git a/utils/hp2ps/Utilities.h b/utils/hp2ps/Utilities.h
index 10776d9613..d6e1efccba 100644
--- a/utils/hp2ps/Utilities.h
+++ b/utils/hp2ps/Utilities.h
@@ -1,5 +1,4 @@
-#ifndef UTILITIES_H
-#define UTILITIES_H
+#pragma once
 
 char* Basename    PROTO((char *));
 void  DropSuffix  PROTO((char *, char *));
@@ -9,5 +8,3 @@ char *copystring  PROTO((char *));
 char *copystring2 PROTO((char *, char *));
 void *xmalloc	 PROTO((size_t));
 void *xrealloc	 PROTO((void *, size_t));
-
-#endif /* UTILITIES_H */