Fixups in jpeg lib for multiplely defined symbolsa under VisualAge for OS/2

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

src/jpeg/jctrans.c

@@ -21,6 +21,12 @@ LOCAL(void) transencode_master_selection
 LOCAL(void) transencode_coef_controller
 	JPP((j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays));
 
+#if defined(__VISAGECPP__)
+/* Visual Age fixups for multiple declarations */
+#  define start_pass_coef   start_pass_coef2 /* already in jccoeft.c */
+#  define compress_output   compress_output2 /* already in jccoeft.c */
+#endif
+
 
 /*
  * Compression initialization for writing raw-coefficient data.
@@ -246,7 +252,6 @@ start_iMCU_row (j_compress_ptr cinfo)
   coef->MCU_vert_offset = 0;
 }
 
-
 /*
  * Initialize for a processing pass.
  */
@@ -386,3 +391,12 @@ transencode_coef_controller (j_compress_ptr cinfo,
     coef->dummy_buffer[i] = buffer + i;
   }
 }
+
+#if defined(__VISAGECPP__)
+#  ifdef start_pass_coef2
+#   undef start_pass_coef2
+#  endif
+#  ifdef compress_output2
+#    undef compress_output2
+#  endif
+#endif

src/jpeg/jdcolor.c

@@ -12,6 +12,11 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 
+#if defined(__VISAGECPP__)
+/* Visual Age fixups for multiple declarations */
+#  define null_convert   null_convert2 /* already in jcmaint.c */
+#  define grayscale_convert   grayscale_convert2 /* already in jcmaint.c */
+#endif
 
 /* Private subobject */
 
@@ -394,3 +399,12 @@ jinit_color_deconverter (j_decompress_ptr cinfo)
   else
     cinfo->output_components = cinfo->out_color_components;
 }
+
+#if defined(__VISAGECPP__)
+#  ifdef null_convert2
+#   undef null_convert2
+#  endif
+#  ifdef grayscale_convert2
+#   undef grayscale_convert2
+#  endif
+#endif

src/jpeg/jdinput.c

@@ -15,6 +15,10 @@
 #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 */
 
@@ -379,3 +383,9 @@ jinit_input_controller (j_decompress_ptr cinfo)
   inputctl->pub.eoi_reached = FALSE;
   inputctl->inheaders = TRUE;
 }
+
+#if defined(__VISAGECPP__)
+#  ifdef start_input_pass2
+#   undef start_input_pass2
+#  endif
+#endif

src/jpeg/jdmainct.c

@@ -141,6 +141,12 @@ typedef my_main_controller * my_main_ptr;
 #define CTX_POSTPONED_ROW	2	/* feeding postponed row group */
 
 
+#if defined(__VISAGECPP__)
+/* Visual Age fixups for multiple declarations */
+#  define start_pass_main   start_pass_main2 /* already in jcmaint.c */
+#  define process_data_simple_main process_data_simple_main2 /* already in jcmaint.c */
+#endif
+
 /* Forward declarations */
 METHODDEF(void) process_data_simple_main
 	JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,
@@ -512,3 +518,12 @@ jinit_d_main_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
 			 (JDIMENSION) (rgroup * ngroups));
   }
 }
+
+#if defined(__VISAGECPP__)
+#  ifdef start_pass_main2
+#   undef start_pass_main2
+#  endif
+#  ifdef process_data_simple_main2
+#   undef process_data_simple_main2
+#  endif
+#endif

src/jpeg/jdmaster.c

@@ -15,6 +15,10 @@
 #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 */
 
@@ -555,3 +559,10 @@ jinit_master_decompress (j_decompress_ptr cinfo)
 
   master_selection(cinfo);
 }
+
+#if defined(__VISAGECPP__)
+#  ifdef start_input_pass2
+#   undef start_input_pass2
+#  endif
+#endif
+

src/jpeg/jpegint.h

@@ -142,6 +142,11 @@ struct jpeg_decomp_master {
   boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
 };
 
+#if defined(__VISAGECPP__)
+/* Visual Age fixups for multiple declarations */
+#  define start_input_pass   start_input_pass2 /* already in jcmaint.c */
+#endif
+
 /* Input control module */
 struct jpeg_input_controller {
   JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
@@ -154,6 +159,12 @@ struct jpeg_input_controller {
   boolean eoi_reached;		/* True when EOI has been consumed */
 };
 
+#if defined(__VISAGECPP__)
+#  ifdef start_input_pass2
+#   undef start_input_pass2
+#  endif
+#endif
+
 /* Main buffer control (downsampled-data buffer) */
 struct jpeg_d_main_controller {
   JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));