diff options
author | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-07-24 18:15:13 +0000 |
---|---|---|
committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-07-24 18:15:13 +0000 |
commit | d5899efe4a68c00b14f7b4e40042b60c86db4898 (patch) | |
tree | 0d786dd7fe0966c21ec264b2b0d194081dd4df84 /preconv.c | |
parent | df50b5d64e0d28bd648ff97b998eced503c945fc (diff) | |
download | mandoc-d5899efe4a68c00b14f7b4e40042b60c86db4898.tar.gz mandoc-d5899efe4a68c00b14f7b4e40042b60c86db4898.tar.zst mandoc-d5899efe4a68c00b14f7b4e40042b60c86db4898.zip |
Scary-looking but otherwise harmless changes allow me to build for Windows.
That is to say, with mingw32. This amounts to the following:
(1) break compat.c into compat_strlcpy.c and compat_strlcat.c
(2) add compat_getsubopt.c (from OpenBSD) and test-getsubopt.c
(3) add test-strptime.c for HAVE_STRPTIME
(4) add ifdef bits here and there, where necessary
(5) remove some harmless unportable stuff (u_char, localtime_r)
I've added the appropriate mdocml.zip target to the Makefile, too.
Diffstat (limited to 'preconv.c')
-rw-r--r-- | preconv.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $Id: preconv.c,v 1.4 2011/05/26 21:13:07 kristaps Exp $ */ +/* $Id: preconv.c,v 1.5 2011/07/24 18:15:14 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -18,8 +18,10 @@ #include "config.h" #endif +#ifdef HAVE_MMAP #include <sys/stat.h> #include <sys/mman.h> +#endif #include <assert.h> #include <fcntl.h> @@ -244,10 +246,11 @@ static int read_whole_file(const char *f, int fd, struct buf *fb, int *with_mmap) { - struct stat st; size_t off; ssize_t ssz; +#ifdef HAVE_MMAP + struct stat st; if (-1 == fstat(fd, &st)) { perror(f); return(0); @@ -273,6 +276,7 @@ read_whole_file(const char *f, int fd, if (fb->buf != MAP_FAILED) return(1); } +#endif /* * If this isn't a regular file (like, say, stdin), then we must @@ -510,9 +514,11 @@ main(int argc, char *argv[]) rc = EXIT_SUCCESS; out: +#ifdef HAVE_MMAP if (map) munmap(b.buf, b.sz); else +#endif free(b.buf); if (fd > STDIN_FILENO) |