diff options
author | Olivier Paquet <olivier.paquet@gmail.com> | 2021-01-05 19:57:54 +0000 |
---|---|---|
committer | Olivier Paquet <olivier.paquet@gmail.com> | 2021-01-05 19:57:54 +0000 |
commit | 17d2aa03b801b97b0f38d71c62eead81388520b3 (patch) | |
tree | 680536f78142b2ec54a52a9ebe2ee524add21196 /contrib | |
parent | dcd410f6374244fea9f03001e38df70efb970096 (diff) | |
parent | 7eac42cc2bff939185f05d812583810565a5d9ad (diff) | |
download | libtiff-git-17d2aa03b801b97b0f38d71c62eead81388520b3.tar.gz |
Merge branch 'iptcutil' into 'master'
contrib/iptcutil.c: set '#ifdef _WIN32' (was '#ifdef WIN32', which failed at build time)
See merge request libtiff/libtiff!197
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/iptcutil/iptcutil.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/iptcutil/iptcutil.c b/contrib/iptcutil/iptcutil.c index 621716df..e002eee1 100644 --- a/contrib/iptcutil/iptcutil.c +++ b/contrib/iptcutil/iptcutil.c @@ -17,7 +17,7 @@ # include <fcntl.h> #endif -#ifdef WIN32 +#ifdef _WIN32 #define STRNICMP strnicmp #else #define STRNICMP strncasecmp @@ -414,14 +414,14 @@ int main(int argc, char *argv[]) { case 't': mode = 1; -#ifdef WIN32 +#ifdef _WIN32 /* Set "stdout" to binary mode: */ _setmode( _fileno( ofile ), _O_BINARY ); #endif break; case 'b': mode = 0; -#ifdef WIN32 +#ifdef _WIN32 /* Set "stdin" to binary mode: */ _setmode( _fileno( ifile ), _O_BINARY ); #endif |