diff options
| author | DRC <dcommander@users.sourceforge.net> | 2012-01-26 22:20:31 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2012-01-26 22:20:31 +0000 |
| commit | a7466c9d861cd1eca74ee4d82d334a80a1d0a175 (patch) | |
| tree | c54cea3171037542e307e37a16568578be984353 /win | |
| parent | 81a50f71a31cadef7220c339b9d8658c9f41aed8 (diff) | |
| download | libjpeg-turbo-a7466c9d861cd1eca74ee4d82d334a80a1d0a175.tar.gz | |
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+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@739 632fc199-4ca6-4c93-a231-07263d6284db
Diffstat (limited to 'win')
| -rw-r--r-- | win/config.h.in | 10 | ||||
| -rw-r--r-- | win/jconfig.h.in | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/win/config.h.in b/win/config.h.in index 110af3c8..ff556c4e 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 382e5766..be4b5c39 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 |