From 0904e5e12a4a6d31cd2c55bed973bbacb366e92a Mon Sep 17 00:00:00 2001 From: David Webster Date: Mon, 6 Jan 2003 17:50:21 +0000 Subject: [PATCH] OS/2 patches missing from this version git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/jpeg/jdinput.c | 11 ----------- src/jpeg/jdmaster.c | 11 ----------- src/jpeg/jpegint.h | 11 ----------- 3 files changed, 33 deletions(-) diff --git a/src/jpeg/jdinput.c b/src/jpeg/jdinput.c index ce05a85815..942a99c141 100644 --- a/src/jpeg/jdinput.c +++ b/src/jpeg/jdinput.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 { @@ -388,9 +383,3 @@ jinit_input_controller (j_decompress_ptr cinfo) 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 f853b7ad19..8a5abc71fa 100644 --- 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 { @@ -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 - diff --git a/src/jpeg/jpegint.h b/src/jpeg/jpegint.h index 14a51d14d8..ee99a2e927 100644 --- 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 */ }; -#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)); @@ -159,12 +154,6 @@ 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)); -- 2.45.2