On Linux, wcwidth() needs _XOPEN_SOURCE, or just _GNU_SOURCE for simplicity.

[mandoc.git] / preconv.c

diff --git a/preconv.c b/preconv.c
index a0b2d6415e99ba4d2c648db8777ce8d133817f4e..1df18b89ec7e00482a1ca5638a836dd665e6e14f 100644 (file)
--- a/preconv.c
+++ b/preconv.c
@@ -1,4 +1,4 @@
-/*     $Id: preconv.c,v 1.5 2011/07/24 18:15:14 kristaps Exp $ */
+/*     $Id: preconv.c,v 1.8 2014/08/16 19:00:01 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -14,11 +14,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
 
-#ifdef HAVE_MMAP
+#include <sys/types.h>
+#if HAVE_MMAP
 #include <sys/stat.h>
 #include <sys/mman.h>
 #endif
@@ -32,13 +31,9 @@
 
 /* 
  * The read_whole_file() and resize_buf() functions are copied from
- * read.c, including all dependency code (MAP_FILE, etc.).
+ * read.c, including all dependency code.
  */
 
-#ifndef MAP_FILE
-#define        MAP_FILE        0
-#endif
-
 enum   enc {
        ENC_UTF_8, /* UTF-8 */
        ENC_US_ASCII, /* US-ASCII */
@@ -249,7 +244,7 @@ read_whole_file(const char *f, int fd,
        size_t           off;
        ssize_t          ssz;
 
-#ifdef HAVE_MMAP
+#if HAVE_MMAP
        struct stat      st;
        if (-1 == fstat(fd, &st)) {
                perror(f);
@@ -271,8 +266,7 @@ read_whole_file(const char *f, int fd,
        if (S_ISREG(st.st_mode)) {
                *with_mmap = 1;
                fb->sz = (size_t)st.st_size;
-               fb->buf = mmap(NULL, fb->sz, PROT_READ, 
-                               MAP_FILE|MAP_SHARED, fd, 0);
+               fb->buf = mmap(NULL, fb->sz, PROT_READ, MAP_SHARED, fd, 0);
                if (fb->buf != MAP_FAILED)
                        return(1);
        }
@@ -514,7 +508,7 @@ main(int argc, char *argv[])
 
        rc = EXIT_SUCCESS;
 out:
-#ifdef HAVE_MMAP
+#if HAVE_MMAP
        if (map)
                munmap(b.buf, b.sz);
        else