Added box style functionality to style manager dialog

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

diff --git a/src/jpeg/jdmaster.c b/src/jpeg/jdmaster.c
index f853b7ad19e2052575a01e06c4e64eb1fb6323e8..d68747631a164c61ad062cc4df7652bb931e6763 100644 (file)
--- a/src/jpeg/jdmaster.c
+++ b/src/jpeg/jdmaster.c
@@ -15,11 +15,6 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 
-#if defined(__VISAGECPP__)
-/* Visual Age fixups for multiple declarations */
-#  define start_input_pass   start_input_pass2 /* already in jcmaint.c */
-#endif
-
 /* Private state */
 
 typedef struct {
@@ -27,7 +22,7 @@ typedef struct {
 
   int pass_number;             /* # of passes completed */
 
-  boolean using_merged_upsample; /* TRUE if using merged upsample/cconvert */
+  wxjpeg_boolean using_merged_upsample; /* TRUE if using merged upsample/cconvert */
 
   /* Saved references to initialized quantizer modules,
    * in case we need to switch modes.
@@ -44,7 +39,7 @@ typedef my_decomp_master * my_master_ptr;
  * CRUCIAL: this must match the actual capabilities of jdmerge.c!
  */
 
-LOCAL(boolean)
+LOCAL(wxjpeg_boolean)
 use_merged_upsample (j_decompress_ptr cinfo)
 {
 #ifdef UPSAMPLE_MERGING_SUPPORTED
@@ -292,7 +287,7 @@ LOCAL(void)
 master_selection (j_decompress_ptr cinfo)
 {
   my_master_ptr master = (my_master_ptr) cinfo->master;
-  boolean use_c_buffer;
+  wxjpeg_boolean use_c_buffer;
   long samplesperrow;
   JDIMENSION jd_samplesperrow;
 
@@ -560,9 +555,3 @@ jinit_master_decompress (j_decompress_ptr cinfo)
   master_selection(cinfo);
 }
 
-#if defined(__VISAGECPP__)
-#  ifdef start_input_pass2
-#   undef start_input_pass2
-#  endif
-#endif
-