From bef83d35531f40d5d067db7ed21d4a719f615cdc Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Sat, 18 Feb 2017 17:33:24 +0000
Subject: merge revision 1.161: resolve trivial differences with OpenBSD

---
 read.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/read.c b/read.c
index f86054e5..bd083d33 100644
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*	$Id: read.c,v 1.150.2.7 2017/02/03 18:22:30 schwarze Exp $ */
+/*	$Id: read.c,v 1.150.2.8 2017/02/18 17:33:24 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -32,7 +32,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -605,13 +604,14 @@ static int
 read_whole_file(struct mparse *curp, const char *file, int fd,
 		struct buf *fb, int *with_mmap)
 {
+#if HAVE_MMAP
+	struct stat	 st;
+#endif
 	gzFile		 gz;
 	size_t		 off;
 	ssize_t		 ssz;
 
 #if HAVE_MMAP
-	struct stat	 st;
-
 	if (fstat(fd, &st) == -1)
 		err((int)MANDOCLEVEL_SYSERR, "%s", file);
 
-- 
cgit v1.2.3-56-ge451