projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Doc tweaks
[wxWidgets.git]
/
src
/
jpeg
/
jdmainct.c
diff --git
a/src/jpeg/jdmainct.c
b/src/jpeg/jdmainct.c
index 13c956f5deb7da999d6d22c0bc25b81751b96815..a188bef0e4bdc2aed635dda8bdfa6b6c830ddc2a 100644
(file)
--- a/
src/jpeg/jdmainct.c
+++ b/
src/jpeg/jdmainct.c
@@
-13,11
+13,13
@@
* supplies the equivalent of the main buffer in that case.
*/
* supplies the equivalent of the main buffer in that case.
*/
+/* suppress the warnings about using main for the variable names */
+#define main jpegMain
+
#define JPEG_INTERNALS
#include "jinclude.h"
#include "jpeglib.h"
#define JPEG_INTERNALS
#include "jinclude.h"
#include "jpeglib.h"
-
/*
* In the current system design, the main buffer need never be a full-image
* buffer; any full-height buffers will be found inside the coefficient or
/*
* In the current system design, the main buffer need never be a full-image
* buffer; any full-height buffers will be found inside the coefficient or
@@
-139,6
+141,12
@@
typedef my_main_controller * my_main_ptr;
#define CTX_POSTPONED_ROW 2 /* feeding postponed row group */
#define CTX_POSTPONED_ROW 2 /* feeding postponed row group */
+#if defined(__VISAGECPP__)
+/* Visual Age fixups for multiple declarations */
+# define start_pass_main start_pass_main2 /* already in jcmaint.c */
+# define process_data_simple_main process_data_simple_main2 /* already in jcmaint.c */
+#endif
+
/* Forward declarations */
METHODDEF(void) process_data_simple_main
JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,
/* Forward declarations */
METHODDEF(void) process_data_simple_main
JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,
@@
-510,3
+518,12
@@
jinit_d_main_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
(JDIMENSION) (rgroup * ngroups));
}
}
(JDIMENSION) (rgroup * ngroups));
}
}
+
+#if defined(__VISAGECPP__)
+# ifdef start_pass_main2
+# undef start_pass_main2
+# endif
+# ifdef process_data_simple_main2
+# undef process_data_simple_main2
+# endif
+#endif