diff options
author | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2012-01-26 22:20:31 +0000 |
---|---|---|
committer | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2012-01-26 22:20:31 +0000 |
commit | 7d1725c28b9e0a50df40747b36ea81cf3c9cb622 (patch) | |
tree | c54cea3171037542e307e37a16568578be984353 | |
parent | b8a82b0de31dd741ff58ec9eeecc117772bf1615 (diff) |
Move INLINE macro into config.h. That's really where it belongs anyhow, since it is used only internally, and putting it in jconfig.h was causing problems with DevIL.
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@739 632fc199-4ca6-4c93-a231-07263d6284db
-rw-r--r-- | ChangeLog.txt | 5 | ||||
-rw-r--r-- | jccolor.c | 1 | ||||
-rw-r--r-- | jconfig.h.in | 3 | ||||
-rw-r--r-- | jdcolor.c | 1 | ||||
-rw-r--r-- | jdmerge.c | 1 | ||||
-rw-r--r-- | win/config.h.in | 10 | ||||
-rw-r--r-- | win/jconfig.h.in | 10 |
7 files changed, 18 insertions, 13 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 1a7bd0d..f7e0fc5 100644 --- 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) ================== @@ -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 e0d9dc8..27d4cc9 100644 --- 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 @@ -14,6 +14,7 @@ #include "jinclude.h" #include "jpeglib.h" #include "jsimd.h" +#include "config.h" /* Private subobject */ @@ -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 110af3c..ff556c4 100644 --- a/win/config.h.in +++ b/win/config.h.in @@ -1,3 +1,13 @@ #define VERSION "@VERSION@"
#define BUILD "@BUILD@"
#define PACKAGE_NAME "@CMAKE_PROJECT_NAME@"
+ +#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 382e576..be4b5c3 100644 --- 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 |