cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* test/raw_decode.c (XMD_H): Avoid conflicting typedefs for INT32

Browse Source 
and boolean in MinGW build due to including jpeglib.h.
This commit is contained in:
Bob Friesenhahn 2015-06-20 16:52:25 +00:00
parent 64a6901448
commit b72cc590ae
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2015-06-20 Bob Friesenhahn <bfriesen@simple.dallas.tx.us> 2015-06-20 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
* test/raw_decode.c (XMD_H): Avoid conflicting typedefs for INT32
and boolean in MinGW build due to including jpeglib.h.
* test/rewrite_tag.c (main): Fix problem with location of variable * test/rewrite_tag.c (main): Fix problem with location of variable
declaration. declaration.

10
test/raw_decode.c
View File

@ -1,4 +1,4 @@
/* $Id: raw_decode.c,v 1.5 2012-12-20 18:08:07 tgl Exp $ */ /* $Id: raw_decode.c,v 1.6 2015-06-20 16:52:25 bfriesen Exp $ */
/* /*
* Copyright (c) 2012, Frank Warmerdam <warmerdam@pobox.com> * Copyright (c) 2012, Frank Warmerdam <warmerdam@pobox.com>
@ -41,7 +41,13 @@
#endif #endif
#include "tiffio.h" #include "tiffio.h"
/*
Avoid conflicting typedefs for INT32 and boolean when including jpeglib.h.
*/
#if defined(__MINGW32__)
# define XMD_H 1
# define HAVE_BOOLEAN /* Needs to match statement in jconfig.h */
#endif
#include "jpeglib.h" /* Needed for JPEG_LIB_VERSION */ #include "jpeglib.h" /* Needed for JPEG_LIB_VERSION */
static unsigned char cluster_0[] = { 0, 0, 2, 0, 138, 139 }; static unsigned char cluster_0[] = { 0, 0, 2, 0, 138, 139 };