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
This commit is contained in:
@@ -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));
|
||||
|
||||
Reference in New Issue
Block a user