OS/2 patches missing from this version

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

diff --git a/src/jpeg/jdinput.c b/src/jpeg/jdinput.c
index ce05a858150fccabebb9d1ed9f915551333dab00..942a99c1417d8cfb95b5f81a430fefca298b4d56 100644 (file)
--- a/src/jpeg/jdinput.c
+++ b/src/jpeg/jdinput.c
@@ -15,11 +15,6 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 
 #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 {
 /* Private state */
 
 typedef struct {


@@ -388,9 +383,3 @@ jinit_input_controller (j_decompress_ptr cinfo)
   inputctl->inheaders = TRUE;
 }
 
   inputctl->inheaders = TRUE;
 }
 

-#if defined(__VISAGECPP__)
-#  ifdef start_input_pass2
-#   undef start_input_pass2
-#  endif
-#endif
-

diff --git a/src/jpeg/jdmaster.c b/src/jpeg/jdmaster.c
index f853b7ad19e2052575a01e06c4e64eb1fb6323e8..8a5abc71fac17a3451016ee16b6e5301edc62ab9 100644 (file)
--- a/src/jpeg/jdmaster.c
+++ b/src/jpeg/jdmaster.c
@@ -15,11 +15,6 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 
 #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 {
 /* Private state */
 
 typedef struct {


@@ -560,9 +555,3 @@ jinit_master_decompress (j_decompress_ptr cinfo)
   master_selection(cinfo);
 }
 
   master_selection(cinfo);
 }
 

-#if defined(__VISAGECPP__)
-#  ifdef start_input_pass2
-#   undef start_input_pass2
-#  endif
-#endif
-

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));