From: DRC <information@libjpeg-turbo.org>
Date: Sat, 10 Dec 2016 15:35:30 +0000 (-0600)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.5.90~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a9b042b261bbf0ac779f770701def31489c155c;p=libjpeg-turbo

Merge branch 'master' into dev
---

8a9b042b261bbf0ac779f770701def31489c155c
diff --cc LICENSE.md
index 37fe0b0,0572390..8dfc045
--- a/LICENSE.md
+++ b/LICENSE.md
@@@ -9,13 -9,11 +9,12 @@@ libjpeg-turbo is covered by three compa
    This license applies to the libjpeg API library and associated programs
    (any code inherited from libjpeg, and any modifications to that code.)
  
- - The Modified (3-clause) BSD License, which is listed in
-   [turbojpeg.c](turbojpeg.c)
+ - The Modified (3-clause) BSD License, which is listed below
  
 -  This license covers the TurboJPEG API library and associated programs.
 +  This license covers the TurboJPEG API library and associated programs, as
 +  well as the build system.
  
- - The zlib License, which is listed in [simd/jsimdext.inc](simd/jsimdext.inc)
+ - The zlib License, which is listed below
  
    This license is a subset of the other two, and it covers the libjpeg-turbo
    SIMD extensions.
diff --cc jconfigint.h.in
index d37ac33,963e760..835f7c4
--- a/jconfigint.h.in
+++ b/jconfigint.h.in
@@@ -1,18 -1,17 +1,21 @@@
  /* libjpeg-turbo build number */
 -#undef BUILD
 +#define BUILD "@BUILD@"
  
+ /* Compiler's inline keyword */
+ #undef inline
+ 
  /* How to obtain function inlining. */
 -#undef INLINE
 +#define INLINE @INLINE@
  
  /* Define to the full name of this package. */
 -#undef PACKAGE_NAME
 +#define PACKAGE_NAME "@CMAKE_PROJECT_NAME@"
  
  /* Version number of package */
 -#undef VERSION
 +#define VERSION "@VERSION@"
 +
 +#ifndef _WIN32
  
  /* The size of `size_t', as computed by sizeof. */
 -#undef SIZEOF_SIZE_T
 +#define SIZEOF_SIZE_T @SIZE_T@
 +
 +#endif