Index: modules/awt/src/main/native/gl/shared/JPEGEncoder/JpegEncoder.c =================================================================== --- modules/awt/src/main/native/gl/shared/JPEGEncoder/JpegEncoder.c (revision 428702) +++ modules/awt/src/main/native/gl/shared/JPEGEncoder/JpegEncoder.c (working copy) @@ -24,7 +24,6 @@ #include "org_apache_harmony_x_imageio_plugins_jpeg_JPEGImageWriter.h" #include "jpeglib.h" -#include "jpegint.h" #include "setjmp.h" #include "exceptions.h" Index: modules/awt/src/main/native/jpegdecoder/shared/JPEGDecoder.h =================================================================== --- modules/awt/src/main/native/jpegdecoder/shared/JPEGDecoder.h (revision 428702) +++ modules/awt/src/main/native/jpegdecoder/shared/JPEGDecoder.h (working copy) @@ -28,7 +28,6 @@ #include "org_apache_harmony_awt_gl_image_JpegDecoder.h" #include "jpeglib.h" -#include "jpegint.h" #include "setjmp.h" #include "exceptions.h" @@ -43,4 +42,12 @@ jfieldID img_JPEG_currScanlineID; jfieldID img_JPEG_hNativeDecoderID; +/* MIN(a, b) macro */ +#undef MIN +#define MIN(a, b) ((a) < (b))?(a):(b) + +/* MAX(a, b) macro */ +#undef MAX +#define MAX(a, b) ((a) > (b))?(a):(b) + #endif