Blame SOURCES/libjpeg-turbo-1.4-compat.patch

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