Fix warning about always_inline attribute in libjpeg_turbo.
GCC 4.7/4.8 warns when __attribute__((always_inline)) is used without a
normal 'inline' keyword. Pull an equivalent of upstream r1188 to avoid
this warning.
R=rmcilroy@chromium.org, phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/218733003
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@261103 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
diff --git a/README.chromium b/README.chromium
index c8079ca..3b0dbf9 100644
--- a/README.chromium
+++ b/README.chromium
@@ -8,6 +8,7 @@
Description:
This consists of three components:
* A partial copy of libjpeg-turbo 1.2.80 (r856);
+* Revision r1188 cherry-picked from upstream trunk;
* A build file (libjpeg.gyp), and;
* Patched header files used by Chromium.
diff --git a/config.h b/config.h
index 25793c0..81efa0d 100644
--- a/config.h
+++ b/config.h
@@ -69,7 +69,7 @@
/* How to obtain function inlining. */
#ifndef INLINE
#if defined(__GNUC__)
-#define INLINE __attribute__((always_inline))
+#define INLINE inline __attribute__((always_inline))
#elif defined(_MSC_VER)
#define INLINE __forceinline
#else
