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/jpeg2000/libjasper/base/jas_stream.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/jpeg2000/libjasper/base/jas_stream.c')
| -rw-r--r-- | converter/other/jpeg2000/libjasper/base/jas_stream.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/converter/other/jpeg2000/libjasper/base/jas_stream.c b/converter/other/jpeg2000/libjasper/base/jas_stream.c index 7af161d2..7c6050fb 100644 --- a/converter/other/jpeg2000/libjasper/base/jas_stream.c +++ b/converter/other/jpeg2000/libjasper/base/jas_stream.c @@ -117,6 +117,7 @@ */ #define _XOPEN_SOURCE 500 /* Make sure P_tmpdir is defined */ +#include "pm_config.h" #include <assert.h> #include <fcntl.h> #include <stdlib.h> @@ -126,7 +127,7 @@ #if defined(HAVE_UNISTD_H) #include <unistd.h> #endif -#if defined(WIN32) || defined(HAVE_IO_H) +#if MSVCRT #include <io.h> #endif @@ -440,7 +441,7 @@ jas_stream_t *jas_stream_fdopen(int fd, const char *mode) /* Parse the mode string. */ stream->openmode_ = jas_strtoopenmode(mode); -#if defined(WIN32) +#if defined(HAVE_SETMODE) && defined(O_BINARY) /* Argh!!! Someone ought to banish text mode (i.e., O_TEXT) to the greatest depths of purgatory! */ /* Ensure that the file descriptor is in binary mode, if the caller |