simplify/cleanup wxTheXXXList and wxGDIObject code (patch 1452023 from Paul Cornett)

[wxWidgets.git] / src / jpeg / jpegint.h

diff --git a/src/jpeg/jpegint.h b/src/jpeg/jpegint.h
index 14a51d14d835ac8fe7ddbffa0deafa2b417aa48d..ee99a2e927df5a53cc57512dd1ced8b9742a422c 100644 (file)
--- a/src/jpeg/jpegint.h
+++ b/src/jpeg/jpegint.h
@@ -142,11 +142,6 @@ struct jpeg_decomp_master {
   boolean is_dummy_pass;       /* True during 1st pass for 2-pass quant */
 };
 
   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));
 /* Input control module */
 struct jpeg_input_controller {
   JMETHOD(int, consume_input, (j_decompress_ptr cinfo));


@@ -159,12 +154,6 @@ struct jpeg_input_controller {
   boolean eoi_reached;         /* True when EOI has been consumed */
 };
 
   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));
 /* Main buffer control (downsampled-data buffer) */
 struct jpeg_d_main_controller {
   JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));