aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2014-08-11 00:31:13 +0000
committerIngo Schwarze <schwarze@openbsd.org>2014-08-11 00:31:13 +0000
commitefdbf640ebc1b89f89b24d81cf52c7f5b377531b (patch)
tree19cf5317877882b5562089fbf9baf9849daf252b
parentf3881965f856f945f65bdba14a964b3bc143e2da (diff)
downloadmandoc-efdbf640ebc1b89f89b24d81cf52c7f5b377531b.tar.gz
mandoc-efdbf640ebc1b89f89b24d81cf52c7f5b377531b.tar.zst
mandoc-efdbf640ebc1b89f89b24d81cf52c7f5b377531b.zip
Get rid of HAVE_CONFIG_H, it is always defined; idea from libnbcompat.
Include <sys/types.h> where needed, it does not belong in config.h.
-rw-r--r--Makefile6
-rw-r--r--apropos.c6
-rw-r--r--apropos_db.c5
-rw-r--r--mandocdb.c4
4 files changed, 9 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index d69eaa58..8073ffe2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.395.2.26 2014/08/05 11:19:46 schwarze Exp $
+# $Id: Makefile,v 1.395.2.27 2014/08/11 00:31:13 schwarze Exp $
#
# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
# Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -34,8 +34,8 @@ VERSION = 1.12.4
#
CFLAGS += -DUSE_WCHAR
-CFLAGS += -g -DHAVE_CONFIG_H
-CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+CFLAGS += -g -W -Wall -Wstrict-prototypes
+CFLAGS += -Wno-unused-parameter -Wwrite-strings
PREFIX = /usr/local
BINDIR = $(PREFIX)/bin
INCLUDEDIR = $(PREFIX)/include/mandoc
diff --git a/apropos.c b/apropos.c
index f5d1425f..26adeb49 100644
--- a/apropos.c
+++ b/apropos.c
@@ -1,4 +1,4 @@
-/* $Id: apropos.c,v 1.27.2.1 2013/09/17 23:23:10 schwarze Exp $ */
+/* $Id: apropos.c,v 1.27.2.2 2014/08/11 00:31:13 schwarze Exp $ */
/*
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,10 +15,10 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
+
#include <sys/param.h>
+#include <sys/types.h>
#include <assert.h>
#include <getopt.h>
diff --git a/apropos_db.c b/apropos_db.c
index 2eee2091..125d0aa0 100644
--- a/apropos_db.c
+++ b/apropos_db.c
@@ -1,4 +1,4 @@
-/* $Id: apropos_db.c,v 1.32.2.6 2014/04/23 21:31:38 schwarze Exp $ */
+/* $Id: apropos_db.c,v 1.32.2.7 2014/08/11 00:31:13 schwarze Exp $ */
/*
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,11 +15,10 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <sys/param.h>
+#include <sys/types.h>
#include <assert.h>
#include <fcntl.h>
diff --git a/mandocdb.c b/mandocdb.c
index 99a300d8..27047d14 100644
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/* $Id: mandocdb.c,v 1.49.2.16 2014/04/23 21:31:38 schwarze Exp $ */
+/* $Id: mandocdb.c,v 1.49.2.17 2014/08/11 00:31:13 schwarze Exp $ */
/*
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,9 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <sys/types.h>