Fixed linking errors related to wxAnyButton in wxUniv.

[wxWidgets.git] / src / jpeg / jmemmgr.c

diff --git a/src/jpeg/jmemmgr.c b/src/jpeg/jmemmgr.c
index d801b322da05e0cd033159ba973676e4305101ef..173d9ded6139d57a741b612043ae3b8600d94bd7 100644 (file)
--- a/src/jpeg/jmemmgr.c
+++ b/src/jpeg/jmemmgr.c
@@ -156,9 +156,9 @@ struct jvirt_sarray_control {
   JDIMENSION rowsperchunk;     /* allocation chunk size in mem_buffer */
   JDIMENSION cur_start_row;    /* first logical row # in the buffer */
   JDIMENSION first_undef_row;  /* row # of first uninitialized row */
   JDIMENSION rowsperchunk;     /* allocation chunk size in mem_buffer */
   JDIMENSION cur_start_row;    /* first logical row # in the buffer */
   JDIMENSION first_undef_row;  /* row # of first uninitialized row */

-  boolean pre_zero;            /* pre-zero mode requested? */
-  boolean dirty;               /* do current buffer contents need written? */
-  boolean b_s_open;            /* is backing-store data valid? */
+  wxjpeg_boolean pre_zero;             /* pre-zero mode requested? */
+  wxjpeg_boolean dirty;                /* do current buffer contents need written? */
+  wxjpeg_boolean b_s_open;             /* is backing-store data valid? */

   jvirt_sarray_ptr next;       /* link to next virtual sarray control block */
   backing_store_info b_s_info; /* System-dependent control info */
 };
   jvirt_sarray_ptr next;       /* link to next virtual sarray control block */
   backing_store_info b_s_info; /* System-dependent control info */
 };


@@ -172,9 +172,9 @@ struct jvirt_barray_control {
   JDIMENSION rowsperchunk;     /* allocation chunk size in mem_buffer */
   JDIMENSION cur_start_row;    /* first logical row # in the buffer */
   JDIMENSION first_undef_row;  /* row # of first uninitialized row */
   JDIMENSION rowsperchunk;     /* allocation chunk size in mem_buffer */
   JDIMENSION cur_start_row;    /* first logical row # in the buffer */
   JDIMENSION first_undef_row;  /* row # of first uninitialized row */

-  boolean pre_zero;            /* pre-zero mode requested? */
-  boolean dirty;               /* do current buffer contents need written? */
-  boolean b_s_open;            /* is backing-store data valid? */
+  wxjpeg_boolean pre_zero;             /* pre-zero mode requested? */
+  wxjpeg_boolean dirty;                /* do current buffer contents need written? */
+  wxjpeg_boolean b_s_open;             /* is backing-store data valid? */

   jvirt_barray_ptr next;       /* link to next virtual barray control block */
   backing_store_info b_s_info; /* System-dependent control info */
 };
   jvirt_barray_ptr next;       /* link to next virtual barray control block */
   backing_store_info b_s_info; /* System-dependent control info */
 };


