Remove old wxDCBase class, restore IMPLEMENT_CLASS macros for buffered dc classes

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

diff --git a/src/jpeg/jdatasrc.c b/src/jpeg/jdatasrc.c
index edc752bf5d8c233a6597ba6a46d48ec7e43c65c7..09a43300aaa896e47f56d3d115657837898e38b5 100644 (file)
--- a/src/jpeg/jdatasrc.c
+++ b/src/jpeg/jdatasrc.c
@@ -27,7 +27,7 @@ typedef struct {
 
   FILE * infile;               /* source stream */
   JOCTET * buffer;             /* start of buffer */
 
   FILE * infile;               /* source stream */
   JOCTET * buffer;             /* start of buffer */

-  boolean start_of_file;       /* have we gotten any data yet? */
+  wxjpeg_boolean start_of_file;        /* have we gotten any data yet? */

 } my_source_mgr;
 
 typedef my_source_mgr * my_src_ptr;
 } my_source_mgr;
 
 typedef my_source_mgr * my_src_ptr;


@@ -86,7 +86,7 @@ init_source (j_decompress_ptr cinfo)
  * the front of the buffer rather than discarding it.
  */
 
  * the front of the buffer rather than discarding it.
  */
 

-METHODDEF(boolean)
+METHODDEF(wxjpeg_boolean)

 fill_input_buffer (j_decompress_ptr cinfo)
 {
   my_src_ptr src = (my_src_ptr) cinfo->src;
 fill_input_buffer (j_decompress_ptr cinfo)
 {
   my_src_ptr src = (my_src_ptr) cinfo->src;