don't wake up on Windows messages when waiting for thread termination in a console...

[wxWidgets.git] / src / jpeg / jdcolor.c

diff --git a/src/jpeg/jdcolor.c b/src/jpeg/jdcolor.c
index c51854496016be6b63382d6af71c85c7e1ebd4f0..cca28422979b7f670c7a5b66970f1cebb133bef4 100644 (file)
--- a/src/jpeg/jdcolor.c
+++ b/src/jpeg/jdcolor.c
@@ -12,6 +12,11 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 
+#if defined(__VISAGECPP__)
+/* Visual Age fixups for multiple declarations */
+#  define null_convert   null_convert2 /* already in jcmaint.c */
+#  define grayscale_convert   grayscale_convert2 /* already in jcmaint.c */
+#endif
 
 /* Private subobject */
 
@@ -394,3 +399,12 @@ jinit_color_deconverter (j_decompress_ptr cinfo)
   else
     cinfo->output_components = cinfo->out_color_components;
 }
+
+#if defined(__VISAGECPP__)
+#  ifdef null_convert2
+#   undef null_convert2
+#  endif
+#  ifdef grayscale_convert2
+#   undef grayscale_convert2
+#  endif
+#endif