Easier integration into FreeBSD (sys/types.h, time.h, etc.).VERSION.1.4.5

9 files changed, 19 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index ccd831df..1c05490c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .SUFFIXES:	.html .sgml
 
-VERSION	= 1.4.4
+VERSION	= 1.4.5
 VDATE	= 9 March 2009
 
 BINDIR		= $(PREFIX)/bin
@@ -13,9 +13,12 @@ INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-CPPFLAGS = -DVERSION=\"$(VERSION)\"
+VFLAGS  = -DVERSION=\"$(VERSION)\"
 CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g 
 
+LINTFLAGS += $(VFLAGS)
+CFLAGS    += $(VFLAGS)
+
 LIBLNS	= macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
 	  validate.ln action.ln lib.ln att.ln arch.ln vol.ln \
 	  msec.ln st.ln
diff --git a/action.c b/action.c
index 686f8159..88c86b44 100644
--- a/action.c
+++ b/action.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 
 #include "private.h"
 
diff --git a/argv.c b/argv.c
index 1756a3ea..c34a53d9 100644
--- a/argv.c
+++ b/argv.c
@@ -16,6 +16,8 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
diff --git a/macro.c b/macro.c
index ba29e9dd..0e7598f3 100644
--- a/macro.c
+++ b/macro.c
@@ -21,9 +21,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef	__linux__
-#include <time.h>
-#endif
+
+#include "private.h"
 
 /*
  * This has scanning/parsing routines, each of which extract a macro and
@@ -31,8 +30,6 @@
  * macro. 
  */
 
-#include "private.h"
-
 static int	  macro_obsolete(MACRO_PROT_ARGS);
 static int	  macro_constant(MACRO_PROT_ARGS);
 static int	  macro_constant_scoped(MACRO_PROT_ARGS);
diff --git a/mdoc.h b/mdoc.h
index ad2edf85..63db32d3 100644
--- a/mdoc.h
+++ b/mdoc.h
@@ -19,6 +19,8 @@
 #ifndef MDOC_H
 #define MDOC_H
 
+#include <time.h>
+
 /*
  * This library implements a validating scanner/parser for ``mdoc'' roff
  * macro documents, a.k.a. BSD manual page documents.  The mdoc.c file
diff --git a/mdocterm.c b/mdocterm.c
index a419880b..71f119e0 100644
--- a/mdocterm.c
+++ b/mdocterm.c
@@ -16,6 +16,8 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
@@ -23,9 +25,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifndef __OpenBSD__
-#include <time.h>
-#endif
 
 #include "mmain.h"
 #include "term.h"
diff --git a/strings.c b/strings.c
index d9eedb33..e212cf26 100644
--- a/strings.c
+++ b/strings.c
@@ -16,14 +16,13 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#ifndef __OpenBSD__
-#include <time.h>
-#endif
 
 #include "private.h"
 
diff --git a/term.c b/term.c
index 9baf5079..94f1423c 100644
--- a/term.c
+++ b/term.c
@@ -16,6 +16,8 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
diff --git a/validate.c b/validate.c
index 754997f1..d859299c 100644
--- a/validate.c
+++ b/validate.c
@@ -16,6 +16,8 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>