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