diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-02-12 20:44:37 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-02-12 20:44:37 +0000 |
commit | eae74c7acfa484868f5374f8f0ebff1eb39d1c61 (patch) | |
tree | b2ce4f2f26c00e5be74fd4c55a737ca7bed39da7 /converter/other/cameratopam/cameratopam.c | |
parent | 47e6714f1bb9be3587d5c76d5638887b595e6355 (diff) | |
download | netpbm-mirror-eae74c7acfa484868f5374f8f0ebff1eb39d1c61.tar.gz netpbm-mirror-eae74c7acfa484868f5374f8f0ebff1eb39d1c61.tar.xz netpbm-mirror-eae74c7acfa484868f5374f8f0ebff1eb39d1c61.zip |
redo conditional compilation of Windows stuff to use MSVCRT, based on _WIN32, instead of WIN32
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1644 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other/cameratopam/cameratopam.c')
-rw-r--r-- | converter/other/cameratopam/cameratopam.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/converter/other/cameratopam/cameratopam.c b/converter/other/cameratopam/cameratopam.c index 87bde3ce..aa9c49cd 100644 --- a/converter/other/cameratopam/cameratopam.c +++ b/converter/other/cameratopam/cameratopam.c @@ -10,6 +10,8 @@ #define _BSD_SOURCE 1 /* Make sure string.h contains strcasecmp() */ #define _XOPEN_SOURCE /* Make sure unistd.h contains swab() */ +#include "pm_config.h" + #include <ctype.h> #include <unistd.h> #include <errno.h> @@ -26,7 +28,7 @@ #ifdef __CYGWIN__ #include <io.h> #endif -#if !defined(WIN32) || defined(__CYGWIN__) +#if !MSVCRT #include <unistd.h> #endif @@ -207,7 +209,7 @@ static void CLASS bad_pixels() free (fname); if (errno != ERANGE) return; } -#ifdef WIN32 +#if MSVCRT if (fname[1] == ':') memmove (fname, fname+2, len-2); for (cp=fname; *cp; cp++) |