From: Alexander Monakov <amonakov@gmail.com>
Date: Thu, 5 May 2011 03:59:27 +0000 (+0400)
Subject: Do not define INLINE in custom config for libjpeg
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=85009a1b35365f3a178b36b3aa5374c27581b312;p=lugaru.git

Do not define INLINE in custom config for libjpeg
---

diff --git a/Dependencies/libjpeg/jconfig.h b/Dependencies/libjpeg/jconfig.h
index 434f1ec..3700728 100644
--- a/Dependencies/libjpeg/jconfig.h
+++ b/Dependencies/libjpeg/jconfig.h
@@ -4,10 +4,6 @@
 /* #define NEED_BSD_STRINGS -- causes fail on Win32 */
 #define NEED_SYS_TYPES_H
 
-#ifdef JPEG_INTERNALS
-#define INLINE inline
-#endif /* JPEG_INTERNALS */
-
 #ifdef JPEG_CJPEG_DJPEG
 #define BMP_SUPPORTED		/* BMP image file format */
 #define GIF_SUPPORTED		/* GIF image file format */
@@ -16,9 +12,3 @@
 #define TARGA_SUPPORTED		/* Targa image file format */
 #endif /* JPEG_CJPEG_DJPEG */
 
-#ifdef _MSC_VER
-#ifndef INLINE
-#define INLINE __inline__
-#endif
-#endif
-