Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More duplicate symbol fixes for VisualAge builds.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-10-15 14:15:17 +00:00
parent 32b26030fe
commit 74587a6b43
5 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/jpeg/jdcoefct.c
View File

@@ -104,13 +104,16 @@ start_iMCU_row (j_decompress_ptr cinfo)
*/ */
METHODDEF(void) METHODDEF(void)
#if defined(__VISAGECPP__)
start_input_pass2 (j_decompress_ptr cinfo)
#else
start_input_pass (j_decompress_ptr cinfo) start_input_pass (j_decompress_ptr cinfo)
#endif
{ {
cinfo->input_iMCU_row = 0; cinfo->input_iMCU_row = 0;
start_iMCU_row(cinfo); start_iMCU_row(cinfo);
} }
/* /*
* Initialize for an output processing pass. * Initialize for an output processing pass.
*/ */
@@ -681,7 +684,12 @@ jinit_d_coef_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
SIZEOF(my_coef_controller)); SIZEOF(my_coef_controller));
cinfo->coef = (struct jpeg_d_coef_controller *) coef; cinfo->coef = (struct jpeg_d_coef_controller *) coef;
#if defined(__VISAGECPP__)
coef->pub.start_input_pass2 = start_input_pass2;
#else
coef->pub.start_input_pass = start_input_pass; coef->pub.start_input_pass = start_input_pass;
#endif
coef->pub.start_output_pass = start_output_pass; coef->pub.start_output_pass = start_output_pass;
#ifdef BLOCK_SMOOTHING_SUPPORTED #ifdef BLOCK_SMOOTHING_SUPPORTED
coef->coef_bits_latch = NULL; coef->coef_bits_latch = NULL;
@@ -734,3 +742,4 @@ jinit_d_coef_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
coef->pub.coef_arrays = NULL; /* flag for no virtual arrays */ coef->pub.coef_arrays = NULL; /* flag for no virtual arrays */
} }
} }

14
src/jpeg/jdinput.c
View File

@@ -15,11 +15,6 @@
#include "jinclude.h" #include "jinclude.h"
#include "jpeglib.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 */ /* Private state */
typedef struct { typedef struct {
@@ -260,7 +255,11 @@ start_input_pass (j_decompress_ptr cinfo)
per_scan_setup(cinfo); per_scan_setup(cinfo);
latch_quant_tables(cinfo); latch_quant_tables(cinfo);
(*cinfo->entropy->start_pass) (cinfo); (*cinfo->entropy->start_pass) (cinfo);
#if defined(__VISAGECPP__)
(*cinfo->coef->start_input_pass2) (cinfo);
#else
(*cinfo->coef->start_input_pass) (cinfo); (*cinfo->coef->start_input_pass) (cinfo);
#endif
cinfo->inputctl->consume_input = cinfo->coef->consume_data; cinfo->inputctl->consume_input = cinfo->coef->consume_data;
} }
@@ -384,8 +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

11
src/jpeg/jdmaster.c
View File

@@ -15,11 +15,6 @@
#include "jinclude.h" #include "jinclude.h"
#include "jpeglib.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 */ /* Private state */
typedef struct { 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

2
src/jpeg/jdtrans.c
View File

@@ -121,7 +121,6 @@ transdecode_master_selection (j_decompress_ptr cinfo)
/* Initialize input side of decompressor to consume first scan. */ /* Initialize input side of decompressor to consume first scan. */
(*cinfo->inputctl->start_input_pass) (cinfo); (*cinfo->inputctl->start_input_pass) (cinfo);
/* Initialize progress monitoring. */ /* Initialize progress monitoring. */
if (cinfo->progress != NULL) { if (cinfo->progress != NULL) {
int nscans; int nscans;
@@ -141,3 +140,4 @@ transdecode_master_selection (j_decompress_ptr cinfo)
cinfo->progress->total_passes = 1; cinfo->progress->total_passes = 1;
} }
} }

17
src/jpeg/jpegint.h
View File

@@ -142,10 +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 */ /* Input control module */
struct jpeg_input_controller { struct jpeg_input_controller {
@@ -159,11 +155,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) */ /* Main buffer control (downsampled-data buffer) */
struct jpeg_d_main_controller { struct jpeg_d_main_controller {
@@ -175,7 +166,15 @@ struct jpeg_d_main_controller {
/* Coefficient buffer control */ /* Coefficient buffer control */
struct jpeg_d_coef_controller { struct jpeg_d_coef_controller {
#if defined(__VISAGECPP__)
/* the start input pass in jdcoeft must have a different name than the
// one in jdtrans under VisualAge or else we get a dup symbol error
*/
JMETHOD(void, start_input_pass2, (j_decompress_ptr cinfo));
#else
JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo)); JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
#endif
JMETHOD(int, consume_data, (j_decompress_ptr cinfo)); JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo)); JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
JMETHOD(int, decompress_data, (j_decompress_ptr cinfo, JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,