@@ -520,7 +520,7 @@ alloc_barray (j_common_ptr cinfo, int pool_id,
 
 
 METHODDEF(jvirt_sarray_ptr)
 
 
 METHODDEF(jvirt_sarray_ptr)

-request_virt_sarray (j_common_ptr cinfo, int pool_id, boolean pre_zero,
+request_virt_sarray (j_common_ptr cinfo, int pool_id, wxjpeg_boolean pre_zero,

                     JDIMENSION samplesperrow, JDIMENSION numrows,
                     JDIMENSION maxaccess)
 /* Request a virtual 2-D sample array */
                     JDIMENSION samplesperrow, JDIMENSION numrows,
                     JDIMENSION maxaccess)
 /* Request a virtual 2-D sample array */


@@ -550,7 +550,7 @@ request_virt_sarray (j_common_ptr cinfo, int pool_id, boolean pre_zero,
 
 
 METHODDEF(jvirt_barray_ptr)
 
 
 METHODDEF(jvirt_barray_ptr)

-request_virt_barray (j_common_ptr cinfo, int pool_id, boolean pre_zero,
+request_virt_barray (j_common_ptr cinfo, int pool_id, wxjpeg_boolean pre_zero,

                     JDIMENSION blocksperrow, JDIMENSION numrows,
                     JDIMENSION maxaccess)
 /* Request a virtual 2-D coefficient-block array */
                     JDIMENSION blocksperrow, JDIMENSION numrows,
                     JDIMENSION maxaccess)
 /* Request a virtual 2-D coefficient-block array */


@@ -687,7 +687,7 @@ realize_virt_arrays (j_common_ptr cinfo)
 
 
 LOCAL(void)
 
 
 LOCAL(void)

-do_sarray_io (j_common_ptr cinfo, jvirt_sarray_ptr ptr, boolean writing)
+do_sarray_io (j_common_ptr cinfo, jvirt_sarray_ptr ptr, wxjpeg_boolean writing)

 /* Do backing store read or write of a virtual sample array */
 {
   long bytesperrow, file_offset, byte_count, rows, thisrow, i;
 /* Do backing store read or write of a virtual sample array */
 {
   long bytesperrow, file_offset, byte_count, rows, thisrow, i;


@@ -720,7 +720,7 @@ do_sarray_io (j_common_ptr cinfo, jvirt_sarray_ptr ptr, boolean writing)
 
 
 LOCAL(void)
 
 
 LOCAL(void)

-do_barray_io (j_common_ptr cinfo, jvirt_barray_ptr ptr, boolean writing)
+do_barray_io (j_common_ptr cinfo, jvirt_barray_ptr ptr, wxjpeg_boolean writing)

 /* Do backing store read or write of a virtual coefficient-block array */
 {
   long bytesperrow, file_offset, byte_count, rows, thisrow, i;
 /* Do backing store read or write of a virtual coefficient-block array */
 {
   long bytesperrow, file_offset, byte_count, rows, thisrow, i;


@@ -755,7 +755,7 @@ do_barray_io (j_common_ptr cinfo, jvirt_barray_ptr ptr, boolean writing)
 METHODDEF(JSAMPARRAY)
 access_virt_sarray (j_common_ptr cinfo, jvirt_sarray_ptr ptr,
                    JDIMENSION start_row, JDIMENSION num_rows,
 METHODDEF(JSAMPARRAY)
 access_virt_sarray (j_common_ptr cinfo, jvirt_sarray_ptr ptr,
                    JDIMENSION start_row, JDIMENSION num_rows,

-                   boolean writable)
+                   wxjpeg_boolean writable)

 /* Access the part of a virtual sample array starting at start_row */
 /* and extending for num_rows rows.  writable is true if  */
 /* caller intends to modify the accessed area. */
 /* Access the part of a virtual sample array starting at start_row */
 /* and extending for num_rows rows.  writable is true if  */
 /* caller intends to modify the accessed area. */


@@ -840,7 +840,7 @@ access_virt_sarray (j_common_ptr cinfo, jvirt_sarray_ptr ptr,
 METHODDEF(JBLOCKARRAY)
 access_virt_barray (j_common_ptr cinfo, jvirt_barray_ptr ptr,
                    JDIMENSION start_row, JDIMENSION num_rows,
 METHODDEF(JBLOCKARRAY)
 access_virt_barray (j_common_ptr cinfo, jvirt_barray_ptr ptr,
                    JDIMENSION start_row, JDIMENSION num_rows,

-                   boolean writable)
+                   wxjpeg_boolean writable)

 /* Access the part of a virtual block array starting at start_row */
 /* and extending for num_rows rows.  writable is true if  */
 /* caller intends to modify the accessed area. */
 /* Access the part of a virtual block array starting at start_row */
 /* and extending for num_rows rows.  writable is true if  */
 /* caller intends to modify the accessed area. */