diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-02-13 00:11:02 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-02-13 00:11:02 +0000 |
| commit | 6a233b0f40bb4590fc70f3e24e49627ef504ce39 (patch) | |
| tree | 73dd8c8939b9dd9993238c823b02241a92f8cce5 | |
| parent | eae74c7acfa484868f5374f8f0ebff1eb39d1c61 (diff) | |
| download | netpbm-mirror-6a233b0f40bb4590fc70f3e24e49627ef504ce39.tar.gz netpbm-mirror-6a233b0f40bb4590fc70f3e24e49627ef504ce39.tar.xz netpbm-mirror-6a233b0f40bb4590fc70f3e24e49627ef504ce39.zip | |
Make it build on Windows with Mingw
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1645 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/other/Makefile | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 2 | ||||
| -rw-r--r-- | lib/libpm.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/converter/other/Makefile b/converter/other/Makefile index bdacee0f..e3ef6d6a 100644 --- a/converter/other/Makefile +++ b/converter/other/Makefile @@ -121,6 +121,7 @@ PORTBINARIES = avstopam bmptopnm fitstopnm \ ifneq ($(DONT_HAVE_PROCESS_MGMT),Y) PORTBINARIES += pstopnm + PORTBINARIES += pnmtops endif BINARIES = \ @@ -128,7 +129,6 @@ BINARIES = \ pamtopdbimg \ pamtosrf \ pdbimgtopam \ - pnmtops \ pnmtorast \ rasttopnm \ srftopam \ diff --git a/doc/HISTORY b/doc/HISTORY index 84c9344d..1bd37e7f 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -24,6 +24,8 @@ not yet BJH Release 10.58.00 Build: redo conditional compilation of Windows to use MSVCRT, based on _WIN32, instead of WIN32. + Build, Windows: various fixes. + Build: use Pkgconfig to find libxml2 if it works (fall back to xml2-config). diff --git a/lib/libpm.c b/lib/libpm.c index f6578a59..9534b53a 100644 --- a/lib/libpm.c +++ b/lib/libpm.c @@ -129,8 +129,8 @@ pm_fork(int * const iAmParentP, } } #else - asprintfN(errorP, "Cannot fork a process, because this system does " - "not have POSIX fork()"); + pm_asprintf(errorP, "Cannot fork a process, because this system does " + "not have POSIX fork()"); #endif } |