Rex Dieter 328ff5a
diff -up digikam-4.5.0/core/libs/dimg/loaders/iccjpeg.h.JPP digikam-4.5.0/core/libs/dimg/loaders/iccjpeg.h
Rex Dieter 328ff5a
--- digikam-4.5.0/core/libs/dimg/loaders/iccjpeg.h.JPP	2014-11-12 04:52:49.000000000 -0600
Rex Dieter 328ff5a
+++ digikam-4.5.0/core/libs/dimg/loaders/iccjpeg.h	2014-11-17 09:05:03.975853379 -0600
Rex Dieter 328ff5a
@@ -45,6 +45,13 @@
Rex Dieter 328ff5a
 #include <stdio.h>    /* needed to define "FILE", "NULL" */
Rex Dieter 328ff5a
 #include <jpeglib.h>
Rex Dieter 328ff5a
 
Rex Dieter 328ff5a
+#ifndef JPP
Rex Dieter 328ff5a
+#define JPP(x) x
Rex Dieter 328ff5a
+#endif
Rex Dieter 328ff5a
+
Rex Dieter 328ff5a
+#ifndef FAR
Rex Dieter 328ff5a
+#define FAR
Rex Dieter 328ff5a
+#endif
Rex Dieter 328ff5a
 
Rex Dieter 328ff5a
 /**
Rex Dieter 328ff5a
  * This routine writes the given ICC profile data into a JPEG file.
Rex Dieter 328ff5a
diff -up digikam-4.5.0/core/libs/jpegutils/libjpeg-62/jinclude.h.JPP digikam-4.5.0/core/libs/jpegutils/libjpeg-62/jinclude.h
Rex Dieter 328ff5a
diff -up digikam-4.5.0/core/libs/jpegutils/libjpeg-62/transupp.h.JPP digikam-4.5.0/core/libs/jpegutils/libjpeg-62/transupp.h
Rex Dieter 328ff5a
--- digikam-4.5.0/core/libs/jpegutils/libjpeg-62/transupp.h.JPP	2014-11-12 04:52:49.000000000 -0600
Rex Dieter 328ff5a
+++ digikam-4.5.0/core/libs/jpegutils/libjpeg-62/transupp.h	2014-11-17 09:07:33.447361822 -0600
Rex Dieter 328ff5a
@@ -32,6 +32,9 @@
Rex Dieter 328ff5a
 #define jcopy_markers_execute			jCMrkExec
Rex Dieter 328ff5a
 #endif /* NEED_SHORT_EXTERNAL_NAMES */
Rex Dieter 328ff5a
 
Rex Dieter 328ff5a
+#ifndef JPP
Rex Dieter 328ff5a
+#define JPP(x) x
Rex Dieter 328ff5a
+#endif
Rex Dieter 328ff5a
 
Rex Dieter 328ff5a
 /*
Rex Dieter 328ff5a
  * Codes for supported types of image transformations.
Rex Dieter 328ff5a
diff -up digikam-4.5.0/extra/kipi-plugins/common/libkipiplugins/tools/imageio/iccjpeg.h.JPP digikam-4.5.0/extra/kipi-plugins/common/libkipiplugins/tools/imageio/iccjpeg.h
Rex Dieter 328ff5a
--- digikam-4.5.0/extra/kipi-plugins/common/libkipiplugins/tools/imageio/iccjpeg.h.JPP	2014-11-12 04:53:14.000000000 -0600
Rex Dieter 328ff5a
+++ digikam-4.5.0/extra/kipi-plugins/common/libkipiplugins/tools/imageio/iccjpeg.h	2014-11-17 09:00:48.591123547 -0600
Rex Dieter 328ff5a
@@ -45,6 +45,13 @@
Rex Dieter 328ff5a
 #include <stdio.h>    /* needed to define "FILE", "NULL" */
Rex Dieter 328ff5a
 #include <jpeglib.h>
Rex Dieter 328ff5a
 
Rex Dieter 328ff5a
+#ifndef JPP
Rex Dieter 328ff5a
+#define JPP(x) x
Rex Dieter 328ff5a
+#endif
Rex Dieter 328ff5a
+
Rex Dieter 328ff5a
+#ifndef FAR
Rex Dieter 328ff5a
+#define FAR
Rex Dieter 328ff5a
+#endif
Rex Dieter 328ff5a
 
Rex Dieter 328ff5a
 /**
Rex Dieter 328ff5a
  * This routine writes the given ICC profile data into a JPEG file.
Rex Dieter 328ff5a
diff -up digikam-4.5.0/extra/kipi-plugins/jpeglossless/libjpeg/transupp.h.JPP digikam-4.5.0/extra/kipi-plugins/jpeglossless/libjpeg/transupp.h
Rex Dieter 328ff5a
--- digikam-4.5.0/extra/kipi-plugins/jpeglossless/libjpeg/transupp.h.JPP	2014-11-12 04:53:14.000000000 -0600
Rex Dieter 328ff5a
+++ digikam-4.5.0/extra/kipi-plugins/jpeglossless/libjpeg/transupp.h	2014-11-17 09:02:17.295615766 -0600
Rex Dieter 328ff5a
@@ -94,6 +94,9 @@ namespace KIPIJPEGLossLessPlugin
Rex Dieter 328ff5a
 #define jcopy_markers_execute		jCMrkExec
Rex Dieter 328ff5a
 #endif /* NEED_SHORT_EXTERNAL_NAMES */
Rex Dieter 328ff5a
 
Rex Dieter 328ff5a
+#ifndef JPP
Rex Dieter 328ff5a
+#define JPP(x) x
Rex Dieter 328ff5a
+#endif
Rex Dieter 328ff5a
 
Rex Dieter 328ff5a
 /*
Rex Dieter 328ff5a
  * Codes for supported types of image transformations.