Remove uses of FAR in jpeg code Upstream libjpeg-trubo removed the (empty) FAR macro: http://sourceforge.net/p/libjpeg-turbo/code/1312/ Adjust our code to not use the undefined FAR macro anymore. diff --git a/src/share/native/sun/awt/image/jpeg/imageioJPEG.c b/src/share/native/sun/awt/image/jpeg/imageioJPEG.c --- jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c +++ jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c @@ -1385,7 +1385,7 @@ /* and fill it in */ dst_ptr = icc_data; for (seq_no = first; seq_no < last; seq_no++) { - JOCTET FAR *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN; + JOCTET *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN; unsigned int length = icc_markers[seq_no]->data_length - ICC_OVERHEAD_LEN; diff --git a/src/share/native/sun/awt/image/jpeg/jpegdecoder.c b/src/share/native/sun/awt/image/jpeg/jpegdecoder.c --- jdk8/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c +++ jdk8/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c @@ -41,9 +41,8 @@ #include "jni.h" #include "jni_util.h" -/* undo "system_boolean" hack and undef FAR since we don't use it anyway */ +/* undo "system_boolean" hack since we don't use it anyway */ #undef boolean -#undef FAR #include #include "jerror.h"