diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-29 01:00:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-29 01:00:10 +0200 |
| commit | 0e1866017fd389629629b150ce252820592506cd (patch) | |
| tree | 681142ae0e610ef7af2a43ca2d62c3ea5ed5f91a /src/3rdparty/libjpeg/src/jconfigint.h | |
| parent | 9567a34bc0d9be87d3b0d6cbcb841837ca1d5659 (diff) | |
| parent | 9a8175a13124e156948914854d2fda7436065b08 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6083c3e61b7dbe188f83676f7e7bb268e5ccf2f3
Diffstat (limited to 'src/3rdparty/libjpeg/src/jconfigint.h')
| -rw-r--r-- | src/3rdparty/libjpeg/src/jconfigint.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/3rdparty/libjpeg/src/jconfigint.h b/src/3rdparty/libjpeg/src/jconfigint.h deleted file mode 100644 index 2131bf52a1..0000000000 --- a/src/3rdparty/libjpeg/src/jconfigint.h +++ /dev/null @@ -1,13 +0,0 @@ -#define VERSION "@VERSION@" -#define BUILD "@BUILD@" -#define PACKAGE_NAME "@CMAKE_PROJECT_NAME@" - -#ifndef INLINE -#if defined(__GNUC__) -#define INLINE inline __attribute__((always_inline)) -#elif defined(_MSC_VER) -#define INLINE __forceinline -#else -#define INLINE -#endif -#endif |