From: Michael Wetherell <mike.wetherell@ntlworld.com>
Date: Tue, 28 Nov 2006 20:44:32 +0000 (+0000)
Subject: Rename boolean to wxjpeg_boolean to avoid conflicts.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e26a41ba709fbb2b645f99a4397986ac11f328b1?ds=inline

Rename boolean to wxjpeg_boolean to avoid conflicts.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/tiff/tif_jpeg.c b/src/tiff/tif_jpeg.c
index 529afa7117..6f3d652920 100644
--- a/src/tiff/tif_jpeg.c
+++ b/src/tiff/tif_jpeg.c
@@ -67,6 +67,10 @@ int TIFFFillTile(TIFF*, ttile_t);
 #include "jpeglib.h"
 #include "jerror.h"
 
+#ifndef HAVE_WXJPEG_BOOLEAN
+typedef boolean wxjpeg_boolean;
+#endif
+
 /*
  * On some machines it may be worthwhile to use _setjmp or sigsetjmp
  * in place of plain setjmp.  These macros will make it easier.
@@ -239,20 +243,20 @@ TIFFjpeg_set_colorspace(JPEGState* sp, J_COLOR_SPACE colorspace)
 }
 
 static int
-TIFFjpeg_set_quality(JPEGState* sp, int quality, boolean force_baseline)
+TIFFjpeg_set_quality(JPEGState* sp, int quality, wxjpeg_boolean force_baseline)
 {
 	return CALLVJPEG(sp,
 	    jpeg_set_quality(&sp->cinfo.c, quality, force_baseline));
 }
 
 static int
-TIFFjpeg_suppress_tables(JPEGState* sp, boolean suppress)
+TIFFjpeg_suppress_tables(JPEGState* sp, wxjpeg_boolean suppress)
 {
 	return CALLVJPEG(sp, jpeg_suppress_tables(&sp->cinfo.c, suppress));
 }
 
 static int
-TIFFjpeg_start_compress(JPEGState* sp, boolean write_all_tables)
+TIFFjpeg_start_compress(JPEGState* sp, wxjpeg_boolean write_all_tables)
 {
 	return CALLVJPEG(sp,
 	    jpeg_start_compress(&sp->cinfo.c, write_all_tables));
@@ -285,7 +289,7 @@ TIFFjpeg_write_tables(JPEGState* sp)
 }
 
 static int
-TIFFjpeg_read_header(JPEGState* sp, boolean require_image)
+TIFFjpeg_read_header(JPEGState* sp, wxjpeg_boolean require_image)
 {
 	return CALLJPEG(sp, -1, jpeg_read_header(&sp->cinfo.d, require_image));
 }
@@ -353,7 +357,7 @@ std_init_destination(j_compress_ptr cinfo)
 	sp->dest.free_in_buffer = (size_t) tif->tif_rawdatasize;
 }
 
-static boolean
+static wxjpeg_boolean
 std_empty_output_buffer(j_compress_ptr cinfo)
 {
 	JPEGState* sp = (JPEGState*) cinfo;
@@ -404,7 +408,7 @@ tables_init_destination(j_compress_ptr cinfo)
 	sp->dest.free_in_buffer = (size_t) sp->jpegtables_length;
 }
 
-static boolean
+static wxjpeg_boolean
 tables_empty_output_buffer(j_compress_ptr cinfo)
 {
 	JPEGState* sp = (JPEGState*) cinfo;
@@ -470,7 +474,7 @@ std_init_source(j_decompress_ptr cinfo)
 	sp->src.bytes_in_buffer = (size_t) tif->tif_rawcc;
 }
 
-static boolean
+static wxjpeg_boolean
 std_fill_input_buffer(j_decompress_ptr cinfo)
 {
 	JPEGState* sp = (JPEGState* ) cinfo;