summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2017-06-20 18:56:53 +0000
committerTom Lane2017-06-20 18:56:53 +0000
commitc8cfba85a9e3c2920d987ce6103ccc22b2554e71 (patch)
tree245a716df625394d0548c5977310df1b147351da
parentf0ae5a2d8343891a3c64dbbafbc63edcdc3d05e6 (diff)
Adjust #include's to build in Postgres rather than FreeBSD environment.
Remove '#include <sys/cdefs.h>', which will fail in many non-BSD environments, as well as the __FBSDID() FreeBSD-ism. Replace them with '#include "c.h"', which will allow use of the Postgres project's portability infrastructure. This is intended to be a permanent diff between the FreeBSD upstream files and our copy.
-rw-r--r--args.c3
-rw-r--r--indent.c3
-rw-r--r--io.c3
-rw-r--r--lexi.c4
-rw-r--r--parse.c3
-rw-r--r--pr_comment.c3
6 files changed, 7 insertions, 12 deletions
diff --git a/args.c b/args.c
index 6c8cf9e..73d8121 100644
--- a/args.c
+++ b/args.c
@@ -39,8 +39,7 @@ static char sccsid[] = "@(#)args.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/usr.bin/indent/args.c 304650 2016-08-23 01:40:45Z pfg $");
+#include "c.h"
/*
* Argument scanning and profile reading code. Default parameters are set
diff --git a/indent.c b/indent.c
index dba9026..d01d722 100644
--- a/indent.c
+++ b/indent.c
@@ -39,8 +39,7 @@ static char sccsid[] = "@(#)indent.c 5.17 (Berkeley) 6/7/93";
#endif /* not lint */
#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 309380 2016-12-02 01:25:51Z pfg $");
+#include "c.h"
#include <sys/param.h>
#include <err.h>
diff --git a/io.c b/io.c
index d9af767..0792df0 100644
--- a/io.c
+++ b/io.c
@@ -39,8 +39,7 @@ static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/usr.bin/indent/io.c 309418 2016-12-02 16:41:08Z pfg $");
+#include "c.h"
#include <ctype.h>
#include <err.h>
diff --git a/lexi.c b/lexi.c
index b67a4b5..3c7bfef 100644
--- a/lexi.c
+++ b/lexi.c
@@ -38,8 +38,8 @@
static char sccsid[] = "@(#)lexi.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/usr.bin/indent/lexi.c 309382 2016-12-02 01:52:32Z pfg $");
+
+#include "c.h"
/*
* Here we have the token scanner for indent. It scans off one token and puts
diff --git a/parse.c b/parse.c
index e95d8d8..a51eb8b 100644
--- a/parse.c
+++ b/parse.c
@@ -39,8 +39,7 @@ static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/usr.bin/indent/parse.c 309419 2016-12-02 16:42:45Z pfg $");
+#include "c.h"
#include <err.h>
#include <stdio.h>
diff --git a/pr_comment.c b/pr_comment.c
index bb57135..b0eacac 100644
--- a/pr_comment.c
+++ b/pr_comment.c
@@ -39,8 +39,7 @@ static char sccsid[] = "@(#)pr_comment.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/usr.bin/indent/pr_comment.c 309343 2016-12-01 01:56:34Z pfg $");
+#include "c.h"
#include <err.h>
#include <stdio.h>