Move INLINE macro into config.h. That's really where it belongs anyhow, since it...

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@739 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 1a7bd0d107de49c46b5219f9eb9378f919ed0800..f7e0fc5e686232bc0969210fde2cefe257fec12f 100644 (file)
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -19,6 +19,11 @@ and pixel formats (TurboJPEG API), which allow applications to specify that,
 when decompressing to a 4-component RGB buffer, the unused byte should be set
 to 0xFF so that it can be interpreted as an opaque alpha channel.
 
+[5] Fixed regression issue whereby DevIL failed to build against libjpeg-turbo
+because libjpeg-turbo's distributed version of jconfig.h contained an INLINE
+macro, which conflicted with a similar macro in DevIL.  This macro is used only
+internally when building libjpeg-turbo, so it was moved into config.h.
+
 
 1.1.90 (1.2 beta1)
 ==================

diff --git a/jccolor.c b/jccolor.c
index 0d8910aeac8e22f3aa264ad9b64f5b4c80f1ca93..973055574249ad163473beae65e1be8dad95e778 100644 (file)
--- a/jccolor.c
+++ b/jccolor.c
@@ -14,6 +14,7 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 #include "jsimd.h"
+#include "config.h"
 
 
 /* Private subobject */

diff --git a/jconfig.h.in b/jconfig.h.in
index e0d9dc8d76d2930819b28e41896cabdc1a9e7b4a..27d4cc9d526dc0c6f903bcdaa55986416998856f 100644 (file)
--- a/jconfig.h.in
+++ b/jconfig.h.in
@@ -30,9 +30,6 @@
 /* Compiler does not support pointers to unspecified structures. */
 #undef INCOMPLETE_TYPES_BROKEN
 
-/* How to obtain function inlining. */
-#undef INLINE
-
 /* Compiler has <strings.h> rather than standard <string.h>. */
 #undef NEED_BSD_STRINGS
 

diff --git a/jdcolor.c b/jdcolor.c
index a9a9220862f9ca0d77257ee04b7dc8696547c155..d9268dbb522475fd0f9334b6ff6b75e8432beb27 100644 (file)
--- a/jdcolor.c
+++ b/jdcolor.c
@@ -14,6 +14,7 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 #include "jsimd.h"
+#include "config.h"
 
 
 /* Private subobject */

diff --git a/jdmerge.c b/jdmerge.c
index c813080c0b092469ba6ca958aaecf2b1d597c64e..cfa3bb921d38180863ce6a2927f0791ff40b6394 100644 (file)
--- a/jdmerge.c
+++ b/jdmerge.c
@@ -38,6 +38,7 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 #include "jsimd.h"
+#include "config.h"
 
 #ifdef UPSAMPLE_MERGING_SUPPORTED
 

diff --git a/win/config.h.in b/win/config.h.in
index 110af3c86202fff0308ac225fe77454408260c33..ff556c4e54118ee97cb789d86843cab409a80150 100644 (file)
--- a/win/config.h.in
+++ b/win/config.h.in
@@ -1,3 +1,13 @@
 #define VERSION "@VERSION@"\r
 #define BUILD "@BUILD@"\r
 #define PACKAGE_NAME "@CMAKE_PROJECT_NAME@"\r
+
+#ifndef INLINE
+#if defined(__GNUC__)
+#define INLINE __attribute__((always_inline))
+#elif defined(_MSC_VER)
+#define INLINE __forceinline
+#else
+#define INLINE
+#endif
+#endif

diff --git a/win/jconfig.h.in b/win/jconfig.h.in
index 382e5766c3c21c20437c976a3a255d9dd4019073..be4b5c39307b9b9f2a18a5cf531a7c51773cd962 100644 (file)
--- a/win/jconfig.h.in
+++ b/win/jconfig.h.in
@@ -33,16 +33,6 @@ typedef signed int INT32;
 #endif
 #define XMD_H                   /* prevent jmorecfg.h from redefining it */
 
-#ifndef INLINE
-#if defined(__GNUC__)
-#define INLINE __attribute__((always_inline))
-#elif defined(_MSC_VER)
-#define INLINE __forceinline
-#else
-#define INLINE
-#endif
-#endif
-
 #ifdef JPEG_INTERNALS
 
 #undef RIGHT_SHIFT_IS_UNSIGNED