Imported Upstream version 2.10upstream/2.10upstream

Change-Id: Ic72ac9c6134dff3a335d581378095e0011abcb08
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

257 files changed, 1464 insertions, 659 deletions

diff --git a/B/dos32/bc_pp.bat b/B/dos32/bc_pp.bat
index a85ed44..1af928a 100644
--- a/B/dos32/bc_pp.bat
+++ b/B/dos32/bc_pp.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   DOS 32-bit

 @echo //   Borland C/C++ + Borland PowerPack 1.0 (DPMI32)

diff --git a/B/dos32/dj2.bat b/B/dos32/dj2.bat
index 7e152e9..eb07ff6 100644
--- a/B/dos32/dj2.bat
+++ b/B/dos32/dj2.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   DOS 32-bit

 @echo //   djgpp2 + gcc

diff --git a/B/dos32/dm.bat b/B/dos32/dm.bat
index 126763e..e3c9e8a 100644
--- a/B/dos32/dm.bat
+++ b/B/dos32/dm.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   DOS 32-bit

 @echo //   Digital Mars C/C++

diff --git a/B/dos32/emx.bat b/B/dos32/emx.bat
index 4624972..2b42003 100644
--- a/B/dos32/emx.bat
+++ b/B/dos32/emx.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   DOS 32-bit

 @echo //   emx + gcc

diff --git a/B/dos32/highc.bat b/B/dos32/highc.bat
index f1591ba..db5a1bd 100644
--- a/B/dos32/highc.bat
+++ b/B/dos32/highc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   DOS 32-bit

 @echo //   MetaWare High C/C++ (using Pharlap DOS extender)

diff --git a/B/dos32/ndp.bat b/B/dos32/ndp.bat
index 71882ec..70b3d63 100644
--- a/B/dos32/ndp.bat
+++ b/B/dos32/ndp.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   DOS 32-bit

 @echo //   Microway NDP C/C++

diff --git a/B/dos32/sc.bat b/B/dos32/sc.bat
index 22a4684..88be095 100644
--- a/B/dos32/sc.bat
+++ b/B/dos32/sc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   DOS 32-bit

 @echo //   Symantec C/C++

diff --git a/B/dos32/wc.bat b/B/dos32/wc.bat
index 3698f6b..306f982 100644
--- a/B/dos32/wc.bat
+++ b/B/dos32/wc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   DOS 32-bit

 @echo //   Watcom C/C++ (using DOS/4G extender)

diff --git a/B/dos32/zc.bat b/B/dos32/zc.bat
index 4bbc6a4..2d344cb 100644
--- a/B/dos32/zc.bat
+++ b/B/dos32/zc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   DOS 32-bit

 @echo //   Zortech C/C++

diff --git a/B/generic/Makefile b/B/generic/Makefile
index 68c6e2f..98f5d9e 100644
--- a/B/generic/Makefile
+++ b/B/generic/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-2015 Markus F.X.J. Oberhumer
+# Copyright (C) 1996-2017 Markus F.X.J. Oberhumer
 #
 # this is modelled after build.sh; needs GNU make 3.80 or better
 
diff --git a/B/generic/build.sh b/B/generic/build.sh
index e71a98d..28f95b5 100755
--- a/B/generic/build.sh
+++ b/B/generic/build.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 ## vim:set ts=4 sw=4 et:
 set -e
-echo "// Copyright (C) 1996-2015 Markus F.X.J. Oberhumer"
+echo "// Copyright (C) 1996-2017 Markus F.X.J. Oberhumer"
 echo "//"
 echo "//   Generic Posix/Unix system"
 echo "//   Generic C compiler"
diff --git a/B/generic/clean.sh b/B/generic/clean.sh
index 87bd4c8..eb7a968 100755
--- a/B/generic/clean.sh
+++ b/B/generic/clean.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 ## vim:set ts=4 sw=4 et:
-# Copyright (C) 1996-2015 Markus F.X.J. Oberhumer
+# Copyright (C) 1996-2017 Markus F.X.J. Oberhumer
 
 rm -f *.o liblzo2.a dict.out lzopack.out precomp.out precomp2.out simple.out lzotest.out testmini.out
 
diff --git a/B/os2/emx.bat b/B/os2/emx.bat
index bc63571..182f049 100644
--- a/B/os2/emx.bat
+++ b/B/os2/emx.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   OS/2 32-bit

 @echo //   emx + gcc

diff --git a/B/os2/wc.bat b/B/os2/wc.bat
index 5e79567..cecce7d 100644
--- a/B/os2/wc.bat
+++ b/B/os2/wc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   OS/2 32-bit

 @echo //   Watcom C/C++

diff --git a/B/os2/zc.bat b/B/os2/zc.bat
index 9a1bc02..91bd480 100644
--- a/B/os2/zc.bat
+++ b/B/os2/zc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   OS/2 32-bit

 @echo //   Zortech C/C++

diff --git a/B/win32/bc.bat b/B/win32/bc.bat
index f8cf27c..7124c36 100644
--- a/B/win32/bc.bat
+++ b/B/win32/bc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Borland C/C++

diff --git a/B/win32/cygwin.bat b/B/win32/cygwin.bat
index c961d0b..7cc4448 100644
--- a/B/win32/cygwin.bat
+++ b/B/win32/cygwin.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   cygwin + gcc

diff --git a/B/win32/dm.bat b/B/win32/dm.bat
index c0b88aa..e9f944a 100644
--- a/B/win32/dm.bat
+++ b/B/win32/dm.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Digital Mars C/C++

diff --git a/B/win32/ic.bat b/B/win32/ic.bat
index 30c635c..eeb260b 100644
--- a/B/win32/ic.bat
+++ b/B/win32/ic.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Intel C/C++

diff --git a/B/win32/lccwin32.bat b/B/win32/lccwin32.bat
index 1c270c0..bd40d04 100644
--- a/B/win32/lccwin32.bat
+++ b/B/win32/lccwin32.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   lcc-win32

diff --git a/B/win32/mingw.bat b/B/win32/mingw.bat
index d466f46..edd9b89 100644
--- a/B/win32/mingw.bat
+++ b/B/win32/mingw.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   MinGW + gcc

diff --git a/B/win32/mwerks.bat b/B/win32/mwerks.bat
index f1e4d08..cb1a471 100644
--- a/B/win32/mwerks.bat
+++ b/B/win32/mwerks.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Metrowerks CodeWarrior C/C++

diff --git a/B/win32/pellesc.bat b/B/win32/pellesc.bat
index cfe8af5..5115be6 100644
--- a/B/win32/pellesc.bat
+++ b/B/win32/pellesc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Pelles C

diff --git a/B/win32/pgi.bat b/B/win32/pgi.bat
index 8b20d77..a3b3798 100644
--- a/B/win32/pgi.bat
+++ b/B/win32/pgi.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Portland Group PGI C/C++

diff --git a/B/win32/pw32.bat b/B/win32/pw32.bat
index 7b4d630..43d5717 100644
--- a/B/win32/pw32.bat
+++ b/B/win32/pw32.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   PW32 + gcc

diff --git a/B/win32/rsxnt.bat b/B/win32/rsxnt.bat
index de8d876..c72314f 100644
--- a/B/win32/rsxnt.bat
+++ b/B/win32/rsxnt.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   rsxnt + gcc

diff --git a/B/win32/sc.bat b/B/win32/sc.bat
index 2d56617..6f2932f 100644
--- a/B/win32/sc.bat
+++ b/B/win32/sc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Symantec C/C++

diff --git a/B/win32/vc.bat b/B/win32/vc.bat
index 0d66e81..f4336af 100644
--- a/B/win32/vc.bat
+++ b/B/win32/vc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Microsoft Visual C/C++

diff --git a/B/win32/vc_dll.bat b/B/win32/vc_dll.bat
index 7b0a02b..ee1f8de 100644
--- a/B/win32/vc_dll.bat
+++ b/B/win32/vc_dll.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Microsoft Visual C/C++ (DLL)

diff --git a/B/win32/vc_dll.def b/B/win32/vc_dll.def
index 215fb86..967cdf1 100644
--- a/B/win32/vc_dll.def
+++ b/B/win32/vc_dll.def
@@ -1,7 +1,7 @@
 EXPORTS

- _lzo1c_decompress_asm=lzo1c_decompress_asm

- _lzo1f_decompress_asm_fast=lzo1f_decompress_asm_fast

- _lzo1x_decompress_asm=lzo1x_decompress_asm

- _lzo1x_decompress_asm_fast=lzo1x_decompress_asm_fast

- _lzo1y_decompress_asm=lzo1y_decompress_asm

- _lzo1y_decompress_asm_fast=lzo1y_decompress_asm_fast

+ lzo1c_decompress_asm

+ lzo1f_decompress_asm_fast

+ lzo1x_decompress_asm

+ lzo1x_decompress_asm_fast

+ lzo1y_decompress_asm

+ lzo1y_decompress_asm_fast

diff --git a/B/win32/wc.bat b/B/win32/wc.bat
index 685df93..e7266e5 100644
--- a/B/win32/wc.bat
+++ b/B/win32/wc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 32-bit

 @echo //   Watcom C/C++

diff --git a/B/win64/ic.bat b/B/win64/ic.bat
index 9ddc3dd..4587019 100644
--- a/B/win64/ic.bat
+++ b/B/win64/ic.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 64-bit (Itanium)

 @echo //   Intel C/C++

diff --git a/B/win64/ic_dll.bat b/B/win64/ic_dll.bat
index 0bf285f..9139822 100644
--- a/B/win64/ic_dll.bat
+++ b/B/win64/ic_dll.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 64-bit (Itanium)

 @echo //   Intel C/C++ (DLL)

diff --git a/B/win64/vc.bat b/B/win64/vc.bat
index 888bd06..c442916 100644
--- a/B/win64/vc.bat
+++ b/B/win64/vc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 64-bit (AMD64 or Itanium)

 @echo //   Microsoft Visual C/C++

diff --git a/B/win64/vc_dll.bat b/B/win64/vc_dll.bat
index 8427e19..bfc26f2 100644
--- a/B/win64/vc_dll.bat
+++ b/B/win64/vc_dll.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2015 Markus F.X.J. Oberhumer

+@echo // Copyright (C) 1996-2017 Markus F.X.J. Oberhumer

 @echo //

 @echo //   Windows 64-bit (AMD64 or Itanium)

 @echo //   Microsoft Visual C/C++ (DLL)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf79f63..98c0a1a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,26 @@
 #
-# CMakeLists.txt --- a simple "CMake" file for building LZO
+# CMakeLists.txt --- a "CMake" file for building LZO
 #
 # This file is part of the LZO data compression library.
+#   http://www.oberhumer.com/opensource/lzo/
 #
-# Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 # All Rights Reserved.
 #
 
+cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
+
 #
-# simple usage:
+# simple usage example (Unix):
 #     mkdir -p build && cd build && cmake .. && make
 #
-# another usage example:
+# simple usage example (Windows MSVC):
+#     md build
+#     cd build
+#     cmake .. -G "NMake Makefiles"
+#     nmake
+#
+# another usage example (Unix):
 #     mkdir -p build/release-i686
 #     cd       build/release-i686
 #     cmake ../.. -DENABLE_STATIC=0 -DENABLE_SHARED=1 \
@@ -23,11 +32,9 @@
 # see http://www.cmake.org/ for more info
 #
 
-#
-# init
-#
-
-cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
+# /***********************************************************************
+# // init
+# ************************************************************************/
 
 # Disallow in-source builds. Note that you will still have to manually
 # clean up a few files if you accidentally try an in-source build.
@@ -37,50 +44,86 @@ if(",${CMAKE_SOURCE_DIR}," STREQUAL ",${CMAKE_BINARY_DIR},")
     message(FATAL_ERROR "ERROR: In-source builds are not allowed.")
 endif()
 
-project(lzo C)
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
+endif()
 
-#
-# configuration options
-#
+project(lzo VERSION 2.10 LANGUAGES C)
 
+# configuration options
 option(ENABLE_STATIC "Build static LZO library." ON)
 option(ENABLE_SHARED "Build shared LZO library." OFF)
-
-if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
+if(NOT ENABLE_STATIC AND NOT ENABLE_SHARED)
+    set(ENABLE_STATIC ON)
 endif()
+if(ENABLE_SHARED AND WIN32)
+    cmake_minimum_required(VERSION 3.4.3 FATAL_ERROR) # needed for WINDOWS_EXPORT_ALL_SYMBOLS
+endif()
+
+# install directories
 if(NOT CMAKE_INSTALL_PREFIX)
-    set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "" FORCE)
+    message(FATAL_ERROR "ERROR: CMAKE_INSTALL_PREFIX is not defined.")
 endif()
+include(FindPkgConfig QUIET)
+include(GNUInstallDirs)
 
-#
-# targets
-#
+# /***********************************************************************
+# // targets
+# ************************************************************************/
 
 file(GLOB lzo_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.c")
 list(SORT lzo_SOURCES)
 
 # LZO library
-if(NOT ENABLE_STATIC AND NOT ENABLE_SHARED)
-    set(ENABLE_STATIC ON)
+if(NOT DEFINED lzo_USE_OBJECT_LIB)
+    if(ENABLE_STATIC AND ENABLE_SHARED)
+        if(CMAKE_POSITION_INDEPENDENT_CODE OR MSVC)
+            # all objects are PIC on this system => can share objects
+            set(lzo_USE_OBJECT_LIB 1)
+        endif()
+    endif()
+endif()
+set(lzo_COMPILE_TARGETS )
+if(lzo_USE_OBJECT_LIB)
+    add_library(lzo_object_lib OBJECT ${lzo_SOURCES})
+    list(APPEND lzo_COMPILE_TARGETS lzo_object_lib)
+    set_property(TARGET lzo_object_lib PROPERTY POSITION_INDEPENDENT_CODE ON)
 endif()
 if(ENABLE_STATIC)
-    add_library(lzo_static STATIC ${lzo_SOURCES})
-    set_target_properties(lzo_static PROPERTIES OUTPUT_NAME lzo2)
+    if(lzo_USE_OBJECT_LIB)
+        add_library(lzo_static_lib STATIC $<TARGET_OBJECTS:lzo_object_lib>)
+    else()
+        add_library(lzo_static_lib STATIC ${lzo_SOURCES})
+        list(APPEND lzo_COMPILE_TARGETS lzo_static_lib)
+    endif()
+    set_target_properties(lzo_static_lib PROPERTIES OUTPUT_NAME lzo2)
 endif()
 if(ENABLE_SHARED)
-    add_library(lzo_shared SHARED ${lzo_SOURCES})
-    set_target_properties(lzo_shared PROPERTIES OUTPUT_NAME lzo2)
-    set_target_properties(lzo_shared PROPERTIES SOVERSION 2 VERSION 2.0.0)
+    if(lzo_USE_OBJECT_LIB)
+        add_library(lzo_shared_lib SHARED $<TARGET_OBJECTS:lzo_object_lib>)
+    else()
+        add_library(lzo_shared_lib SHARED ${lzo_SOURCES})
+        list(APPEND lzo_COMPILE_TARGETS lzo_shared_lib)
+    endif()
+    set_target_properties(lzo_shared_lib PROPERTIES OUTPUT_NAME lzo2)
+    if(ENABLE_STATIC)
+        # avoid name clash between static lzo2.lib and DLL import-lib lzo2.lib
+        set_target_properties(lzo_shared_lib PROPERTIES ARCHIVE_OUTPUT_NAME lzo2_dllimport)
+    endif()
+    set_target_properties(lzo_shared_lib PROPERTIES SOVERSION 2 VERSION 2.0.0) # ABI version is 2.0.0 !
+    set_target_properties(lzo_shared_lib PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
 endif()
 
 # tests & examples
 macro(lzo_add_executable t)
     add_executable(${t} ${ARGN})
     if(ENABLE_STATIC)
-        target_link_libraries(${t} lzo_static)
+        target_link_libraries(${t} lzo_static_lib)
     else()
-        target_link_libraries(${t} lzo_shared)
+        target_link_libraries(${t} lzo_shared_lib)
+        if(DEFINED CMAKE_INSTALL_FULL_LIBDIR)
+            set_target_properties(${t} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
+        endif()
     endif()
 endmacro()
 # main test driver
@@ -103,15 +146,16 @@ endif()
 # miniLZO
 if(1)
     add_executable(testmini minilzo/testmini.c minilzo/minilzo.c)
-    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/lzo) # needed for "lzoconf.h"
+    target_include_directories(testmini PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include/lzo") # needed for "lzoconf.h"
 endif()
 
-#
-# compilation flags
-#
+# /***********************************************************************
+# // compilation flags
+# // this section currently mostly matches the Autoconf version
+# ************************************************************************/
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 
 include(CheckFunctionExists)
 include(CheckIncludeFile)
@@ -120,6 +164,14 @@ include(CheckSymbolExists)
 include(CheckTypeSize)
 include(TestBigEndian)
 
+if(MSVC)
+    # disable silly warnings about using "deprecated" POSIX functions like fopen()
+    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+    add_definitions(-D_CRT_NONSTDC_NO_WARNINGS)
+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif()
+
 # Checks for header files
 macro(mfx_check_include_file f var)
     check_include_file("${f}" "mfx_${var}")
@@ -187,48 +239,76 @@ endif()
 # LZO_HAVE_CONFIG_H
 add_definitions(-DLZO_CFG_NO_CONFIG_HEADER=1)
 
-#
-# "make install"
-#
+# warnings
+foreach(t ${lzo_COMPILE_TARGETS})
+    if(CMAKE_C_COMPILER_ID MATCHES "^(Clang|GNU)$")
+        target_compile_options(${t} PRIVATE -Wall -W -Wcast-qual)
+    endif()
+endforeach()
 
-# these subdirs are relative to CMAKE_INSTALL_PREFIX
-if(NOT DEFINED install_doc_subdir)
-    set(install_doc_subdir "share/doc/lzo")
-endif()
-if(NOT DEFINED install_include_subdir)
-    set(install_include_subdir "include/lzo")
-endif()
-if(NOT DEFINED install_lib_subdir)
-    set(install_lib_subdir "lib")
-endif()
-if(NOT DEFINED install_examples_subdir)
-    set(install_examples_subdir "libexec/lzo/examples")
-endif()
+# /***********************************************************************
+# // "make test"
+# ************************************************************************/
+
+include(CTest)
+add_test(NAME simple     COMMAND simple)
+add_test(NAME testmini   COMMAND testmini)
+add_test(NAME lzotest-01 COMMAND lzotest -mlzo   -n2  -q "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+add_test(NAME lzotest-02 COMMAND lzotest -mavail -n10 -q "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+add_test(NAME lzotest-03 COMMAND lzotest -mall   -n10 -q "${CMAKE_CURRENT_SOURCE_DIR}/include/lzo/lzodefs.h")
+
+# /***********************************************************************
+# // "make install"
+# ************************************************************************/
 
-set(doc_DATA AUTHORS COPYING NEWS THANKS doc/LZO.FAQ doc/LZO.TXT doc/LZOAPI.TXT)
-set(pkginclude_HEADERS
-    include/lzo/lzo1.h include/lzo/lzo1a.h include/lzo/lzo1b.h
+if(DEFINED CMAKE_INSTALL_FULL_LIBDIR)
+
+set(f AUTHORS COPYING NEWS THANKS doc/LZO.FAQ doc/LZO.TXT doc/LZOAPI.TXT)
+install(FILES ${f} DESTINATION "${CMAKE_INSTALL_FULL_DOCDIR}")
+
+set(f include/lzo/lzo1.h include/lzo/lzo1a.h include/lzo/lzo1b.h
     include/lzo/lzo1c.h include/lzo/lzo1f.h include/lzo/lzo1x.h
     include/lzo/lzo1y.h include/lzo/lzo1z.h include/lzo/lzo2a.h
     include/lzo/lzo_asm.h include/lzo/lzoconf.h include/lzo/lzodefs.h
     include/lzo/lzoutil.h
 )
+install(FILES ${f} DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lzo")
 
-install(FILES ${doc_DATA} DESTINATION "${install_doc_subdir}")
-install(FILES ${pkginclude_HEADERS} DESTINATION "${install_include_subdir}")
 if(ENABLE_STATIC)
-    install(TARGETS lzo_static DESTINATION "${install_lib_subdir}")
+    install(TARGETS lzo_static_lib ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
 endif()
 if(ENABLE_SHARED)
-    install(TARGETS lzo_shared DESTINATION "${install_lib_subdir}")
+    install(TARGETS lzo_shared_lib
+        ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+        LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
+        RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
+    )
 endif()
-if(0)
-    set(lzo_EXAMPLES lzopack lzotest simple)
-    if(NOT ENABLE_STATIC)
-        set(d "${CMAKE_INSTALL_PREFIX}/${install_lib_subdir}")
-        set_target_properties(${lzo_EXAMPLES} PROPERTIES INSTALL_RPATH "${d}")
-    endif()
-    install(TARGETS ${lzo_EXAMPLES} DESTINATION "${install_examples_subdir}")
+
+if(1)
+    set(f lzopack lzotest simple testmini) # examples
+    install(TARGETS ${f} DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/lzo/examples")
+endif()
+
+if(PKG_CONFIG_FOUND)
+    configure_file(lzo2.pc.cmakein lzo2.pc @ONLY)
+    #if(EXISTS "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lzo2.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
+    #endif()
+endif()
+
+endif() # CMAKE_INSTALL_FULL_LIBDIR
+
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.maint.txt")
+include("${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.maint.txt")
+endif()
+
+# finally print some info about the build-type
+if(CMAKE_CONFIGURATION_TYPES)
+message(STATUS "CMAKE_CONFIGURATION_TYPES = ${CMAKE_CONFIGURATION_TYPES}")
+endif()
+if(CMAKE_BUILD_TYPE)
+message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}")
 endif()
 
 # vim:set ft=cmake ts=4 sw=4 tw=0 et:
diff --git a/Makefile.am b/Makefile.am
index 8365cab..e4d383b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,9 @@
 #  Makefile --- Makefile for building the LZO library
 #
 #  This file is part of the LZO data compression library.
+#    http://www.oberhumer.com/opensource/lzo/
 #
-#  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+#  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 #  All Rights Reserved.
 #
 
@@ -13,6 +14,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)
 LDADD = src/liblzo2.la
 lib_LTLIBRARIES =
 noinst_PROGRAMS =
+pkgconfig_DATA = lzo2.pc
 
 
 ##/***********************************************************************
@@ -20,35 +22,35 @@ noinst_PROGRAMS =
 ##************************************************************************/
 
 doc_DATA = AUTHORS COPYING NEWS THANKS doc/LZO.FAQ doc/LZO.TXT doc/LZOAPI.TXT
-EXTRA_DIST += BUGS CMakeLists.txt autoconf/shtool
+EXTRA_DIST += BUGS CMakeLists.txt lzo2.pc.cmakein autoconf/shtool
 
 # hooks for Automake targets
 dist-hook: dist-hook-1
 dist-hook-1:
-	cp -pR $(srcdir)/B/ $(srcdir)/asm/ $(srcdir)/doc/ $(srcdir)/util/ "$(distdir)/"
+	cp -pR '$(srcdir)/B/' '$(srcdir)/asm/' '$(srcdir)/doc/' '$(srcdir)/util/' '$(distdir)/'
 	-rm -f $(distdir)/util/*.dat
 
 check-local: all-am
-	./lzotest/lzotest -mlzo -n2 -q $(top_srcdir)/COPYING
+	./lzotest/lzotest$(EXEEXT) -mlzo -n2 -q '$(top_srcdir)/COPYING'
 	@echo
 	@echo "===== All checks passed. Type 'make test' for more exhaustive testing. ====="
 	@echo
 
 # special targets
 basic-test: all
-	./lzotest/lzotest -mlzo -n2 -q $(top_srcdir)/COPYING
-	./tests/align
-	./tests/chksum
-	./examples/simple
-	./minilzo/testmini
+	./lzotest/lzotest$(EXEEXT) -mlzo -n2 -q '$(top_srcdir)/COPYING'
+	./tests/align$(EXEEXT)
+	./tests/chksum$(EXEEXT)
+	./examples/simple$(EXEEXT)
+	./minilzo/testmini$(EXEEXT)
 
 test: all
-	./lzotest/lzotest -mavail -n10 -q $(top_srcdir)/COPYING
-	LZOTEST=./lzotest/lzotest$(EXEEXT) $(SHELL) -e "$(top_srcdir)/util/check.sh" "$(top_srcdir)"
-	./tests/align
-	./tests/chksum
-	./examples/simple
-	./minilzo/testmini
+	./lzotest/lzotest$(EXEEXT) -mavail -n10 -q '$(top_srcdir)/COPYING'
+	LZOTEST=./lzotest/lzotest$(EXEEXT) $(SHELL) '$(top_srcdir)/util/check.sh' '$(top_srcdir)'
+	./tests/align$(EXEEXT)
+	./tests/chksum$(EXEEXT)
+	./examples/simple$(EXEEXT)
+	./minilzo/testmini$(EXEEXT)
 	@echo
 	@echo "===== All tests passed. Now you are ready to install LZO. ====="
 	@echo
diff --git a/Makefile.in b/Makefile.in
index a88e6a8..dd71d85 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,8 +18,9 @@
 #  Makefile --- Makefile for building the LZO library
 #
 #  This file is part of the LZO data compression library.
+#    http://www.oberhumer.com/opensource/lzo/
 #
-#  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+#  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 #  All Rights Reserved.
 #
 
@@ -119,7 +120,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = lzo2.pc
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -149,7 +150,7 @@ am__uninstall_files_from_dir = { \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(docdir)" \
-	"$(DESTDIR)$(pkgincludedir)"
+	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 src_liblzo2_la_DEPENDENCIES = $(LZO_ASM_OBJECTS)
 am__dirstamp = $(am__leading_dot)dirstamp
@@ -298,7 +299,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-DATA = $(doc_DATA)
+DATA = $(doc_DATA) $(pkgconfig_DATA)
 HEADERS = $(pkginclude_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
 	$(LISP)config.hin
@@ -323,7 +324,8 @@ CTAGS = ctags
 CSCOPE = cscope
 AM_RECURSIVE_TARGETS = cscope
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.hin \
-	$(top_srcdir)/autoconf/ar-lib $(top_srcdir)/autoconf/compile \
+	$(srcdir)/lzo2.pc.in $(top_srcdir)/autoconf/ar-lib \
+	$(top_srcdir)/autoconf/compile \
 	$(top_srcdir)/autoconf/config.guess \
 	$(top_srcdir)/autoconf/config.sub \
 	$(top_srcdir)/autoconf/depcomp \
@@ -460,6 +462,7 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -475,23 +478,25 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = BUGS CMakeLists.txt autoconf/shtool src/compr1b.h \
-	src/compr1c.h src/config1.h src/config1a.h src/config1b.h \
-	src/config1c.h src/config1f.h src/config1x.h src/config1y.h \
-	src/config1z.h src/config2a.h src/lzo1_cm.ch src/lzo1_d.ch \
-	src/lzo1a_cm.ch src/lzo1a_cr.ch src/lzo1a_de.h src/lzo1b_c.ch \
-	src/lzo1b_cc.h src/lzo1b_cm.ch src/lzo1b_cr.ch src/lzo1b_d.ch \
-	src/lzo1b_de.h src/lzo1b_r.ch src/lzo1b_sm.ch src/lzo1b_tm.ch \
-	src/lzo1c_cc.h src/lzo1f_d.ch src/lzo1x_c.ch src/lzo1x_d.ch \
-	src/lzo1x_oo.ch src/lzo2a_d.ch src/lzo_conf.h src/lzo_dict.h \
-	src/lzo_dll.ch src/lzo_func.h src/lzo_mchw.ch src/lzo_ptr.h \
-	src/lzo_supp.h src/lzo_swd.ch src/stats1a.h src/stats1b.h \
-	src/stats1c.h examples/portab.h examples/portab_a.h \
-	lzotest/asm.h lzotest/db.h lzotest/wrap.h lzotest/wrapmisc.h \
-	minilzo/Makefile.minilzo minilzo/README.LZO minilzo/minilzo.h
+EXTRA_DIST = BUGS CMakeLists.txt lzo2.pc.cmakein autoconf/shtool \
+	src/compr1b.h src/compr1c.h src/config1.h src/config1a.h \
+	src/config1b.h src/config1c.h src/config1f.h src/config1x.h \
+	src/config1y.h src/config1z.h src/config2a.h src/lzo1_cm.ch \
+	src/lzo1_d.ch src/lzo1a_cm.ch src/lzo1a_cr.ch src/lzo1a_de.h \
+	src/lzo1b_c.ch src/lzo1b_cc.h src/lzo1b_cm.ch src/lzo1b_cr.ch \
+	src/lzo1b_d.ch src/lzo1b_de.h src/lzo1b_r.ch src/lzo1b_sm.ch \
+	src/lzo1b_tm.ch src/lzo1c_cc.h src/lzo1f_d.ch src/lzo1x_c.ch \
+	src/lzo1x_d.ch src/lzo1x_oo.ch src/lzo2a_d.ch src/lzo_conf.h \
+	src/lzo_dict.h src/lzo_dll.ch src/lzo_func.h src/lzo_mchw.ch \
+	src/lzo_ptr.h src/lzo_supp.h src/lzo_swd.ch src/stats1a.h \
+	src/stats1b.h src/stats1c.h examples/portab.h \
+	examples/portab_a.h lzotest/asm.h lzotest/db.h lzotest/wrap.h \
+	lzotest/wrapmisc.h minilzo/Makefile.minilzo minilzo/README.LZO \
+	minilzo/minilzo.h
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)
 LDADD = src/liblzo2.la
 lib_LTLIBRARIES = src/liblzo2.la
+pkgconfig_DATA = lzo2.pc
 doc_DATA = AUTHORS COPYING NEWS THANKS doc/LZO.FAQ doc/LZO.TXT doc/LZOAPI.TXT
 pkginclude_HEADERS = \
     include/lzo/lzo1.h include/lzo/lzo1a.h include/lzo/lzo1b.h \
@@ -610,6 +615,8 @@ $(srcdir)/config.hin: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
+lzo2.pc: $(top_builddir)/config.status $(srcdir)/lzo2.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -1059,6 +1066,27 @@ uninstall-docDATA:
 	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
+install-pkgconfigDATA: $(pkgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+	done
+
+uninstall-pkgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 install-pkgincludeHEADERS: $(pkginclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
@@ -1312,7 +1340,7 @@ check: check-am
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \
 		config.h
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgincludedir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -1381,7 +1409,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-docDATA install-pkgincludeHEADERS
+install-data-am: install-docDATA install-pkgconfigDATA \
+	install-pkgincludeHEADERS
 
 install-dvi: install-dvi-am
 
@@ -1430,7 +1459,7 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-docDATA uninstall-libLTLIBRARIES \
-	uninstall-pkgincludeHEADERS
+	uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS
 
 .MAKE: all check-am install-am install-strip
 
@@ -1447,13 +1476,13 @@ uninstall-am: uninstall-docDATA uninstall-libLTLIBRARIES \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am \
 	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-pkgincludeHEADERS install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
-	uninstall-docDATA uninstall-libLTLIBRARIES \
-	uninstall-pkgincludeHEADERS
+	install-pkgconfigDATA install-pkgincludeHEADERS install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-docDATA uninstall-libLTLIBRARIES \
+	uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS
 
 .PRECIOUS: Makefile
 
@@ -1461,30 +1490,30 @@ uninstall-am: uninstall-docDATA uninstall-libLTLIBRARIES \
 # hooks for Automake targets
 dist-hook: dist-hook-1
 dist-hook-1:
-	cp -pR $(srcdir)/B/ $(srcdir)/asm/ $(srcdir)/doc/ $(srcdir)/util/ "$(distdir)/"
+	cp -pR '$(srcdir)/B/' '$(srcdir)/asm/' '$(srcdir)/doc/' '$(srcdir)/util/' '$(distdir)/'
 	-rm -f $(distdir)/util/*.dat
 
 check-local: all-am
-	./lzotest/lzotest -mlzo -n2 -q $(top_srcdir)/COPYING
+	./lzotest/lzotest$(EXEEXT) -mlzo -n2 -q '$(top_srcdir)/COPYING'
 	@echo
 	@echo "===== All checks passed. Type 'make test' for more exhaustive testing. ====="
 	@echo
 
 # special targets
 basic-test: all
-	./lzotest/lzotest -mlzo -n2 -q $(top_srcdir)/COPYING
-	./tests/align
-	./tests/chksum
-	./examples/simple
-	./minilzo/testmini
+	./lzotest/lzotest$(EXEEXT) -mlzo -n2 -q '$(top_srcdir)/COPYING'
+	./tests/align$(EXEEXT)
+	./tests/chksum$(EXEEXT)
+	./examples/simple$(EXEEXT)
+	./minilzo/testmini$(EXEEXT)
 
 test: all
-	./lzotest/lzotest -mavail -n10 -q $(top_srcdir)/COPYING
-	LZOTEST=./lzotest/lzotest$(EXEEXT) $(SHELL) -e "$(top_srcdir)/util/check.sh" "$(top_srcdir)"
-	./tests/align
-	./tests/chksum
-	./examples/simple
-	./minilzo/testmini
+	./lzotest/lzotest$(EXEEXT) -mavail -n10 -q '$(top_srcdir)/COPYING'
+	LZOTEST=./lzotest/lzotest$(EXEEXT) $(SHELL) '$(top_srcdir)/util/check.sh' '$(top_srcdir)'
+	./tests/align$(EXEEXT)
+	./tests/chksum$(EXEEXT)
+	./examples/simple$(EXEEXT)
+	./minilzo/testmini$(EXEEXT)
 	@echo
 	@echo "===== All tests passed. Now you are ready to install LZO. ====="
 	@echo
diff --git a/NEWS b/NEWS
index 80da4ea..4c2bbda 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,12 @@
 User visible changes for LZO -- a real-time data compression library
 ============================================================================
 
+Changes in 2.10 (01 Mar 2017)
+  * Improve CMake build support.
+  * Add support for pkg-config.
+  * Do not redefine "snprintf" so that the examples build with MSVC 2015.
+  * Assorted cleanups.
+
 Changes in 2.09 (04 Feb 2015)
   * Work around gcc bug #64516 that could affect architectures like
     armv4, armv5 and sparc.
@@ -16,10 +22,10 @@ Changes in 2.07 (25 Jun 2014)
     variants which could result in a possible buffer overrun when
     processing maliciously crafted compressed input data.
 
-    Fortunately this issue only affects 32-bit systems and also can only happen
+    Note that this issue only affects 32-bit systems and also can only happen
     if you use uncommonly huge buffer sizes where you have to decompress more
-    than 16 MiB (> 2^24 bytes) untrusted compressed bytes within a single
-    function call, so the practical implications are limited.
+    than 16 MiB (> 2^24 bytes) untrusted compressed bytes within a
+    *single* function call, so the practical implications are limited.
 
     POTENTIAL SECURITY ISSUE. CVE-2014-4607.
 
diff --git a/aclocal.m4 b/aclocal.m4
index 9db4ce9..1f3e24f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -20,6 +20,221 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996-2001, 2003-2013 Free Software Foundation, Inc.
diff --git a/asm/i386/obj/elf32/lzo1c_s1.o b/asm/i386/obj/elf32/lzo1c_s1.o
index 59f320e..eb4429e 100644
--- a/asm/i386/obj/elf32/lzo1c_s1.o
+++ b/asm/i386/obj/elf32/lzo1c_s1.o
diff --git a/asm/i386/obj/elf32/lzo1f_f1.o b/asm/i386/obj/elf32/lzo1f_f1.o
index 064b1c5..3134a85 100644
--- a/asm/i386/obj/elf32/lzo1f_f1.o
+++ b/asm/i386/obj/elf32/lzo1f_f1.o
diff --git a/asm/i386/obj/elf32/lzo1x_f1.o b/asm/i386/obj/elf32/lzo1x_f1.o
index 470fb75..fc96ecc 100644
--- a/asm/i386/obj/elf32/lzo1x_f1.o
+++ b/asm/i386/obj/elf32/lzo1x_f1.o
diff --git a/asm/i386/obj/elf32/lzo1x_s1.o b/asm/i386/obj/elf32/lzo1x_s1.o
index 8483013..817386d 100644
--- a/asm/i386/obj/elf32/lzo1x_s1.o
+++ b/asm/i386/obj/elf32/lzo1x_s1.o
diff --git a/asm/i386/obj/elf32/lzo1y_f1.o b/asm/i386/obj/elf32/lzo1y_f1.o
index 5ac4a8f..15300e8 100644
--- a/asm/i386/obj/elf32/lzo1y_f1.o
+++ b/asm/i386/obj/elf32/lzo1y_f1.o
diff --git a/asm/i386/obj/elf32/lzo1y_s1.o b/asm/i386/obj/elf32/lzo1y_s1.o
index eb265ab..2fdd42e 100644
--- a/asm/i386/obj/elf32/lzo1y_s1.o
+++ b/asm/i386/obj/elf32/lzo1y_s1.o
diff --git a/asm/i386/obj/win32/lzo1c_s1.obj b/asm/i386/obj/win32/lzo1c_s1.obj
index ef6189c..b9703e8 100644
--- a/asm/i386/obj/win32/lzo1c_s1.obj
+++ b/asm/i386/obj/win32/lzo1c_s1.obj
diff --git a/asm/i386/obj/win32/lzo1f_f1.obj b/asm/i386/obj/win32/lzo1f_f1.obj
index 83bafa9..e0c0295 100644
--- a/asm/i386/obj/win32/lzo1f_f1.obj
+++ b/asm/i386/obj/win32/lzo1f_f1.obj
diff --git a/asm/i386/obj/win32/lzo1x_f1.obj b/asm/i386/obj/win32/lzo1x_f1.obj
index 83dc586..c6c1f80 100644
--- a/asm/i386/obj/win32/lzo1x_f1.obj
+++ b/asm/i386/obj/win32/lzo1x_f1.obj
diff --git a/asm/i386/obj/win32/lzo1x_s1.obj b/asm/i386/obj/win32/lzo1x_s1.obj
index dff65d3..b95eb96 100644
--- a/asm/i386/obj/win32/lzo1x_s1.obj
+++ b/asm/i386/obj/win32/lzo1x_s1.obj
diff --git a/asm/i386/obj/win32/lzo1y_f1.obj b/asm/i386/obj/win32/lzo1y_f1.obj
index 5c0d1c2..3082791 100644
--- a/asm/i386/obj/win32/lzo1y_f1.obj
+++ b/asm/i386/obj/win32/lzo1y_f1.obj
diff --git a/asm/i386/obj/win32/lzo1y_s1.obj b/asm/i386/obj/win32/lzo1y_s1.obj
index 68c5d30..1c34c7b 100644
--- a/asm/i386/obj/win32/lzo1y_s1.obj
+++ b/asm/i386/obj/win32/lzo1y_s1.obj
diff --git a/asm/i386/src/enter.ash b/asm/i386/src/enter.ash
index fbfc9b8..cc5941b 100644
--- a/asm/i386/src/enter.ash
+++ b/asm/i386/src/enter.ash
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src/leave.ash b/asm/i386/src/leave.ash
index 209e2bb..dbaeda0 100644
--- a/asm/i386/src/leave.ash
+++ b/asm/i386/src/leave.ash
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src/lzo1c_d.ash b/asm/i386/src/lzo1c_d.ash
index d373ed2..0d41024 100644
--- a/asm/i386/src/lzo1c_d.ash
+++ b/asm/i386/src/lzo1c_d.ash
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src/lzo1c_s1.S b/asm/i386/src/lzo1c_s1.S
index 2de4463..03ca397 100644
--- a/asm/i386/src/lzo1c_s1.S
+++ b/asm/i386/src/lzo1c_s1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src/lzo1f_d.ash b/asm/i386/src/lzo1f_d.ash
index edbe0a6..99093f6 100644
--- a/asm/i386/src/lzo1f_d.ash
+++ b/asm/i386/src/lzo1f_d.ash
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src/lzo1f_f1.S b/asm/i386/src/lzo1f_f1.S
index b77c894..212b62f 100644
--- a/asm/i386/src/lzo1f_f1.S
+++ b/asm/i386/src/lzo1f_f1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src/lzo1x_d.ash b/asm/i386/src/lzo1x_d.ash
index 35d1ca4..4635a2a 100644
--- a/asm/i386/src/lzo1x_d.ash
+++ b/asm/i386/src/lzo1x_d.ash
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src/lzo1x_f1.S b/asm/i386/src/lzo1x_f1.S
index 2081052..4f02add 100644
--- a/asm/i386/src/lzo1x_f1.S
+++ b/asm/i386/src/lzo1x_f1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src/lzo1x_s1.S b/asm/i386/src/lzo1x_s1.S
index c034d7a..d706fc2 100644
--- a/asm/i386/src/lzo1x_s1.S
+++ b/asm/i386/src/lzo1x_s1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src/lzo1y_f1.S b/asm/i386/src/lzo1y_f1.S
index 2fbd022..2982c32 100644
--- a/asm/i386/src/lzo1y_f1.S
+++ b/asm/i386/src/lzo1y_f1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src/lzo1y_s1.S b/asm/i386/src/lzo1y_s1.S
index 245a8f7..ddf8574 100644
--- a/asm/i386/src/lzo1y_s1.S
+++ b/asm/i386/src/lzo1y_s1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src/lzo_asm.h b/asm/i386/src/lzo_asm.h
index 538b408..7227b31 100644
--- a/asm/i386/src/lzo_asm.h
+++ b/asm/i386/src/lzo_asm.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_gas/all/asm_all.S b/asm/i386/src_gas/all/asm_all.S
index 730ed07..8aa67cb 100644
--- a/asm/i386/src_gas/all/asm_all.S
+++ b/asm/i386/src_gas/all/asm_all.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -27,17 +27,31 @@
 
 /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
+#undef _
 #ifndef NAME1
-#if (defined(__MACH__) && defined(__APPLE__))
+#if defined(__ELF__)
+#  define NAME1(a)           a
+#elif (defined(__MACH__) && defined(__APPLE__))
+#  define NAME1(a)      _ ## a
+#elif defined(_WIN32) && !defined(_WIN64)
 #  define NAME1(a)      _ ## a
+#elif defined(_WIN64)
+#  define NAME1(a)           a
 #else
 #  define NAME1(a)      _ ## a
 #  define NAME2(a)           a
 #endif
 #endif
+#define XNAME(a,b,c)    LZO_PP_ECONCAT3(NAME1(a),b,c)
 #ifndef LZO_PP_CONCAT2
 #  define LZO_PP_CONCAT2(a,b)   a ## b
 #endif
+#ifndef LZO_PP_CONCAT3
+#  define LZO_PP_CONCAT3(a,b,c) a ## b ## c
+#endif
+#ifndef LZO_PP_ECONCAT3
+#  define LZO_PP_ECONCAT3(a,b,c) LZO_PP_CONCAT3(a,b,c)
+#endif
 #ifndef p2align
 #  define p2align(a)        .p2align a
 #endif
@@ -50,38 +64,38 @@
 #  elif (defined(__MACH__) && defined(__APPLE__))
 #    define hiddenf(a)      .private_extern a
 #  else
-#    define hiddenf(a)
+#    define hiddenf(a)      
 #  endif
 #endif
 #ifndef typef
 #  if defined(__ELF__)
 #    define typef(a)        .type a,@function
 #  else
-#    define typef(a)
+#    define typef(a)        
 #  endif
 #endif
 #ifndef sizef
 #  if defined(__ELF__)
 #    define sizef(a,b)      .size a,b
 #  else
-#    define sizef(a,b)
+#    define sizef(a,b)      
 #  endif
 #endif
 #if defined(__ELF__)
 .section .note.GNU-stack,"",@progbits
 #endif
 .text
-#if defined(_WIN32) || defined(__WIN32__)
-#  if defined(LZO_WIN32_FEAT_00)
-#    LZO_WIN32_FEAT_00
-#  else
+#if defined(_WIN32) && !defined(_WIN64)
+#if defined(LZO_WIN32_FEAT_00)
+LZO_WIN32_FEAT_00
+#else
 #if defined(__GNUC__) && !defined(__clang__)
 .globl @feat.00
 #endif
 @feat.00 = 1
-#  endif
 #endif
-#if defined(__ELF__) || (defined(__MACH__) && defined(__APPLE__)) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) || defined(__WIN64__)
+#endif
+#if defined(__ELF__) || (defined(__MACH__) && defined(__APPLE__)) || defined(_WIN32) || defined(_WIN64)
 p2align(6)
 #else
 p2align(4)
diff --git a/asm/i386/src_gas/asminit.def b/asm/i386/src_gas/asminit.def
index 257190d..0f1859e 100644
--- a/asm/i386/src_gas/asminit.def
+++ b/asm/i386/src_gas/asminit.def
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -25,18 +25,32 @@
    http://www.oberhumer.com/opensource/lzo/
  */
 
+#undef _
 #ifndef NAME1
-#if (defined(__MACH__) && defined(__APPLE__))
+#if defined(__ELF__)
+#  define NAME1(a)           a
+#elif (defined(__MACH__) && defined(__APPLE__))
+#  define NAME1(a)      _ ## a
+#elif defined(_WIN32) && !defined(_WIN64)
 #  define NAME1(a)      _ ## a
+#elif defined(_WIN64)
+#  define NAME1(a)           a
 #else
 #  define NAME1(a)      _ ## a
 #  define NAME2(a)           a
 #endif
 #endif
+#define XNAME(a,b,c)    LZO_PP_ECONCAT3(NAME1(a),b,c)
 
 #ifndef LZO_PP_CONCAT2
 #  define LZO_PP_CONCAT2(a,b)   a ## b
 #endif
+#ifndef LZO_PP_CONCAT3
+#  define LZO_PP_CONCAT3(a,b,c) a ## b ## c
+#endif
+#ifndef LZO_PP_ECONCAT3
+#  define LZO_PP_ECONCAT3(a,b,c) LZO_PP_CONCAT3(a,b,c)
+#endif
 
 #ifndef p2align
 #  define p2align(a)        .p2align a
@@ -50,21 +64,21 @@
 #  elif (defined(__MACH__) && defined(__APPLE__))
 #    define hiddenf(a)      .private_extern a
 #  else
-#    define hiddenf(a)
+#    define hiddenf(a)      /*empty*/
 #  endif
 #endif
 #ifndef typef
 #  if defined(__ELF__)
 #    define typef(a)        .type a,@function
 #  else
-#    define typef(a)
+#    define typef(a)        /*empty*/
 #  endif
 #endif
 #ifndef sizef
 #  if defined(__ELF__)
 #    define sizef(a,b)      .size a,b
 #  else
-#    define sizef(a,b)
+#    define sizef(a,b)      /*empty*/
 #  endif
 #endif
 
@@ -72,17 +86,17 @@
 .section .note.GNU-stack,"",@progbits
 #endif
 .text
-#if defined(_WIN32) || defined(__WIN32__)
-#  if defined(LZO_WIN32_FEAT_00)
-#    LZO_WIN32_FEAT_00
-#  else
+#if defined(_WIN32) && !defined(_WIN64)
+#if defined(LZO_WIN32_FEAT_00)
+LZO_WIN32_FEAT_00
+#else
 #if defined(__GNUC__) && !defined(__clang__)
 .globl @feat.00
 #endif
 @feat.00 = 1
-#  endif
 #endif
-#if defined(__ELF__) || (defined(__MACH__) && defined(__APPLE__)) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) || defined(__WIN64__)
+#endif
+#if defined(__ELF__) || (defined(__MACH__) && defined(__APPLE__)) || defined(_WIN32) || defined(_WIN64)
 p2align(6)
 #else
 p2align(4)
diff --git a/asm/i386/src_gas/lzo1c_s1.S b/asm/i386/src_gas/lzo1c_s1.S
index 4f15ca8..374e60f 100644
--- a/asm/i386/src_gas/lzo1c_s1.S
+++ b/asm/i386/src_gas/lzo1c_s1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_gas/lzo1f_f1.S b/asm/i386/src_gas/lzo1f_f1.S
index a2c3c4e..4c5427b 100644
--- a/asm/i386/src_gas/lzo1f_f1.S
+++ b/asm/i386/src_gas/lzo1f_f1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_gas/lzo1x_f1.S b/asm/i386/src_gas/lzo1x_f1.S
index 8e2bcc9..9ca92c3 100644
--- a/asm/i386/src_gas/lzo1x_f1.S
+++ b/asm/i386/src_gas/lzo1x_f1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_gas/lzo1x_s1.S b/asm/i386/src_gas/lzo1x_s1.S
index ed43092..3e31c18 100644
--- a/asm/i386/src_gas/lzo1x_s1.S
+++ b/asm/i386/src_gas/lzo1x_s1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_gas/lzo1y_f1.S b/asm/i386/src_gas/lzo1y_f1.S
index 32ee007..b3129c3 100644
--- a/asm/i386/src_gas/lzo1y_f1.S
+++ b/asm/i386/src_gas/lzo1y_f1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_gas/lzo1y_s1.S b/asm/i386/src_gas/lzo1y_s1.S
index 6a52bbb..c67db49 100644
--- a/asm/i386/src_gas/lzo1y_s1.S
+++ b/asm/i386/src_gas/lzo1y_s1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_masm/all/asm_all.asm b/asm/i386/src_masm/all/asm_all.asm
index bda48d4..58ae470 100644
--- a/asm/i386/src_masm/all/asm_all.asm
+++ b/asm/i386/src_masm/all/asm_all.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_masm/asminit.def b/asm/i386/src_masm/asminit.def
index 749eb9b..5754d78 100644
--- a/asm/i386/src_masm/asminit.def
+++ b/asm/i386/src_masm/asminit.def
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_masm/lzo1c_s1.asm b/asm/i386/src_masm/lzo1c_s1.asm
index f9418df..67016e3 100644
--- a/asm/i386/src_masm/lzo1c_s1.asm
+++ b/asm/i386/src_masm/lzo1c_s1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_masm/lzo1f_f1.asm b/asm/i386/src_masm/lzo1f_f1.asm
index ec51f0b..f1252af 100644
--- a/asm/i386/src_masm/lzo1f_f1.asm
+++ b/asm/i386/src_masm/lzo1f_f1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_masm/lzo1x_f1.asm b/asm/i386/src_masm/lzo1x_f1.asm
index efe2f04..95feaa2 100644
--- a/asm/i386/src_masm/lzo1x_f1.asm
+++ b/asm/i386/src_masm/lzo1x_f1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_masm/lzo1x_s1.asm b/asm/i386/src_masm/lzo1x_s1.asm
index 1c31acc..4af988a 100644
--- a/asm/i386/src_masm/lzo1x_s1.asm
+++ b/asm/i386/src_masm/lzo1x_s1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_masm/lzo1y_f1.asm b/asm/i386/src_masm/lzo1y_f1.asm
index f111ccb..d86112a 100644
--- a/asm/i386/src_masm/lzo1y_f1.asm
+++ b/asm/i386/src_masm/lzo1y_f1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_masm/lzo1y_s1.asm b/asm/i386/src_masm/lzo1y_s1.asm
index c777948..3c4ab48 100644
--- a/asm/i386/src_masm/lzo1y_s1.asm
+++ b/asm/i386/src_masm/lzo1y_s1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_nasm/all/asm_all.asm b/asm/i386/src_nasm/all/asm_all.asm
index f453e62..87260c0 100644
--- a/asm/i386/src_nasm/all/asm_all.asm
+++ b/asm/i386/src_nasm/all/asm_all.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
@@ -50,10 +50,18 @@ bits 32
 %endif
 %endif
 %ifndef NAME1
-%ifidni __OUTPUT_FORMAT__,macho32
+%ifidni __OUTPUT_FORMAT__,elf32
+%define NAME1(a)             a
+%elifidni __OUTPUT_FORMAT__,elf64
+%define NAME1(a)             a
+%elifidni __OUTPUT_FORMAT__,macho32
 %define NAME1(a)        _ %+ a
 %elifidni __OUTPUT_FORMAT__,macho64
 %define NAME1(a)        _ %+ a
+%elifidni __OUTPUT_FORMAT__,win32
+%define NAME1(a)        _ %+ a
+%elifidni __OUTPUT_FORMAT__,win64
+%define NAME1(a)             a
 %else
 %define NAME1(a)        _ %+ a
 %define NAME2(a)             a
diff --git a/asm/i386/src_nasm/asminit.def b/asm/i386/src_nasm/asminit.def
index 773cf99..db792af 100644
--- a/asm/i386/src_nasm/asminit.def
+++ b/asm/i386/src_nasm/asminit.def
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
@@ -49,10 +49,18 @@ bits 32
 %endif
 
 %ifndef NAME1
-%ifidni __OUTPUT_FORMAT__,macho32
+%ifidni __OUTPUT_FORMAT__,elf32
+%define NAME1(a)             a
+%elifidni __OUTPUT_FORMAT__,elf64
+%define NAME1(a)             a
+%elifidni __OUTPUT_FORMAT__,macho32
 %define NAME1(a)        _ %+ a
 %elifidni __OUTPUT_FORMAT__,macho64
 %define NAME1(a)        _ %+ a
+%elifidni __OUTPUT_FORMAT__,win32
+%define NAME1(a)        _ %+ a
+%elifidni __OUTPUT_FORMAT__,win64
+%define NAME1(a)             a
 %else
 %define NAME1(a)        _ %+ a
 %define NAME2(a)             a
diff --git a/asm/i386/src_nasm/lzo1c_s1.asm b/asm/i386/src_nasm/lzo1c_s1.asm
index 982b474..cb408e0 100644
--- a/asm/i386/src_nasm/lzo1c_s1.asm
+++ b/asm/i386/src_nasm/lzo1c_s1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_nasm/lzo1f_f1.asm b/asm/i386/src_nasm/lzo1f_f1.asm
index ccf37ed..ebad1fd 100644
--- a/asm/i386/src_nasm/lzo1f_f1.asm
+++ b/asm/i386/src_nasm/lzo1f_f1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_nasm/lzo1x_f1.asm b/asm/i386/src_nasm/lzo1x_f1.asm
index e269caa..e559474 100644
--- a/asm/i386/src_nasm/lzo1x_f1.asm
+++ b/asm/i386/src_nasm/lzo1x_f1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_nasm/lzo1x_s1.asm b/asm/i386/src_nasm/lzo1x_s1.asm
index ad054be..cd4cb71 100644
--- a/asm/i386/src_nasm/lzo1x_s1.asm
+++ b/asm/i386/src_nasm/lzo1x_s1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_nasm/lzo1y_f1.asm b/asm/i386/src_nasm/lzo1y_f1.asm
index ddd55fb..6c65bb1 100644
--- a/asm/i386/src_nasm/lzo1y_f1.asm
+++ b/asm/i386/src_nasm/lzo1y_f1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_nasm/lzo1y_s1.asm b/asm/i386/src_nasm/lzo1y_s1.asm
index ce88004..08aeec3 100644
--- a/asm/i386/src_nasm/lzo1y_s1.asm
+++ b/asm/i386/src_nasm/lzo1y_s1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/autoconf/ar-lib b/autoconf/ar-lib
index 1700c5e..05094d3 100755
--- a/autoconf/ar-lib
+++ b/autoconf/ar-lib
@@ -4,7 +4,7 @@
 me=ar-lib
 scriptversion=2012-03-01.08; # UTC
 
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 Free Software Foundation, Inc.
 # Written by Peter Rosin <peda@lysator.liu.se>.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/autoconf/compile b/autoconf/compile
index 69fad9c..2ab71e4 100755
--- a/autoconf/compile
+++ b/autoconf/compile
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -255,7 +255,8 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -342,6 +343,6 @@ exit $ret
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/autoconf/config.guess b/autoconf/config.guess
index dbfb978..1000e2b 100755
--- a/autoconf/config.guess
+++ b/autoconf/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2015-01-01'
+timestamp='2017-02-07'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ timestamp='2015-01-01'
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -168,19 +168,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    /sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || \
+	    echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
+	    earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
+	# to ELF recently (or will in the future) and ABI.
 	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		os=netbsdelf
+		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -197,6 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		os=netbsd
 		;;
 	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		;;
+	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
@@ -207,13 +224,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		release='-gnu'
 		;;
 	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
+	echo "${machine}-${os}${release}${abi}"
 	exit ;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -223,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -235,6 +256,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
+    *:Sortix:*:*)
+	echo ${UNAME_MACHINE}-unknown-sortix
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -251,42 +275,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@@ -359,16 +383,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -393,7 +417,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
 		echo m68k-sun-sunos${UNAME_RELEASE}
@@ -618,13 +642,13 @@ EOF
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
 			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
@@ -663,11 +687,11 @@ EOF
 		    exit (0);
 		}
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
+	if [ ${HP_ARCH} = hppa2.0w ]
 	then
 	    eval $set_cc_for_build
 
@@ -680,12 +704,12 @@ EOF
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	    else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -790,14 +814,14 @@ EOF
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -879,7 +903,7 @@ EOF
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@@ -902,7 +926,7 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
@@ -933,6 +957,9 @@ EOF
     crisv32:Linux:*:*)
 	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
+    e2k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     frv:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -945,6 +972,9 @@ EOF
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+    k1om:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -970,6 +1000,9 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    mips64el:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     openrisc*:Linux:*:*)
 	echo or1k-unknown-linux-${LIBC}
 	exit ;;
@@ -1002,6 +1035,9 @@ EOF
     ppcle:Linux:*:*)
 	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
@@ -1021,7 +1057,7 @@ EOF
 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1100,7 +1136,7 @@ EOF
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
+	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;
@@ -1249,6 +1285,9 @@ EOF
     SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1262,9 +1301,9 @@ EOF
 	    UNAME_PROCESSOR=powerpc
 	fi
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		    grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
@@ -1286,7 +1325,7 @@ EOF
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
@@ -1304,6 +1343,9 @@ EOF
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit ;;
+    NSX-?:NONSTOP_KERNEL:*:*)
+	echo nsx-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
 	exit ;;
@@ -1317,7 +1359,7 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
@@ -1359,7 +1401,7 @@ EOF
 	echo i386-pc-xenix
 	exit ;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
 	exit ;;
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
@@ -1370,23 +1412,25 @@ EOF
     x86_64:VMkernel:*:*)
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
+    amd64:Isilon\ OneFS:*:*)
+	echo x86_64-unknown-onefs
+	exit ;;
 esac
 
 cat >&2 <<EOF
 $0: unable to guess system type
 
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite
+config.guess and config.sub with the latest versions from:
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
 
 config.guess timestamp = $timestamp
 
diff --git a/autoconf/config.rpath b/autoconf/config.rpath
index a3e25c8..af3c415 100755
--- a/autoconf/config.rpath
+++ b/autoconf/config.rpath
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2015 Free Software Foundation, Inc.
+#   Copyright 1996-2017 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
diff --git a/autoconf/config.sub b/autoconf/config.sub
index 6d2e94c..87abeab 100755
--- a/autoconf/config.sub
+++ b/autoconf/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2015-01-01'
+timestamp='2017-02-07'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ timestamp='2015-01-01'
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -53,8 +53,7 @@ timestamp='2015-01-01'
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -117,8 +116,8 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -255,11 +254,12 @@ case $basic_machine in
 	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
+	| ba \
 	| be32 | be64 \
 	| bfin \
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
+	| e2k | epiphany \
 	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
@@ -301,11 +301,12 @@ case $basic_machine in
 	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pru \
 	| pyramid \
 	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -376,12 +377,13 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| ba-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
+	| e2k-* | elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -427,13 +429,15 @@ case $basic_machine in
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pru-* \
 	| pyramid-* \
+	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile*-* \
@@ -518,6 +522,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-aros
 		;;
+	asmjs)
+		basic_machine=asmjs-unknown
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -638,6 +645,14 @@ case $basic_machine in
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
+	e500v[12])
+		basic_machine=powerpc-unknown
+		os=$os"spe"
+		;;
+	e500v[12]-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=$os"spe"
+		;;
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
@@ -933,6 +948,9 @@ case $basic_machine in
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
+	nsx-tandem)
+		basic_machine=nsx-tandem
+		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@@ -1017,7 +1035,7 @@ case $basic_machine in
 	ppc-* | ppcbe-*)
 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
+	ppcle | powerpclittle)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
@@ -1027,7 +1045,7 @@ case $basic_machine in
 		;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+	ppc64le | powerpc64little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)
@@ -1373,18 +1391,18 @@ case $os in
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
+	      | -aos* | -aros* | -cloudabi* | -sortix* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -1393,7 +1411,8 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1525,6 +1544,8 @@ case $os in
 		;;
 	-nacl*)
 		;;
+	-ios)
+		;;
 	-none)
 		;;
 	*)
@@ -1620,6 +1641,9 @@ case $basic_machine in
 	sparc-* | *-sun)
 		os=-sunos4.1.1
 		;;
+	pru-*)
+		os=-elf
+		;;
 	*-be)
 		os=-beos
 		;;
diff --git a/autoconf/depcomp b/autoconf/depcomp
index fda2463..b687232 100755
--- a/autoconf/depcomp
+++ b/autoconf/depcomp
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -751,6 +751,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/autoconf/install-sh b/autoconf/install-sh
index 0b0fdcb..0360b79 100755
--- a/autoconf/install-sh
+++ b/autoconf/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2016-01-11.22; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -496,6 +496,6 @@ done
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/autoconf/local.m4 b/autoconf/local.m4
index 38754b1..978f7dc 100644
--- a/autoconf/local.m4
+++ b/autoconf/local.m4
@@ -193,10 +193,10 @@ case x$mfx_tmp in
 esac
 ])
 
-dnl Serial 13  -*- Autoconf -*-
+dnl Serial 15  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2017 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -255,7 +255,7 @@ dnl configure.ac when using autoheader 2.62.
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-/* Enable general extensions on OS X.  */
+/* Enable general extensions on macOS.  */
 #ifndef _DARWIN_C_SOURCE
 # undef _DARWIN_C_SOURCE
 #endif
@@ -263,14 +263,38 @@ dnl configure.ac when using autoheader 2.62.
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
-/* Use GNU style printf and scanf.  */
-#ifndef __USE_MINGW_ANSI_STDIO
-# undef __USE_MINGW_ANSI_STDIO
-#endif
 /* Enable threading extensions on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014.  */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014.  */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# undef __STDC_WANT_IEC_60559_BFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015.  */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# undef __STDC_WANT_IEC_60559_DFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# undef __STDC_WANT_IEC_60559_TYPES_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010.  */
+#ifndef __STDC_WANT_LIB_EXT2__
+# undef __STDC_WANT_LIB_EXT2__
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009.  */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# undef __STDC_WANT_MATH_SPEC_FUNCS__
+#endif
 /* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
@@ -299,8 +323,14 @@ dnl configure.ac when using autoheader 2.62.
   AC_DEFINE([_ALL_SOURCE])
   AC_DEFINE([_DARWIN_C_SOURCE])
   AC_DEFINE([_GNU_SOURCE])
-  AC_DEFINE([__USE_MINGW_ANSI_STDIO])
   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
+  AC_DEFINE([__STDC_WANT_IEC_60559_ATTRIBS_EXT__])
+  AC_DEFINE([__STDC_WANT_IEC_60559_BFP_EXT__])
+  AC_DEFINE([__STDC_WANT_IEC_60559_DFP_EXT__])
+  AC_DEFINE([__STDC_WANT_IEC_60559_FUNCS_EXT__])
+  AC_DEFINE([__STDC_WANT_IEC_60559_TYPES_EXT__])
+  AC_DEFINE([__STDC_WANT_LIB_EXT2__])
+  AC_DEFINE([__STDC_WANT_MATH_SPEC_FUNCS__])
   AC_DEFINE([_TANDEM_SOURCE])
   AC_CACHE_CHECK([whether _XOPEN_SOURCE should be defined],
     [ac_cv_should_define__xopen_source],
@@ -555,7 +585,7 @@ AC_C_BIGENDIAN([AC_DEFINE(NRV_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is b
 ])
 # Checks for stat-related time functions.
 
-# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2015 Free Software
+# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2017 Free Software
 # Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
diff --git a/autoconf/mdate-sh b/autoconf/mdate-sh
index b793600..f80075c 100755
--- a/autoconf/mdate-sh
+++ b/autoconf/mdate-sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 # Get modification time of a file or directory and pretty-print it.
 
-scriptversion=2010-08-21.06; # UTC
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 1995-2015 Free Software Foundation, Inc.
+# Copyright (C) 1995-2017 Free Software Foundation, Inc.
 # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
 #
 # This program is free software; you can redistribute it and/or modify
@@ -219,6 +219,6 @@ echo $day $month $year
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/autoconf/missing b/autoconf/missing
index 3af2828..c6e3795 100755
--- a/autoconf/missing
+++ b/autoconf/missing
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -210,6 +210,6 @@ exit $st
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/autoconf/mkinstalldirs b/autoconf/mkinstalldirs
index 55d537f..a31ce6d 100755
--- a/autoconf/mkinstalldirs
+++ b/autoconf/mkinstalldirs
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2016-01-11.22; # UTC
 
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
@@ -157,6 +157,6 @@ exit $errstatus
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/autoconf/py-compile b/autoconf/py-compile
index 382e083..3693d96 100755
--- a/autoconf/py-compile
+++ b/autoconf/py-compile
@@ -1,9 +1,9 @@
 #!/bin/sh
 # py-compile - Compile a Python program
 
-scriptversion=2011-06-08.12; # UTC
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2017 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -165,6 +165,6 @@ sys.stdout.write('\n')" 2>/dev/null || :
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/autoconf/ylwrap b/autoconf/ylwrap
index 49716bb..abac60c 100755
--- a/autoconf/ylwrap
+++ b/autoconf/ylwrap
@@ -1,9 +1,9 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
 
-scriptversion=2013-01-12.17; # UTC
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
@@ -227,6 +227,6 @@ exit $ret
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/configure b/configure
index 06a488d..f0356cd 100755
--- a/configure
+++ b/configure
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for LZO 2.09.
+# Generated by GNU Autoconf 2.69 for LZO 2.10.
 #
 # Report bugs to <markus@oberhumer.com>.
 #
-# Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer.
+# Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer.
 # All Rights Reserved.
 # This configure script may be copied, distributed and modified under the
 # terms of the GNU General Public License; see COPYING for more details.
@@ -595,8 +595,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='LZO'
 PACKAGE_TARNAME='lzo'
-PACKAGE_VERSION='2.09'
-PACKAGE_STRING='LZO 2.09'
+PACKAGE_VERSION='2.10'
+PACKAGE_STRING='LZO 2.10'
 PACKAGE_BUGREPORT='markus@oberhumer.com'
 PACKAGE_URL='http://www.oberhumer.com/opensource/lzo/'
 
@@ -646,6 +646,7 @@ LZO_USE_ASM_i386_obj_elf32_FALSE
 LZO_USE_ASM_i386_obj_elf32_TRUE
 LZO_USE_ASM_i386_src_gas_FALSE
 LZO_USE_ASM_i386_src_gas_TRUE
+pkgconfigdir
 OTOOL64
 OTOOL
 LIPO
@@ -784,6 +785,7 @@ enable_fast_install
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+with_pkgconfigdir
 enable_asm
 '
       ac_precious_vars='build_alias
@@ -1337,7 +1339,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures LZO 2.09 to adapt to many kinds of systems.
+\`configure' configures LZO 2.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1408,7 +1410,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of LZO 2.09:";;
+     short | recursive ) echo "Configuration of LZO 2.10:";;
    esac
   cat <<\_ACEOF
 
@@ -1441,6 +1443,8 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
                           compiler's sysroot if not specified).
+  --with-pkgconfigdir     pkg-config installation directory
+                          ['${libdir}/pkgconfig']
 
 Some influential environment variables:
   CC          C compiler command
@@ -1521,14 +1525,14 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-LZO configure 2.09
+LZO configure 2.10
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer.
+Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer.
 All Rights Reserved.
 This configure script may be copied, distributed and modified under the
 terms of the GNU General Public License; see COPYING for more details.
@@ -2132,7 +2136,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by LZO $as_me 2.09, which was
+It was created by LZO $as_me 2.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2531,7 +2535,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2017 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -2591,7 +2595,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 # Checks for stat-related time functions.
 
-# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2015 Free Software
+# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2017 Free Software
 # Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
@@ -5465,7 +5469,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='lzo'
- VERSION='2.09'
+ VERSION='2.10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12946,6 +12950,21 @@ CC=$lt_save_CC
 
 
 
+
+# Check whether --with-pkgconfigdir was given.
+if test "${with_pkgconfigdir+set}" = set; then :
+  withval=$with_pkgconfigdir;
+else
+  with_pkgconfigdir='${libdir}/pkgconfig'
+fi
+
+pkgconfigdir=$with_pkgconfigdir
+
+
+
+
+
+
 # /***********************************************************************
 # // Checks for header files
 # ************************************************************************/
@@ -14208,7 +14227,7 @@ if test "X$enable_asm" != Xno; then
 fi
 
 
-ac_config_files="$ac_config_files Makefile"
+ac_config_files="$ac_config_files Makefile lzo2.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -14762,7 +14781,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by LZO $as_me 2.09, which was
+This file was extended by LZO $as_me 2.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14829,7 +14848,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-LZO config.status 2.09
+LZO config.status 2.10
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -15240,6 +15259,7 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.hin" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "lzo2.pc") CONFIG_FILES="$CONFIG_FILES lzo2.pc" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -16464,7 +16484,7 @@ cat <<EOF
 
    LZO ${PACKAGE_VERSION} configured.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/configure.ac b/configure.ac
index 4dee7f0..9c6f5e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 #
 #  This file is part of the LZO data compression library.
 #
-#  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+#  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 #  All Rights Reserved.
 #
 #  The LZO library is free software; you can redistribute it and/or
@@ -31,13 +31,13 @@
 # // Init
 # ************************************************************************/
 
-AC_COPYRIGHT([Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer.
+AC_COPYRIGHT([Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer.
 All Rights Reserved.
 This configure script may be copied, distributed and modified under the
 terms of the GNU General Public License; see COPYING for more details.])
 
 AC_PREREQ(2.69)
-AC_INIT([LZO],[2.09],[markus@oberhumer.com],[lzo],[http://www.oberhumer.com/opensource/lzo/])
+AC_INIT([LZO],[2.10],[markus@oberhumer.com],[lzo],[http://www.oberhumer.com/opensource/lzo/])
 AC_MSG_NOTICE([Configuring LZO $PACKAGE_VERSION])
 AC_CONFIG_SRCDIR(src/lzo_init.c)
 AC_CONFIG_AUX_DIR(autoconf)
@@ -78,6 +78,7 @@ AH_BOTTOM([#endif /* already included */])
 AC_ENABLE_STATIC
 AC_DISABLE_SHARED
 LT_INIT
+PKG_INSTALLDIR
 
 
 # /***********************************************************************
@@ -184,7 +185,7 @@ AC_CONFIG_COMMANDS_PRE([
     test "X$DEFS" != "X" && DEFS="$DEFS "
     DEFS="${DEFS}${my_DEFS}"
 ])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile lzo2.pc])
 AC_OUTPUT
 
 
@@ -207,7 +208,7 @@ cat <<EOF
 
    LZO ${PACKAGE_VERSION} configured.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/doc/LZO.TXT b/doc/LZO.TXT
index 430f10d..2d9cb35 100644
--- a/doc/LZO.TXT
+++ b/doc/LZO.TXT
@@ -6,8 +6,8 @@
  Author  : Markus Franz Xaver Johannes Oberhumer
            <markus@oberhumer.com>
            http://www.oberhumer.com/opensource/lzo/
- Version : 2.09
- Date    : 04 Feb 2015
+ Version : 2.10
+ Date    : 01 Mar 2017
 
 
  Abstract
@@ -277,7 +277,7 @@
 
  Copyright
  ---------
- LZO is Copyright (C) 1996-2015 Markus Franz Xaver Oberhumer
+ LZO is Copyright (C) 1996-2017 Markus Franz Xaver Oberhumer
  All Rights Reserved.
 
  LZO is distributed under the terms of the GNU General Public License (GPL).
diff --git a/examples/dict.c b/examples/dict.c
index 5d8ca62..8945caf 100644
--- a/examples/dict.c
+++ b/examples/dict.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -133,7 +133,7 @@ static int do_file(const char *in_name, int compression_level)
 /*
  * Step 3: compress from 'in' to 'out' with LZO1X-999
  */
-    r = lzo1x_999_compress_level(in,in_len,out,&out_len,wrkmem,
+    r = lzo1x_999_compress_level(in, in_len, out, &out_len, wrkmem,
                                  dict, dict_len, 0, compression_level);
     if (r != LZO_E_OK)
     {
@@ -192,7 +192,7 @@ int __lzo_cdecl_main main(int argc, char *argv[])
 
     printf("\nLZO real-time data compression library (v%s, %s).\n",
            lzo_version_string(), lzo_version_date());
-    printf("Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
+    printf("Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
 
     progname = argv[0];
 
diff --git a/examples/lzopack.c b/examples/lzopack.c
index c01b47d..91c0c1a 100644
--- a/examples/lzopack.c
+++ b/examples/lzopack.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -509,7 +509,7 @@ int __lzo_cdecl_main main(int argc, char *argv[])
 
     printf("\nLZO real-time data compression library (v%s, %s).\n",
            lzo_version_string(), lzo_version_date());
-    printf("Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
+    printf("Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
 
 #if 0
     printf(
diff --git a/examples/overlap.c b/examples/overlap.c
index 215e055..3ff4d18 100644
--- a/examples/overlap.c
+++ b/examples/overlap.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -259,7 +259,7 @@ int __lzo_cdecl_main main(int argc, char *argv[])
 
     printf("\nLZO real-time data compression library (v%s, %s).\n",
            lzo_version_string(), lzo_version_date());
-    printf("Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
+    printf("Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
 
     progname = argv[0];
     if (i < argc && argv[i][0] == '-')
diff --git a/examples/portab.h b/examples/portab.h
index 3c22068..93db56a 100644
--- a/examples/portab.h
+++ b/examples/portab.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -39,7 +39,9 @@
 #  pragma warning(disable: 4710 4711)
 #endif
 /* disable silly warnings about using "deprecated" POSIX functions like "fopen" */
-#if (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 1100))
+#if (LZO_CC_CLANG_MSC && LZO_CC_CLANG >= 0x030500)
+#  pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 1100))
 #  pragma warning(disable: 1786)
 #elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 1000))
 #  pragma warning(disable: 1478)
@@ -131,6 +133,7 @@ static lzo_voidp xmalloc(lzo_uint len)
     if (len >= align && __lzo_align_gap(p, align) != 0)
     {
         printf("%s: C library problem: malloc() returned misaligned pointer!\n", progname);
+        lzo_free(p);
         exit(1);
     }
     return p;
diff --git a/examples/portab_a.h b/examples/portab_a.h
index 57ff444..6484197 100644
--- a/examples/portab_a.h
+++ b/examples/portab_a.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/examples/precomp.c b/examples/precomp.c
index dafd3ea..e61b0c1 100644
--- a/examples/precomp.c
+++ b/examples/precomp.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -89,7 +89,7 @@ int __lzo_cdecl_main main(int argc, char *argv[])
 
     printf("\nLZO real-time data compression library (v%s, %s).\n",
            lzo_version_string(), lzo_version_date());
-    printf("Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
+    printf("Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
 
     progname = argv[0];
     if (argc < 2 || argc > 3)
diff --git a/examples/precomp2.c b/examples/precomp2.c
index 6c359b9..3216cd9 100644
--- a/examples/precomp2.c
+++ b/examples/precomp2.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -123,7 +123,7 @@ int __lzo_cdecl_main main(int argc, char *argv[])
 
     printf("\nLZO real-time data compression library (v%s, %s).\n",
            lzo_version_string(), lzo_version_date());
-    printf("Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
+    printf("Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
 
     progname = argv[0];
     if (argc < 2 || argc > 3)
diff --git a/examples/simple.c b/examples/simple.c
index 9ebfa97..5757e0c 100644
--- a/examples/simple.c
+++ b/examples/simple.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -78,7 +78,7 @@ int __lzo_cdecl_main main(int argc, char *argv[])
 
     printf("\nLZO real-time data compression library (v%s, %s).\n",
            lzo_version_string(), lzo_version_date());
-    printf("Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
+    printf("Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
 
 /*
  * Step 1: initialize the LZO library
diff --git a/include/lzo/lzo1.h b/include/lzo/lzo1.h
index b5a67b6..06e8c4f 100644
--- a/include/lzo/lzo1.h
+++ b/include/lzo/lzo1.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/include/lzo/lzo1a.h b/include/lzo/lzo1a.h
index ca761e5..7ef9d23 100644
--- a/include/lzo/lzo1a.h
+++ b/include/lzo/lzo1a.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/include/lzo/lzo1b.h b/include/lzo/lzo1b.h
index bbfd754..a748fde 100644
--- a/include/lzo/lzo1b.h
+++ b/include/lzo/lzo1b.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/include/lzo/lzo1c.h b/include/lzo/lzo1c.h
index 2001082..a6c6b75 100644
--- a/include/lzo/lzo1c.h
+++ b/include/lzo/lzo1c.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/include/lzo/lzo1f.h b/include/lzo/lzo1f.h
index 504e523..25cbd51 100644
--- a/include/lzo/lzo1f.h
+++ b/include/lzo/lzo1f.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/include/lzo/lzo1x.h b/include/lzo/lzo1x.h
index f1599a6..a111514 100644
--- a/include/lzo/lzo1x.h
+++ b/include/lzo/lzo1x.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/include/lzo/lzo1y.h b/include/lzo/lzo1y.h
index da199c0..0f4d4aa 100644
--- a/include/lzo/lzo1y.h
+++ b/include/lzo/lzo1y.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/include/lzo/lzo1z.h b/include/lzo/lzo1z.h
index 5adb905..3f8dea0 100644
--- a/include/lzo/lzo1z.h
+++ b/include/lzo/lzo1z.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/include/lzo/lzo2a.h b/include/lzo/lzo2a.h
index ded7f9e..f069e9e 100644
--- a/include/lzo/lzo2a.h
+++ b/include/lzo/lzo2a.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/include/lzo/lzo_asm.h b/include/lzo/lzo_asm.h
index 5a654bf..9a57e27 100644
--- a/include/lzo/lzo_asm.h
+++ b/include/lzo/lzo_asm.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/include/lzo/lzoconf.h b/include/lzo/lzoconf.h
index 64ef279..f9a8bdb 100644
--- a/include/lzo/lzoconf.h
+++ b/include/lzo/lzoconf.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -29,9 +29,9 @@
 #ifndef __LZOCONF_H_INCLUDED
 #define __LZOCONF_H_INCLUDED 1
 
-#define LZO_VERSION             0x2090
-#define LZO_VERSION_STRING      "2.09"
-#define LZO_VERSION_DATE        "Feb 04 2015"
+#define LZO_VERSION             0x20a0  /* 2.10 */
+#define LZO_VERSION_STRING      "2.10"
+#define LZO_VERSION_DATE        "Mar 01 2017"
 
 /* internal Autoconf configuration file - only used when building LZO */
 #if defined(LZO_HAVE_CONFIG_H)
diff --git a/include/lzo/lzodefs.h b/include/lzo/lzodefs.h
index 1535c1e..c3e2bcf 100644
--- a/include/lzo/lzodefs.h
+++ b/include/lzo/lzodefs.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -40,6 +40,33 @@
 #    define __LONG_MAX__ 9223372036854775807L
 #  endif
 #endif
+#if 0
+#elif !defined(__LZO_LANG_OVERRIDE)
+#if (defined(__clang__) || defined(__GNUC__)) && defined(__ASSEMBLER__)
+#  if (__ASSEMBLER__+0) <= 0
+#    error "__ASSEMBLER__"
+#  else
+#    define LZO_LANG_ASSEMBLER  1
+#  endif
+#elif defined(__cplusplus)
+#  if (__cplusplus+0) <= 0
+#    error "__cplusplus"
+#  elif (__cplusplus < 199711L)
+#    define LZO_LANG_CXX        1
+#  elif defined(_MSC_VER) && defined(_MSVC_LANG) && (_MSVC_LANG+0 >= 201402L) && 1
+#    define LZO_LANG_CXX        _MSVC_LANG
+#  else
+#    define LZO_LANG_CXX        __cplusplus
+#  endif
+#  define LZO_LANG_CPLUSPLUS    LZO_LANG_CXX
+#else
+#  if defined(__STDC_VERSION__) && (__STDC_VERSION__+0 >= 199409L)
+#    define LZO_LANG_C          __STDC_VERSION__
+#  else
+#    define LZO_LANG_C          1
+#  endif
+#endif
+#endif
 #if !defined(LZO_CFG_NO_DISABLE_WUNDEF)
 #if defined(__ARMCC_VERSION)
 #  pragma diag_suppress 193
@@ -135,10 +162,12 @@
 #  endif
 #endif
 #endif
-#if defined(_MSC_VER) && defined(M_I86HM) && (UINT_MAX == LZO_0xffffL)
+#if (UINT_MAX == LZO_0xffffL)
+#if defined(_MSC_VER) && defined(M_I86HM)
 #  define ptrdiff_t long
 #  define _PTRDIFF_T_DEFINED 1
 #endif
+#endif
 #if (UINT_MAX == LZO_0xffffL)
 #  undef __LZO_RENAME_A
 #  undef __LZO_RENAME_B
@@ -287,7 +316,7 @@
 #define LZO_CPP_ECONCAT6(a,b,c,d,e,f)   LZO_CPP_CONCAT6(a,b,c,d,e,f)
 #define LZO_CPP_ECONCAT7(a,b,c,d,e,f,g) LZO_CPP_CONCAT7(a,b,c,d,e,f,g)
 #endif
-#define __LZO_MASK_GEN(o,b)     (((((o) << ((b)-!!(b))) - (o)) << 1) + (o)*!!(b))
+#define __LZO_MASK_GEN(o,b)     (((((o) << ((b)-((b)!=0))) - (o)) << 1) + (o)*((b)!=0))
 #if 1 && defined(__cplusplus)
 #  if !defined(__STDC_CONSTANT_MACROS)
 #    define __STDC_CONSTANT_MACROS 1
@@ -538,6 +567,12 @@
 #  define LZO_CC_ARMCC          __ARMCC_VERSION
 #  define LZO_INFO_CC           "ARM C Compiler"
 #  define LZO_INFO_CCVER        __VERSION__
+#elif defined(__clang__) && defined(__c2__) && defined(__c2_version__) && defined(_MSC_VER)
+#  define LZO_CC_CLANG          (__clang_major__ * 0x10000L + (__clang_minor__-0) * 0x100 + (__clang_patchlevel__-0))
+#  define LZO_CC_CLANG_C2       _MSC_VER
+#  define LZO_CC_CLANG_VENDOR_MICROSOFT 1
+#  define LZO_INFO_CC           "clang/c2"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__c2_version__)
 #elif defined(__clang__) && defined(__llvm__) && defined(__VERSION__)
 #  if defined(__clang_major__) && defined(__clang_minor__) && defined(__clang_patchlevel__)
 #    define LZO_CC_CLANG        (__clang_major__ * 0x10000L + (__clang_minor__-0) * 0x100 + (__clang_patchlevel__-0))
@@ -549,8 +584,18 @@
 #  elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__)
 #    define LZO_CC_CLANG_GNUC   (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0))
 #  endif
-#  define LZO_INFO_CC           "clang"
-#  define LZO_INFO_CCVER        __VERSION__
+#  if defined(__APPLE_CC__)
+#    define LZO_CC_CLANG_VENDOR_APPLE 1
+#    define LZO_INFO_CC         "clang/apple"
+#  else
+#    define LZO_CC_CLANG_VENDOR_LLVM 1
+#    define LZO_INFO_CC         "clang"
+#  endif
+#  if defined(__clang_version__)
+#    define LZO_INFO_CCVER      __clang_version__
+#  else
+#    define LZO_INFO_CCVER      __VERSION__
+#  endif
 #elif defined(__llvm__) && defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__)
 #  if defined(__GNUC_PATCHLEVEL__)
 #    define LZO_CC_LLVM_GNUC    (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0))
@@ -770,7 +815,7 @@
 #elif (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16)
 #  define LZO_ARCH_I086             1
 #  define LZO_INFO_ARCH             "i086"
-#elif defined(__aarch64__)
+#elif defined(__aarch64__) || defined(_M_ARM64)
 #  define LZO_ARCH_ARM64            1
 #  define LZO_INFO_ARCH             "arm64"
 #elif defined(__alpha__) || defined(__alpha) || defined(_M_ALPHA)
@@ -860,6 +905,15 @@
 #elif defined(__powerpc__) || defined(__powerpc) || defined(__ppc__) || defined(__PPC__) || defined(_M_PPC) || defined(_ARCH_PPC) || defined(_ARCH_PWR)
 #  define LZO_ARCH_POWERPC          1
 #  define LZO_INFO_ARCH             "powerpc"
+#elif defined(__powerpc64__) || defined(__powerpc64) || defined(__ppc64__) || defined(__PPC64__)
+#  define LZO_ARCH_POWERPC          1
+#  define LZO_INFO_ARCH             "powerpc"
+#elif defined(__powerpc64le__) || defined(__powerpc64le) || defined(__ppc64le__) || defined(__PPC64LE__)
+#  define LZO_ARCH_POWERPC          1
+#  define LZO_INFO_ARCH             "powerpc"
+#elif defined(__riscv)
+#  define LZO_ARCH_RISCV            1
+#  define LZO_INFO_ARCH             "riscv"
 #elif defined(__s390__) || defined(__s390) || defined(__s390x__) || defined(__s390x)
 #  define LZO_ARCH_S390             1
 #  define LZO_INFO_ARCH             "s390"
@@ -896,17 +950,21 @@
 #endif
 #if !defined(LZO_ARCH_ARM_THUMB2)
 #if (LZO_ARCH_ARM)
-#  if defined(__ARM_ARCH_ISA_THUMB)
-#   if ((__ARM_ARCH_ISA_THUMB)+0 >= 2)
-#    define LZO_ARCH_ARM_THUMB2     1
-#   endif
-#  elif 1 && defined(__thumb2__)
-#    define LZO_ARCH_ARM_THUMB2     1
-#  elif 1 && defined(__TARGET_ARCH_THUMB) && ((__TARGET_ARCH_THUMB)+0 >= 4)
-#    define LZO_ARCH_ARM_THUMB2     1
+#  if defined(__thumb__) || defined(__thumb) || defined(_M_THUMB)
+#    if defined(__thumb2__)
+#      define LZO_ARCH_ARM_THUMB2   1
+#    elif 1 && defined(__TARGET_ARCH_THUMB) && ((__TARGET_ARCH_THUMB)+0 >= 4)
+#      define LZO_ARCH_ARM_THUMB2   1
+#    elif 1 && defined(_MSC_VER) && defined(_M_THUMB) && ((_M_THUMB)+0 >= 7)
+#      define LZO_ARCH_ARM_THUMB2   1
+#    endif
 #  endif
 #endif
 #endif
+#if (LZO_ARCH_ARM_THUMB2)
+#  undef  LZO_INFO_ARCH
+#  define LZO_INFO_ARCH             "arm_thumb2"
+#endif
 #if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_DOS32 || LZO_OS_OS2)
 #  error "FIXME - missing define for CPU architecture"
 #endif
@@ -1110,7 +1168,7 @@
 #    error "unexpected configuration - check your compiler defines"
 #  endif
 #endif
-#ifdef __cplusplus
+#if defined(__cplusplus)
 extern "C" {
 #endif
 #if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0200))
@@ -1133,7 +1191,7 @@ extern "C" {
 #else
 #  error "FIXME - implement LZO_MM_AHSHIFT"
 #endif
-#ifdef __cplusplus
+#if defined(__cplusplus)
 }
 #endif
 #endif
@@ -1219,7 +1277,6 @@ extern "C" {
 #  define __lzo_gnuc_extension__    __extension__
 #elif (LZO_CC_IBMC >= 600)
 #  define __lzo_gnuc_extension__    __extension__
-#else
 #endif
 #endif
 #if !defined(__lzo_gnuc_extension__)
@@ -1265,7 +1322,7 @@ extern "C" {
 #endif
 #endif
 #if !defined(lzo_has_extension)
-#  define lzo_has_extension         0
+#  define lzo_has_extension(x)      0
 #endif
 #if !defined(LZO_CFG_USE_NEW_STYLE_CASTS) && defined(__cplusplus) && 0
 #  if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020800ul))
@@ -1412,6 +1469,9 @@ extern "C" {
 #    define LZO_UNUSED(var)         ((void) &var)
 #  endif
 #endif
+#if !defined(LZO_UNUSED_RESULT)
+#  define LZO_UNUSED_RESULT(var)    LZO_UNUSED(var)
+#endif
 #if !defined(LZO_UNUSED_FUNC)
 #  if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600))
 #    define LZO_UNUSED_FUNC(func)   ((void) func)
@@ -1830,6 +1890,7 @@ extern "C" {
 #elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 800))
 #  define __lzo_likely(e)       (__builtin_expect(!!(e),1))
 #  define __lzo_unlikely(e)     (__builtin_expect(!!(e),0))
+#elif (LZO_CC_CLANG && LZO_CC_CLANG_C2)
 #elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE)
 #  define __lzo_likely(e)       (__builtin_expect(!!(e),1))
 #  define __lzo_unlikely(e)     (__builtin_expect(!!(e),0))
@@ -1942,11 +2003,16 @@ extern "C" {
 #    define LZO_COMPILE_TIME_ASSERT(e)  {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-2*!(e)];}
 #  endif
 #endif
+#if (LZO_LANG_ASSEMBLER)
+#  undef LZO_COMPILE_TIME_ASSERT_HEADER
+#  define LZO_COMPILE_TIME_ASSERT_HEADER(e)  /*empty*/
+#else
 LZO_COMPILE_TIME_ASSERT_HEADER(1 == 1)
 #if defined(__cplusplus)
 extern "C" { LZO_COMPILE_TIME_ASSERT_HEADER(2 == 2) }
 #endif
 LZO_COMPILE_TIME_ASSERT_HEADER(3 == 3)
+#endif
 #if (LZO_ARCH_I086 || LZO_ARCH_I386) && (LZO_OS_DOS16 || LZO_OS_DOS32 || LZO_OS_OS2 || LZO_OS_OS216 || LZO_OS_WIN16 || LZO_OS_WIN32 || LZO_OS_WIN64)
 #  if (LZO_CC_GNUC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PACIFICC)
 #  elif (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC)
@@ -2021,6 +2087,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(3 == 3)
 #endif
 #endif
 #endif
+#define LZO_SIZEOF_CHAR             1
 #ifndef LZO_SIZEOF_SHORT
 #if defined(SIZEOF_SHORT)
 #  define LZO_SIZEOF_SHORT          (SIZEOF_SHORT)
@@ -2219,12 +2286,12 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_LONG == sizeof(long))
 #  define LZO_WORDSIZE              8
 #elif (LZO_ARCH_AMD64)
 #  define LZO_WORDSIZE              8
+#elif (LZO_ARCH_ARM64)
+#  define LZO_WORDSIZE              8
 #elif (LZO_ARCH_AVR)
 #  define LZO_WORDSIZE              1
 #elif (LZO_ARCH_H8300)
-#  if defined(__NORMAL_MODE__)
-#    define LZO_WORDSIZE            4
-#  elif defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__)
+#  if defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__)
 #    define LZO_WORDSIZE            4
 #  else
 #    define LZO_WORDSIZE            2
@@ -2267,11 +2334,15 @@ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 8)
 #elif (LZO_ARCH_C166 || LZO_ARCH_MCS51 || LZO_ARCH_MCS251 || LZO_ARCH_MSP430)
 #  define LZO_SIZEOF_VOID_P         2
 #elif (LZO_ARCH_H8300)
-#  if defined(__NORMAL_MODE__)
-#    define LZO_SIZEOF_VOID_P       2
-#  elif defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__)
-#    define LZO_SIZEOF_VOID_P       4
+#  if defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__)
+     LZO_COMPILE_TIME_ASSERT_HEADER(LZO_WORDSIZE == 4)
+#    if defined(__NORMAL_MODE__)
+#      define LZO_SIZEOF_VOID_P     2
+#    else
+#      define LZO_SIZEOF_VOID_P     4
+#    endif
 #  else
+     LZO_COMPILE_TIME_ASSERT_HEADER(LZO_WORDSIZE == 2)
 #    define LZO_SIZEOF_VOID_P       2
 #  endif
 #  if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x040000ul)) && (LZO_SIZEOF_INT == 4)
@@ -2361,7 +2432,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #  define LZO_ABI_BIG_ENDIAN        1
 #elif (LZO_ARCH_IA64) && (LZO_OS_POSIX_LINUX || LZO_OS_WIN64)
 #  define LZO_ABI_LITTLE_ENDIAN     1
-#elif (LZO_ARCH_ALPHA || LZO_ARCH_AMD64 || LZO_ARCH_BLACKFIN || LZO_ARCH_CRIS || LZO_ARCH_I086 || LZO_ARCH_I386 || LZO_ARCH_MSP430)
+#elif (LZO_ARCH_ALPHA || LZO_ARCH_AMD64 || LZO_ARCH_BLACKFIN || LZO_ARCH_CRIS || LZO_ARCH_I086 || LZO_ARCH_I386 || LZO_ARCH_MSP430 || LZO_ARCH_RISCV)
 #  define LZO_ABI_LITTLE_ENDIAN     1
 #elif (LZO_ARCH_AVR32 || LZO_ARCH_M68K || LZO_ARCH_S390 || LZO_ARCH_SPU)
 #  define LZO_ABI_BIG_ENDIAN        1
@@ -2381,6 +2452,8 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #  define LZO_ABI_BIG_ENDIAN        1
 #elif 1 && (LZO_ARCH_ARM) && defined(__ARMEL__) && !defined(__ARMEB__)
 #  define LZO_ABI_LITTLE_ENDIAN     1
+#elif 1 && (LZO_ARCH_ARM) && defined(_MSC_VER) && defined(_WIN32)
+#  define LZO_ABI_LITTLE_ENDIAN     1
 #elif 1 && (LZO_ARCH_ARM && LZO_CC_ARMCC_ARMCC)
 #  if defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN)
 #    error "unexpected configuration - check your compiler defines"
@@ -2396,6 +2469,8 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #  define LZO_ABI_BIG_ENDIAN        1
 #elif 1 && (LZO_ARCH_ARM64) && defined(__AARCH64EL__) && !defined(__AARCH64EB__)
 #  define LZO_ABI_LITTLE_ENDIAN     1
+#elif 1 && (LZO_ARCH_ARM64) && defined(_MSC_VER) && defined(_WIN32)
+#  define LZO_ABI_LITTLE_ENDIAN     1
 #elif 1 && (LZO_ARCH_MIPS) && defined(__MIPSEB__) && !defined(__MIPSEL__)
 #  define LZO_ABI_BIG_ENDIAN        1
 #elif 1 && (LZO_ARCH_MIPS) && defined(__MIPSEL__) && !defined(__MIPSEB__)
@@ -2437,6 +2512,12 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #  define LZO_ABI_IP32L64       1
 #  define LZO_INFO_ABI_PM       "ip32l64"
 #endif
+#if (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_VOID_P == 4 && LZO_WORDSIZE == 8)
+#  define LZO_ABI_IP32W64       1
+#  ifndef LZO_INFO_ABI_PM
+#  define LZO_INFO_ABI_PM       "ip32w64"
+#  endif
+#endif
 #if 0
 #elif !defined(__LZO_LIBC_OVERRIDE)
 #if (LZO_LIBC_NAKED)
@@ -2539,6 +2620,13 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #    ifndef LZO_OPT_UNALIGNED32
 #    define LZO_OPT_UNALIGNED32             1
 #    endif
+#  elif 1 && defined(__ARM_ARCH) && ((__ARM_ARCH)+0 >= 7)
+#    ifndef LZO_OPT_UNALIGNED16
+#    define LZO_OPT_UNALIGNED16             1
+#    endif
+#    ifndef LZO_OPT_UNALIGNED32
+#    define LZO_OPT_UNALIGNED32             1
+#    endif
 #  elif 1 && defined(__TARGET_ARCH_ARM) && ((__TARGET_ARCH_ARM)+0 >= 7)
 #    ifndef LZO_OPT_UNALIGNED16
 #    define LZO_OPT_UNALIGNED16             1
@@ -2553,6 +2641,13 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #    ifndef LZO_OPT_UNALIGNED32
 #    define LZO_OPT_UNALIGNED32             1
 #    endif
+#  elif 1 && defined(_MSC_VER) && defined(_M_ARM) && ((_M_ARM)+0 >= 7)
+#    ifndef LZO_OPT_UNALIGNED16
+#    define LZO_OPT_UNALIGNED16             1
+#    endif
+#    ifndef LZO_OPT_UNALIGNED32
+#    define LZO_OPT_UNALIGNED32             1
+#    endif
 #  endif
 #elif (LZO_ARCH_ARM64)
 #  ifndef LZO_OPT_UNALIGNED16
@@ -2598,7 +2693,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #elif (LZO_ARCH_POWERPC)
 #  define LZO_OPT_PREFER_PREINC             1
 #  define LZO_OPT_PREFER_PREDEC             1
-#  if (LZO_ABI_BIG_ENDIAN)
+#  if (LZO_ABI_BIG_ENDIAN) || (LZO_WORDSIZE == 8)
 #    ifndef LZO_OPT_UNALIGNED16
 #    define LZO_OPT_UNALIGNED16             1
 #    endif
@@ -2611,6 +2706,19 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #      endif
 #    endif
 #  endif
+#elif (LZO_ARCH_RISCV)
+#  define LZO_OPT_AVOID_UINT_INDEX          1
+#  ifndef LZO_OPT_UNALIGNED16
+#  define LZO_OPT_UNALIGNED16               1
+#  endif
+#  ifndef LZO_OPT_UNALIGNED32
+#  define LZO_OPT_UNALIGNED32               1
+#  endif
+#  if (LZO_WORDSIZE == 8)
+#    ifndef LZO_OPT_UNALIGNED64
+#    define LZO_OPT_UNALIGNED64             1
+#    endif
+#  endif
 #elif (LZO_ARCH_S390)
 #  ifndef LZO_OPT_UNALIGNED16
 #  define LZO_OPT_UNALIGNED16               1
@@ -2721,18 +2829,23 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #define LZO_TYPEOF_CHAR_P           129u
 #if !defined(lzo_llong_t)
 #if (LZO_SIZEOF_LONG_LONG+0 > 0)
-__lzo_gnuc_extension__ typedef long long lzo_llong_t__;
-__lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
+#  if !(LZO_LANG_ASSEMBLER)
+   __lzo_gnuc_extension__ typedef long long lzo_llong_t__;
+   __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
+#  endif
 #  define lzo_llong_t               lzo_llong_t__
 #  define lzo_ullong_t              lzo_ullong_t__
 #endif
 #endif
 #if !defined(lzo_int16e_t)
-#if (LZO_SIZEOF_LONG == 2)
+#if (LZO_CFG_PREFER_TYPEOF_ACC_INT16E_T == LZO_TYPEOF_SHORT) && (LZO_SIZEOF_SHORT != 2)
+#  undef LZO_CFG_PREFER_TYPEOF_ACC_INT16E_T
+#endif
+#if (LZO_SIZEOF_LONG == 2) && !(LZO_CFG_PREFER_TYPEOF_ACC_INT16E_T == LZO_TYPEOF_SHORT)
 #  define lzo_int16e_t              long
 #  define lzo_uint16e_t             unsigned long
 #  define LZO_TYPEOF_LZO_INT16E_T   LZO_TYPEOF_LONG
-#elif (LZO_SIZEOF_INT == 2)
+#elif (LZO_SIZEOF_INT == 2) && !(LZO_CFG_PREFER_TYPEOF_ACC_INT16E_T == LZO_TYPEOF_SHORT)
 #  define lzo_int16e_t              int
 #  define lzo_uint16e_t             unsigned int
 #  define LZO_TYPEOF_LZO_INT16E_T   LZO_TYPEOF_INT
@@ -2741,8 +2854,10 @@ __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
 #  define lzo_uint16e_t             unsigned short int
 #  define LZO_TYPEOF_LZO_INT16E_T   LZO_TYPEOF_SHORT
 #elif 1 && !(LZO_CFG_TYPE_NO_MODE_HI) && (LZO_CC_CLANG || (LZO_CC_GNUC >= 0x025f00ul) || LZO_CC_LLVM)
+#  if !(LZO_LANG_ASSEMBLER)
    typedef int lzo_int16e_hi_t__ __attribute__((__mode__(__HI__)));
    typedef unsigned int lzo_uint16e_hi_t__ __attribute__((__mode__(__HI__)));
+#  endif
 #  define lzo_int16e_t              lzo_int16e_hi_t__
 #  define lzo_uint16e_t             lzo_uint16e_hi_t__
 #  define LZO_TYPEOF_LZO_INT16E_T   LZO_TYPEOF___MODE_HI
@@ -2759,7 +2874,10 @@ __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
    LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16e_t) == LZO_SIZEOF_LZO_INT16E_T)
 #endif
 #if !defined(lzo_int32e_t)
-#if (LZO_SIZEOF_LONG == 4)
+#if (LZO_CFG_PREFER_TYPEOF_ACC_INT32E_T == LZO_TYPEOF_INT) && (LZO_SIZEOF_INT != 4)
+#  undef LZO_CFG_PREFER_TYPEOF_ACC_INT32E_T
+#endif
+#if (LZO_SIZEOF_LONG == 4) && !(LZO_CFG_PREFER_TYPEOF_ACC_INT32E_T == LZO_TYPEOF_INT)
 #  define lzo_int32e_t              long int
 #  define lzo_uint32e_t             unsigned long int
 #  define LZO_TYPEOF_LZO_INT32E_T   LZO_TYPEOF_LONG
@@ -2776,14 +2894,18 @@ __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
 #  define lzo_uint32e_t             lzo_ullong_t
 #  define LZO_TYPEOF_LZO_INT32E_T   LZO_TYPEOF_LONG_LONG
 #elif 1 && !(LZO_CFG_TYPE_NO_MODE_SI) && (LZO_CC_CLANG || (LZO_CC_GNUC >= 0x025f00ul) || LZO_CC_LLVM) && (__INT_MAX__+0 > 2147483647L)
+#  if !(LZO_LANG_ASSEMBLER)
    typedef int lzo_int32e_si_t__ __attribute__((__mode__(__SI__)));
    typedef unsigned int lzo_uint32e_si_t__ __attribute__((__mode__(__SI__)));
+#  endif
 #  define lzo_int32e_t              lzo_int32e_si_t__
 #  define lzo_uint32e_t             lzo_uint32e_si_t__
 #  define LZO_TYPEOF_LZO_INT32E_T   LZO_TYPEOF___MODE_SI
 #elif 1 && !(LZO_CFG_TYPE_NO_MODE_SI) && (LZO_CC_GNUC >= 0x025f00ul) && defined(__AVR__) && (__LONG_MAX__+0 == 32767L)
+#  if !(LZO_LANG_ASSEMBLER)
    typedef int lzo_int32e_si_t__ __attribute__((__mode__(__SI__)));
    typedef unsigned int lzo_uint32e_si_t__ __attribute__((__mode__(__SI__)));
+#  endif
 #  define lzo_int32e_t              lzo_int32e_si_t__
 #  define lzo_uint32e_t             lzo_uint32e_si_t__
 #  define LZO_INT32_C(c)            (c##LL)
@@ -2803,19 +2925,25 @@ __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
 #endif
 #if !defined(lzo_int64e_t)
 #if (LZO_SIZEOF___INT64 == 8)
-#  if (LZO_CC_BORLANDC) && !(LZO_CFG_TYPE_PREFER___INT64)
-#    define LZO_CFG_TYPE_PREFER___INT64 1
+#  if (LZO_CC_BORLANDC) && !defined(LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T)
+#    define LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T  LZO_TYPEOF___INT64
 #  endif
 #endif
+#if (LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T == LZO_TYPEOF_LONG_LONG) && (LZO_SIZEOF_LONG_LONG != 8)
+#  undef LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T
+#endif
+#if (LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T == LZO_TYPEOF___INT64) && (LZO_SIZEOF___INT64 != 8)
+#  undef LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T
+#endif
 #if (LZO_SIZEOF_INT == 8) && (LZO_SIZEOF_INT < LZO_SIZEOF_LONG)
 #  define lzo_int64e_t              int
 #  define lzo_uint64e_t             unsigned int
 #  define LZO_TYPEOF_LZO_INT64E_T   LZO_TYPEOF_INT
-#elif (LZO_SIZEOF_LONG == 8)
+#elif (LZO_SIZEOF_LONG == 8) && !(LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T == LZO_TYPEOF_LONG_LONG) && !(LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T == LZO_TYPEOF___INT64)
 #  define lzo_int64e_t              long int
 #  define lzo_uint64e_t             unsigned long int
 #  define LZO_TYPEOF_LZO_INT64E_T   LZO_TYPEOF_LONG
-#elif (LZO_SIZEOF_LONG_LONG == 8) && !(LZO_CFG_TYPE_PREFER___INT64)
+#elif (LZO_SIZEOF_LONG_LONG == 8) && !(LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T == LZO_TYPEOF___INT64)
 #  define lzo_int64e_t              lzo_llong_t
 #  define lzo_uint64e_t             lzo_ullong_t
 #  define LZO_TYPEOF_LZO_INT64E_T   LZO_TYPEOF_LONG_LONG
@@ -2918,15 +3046,19 @@ __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
 #if !defined(lzo_intptr_t)
 #if 1 && (LZO_OS_OS400 && (LZO_SIZEOF_VOID_P == 16))
 #  define __LZO_INTPTR_T_IS_POINTER 1
+#  if !(LZO_LANG_ASSEMBLER)
    typedef char *                   lzo_intptr_t;
    typedef char *                   lzo_uintptr_t;
+#  endif
 #  define lzo_intptr_t              lzo_intptr_t
 #  define lzo_uintptr_t             lzo_uintptr_t
 #  define LZO_SIZEOF_LZO_INTPTR_T   LZO_SIZEOF_VOID_P
 #  define LZO_TYPEOF_LZO_INTPTR_T   LZO_TYPEOF_CHAR_P
 #elif (LZO_CC_MSC && (_MSC_VER >= 1300) && (LZO_SIZEOF_VOID_P == 4) && (LZO_SIZEOF_INT == 4))
+#  if !(LZO_LANG_ASSEMBLER)
    typedef __w64 int                lzo_intptr_t;
    typedef __w64 unsigned int       lzo_uintptr_t;
+#  endif
 #  define lzo_intptr_t              lzo_intptr_t
 #  define lzo_uintptr_t             lzo_uintptr_t
 #  define LZO_SIZEOF_LZO_INTPTR_T   LZO_SIZEOF_INT
@@ -2993,8 +3125,10 @@ __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
 #  define LZO_TYPEOF_LZO_WORD_T     LZO_SIZEOF_LZO_INT64L_T
 #elif (LZO_ARCH_SPU) && (LZO_CC_GNUC)
 #if 0
+#  if !(LZO_LANG_ASSEMBLER)
    typedef unsigned lzo_word_t  __attribute__((__mode__(__V16QI__)));
    typedef int      lzo_sword_t __attribute__((__mode__(__V16QI__)));
+#  endif
 #  define lzo_word_t                lzo_word_t
 #  define lzo_sword_t               lzo_sword_t
 #  define LZO_SIZEOF_LZO_WORD_T     16
diff --git a/include/lzo/lzoutil.h b/include/lzo/lzoutil.h
index f44156f..75cd067 100644
--- a/include/lzo/lzoutil.h
+++ b/include/lzo/lzoutil.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/lzo2.pc.cmakein b/lzo2.pc.cmakein
new file mode 100644
index 0000000..728c84b
--- /dev/null
+++ b/lzo2.pc.cmakein
@@ -0,0 +1,21 @@
+#
+#  lzo2.pc -- LZO pkg-config configuration file
+#
+#  This file is part of the LZO data compression library.
+#    http://www.oberhumer.com/opensource/lzo/
+#
+#  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
+#  All Rights Reserved.
+#
+
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_FULL_BINDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+
+Name: lzo2
+Version: @PROJECT_VERSION@
+Description: LZO - a real-time data compression library
+URL: http://www.oberhumer.com/opensource/lzo/
+Cflags: -I${includedir}/lzo
+Libs: -L${libdir} -llzo2
diff --git a/lzo2.pc.in b/lzo2.pc.in
new file mode 100644
index 0000000..d5d7fa9
--- /dev/null
+++ b/lzo2.pc.in
@@ -0,0 +1,21 @@
+#
+#  lzo2.pc -- LZO pkg-config configuration file
+#
+#  This file is part of the LZO data compression library.
+#    http://www.oberhumer.com/opensource/lzo/
+#
+#  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
+#  All Rights Reserved.
+#
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+includedir=@includedir@
+libdir=@libdir@
+
+Name: lzo2
+Version: @PACKAGE_VERSION@
+Description: LZO - a real-time data compression library
+URL: http://www.oberhumer.com/opensource/lzo/
+Cflags: -I${includedir}/lzo
+Libs: -L${libdir} -llzo2
diff --git a/lzotest/asm.h b/lzotest/asm.h
index 72b8289..3648bbe 100644
--- a/lzotest/asm.h
+++ b/lzotest/asm.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/lzotest/db.h b/lzotest/db.h
index 36fc481..d702341 100644
--- a/lzotest/db.h
+++ b/lzotest/db.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/lzotest/lzotest.c b/lzotest/lzotest.c
index e4bae0f..41fd726 100644
--- a/lzotest/lzotest.c
+++ b/lzotest/lzotest.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -1456,7 +1456,7 @@ void usage ( const char *name, int exit_code, lzo_bool show_methods )
                 if (c->decompress_asm_fast_safe)
                     { fprintf(fp, "%s%s", sep, "fastasm+safe"); sep = ", "; }
                 if (c->optimize)
-                    { fprintf(fp, "%s%s", sep, "optimize"); sep = ", "; }
+                    { fprintf(fp, "%s%s", sep, "optimize"); /*sep = ", ";*/ }
                 fprintf(fp, "\n");
             }
         }
@@ -1904,7 +1904,7 @@ int __lzo_cdecl_main main(int argc, char *argv[])
 
     printf("\nLZO real-time data compression library (v%s, %s).\n",
            lzo_version_string(), lzo_version_date());
-    printf("Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
+    printf("Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
 
 
 /*
diff --git a/lzotest/wrap.h b/lzotest/wrap.h
index d2a9c13..815ce04 100644
--- a/lzotest/wrap.h
+++ b/lzotest/wrap.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -238,6 +238,7 @@ adler32_x_compress      ( const lzo_bytep src, lzo_uint  src_len,
     lzo_uint32_t adler;
     adler = lzo_adler32(0, NULL, 0);
     adler = lzo_adler32(adler, dst, src_len);
+    LZO_UNUSED_RESULT(adler);
     *dst_len = src_len;
     LZO_UNUSED(src); LZO_UNUSED(wrkmem);
     return 0;
@@ -252,6 +253,7 @@ crc32_x_compress        ( const lzo_bytep src, lzo_uint  src_len,
     lzo_uint32_t crc;
     crc = lzo_crc32(0, NULL, 0);
     crc = lzo_crc32(crc, dst, src_len);
+    LZO_UNUSED_RESULT(crc);
     *dst_len = src_len;
     LZO_UNUSED(src); LZO_UNUSED(wrkmem);
     return 0;
diff --git a/lzotest/wrapmisc.h b/lzotest/wrapmisc.h
index 12c4809..50e73b6 100644
--- a/lzotest/wrapmisc.h
+++ b/lzotest/wrapmisc.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/minilzo/Makefile.minilzo b/minilzo/Makefile.minilzo
index 6e30163..ae4d6d4 100644
--- a/minilzo/Makefile.minilzo
+++ b/minilzo/Makefile.minilzo
@@ -1,7 +1,7 @@
 #
 # a very simple Makefile for miniLZO
 #
-# Copyright (C) 1996-2015 Markus F.X.J. Oberhumer
+# Copyright (C) 1996-2017 Markus F.X.J. Oberhumer
 #
 
 PROGRAM = testmini
diff --git a/minilzo/README.LZO b/minilzo/README.LZO
index b82d13b..7d9bea5 100644
--- a/minilzo/README.LZO
+++ b/minilzo/README.LZO
@@ -6,8 +6,8 @@
  Author  : Markus Franz Xaver Johannes Oberhumer
            <markus@oberhumer.com>
            http://www.oberhumer.com/opensource/lzo/
- Version : 2.09
- Date    : 04 Feb 2015
+ Version : 2.10
+ Date    : 01 Mar 2017
 
  I've created miniLZO for projects where it is inconvenient to
  include (or require) the full LZO source code just because you
@@ -110,7 +110,7 @@
 
  Appendix D: Copyright
  ---------------------
- LZO and miniLZO are Copyright (C) 1996-2015 Markus Franz Xaver Oberhumer
+ LZO and miniLZO are Copyright (C) 1996-2017 Markus Franz Xaver Oberhumer
  All Rights Reserved.
 
  LZO and miniLZO are distributed under the terms of the GNU General
diff --git a/minilzo/minilzo.c b/minilzo/minilzo.c
index 801f530..8fd8664 100644
--- a/minilzo/minilzo.c
+++ b/minilzo/minilzo.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -60,6 +60,33 @@
 #    define __LONG_MAX__ 9223372036854775807L
 #  endif
 #endif
+#if 0
+#elif !defined(__LZO_LANG_OVERRIDE)
+#if (defined(__clang__) || defined(__GNUC__)) && defined(__ASSEMBLER__)
+#  if (__ASSEMBLER__+0) <= 0
+#    error "__ASSEMBLER__"
+#  else
+#    define LZO_LANG_ASSEMBLER  1
+#  endif
+#elif defined(__cplusplus)
+#  if (__cplusplus+0) <= 0
+#    error "__cplusplus"
+#  elif (__cplusplus < 199711L)
+#    define LZO_LANG_CXX        1
+#  elif defined(_MSC_VER) && defined(_MSVC_LANG) && (_MSVC_LANG+0 >= 201402L) && 1
+#    define LZO_LANG_CXX        _MSVC_LANG
+#  else
+#    define LZO_LANG_CXX        __cplusplus
+#  endif
+#  define LZO_LANG_CPLUSPLUS    LZO_LANG_CXX
+#else
+#  if defined(__STDC_VERSION__) && (__STDC_VERSION__+0 >= 199409L)
+#    define LZO_LANG_C          __STDC_VERSION__
+#  else
+#    define LZO_LANG_C          1
+#  endif
+#endif
+#endif
 #if !defined(LZO_CFG_NO_DISABLE_WUNDEF)
 #if defined(__ARMCC_VERSION)
 #  pragma diag_suppress 193
@@ -155,10 +182,12 @@
 #  endif
 #endif
 #endif
-#if defined(_MSC_VER) && defined(M_I86HM) && (UINT_MAX == LZO_0xffffL)
+#if (UINT_MAX == LZO_0xffffL)
+#if defined(_MSC_VER) && defined(M_I86HM)
 #  define ptrdiff_t long
 #  define _PTRDIFF_T_DEFINED 1
 #endif
+#endif
 #if (UINT_MAX == LZO_0xffffL)
 #  undef __LZO_RENAME_A
 #  undef __LZO_RENAME_B
@@ -307,7 +336,7 @@
 #define LZO_CPP_ECONCAT6(a,b,c,d,e,f)   LZO_CPP_CONCAT6(a,b,c,d,e,f)
 #define LZO_CPP_ECONCAT7(a,b,c,d,e,f,g) LZO_CPP_CONCAT7(a,b,c,d,e,f,g)
 #endif
-#define __LZO_MASK_GEN(o,b)     (((((o) << ((b)-!!(b))) - (o)) << 1) + (o)*!!(b))
+#define __LZO_MASK_GEN(o,b)     (((((o) << ((b)-((b)!=0))) - (o)) << 1) + (o)*((b)!=0))
 #if 1 && defined(__cplusplus)
 #  if !defined(__STDC_CONSTANT_MACROS)
 #    define __STDC_CONSTANT_MACROS 1
@@ -558,6 +587,12 @@
 #  define LZO_CC_ARMCC          __ARMCC_VERSION
 #  define LZO_INFO_CC           "ARM C Compiler"
 #  define LZO_INFO_CCVER        __VERSION__
+#elif defined(__clang__) && defined(__c2__) && defined(__c2_version__) && defined(_MSC_VER)
+#  define LZO_CC_CLANG          (__clang_major__ * 0x10000L + (__clang_minor__-0) * 0x100 + (__clang_patchlevel__-0))
+#  define LZO_CC_CLANG_C2       _MSC_VER
+#  define LZO_CC_CLANG_VENDOR_MICROSOFT 1
+#  define LZO_INFO_CC           "clang/c2"
+#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__c2_version__)
 #elif defined(__clang__) && defined(__llvm__) && defined(__VERSION__)
 #  if defined(__clang_major__) && defined(__clang_minor__) && defined(__clang_patchlevel__)
 #    define LZO_CC_CLANG        (__clang_major__ * 0x10000L + (__clang_minor__-0) * 0x100 + (__clang_patchlevel__-0))
@@ -569,8 +604,18 @@
 #  elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__)
 #    define LZO_CC_CLANG_GNUC   (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0))
 #  endif
-#  define LZO_INFO_CC           "clang"
-#  define LZO_INFO_CCVER        __VERSION__
+#  if defined(__APPLE_CC__)
+#    define LZO_CC_CLANG_VENDOR_APPLE 1
+#    define LZO_INFO_CC         "clang/apple"
+#  else
+#    define LZO_CC_CLANG_VENDOR_LLVM 1
+#    define LZO_INFO_CC         "clang"
+#  endif
+#  if defined(__clang_version__)
+#    define LZO_INFO_CCVER      __clang_version__
+#  else
+#    define LZO_INFO_CCVER      __VERSION__
+#  endif
 #elif defined(__llvm__) && defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__)
 #  if defined(__GNUC_PATCHLEVEL__)
 #    define LZO_CC_LLVM_GNUC    (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0))
@@ -790,7 +835,7 @@
 #elif (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16)
 #  define LZO_ARCH_I086             1
 #  define LZO_INFO_ARCH             "i086"
-#elif defined(__aarch64__)
+#elif defined(__aarch64__) || defined(_M_ARM64)
 #  define LZO_ARCH_ARM64            1
 #  define LZO_INFO_ARCH             "arm64"
 #elif defined(__alpha__) || defined(__alpha) || defined(_M_ALPHA)
@@ -880,6 +925,15 @@
 #elif defined(__powerpc__) || defined(__powerpc) || defined(__ppc__) || defined(__PPC__) || defined(_M_PPC) || defined(_ARCH_PPC) || defined(_ARCH_PWR)
 #  define LZO_ARCH_POWERPC          1
 #  define LZO_INFO_ARCH             "powerpc"
+#elif defined(__powerpc64__) || defined(__powerpc64) || defined(__ppc64__) || defined(__PPC64__)
+#  define LZO_ARCH_POWERPC          1
+#  define LZO_INFO_ARCH             "powerpc"
+#elif defined(__powerpc64le__) || defined(__powerpc64le) || defined(__ppc64le__) || defined(__PPC64LE__)
+#  define LZO_ARCH_POWERPC          1
+#  define LZO_INFO_ARCH             "powerpc"
+#elif defined(__riscv)
+#  define LZO_ARCH_RISCV            1
+#  define LZO_INFO_ARCH             "riscv"
 #elif defined(__s390__) || defined(__s390) || defined(__s390x__) || defined(__s390x)
 #  define LZO_ARCH_S390             1
 #  define LZO_INFO_ARCH             "s390"
@@ -916,17 +970,21 @@
 #endif
 #if !defined(LZO_ARCH_ARM_THUMB2)
 #if (LZO_ARCH_ARM)
-#  if defined(__ARM_ARCH_ISA_THUMB)
-#   if ((__ARM_ARCH_ISA_THUMB)+0 >= 2)
-#    define LZO_ARCH_ARM_THUMB2     1
-#   endif
-#  elif 1 && defined(__thumb2__)
-#    define LZO_ARCH_ARM_THUMB2     1
-#  elif 1 && defined(__TARGET_ARCH_THUMB) && ((__TARGET_ARCH_THUMB)+0 >= 4)
-#    define LZO_ARCH_ARM_THUMB2     1
+#  if defined(__thumb__) || defined(__thumb) || defined(_M_THUMB)
+#    if defined(__thumb2__)
+#      define LZO_ARCH_ARM_THUMB2   1
+#    elif 1 && defined(__TARGET_ARCH_THUMB) && ((__TARGET_ARCH_THUMB)+0 >= 4)
+#      define LZO_ARCH_ARM_THUMB2   1
+#    elif 1 && defined(_MSC_VER) && defined(_M_THUMB) && ((_M_THUMB)+0 >= 7)
+#      define LZO_ARCH_ARM_THUMB2   1
+#    endif
 #  endif
 #endif
 #endif
+#if (LZO_ARCH_ARM_THUMB2)
+#  undef  LZO_INFO_ARCH
+#  define LZO_INFO_ARCH             "arm_thumb2"
+#endif
 #if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_DOS32 || LZO_OS_OS2)
 #  error "FIXME - missing define for CPU architecture"
 #endif
@@ -1130,7 +1188,7 @@
 #    error "unexpected configuration - check your compiler defines"
 #  endif
 #endif
-#ifdef __cplusplus
+#if defined(__cplusplus)
 extern "C" {
 #endif
 #if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0200))
@@ -1153,7 +1211,7 @@ extern "C" {
 #else
 #  error "FIXME - implement LZO_MM_AHSHIFT"
 #endif
-#ifdef __cplusplus
+#if defined(__cplusplus)
 }
 #endif
 #endif
@@ -1239,7 +1297,6 @@ extern "C" {
 #  define __lzo_gnuc_extension__    __extension__
 #elif (LZO_CC_IBMC >= 600)
 #  define __lzo_gnuc_extension__    __extension__
-#else
 #endif
 #endif
 #if !defined(__lzo_gnuc_extension__)
@@ -1285,7 +1342,7 @@ extern "C" {
 #endif
 #endif
 #if !defined(lzo_has_extension)
-#  define lzo_has_extension         0
+#  define lzo_has_extension(x)      0
 #endif
 #if !defined(LZO_CFG_USE_NEW_STYLE_CASTS) && defined(__cplusplus) && 0
 #  if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020800ul))
@@ -1432,6 +1489,9 @@ extern "C" {
 #    define LZO_UNUSED(var)         ((void) &var)
 #  endif
 #endif
+#if !defined(LZO_UNUSED_RESULT)
+#  define LZO_UNUSED_RESULT(var)    LZO_UNUSED(var)
+#endif
 #if !defined(LZO_UNUSED_FUNC)
 #  if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600))
 #    define LZO_UNUSED_FUNC(func)   ((void) func)
@@ -1850,6 +1910,7 @@ extern "C" {
 #elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 800))
 #  define __lzo_likely(e)       (__builtin_expect(!!(e),1))
 #  define __lzo_unlikely(e)     (__builtin_expect(!!(e),0))
+#elif (LZO_CC_CLANG && LZO_CC_CLANG_C2)
 #elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE)
 #  define __lzo_likely(e)       (__builtin_expect(!!(e),1))
 #  define __lzo_unlikely(e)     (__builtin_expect(!!(e),0))
@@ -1962,11 +2023,16 @@ extern "C" {
 #    define LZO_COMPILE_TIME_ASSERT(e)  {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-2*!(e)];}
 #  endif
 #endif
+#if (LZO_LANG_ASSEMBLER)
+#  undef LZO_COMPILE_TIME_ASSERT_HEADER
+#  define LZO_COMPILE_TIME_ASSERT_HEADER(e)  /*empty*/
+#else
 LZO_COMPILE_TIME_ASSERT_HEADER(1 == 1)
 #if defined(__cplusplus)
 extern "C" { LZO_COMPILE_TIME_ASSERT_HEADER(2 == 2) }
 #endif
 LZO_COMPILE_TIME_ASSERT_HEADER(3 == 3)
+#endif
 #if (LZO_ARCH_I086 || LZO_ARCH_I386) && (LZO_OS_DOS16 || LZO_OS_DOS32 || LZO_OS_OS2 || LZO_OS_OS216 || LZO_OS_WIN16 || LZO_OS_WIN32 || LZO_OS_WIN64)
 #  if (LZO_CC_GNUC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PACIFICC)
 #  elif (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC)
@@ -2041,6 +2107,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(3 == 3)
 #endif
 #endif
 #endif
+#define LZO_SIZEOF_CHAR             1
 #ifndef LZO_SIZEOF_SHORT
 #if defined(SIZEOF_SHORT)
 #  define LZO_SIZEOF_SHORT          (SIZEOF_SHORT)
@@ -2239,12 +2306,12 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_LONG == sizeof(long))
 #  define LZO_WORDSIZE              8
 #elif (LZO_ARCH_AMD64)
 #  define LZO_WORDSIZE              8
+#elif (LZO_ARCH_ARM64)
+#  define LZO_WORDSIZE              8
 #elif (LZO_ARCH_AVR)
 #  define LZO_WORDSIZE              1
 #elif (LZO_ARCH_H8300)
-#  if defined(__NORMAL_MODE__)
-#    define LZO_WORDSIZE            4
-#  elif defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__)
+#  if defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__)
 #    define LZO_WORDSIZE            4
 #  else
 #    define LZO_WORDSIZE            2
@@ -2287,11 +2354,15 @@ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 8)
 #elif (LZO_ARCH_C166 || LZO_ARCH_MCS51 || LZO_ARCH_MCS251 || LZO_ARCH_MSP430)
 #  define LZO_SIZEOF_VOID_P         2
 #elif (LZO_ARCH_H8300)
-#  if defined(__NORMAL_MODE__)
-#    define LZO_SIZEOF_VOID_P       2
-#  elif defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__)
-#    define LZO_SIZEOF_VOID_P       4
+#  if defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__)
+     LZO_COMPILE_TIME_ASSERT_HEADER(LZO_WORDSIZE == 4)
+#    if defined(__NORMAL_MODE__)
+#      define LZO_SIZEOF_VOID_P     2
+#    else
+#      define LZO_SIZEOF_VOID_P     4
+#    endif
 #  else
+     LZO_COMPILE_TIME_ASSERT_HEADER(LZO_WORDSIZE == 2)
 #    define LZO_SIZEOF_VOID_P       2
 #  endif
 #  if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x040000ul)) && (LZO_SIZEOF_INT == 4)
@@ -2381,7 +2452,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #  define LZO_ABI_BIG_ENDIAN        1
 #elif (LZO_ARCH_IA64) && (LZO_OS_POSIX_LINUX || LZO_OS_WIN64)
 #  define LZO_ABI_LITTLE_ENDIAN     1
-#elif (LZO_ARCH_ALPHA || LZO_ARCH_AMD64 || LZO_ARCH_BLACKFIN || LZO_ARCH_CRIS || LZO_ARCH_I086 || LZO_ARCH_I386 || LZO_ARCH_MSP430)
+#elif (LZO_ARCH_ALPHA || LZO_ARCH_AMD64 || LZO_ARCH_BLACKFIN || LZO_ARCH_CRIS || LZO_ARCH_I086 || LZO_ARCH_I386 || LZO_ARCH_MSP430 || LZO_ARCH_RISCV)
 #  define LZO_ABI_LITTLE_ENDIAN     1
 #elif (LZO_ARCH_AVR32 || LZO_ARCH_M68K || LZO_ARCH_S390 || LZO_ARCH_SPU)
 #  define LZO_ABI_BIG_ENDIAN        1
@@ -2401,6 +2472,8 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #  define LZO_ABI_BIG_ENDIAN        1
 #elif 1 && (LZO_ARCH_ARM) && defined(__ARMEL__) && !defined(__ARMEB__)
 #  define LZO_ABI_LITTLE_ENDIAN     1
+#elif 1 && (LZO_ARCH_ARM) && defined(_MSC_VER) && defined(_WIN32)
+#  define LZO_ABI_LITTLE_ENDIAN     1
 #elif 1 && (LZO_ARCH_ARM && LZO_CC_ARMCC_ARMCC)
 #  if defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN)
 #    error "unexpected configuration - check your compiler defines"
@@ -2416,6 +2489,8 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #  define LZO_ABI_BIG_ENDIAN        1
 #elif 1 && (LZO_ARCH_ARM64) && defined(__AARCH64EL__) && !defined(__AARCH64EB__)
 #  define LZO_ABI_LITTLE_ENDIAN     1
+#elif 1 && (LZO_ARCH_ARM64) && defined(_MSC_VER) && defined(_WIN32)
+#  define LZO_ABI_LITTLE_ENDIAN     1
 #elif 1 && (LZO_ARCH_MIPS) && defined(__MIPSEB__) && !defined(__MIPSEL__)
 #  define LZO_ABI_BIG_ENDIAN        1
 #elif 1 && (LZO_ARCH_MIPS) && defined(__MIPSEL__) && !defined(__MIPSEB__)
@@ -2457,6 +2532,12 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #  define LZO_ABI_IP32L64       1
 #  define LZO_INFO_ABI_PM       "ip32l64"
 #endif
+#if (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_VOID_P == 4 && LZO_WORDSIZE == 8)
+#  define LZO_ABI_IP32W64       1
+#  ifndef LZO_INFO_ABI_PM
+#  define LZO_INFO_ABI_PM       "ip32w64"
+#  endif
+#endif
 #if 0
 #elif !defined(__LZO_LIBC_OVERRIDE)
 #if (LZO_LIBC_NAKED)
@@ -2559,6 +2640,13 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #    ifndef LZO_OPT_UNALIGNED32
 #    define LZO_OPT_UNALIGNED32             1
 #    endif
+#  elif 1 && defined(__ARM_ARCH) && ((__ARM_ARCH)+0 >= 7)
+#    ifndef LZO_OPT_UNALIGNED16
+#    define LZO_OPT_UNALIGNED16             1
+#    endif
+#    ifndef LZO_OPT_UNALIGNED32
+#    define LZO_OPT_UNALIGNED32             1
+#    endif
 #  elif 1 && defined(__TARGET_ARCH_ARM) && ((__TARGET_ARCH_ARM)+0 >= 7)
 #    ifndef LZO_OPT_UNALIGNED16
 #    define LZO_OPT_UNALIGNED16             1
@@ -2573,6 +2661,13 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #    ifndef LZO_OPT_UNALIGNED32
 #    define LZO_OPT_UNALIGNED32             1
 #    endif
+#  elif 1 && defined(_MSC_VER) && defined(_M_ARM) && ((_M_ARM)+0 >= 7)
+#    ifndef LZO_OPT_UNALIGNED16
+#    define LZO_OPT_UNALIGNED16             1
+#    endif
+#    ifndef LZO_OPT_UNALIGNED32
+#    define LZO_OPT_UNALIGNED32             1
+#    endif
 #  endif
 #elif (LZO_ARCH_ARM64)
 #  ifndef LZO_OPT_UNALIGNED16
@@ -2618,7 +2713,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #elif (LZO_ARCH_POWERPC)
 #  define LZO_OPT_PREFER_PREINC             1
 #  define LZO_OPT_PREFER_PREDEC             1
-#  if (LZO_ABI_BIG_ENDIAN)
+#  if (LZO_ABI_BIG_ENDIAN) || (LZO_WORDSIZE == 8)
 #    ifndef LZO_OPT_UNALIGNED16
 #    define LZO_OPT_UNALIGNED16             1
 #    endif
@@ -2631,6 +2726,19 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #      endif
 #    endif
 #  endif
+#elif (LZO_ARCH_RISCV)
+#  define LZO_OPT_AVOID_UINT_INDEX          1
+#  ifndef LZO_OPT_UNALIGNED16
+#  define LZO_OPT_UNALIGNED16               1
+#  endif
+#  ifndef LZO_OPT_UNALIGNED32
+#  define LZO_OPT_UNALIGNED32               1
+#  endif
+#  if (LZO_WORDSIZE == 8)
+#    ifndef LZO_OPT_UNALIGNED64
+#    define LZO_OPT_UNALIGNED64             1
+#    endif
+#  endif
 #elif (LZO_ARCH_S390)
 #  ifndef LZO_OPT_UNALIGNED16
 #  define LZO_OPT_UNALIGNED16               1
@@ -2741,18 +2849,23 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #define LZO_TYPEOF_CHAR_P           129u
 #if !defined(lzo_llong_t)
 #if (LZO_SIZEOF_LONG_LONG+0 > 0)
-__lzo_gnuc_extension__ typedef long long lzo_llong_t__;
-__lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
+#  if !(LZO_LANG_ASSEMBLER)
+   __lzo_gnuc_extension__ typedef long long lzo_llong_t__;
+   __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
+#  endif
 #  define lzo_llong_t               lzo_llong_t__
 #  define lzo_ullong_t              lzo_ullong_t__
 #endif
 #endif
 #if !defined(lzo_int16e_t)
-#if (LZO_SIZEOF_LONG == 2)
+#if (LZO_CFG_PREFER_TYPEOF_ACC_INT16E_T == LZO_TYPEOF_SHORT) && (LZO_SIZEOF_SHORT != 2)
+#  undef LZO_CFG_PREFER_TYPEOF_ACC_INT16E_T
+#endif
+#if (LZO_SIZEOF_LONG == 2) && !(LZO_CFG_PREFER_TYPEOF_ACC_INT16E_T == LZO_TYPEOF_SHORT)
 #  define lzo_int16e_t              long
 #  define lzo_uint16e_t             unsigned long
 #  define LZO_TYPEOF_LZO_INT16E_T   LZO_TYPEOF_LONG
-#elif (LZO_SIZEOF_INT == 2)
+#elif (LZO_SIZEOF_INT == 2) && !(LZO_CFG_PREFER_TYPEOF_ACC_INT16E_T == LZO_TYPEOF_SHORT)
 #  define lzo_int16e_t              int
 #  define lzo_uint16e_t             unsigned int
 #  define LZO_TYPEOF_LZO_INT16E_T   LZO_TYPEOF_INT
@@ -2761,8 +2874,10 @@ __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
 #  define lzo_uint16e_t             unsigned short int
 #  define LZO_TYPEOF_LZO_INT16E_T   LZO_TYPEOF_SHORT
 #elif 1 && !(LZO_CFG_TYPE_NO_MODE_HI) && (LZO_CC_CLANG || (LZO_CC_GNUC >= 0x025f00ul) || LZO_CC_LLVM)
+#  if !(LZO_LANG_ASSEMBLER)
    typedef int lzo_int16e_hi_t__ __attribute__((__mode__(__HI__)));
    typedef unsigned int lzo_uint16e_hi_t__ __attribute__((__mode__(__HI__)));
+#  endif
 #  define lzo_int16e_t              lzo_int16e_hi_t__
 #  define lzo_uint16e_t             lzo_uint16e_hi_t__
 #  define LZO_TYPEOF_LZO_INT16E_T   LZO_TYPEOF___MODE_HI
@@ -2779,7 +2894,10 @@ __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
    LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16e_t) == LZO_SIZEOF_LZO_INT16E_T)
 #endif
 #if !defined(lzo_int32e_t)
-#if (LZO_SIZEOF_LONG == 4)
+#if (LZO_CFG_PREFER_TYPEOF_ACC_INT32E_T == LZO_TYPEOF_INT) && (LZO_SIZEOF_INT != 4)
+#  undef LZO_CFG_PREFER_TYPEOF_ACC_INT32E_T
+#endif
+#if (LZO_SIZEOF_LONG == 4) && !(LZO_CFG_PREFER_TYPEOF_ACC_INT32E_T == LZO_TYPEOF_INT)
 #  define lzo_int32e_t              long int
 #  define lzo_uint32e_t             unsigned long int
 #  define LZO_TYPEOF_LZO_INT32E_T   LZO_TYPEOF_LONG
@@ -2796,14 +2914,18 @@ __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
 #  define lzo_uint32e_t             lzo_ullong_t
 #  define LZO_TYPEOF_LZO_INT32E_T   LZO_TYPEOF_LONG_LONG
 #elif 1 && !(LZO_CFG_TYPE_NO_MODE_SI) && (LZO_CC_CLANG || (LZO_CC_GNUC >= 0x025f00ul) || LZO_CC_LLVM) && (__INT_MAX__+0 > 2147483647L)
+#  if !(LZO_LANG_ASSEMBLER)
    typedef int lzo_int32e_si_t__ __attribute__((__mode__(__SI__)));
    typedef unsigned int lzo_uint32e_si_t__ __attribute__((__mode__(__SI__)));
+#  endif
 #  define lzo_int32e_t              lzo_int32e_si_t__
 #  define lzo_uint32e_t             lzo_uint32e_si_t__
 #  define LZO_TYPEOF_LZO_INT32E_T   LZO_TYPEOF___MODE_SI
 #elif 1 && !(LZO_CFG_TYPE_NO_MODE_SI) && (LZO_CC_GNUC >= 0x025f00ul) && defined(__AVR__) && (__LONG_MAX__+0 == 32767L)
+#  if !(LZO_LANG_ASSEMBLER)
    typedef int lzo_int32e_si_t__ __attribute__((__mode__(__SI__)));
    typedef unsigned int lzo_uint32e_si_t__ __attribute__((__mode__(__SI__)));
+#  endif
 #  define lzo_int32e_t              lzo_int32e_si_t__
 #  define lzo_uint32e_t             lzo_uint32e_si_t__
 #  define LZO_INT32_C(c)            (c##LL)
@@ -2823,19 +2945,25 @@ __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
 #endif
 #if !defined(lzo_int64e_t)
 #if (LZO_SIZEOF___INT64 == 8)
-#  if (LZO_CC_BORLANDC) && !(LZO_CFG_TYPE_PREFER___INT64)
-#    define LZO_CFG_TYPE_PREFER___INT64 1
+#  if (LZO_CC_BORLANDC) && !defined(LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T)
+#    define LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T  LZO_TYPEOF___INT64
 #  endif
 #endif
+#if (LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T == LZO_TYPEOF_LONG_LONG) && (LZO_SIZEOF_LONG_LONG != 8)
+#  undef LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T
+#endif
+#if (LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T == LZO_TYPEOF___INT64) && (LZO_SIZEOF___INT64 != 8)
+#  undef LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T
+#endif
 #if (LZO_SIZEOF_INT == 8) && (LZO_SIZEOF_INT < LZO_SIZEOF_LONG)
 #  define lzo_int64e_t              int
 #  define lzo_uint64e_t             unsigned int
 #  define LZO_TYPEOF_LZO_INT64E_T   LZO_TYPEOF_INT
-#elif (LZO_SIZEOF_LONG == 8)
+#elif (LZO_SIZEOF_LONG == 8) && !(LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T == LZO_TYPEOF_LONG_LONG) && !(LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T == LZO_TYPEOF___INT64)
 #  define lzo_int64e_t              long int
 #  define lzo_uint64e_t             unsigned long int
 #  define LZO_TYPEOF_LZO_INT64E_T   LZO_TYPEOF_LONG
-#elif (LZO_SIZEOF_LONG_LONG == 8) && !(LZO_CFG_TYPE_PREFER___INT64)
+#elif (LZO_SIZEOF_LONG_LONG == 8) && !(LZO_CFG_PREFER_TYPEOF_ACC_INT64E_T == LZO_TYPEOF___INT64)
 #  define lzo_int64e_t              lzo_llong_t
 #  define lzo_uint64e_t             lzo_ullong_t
 #  define LZO_TYPEOF_LZO_INT64E_T   LZO_TYPEOF_LONG_LONG
@@ -2938,15 +3066,19 @@ __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
 #if !defined(lzo_intptr_t)
 #if 1 && (LZO_OS_OS400 && (LZO_SIZEOF_VOID_P == 16))
 #  define __LZO_INTPTR_T_IS_POINTER 1
+#  if !(LZO_LANG_ASSEMBLER)
    typedef char *                   lzo_intptr_t;
    typedef char *                   lzo_uintptr_t;
+#  endif
 #  define lzo_intptr_t              lzo_intptr_t
 #  define lzo_uintptr_t             lzo_uintptr_t
 #  define LZO_SIZEOF_LZO_INTPTR_T   LZO_SIZEOF_VOID_P
 #  define LZO_TYPEOF_LZO_INTPTR_T   LZO_TYPEOF_CHAR_P
 #elif (LZO_CC_MSC && (_MSC_VER >= 1300) && (LZO_SIZEOF_VOID_P == 4) && (LZO_SIZEOF_INT == 4))
+#  if !(LZO_LANG_ASSEMBLER)
    typedef __w64 int                lzo_intptr_t;
    typedef __w64 unsigned int       lzo_uintptr_t;
+#  endif
 #  define lzo_intptr_t              lzo_intptr_t
 #  define lzo_uintptr_t             lzo_uintptr_t
 #  define LZO_SIZEOF_LZO_INTPTR_T   LZO_SIZEOF_INT
@@ -3013,8 +3145,10 @@ __lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__;
 #  define LZO_TYPEOF_LZO_WORD_T     LZO_SIZEOF_LZO_INT64L_T
 #elif (LZO_ARCH_SPU) && (LZO_CC_GNUC)
 #if 0
+#  if !(LZO_LANG_ASSEMBLER)
    typedef unsigned lzo_word_t  __attribute__((__mode__(__V16QI__)));
    typedef int      lzo_sword_t __attribute__((__mode__(__V16QI__)));
+#  endif
 #  define lzo_word_t                lzo_word_t
 #  define lzo_sword_t               lzo_sword_t
 #  define LZO_SIZEOF_LZO_WORD_T     16
@@ -3156,7 +3290,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast64_t) == sizeof(lzo_uint_fast6
 #undef LZO_HAVE_CONFIG_H
 #include "minilzo.h"
 
-#if !defined(MINILZO_VERSION) || (MINILZO_VERSION != 0x2090)
+#if !defined(MINILZO_VERSION) || (MINILZO_VERSION != 0x20a0)
 #  error "version mismatch in miniLZO source files"
 #endif
 
@@ -3194,7 +3328,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast64_t) == sizeof(lzo_uint_fast6
 #endif
 #endif
 
-#if !defined(__LZOCONF_H_INCLUDED) || (LZO_VERSION+0 != 0x2090)
+#if !defined(__LZOCONF_H_INCLUDED) || (LZO_VERSION+0 != 0x20a0)
 #  error "version mismatch"
 #endif
 
@@ -4088,7 +4222,7 @@ static const char lzo_copyright_[] =
 #else
     "\r\n\n"
     "LZO data compression library.\n"
-    "$Copyright: LZO Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\n"
+    "$Copyright: LZO Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\n"
     "<markus@oberhumer.com>\n"
     "http://www.oberhumer.com $\n\n"
     "$Id: LZO version: v" LZO_VERSION_STRING ", " LZO_VERSION_DATE " $\n"
diff --git a/minilzo/minilzo.h b/minilzo/minilzo.h
index e5adc6e..c1c2297 100644
--- a/minilzo/minilzo.h
+++ b/minilzo/minilzo.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@
 #ifndef __MINILZO_H_INCLUDED
 #define __MINILZO_H_INCLUDED 1
 
-#define MINILZO_VERSION         0x2090
+#define MINILZO_VERSION         0x20a0  /* 2.10 */
 
 #if defined(__LZOCONF_H_INCLUDED)
 #  error "you cannot use both LZO and miniLZO"
diff --git a/minilzo/testmini.c b/minilzo/testmini.c
index f6615d7..ca8c3d1 100644
--- a/minilzo/testmini.c
+++ b/minilzo/testmini.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
 
     printf("\nLZO real-time data compression library (v%s, %s).\n",
            lzo_version_string(), lzo_version_date());
-    printf("Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
+    printf("Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
 
 
 /*
diff --git a/src/compr1b.h b/src/compr1b.h
index 8c23fe8..521c9f9 100644
--- a/src/compr1b.h
+++ b/src/compr1b.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/compr1c.h b/src/compr1c.h
index b5e8fb3..984ef7d 100644
--- a/src/compr1c.h
+++ b/src/compr1c.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/config1.h b/src/config1.h
index 99dd361..e67b600 100644
--- a/src/config1.h
+++ b/src/config1.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/config1a.h b/src/config1a.h
index c316447..c565235 100644
--- a/src/config1a.h
+++ b/src/config1a.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/config1b.h b/src/config1b.h
index 5b4e64a..ee50c1f 100644
--- a/src/config1b.h
+++ b/src/config1b.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/config1c.h b/src/config1c.h
index 7a888d9..988bc49 100644
--- a/src/config1c.h
+++ b/src/config1c.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/config1f.h b/src/config1f.h
index d6ca61d..1a0fa03 100644
--- a/src/config1f.h
+++ b/src/config1f.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/config1x.h b/src/config1x.h
index 72ced78..f3c93ef 100644
--- a/src/config1x.h
+++ b/src/config1x.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/config1y.h b/src/config1y.h
index 3386975..56fcfb0 100644
--- a/src/config1y.h
+++ b/src/config1y.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/config1z.h b/src/config1z.h
index e2f7a21..75ebb0a 100644
--- a/src/config1z.h
+++ b/src/config1z.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/config2a.h b/src/config2a.h
index 17c8281..4a4014b 100644
--- a/src/config2a.h
+++ b/src/config2a.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1.c b/src/lzo1.c
index 96c159e..63bbc59 100644
--- a/src/lzo1.c
+++ b/src/lzo1.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -504,8 +504,8 @@ match:
                     assert(end < in_end);
                 }
 
-                while (ip < end  &&  *m_pos == *ip)
-                    m_pos++, ip++;
+                while (ip < end && *m_pos == *ip)
+                    { m_pos++; ip++; }
                 assert(ip <= in_end);
 
             /* 2b) code the long match */
diff --git a/src/lzo1_99.c b/src/lzo1_99.c
index 506add2..8e1b37f 100644
--- a/src/lzo1_99.c
+++ b/src/lzo1_99.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1_cm.ch b/src/lzo1_cm.ch
index bfb1919..5f2ca08 100644
--- a/src/lzo1_cm.ch
+++ b/src/lzo1_cm.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1_d.ch b/src/lzo1_d.ch
index 2e15a4a..bedc7ce 100644
--- a/src/lzo1_d.ch
+++ b/src/lzo1_d.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1a.c b/src/lzo1a.c
index 1af4dba..6bffa30 100644
--- a/src/lzo1a.c
+++ b/src/lzo1a.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -494,8 +494,8 @@ match:
                     assert(end < in_end);
                 }
 
-                while (ip < end  &&  *m_pos == *ip)
-                    m_pos++, ip++;
+                while (ip < end && *m_pos == *ip)
+                    { m_pos++; ip++; }
                 assert(ip <= in_end);
 
             /* 2a) compute match parameters */
diff --git a/src/lzo1a_99.c b/src/lzo1a_99.c
index 75579d4..1628c92 100644
--- a/src/lzo1a_99.c
+++ b/src/lzo1a_99.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1a_cm.ch b/src/lzo1a_cm.ch
index 1b36e3c..01a957b 100644
--- a/src/lzo1a_cm.ch
+++ b/src/lzo1a_cm.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -153,8 +153,8 @@
                 assert(end < in_end);
             }
 
-            while (ip < end  &&  *m_pos == *ip)
-                m_pos++, ip++;
+            while (ip < end && *m_pos == *ip)
+                { m_pos++; ip++; }
             assert(ip <= in_end);
 
             /* 2a) compute match parameters */
diff --git a/src/lzo1a_cr.ch b/src/lzo1a_cr.ch
index eef584b..1071fa2 100644
--- a/src/lzo1a_cr.ch
+++ b/src/lzo1a_cr.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1a_de.h b/src/lzo1a_de.h
index aaa0137..043c118 100644
--- a/src/lzo1a_de.h
+++ b/src/lzo1a_de.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_1.c b/src/lzo1b_1.c
index 101adba..5241125 100644
--- a/src/lzo1b_1.c
+++ b/src/lzo1b_1.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_2.c b/src/lzo1b_2.c
index 933bebb..764b0a5 100644
--- a/src/lzo1b_2.c
+++ b/src/lzo1b_2.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_3.c b/src/lzo1b_3.c
index 0d070ea..a2b9f2e 100644
--- a/src/lzo1b_3.c
+++ b/src/lzo1b_3.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_4.c b/src/lzo1b_4.c
index 17be356..722c82a 100644
--- a/src/lzo1b_4.c
+++ b/src/lzo1b_4.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_5.c b/src/lzo1b_5.c
index 920dbf1..b8bd8d5 100644
--- a/src/lzo1b_5.c
+++ b/src/lzo1b_5.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_6.c b/src/lzo1b_6.c
index 114aadd..0226fc8 100644
--- a/src/lzo1b_6.c
+++ b/src/lzo1b_6.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_7.c b/src/lzo1b_7.c
index 9f5e6d7..bfb8d72 100644
--- a/src/lzo1b_7.c
+++ b/src/lzo1b_7.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_8.c b/src/lzo1b_8.c
index 94d2042..d7736c3 100644
--- a/src/lzo1b_8.c
+++ b/src/lzo1b_8.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_9.c b/src/lzo1b_9.c
index 2d0532d..ebe70d5 100644
--- a/src/lzo1b_9.c
+++ b/src/lzo1b_9.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_99.c b/src/lzo1b_99.c
index 570f2b0..8a667cb 100644
--- a/src/lzo1b_99.c
+++ b/src/lzo1b_99.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_9x.c b/src/lzo1b_9x.c
index 285caad..c19b436 100644
--- a/src/lzo1b_9x.c
+++ b/src/lzo1b_9x.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_c.ch b/src/lzo1b_c.ch
index f13a812..cd14049 100644
--- a/src/lzo1b_c.ch
+++ b/src/lzo1b_c.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_cc.c b/src/lzo1b_cc.c
index c3318ce..dfad7e2 100644
--- a/src/lzo1b_cc.c
+++ b/src/lzo1b_cc.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_cc.h b/src/lzo1b_cc.h
index 403025f..02a6d29 100644
--- a/src/lzo1b_cc.h
+++ b/src/lzo1b_cc.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_cm.ch b/src/lzo1b_cm.ch
index ccfa869..c38b138 100644
--- a/src/lzo1b_cm.ch
+++ b/src/lzo1b_cm.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -176,8 +176,8 @@
             {
                 const lzo_bytep end;
                 end = in_end;
-                while (ip < end  &&  *m_pos == *ip)
-                    m_pos++, ip++;
+                while (ip < end && *m_pos == *ip)
+                    { m_pos++; ip++; }
                 assert(ip <= in_end);
                 m_len = pd(ip, ii);
             }
diff --git a/src/lzo1b_cr.ch b/src/lzo1b_cr.ch
index 844ce94..bb3a9b9 100644
--- a/src/lzo1b_cr.ch
+++ b/src/lzo1b_cr.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_d.ch b/src/lzo1b_d.ch
index 4fe164f..51e3684 100644
--- a/src/lzo1b_d.ch
+++ b/src/lzo1b_d.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_d1.c b/src/lzo1b_d1.c
index 190eaa2..04c075a 100644
--- a/src/lzo1b_d1.c
+++ b/src/lzo1b_d1.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_d2.c b/src/lzo1b_d2.c
index 98a2704..a741c54 100644
--- a/src/lzo1b_d2.c
+++ b/src/lzo1b_d2.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_de.h b/src/lzo1b_de.h
index cf5abe9..50c337d 100644
--- a/src/lzo1b_de.h
+++ b/src/lzo1b_de.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_r.ch b/src/lzo1b_r.ch
index 827a67d..28fc137 100644
--- a/src/lzo1b_r.ch
+++ b/src/lzo1b_r.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_rr.c b/src/lzo1b_rr.c
index c91bbec..b4f4f4f 100644
--- a/src/lzo1b_rr.c
+++ b/src/lzo1b_rr.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_sm.ch b/src/lzo1b_sm.ch
index 06a83e2..8e3f7c4 100644
--- a/src/lzo1b_sm.ch
+++ b/src/lzo1b_sm.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -129,8 +129,8 @@
                         {
                             const lzo_bytep end;
                             end = MATCH_IP_END;
-                            while (ip < end  &&  *m_pos == *ip)
-                                m_pos++, ip++;
+                            while (ip < end && *m_pos == *ip)
+                                { m_pos++; ip++; }
                             assert(ip <= in_end);
                             x_len = pd(ip, ip_sav);
                         }
diff --git a/src/lzo1b_tm.ch b/src/lzo1b_tm.ch
index a2da025..98ac2c8 100644
--- a/src/lzo1b_tm.ch
+++ b/src/lzo1b_tm.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1b_xx.c b/src/lzo1b_xx.c
index 56f3006..ba7ab87 100644
--- a/src/lzo1b_xx.c
+++ b/src/lzo1b_xx.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1c_1.c b/src/lzo1c_1.c
index 28c3f0c..57d92c2 100644
--- a/src/lzo1c_1.c
+++ b/src/lzo1c_1.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1c_2.c b/src/lzo1c_2.c
index fa09d31..2e4a1c9 100644
--- a/src/lzo1c_2.c
+++ b/src/lzo1c_2.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1c_3.c b/src/lzo1c_3.c
index c8faa16..15710a7 100644
--- a/src/lzo1c_3.c
+++ b/src/lzo1c_3.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1c_4.c b/src/lzo1c_4.c
index ca772d9..3ba6bcf 100644
--- a/src/lzo1c_4.c
+++ b/src/lzo1c_4.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1c_5.c b/src/lzo1c_5.c
index 7e8c546..d43537c 100644
--- a/src/lzo1c_5.c
+++ b/src/lzo1c_5.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1c_6.c b/src/lzo1c_6.c
index 632b8c0..2afb6fd 100644
--- a/src/lzo1c_6.c
+++ b/src/lzo1c_6.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1c_7.c b/src/lzo1c_7.c
index ad8a6ab..d50c906 100644
--- a/src/lzo1c_7.c
+++ b/src/lzo1c_7.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1c_8.c b/src/lzo1c_8.c
index abb2b49..8ae847a 100644
--- a/src/lzo1c_8.c
+++ b/src/lzo1c_8.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1c_9.c b/src/lzo1c_9.c
index abbd0a1..ecc721c 100644
--- a/src/lzo1c_9.c
+++ b/src/lzo1c_9.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1c_99.c b/src/lzo1c_99.c
index c583e83..c81ecd1 100644
--- a/src/lzo1c_99.c
+++ b/src/lzo1c_99.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1c_9x.c b/src/lzo1c_9x.c
index cbc4e51..c4ea914 100644
--- a/src/lzo1c_9x.c
+++ b/src/lzo1c_9x.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1c_cc.c b/src/lzo1c_cc.c
index f704425..952df26 100644
--- a/src/lzo1c_cc.c
+++ b/src/lzo1c_cc.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1c_cc.h b/src/lzo1c_cc.h
index f8b7d83..86a5def 100644
--- a/src/lzo1c_cc.h
+++ b/src/lzo1c_cc.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1c_d1.c b/src/lzo1c_d1.c
index e3fec20..25283ac 100644
--- a/src/lzo1c_d1.c
+++ b/src/lzo1c_d1.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1c_d2.c b/src/lzo1c_d2.c
index fa83cdd..526d5e7 100644
--- a/src/lzo1c_d2.c
+++ b/src/lzo1c_d2.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1c_rr.c b/src/lzo1c_rr.c
index 7851fa4..5c7c987 100644
--- a/src/lzo1c_rr.c
+++ b/src/lzo1c_rr.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1c_xx.c b/src/lzo1c_xx.c
index 8b46509..fb8d304 100644
--- a/src/lzo1c_xx.c
+++ b/src/lzo1c_xx.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1f_1.c b/src/lzo1f_1.c
index 44a138c..c201383 100644
--- a/src/lzo1f_1.c
+++ b/src/lzo1f_1.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -200,7 +200,7 @@ match:
                 const lzo_bytep end;
                 end = in_end;
                 while (ip < end && *m_pos == *ip)
-                    m_pos++, ip++;
+                    { m_pos++; ip++; }
                 m_len = pd(ip, ii);
             }
             assert(m_len >= 3);
diff --git a/src/lzo1f_9x.c b/src/lzo1f_9x.c
index 353aca0..927cdd5 100644
--- a/src/lzo1f_9x.c
+++ b/src/lzo1f_9x.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1f_d.ch b/src/lzo1f_d.ch
index c5093c1..e86027b 100644
--- a/src/lzo1f_d.ch
+++ b/src/lzo1f_d.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1f_d1.c b/src/lzo1f_d1.c
index 278fb68..b6931a0 100644
--- a/src/lzo1f_d1.c
+++ b/src/lzo1f_d1.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1f_d2.c b/src/lzo1f_d2.c
index f98f855..160d2ce 100644
--- a/src/lzo1f_d2.c
+++ b/src/lzo1f_d2.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1x_1.c b/src/lzo1x_1.c
index 2c6cb46..a659393 100644
--- a/src/lzo1x_1.c
+++ b/src/lzo1x_1.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1x_1k.c b/src/lzo1x_1k.c
index 74291c0..4ae6eda 100644
--- a/src/lzo1x_1k.c
+++ b/src/lzo1x_1k.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1x_1l.c b/src/lzo1x_1l.c
index 6fa81fd..90b42e1 100644
--- a/src/lzo1x_1l.c
+++ b/src/lzo1x_1l.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1x_1o.c b/src/lzo1x_1o.c
index 8fd8584..b935fc7 100644
--- a/src/lzo1x_1o.c
+++ b/src/lzo1x_1o.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1x_9x.c b/src/lzo1x_9x.c
index 4432e48..6337f14 100644
--- a/src/lzo1x_9x.c
+++ b/src/lzo1x_9x.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1x_c.ch b/src/lzo1x_c.ch
index 562e0b1..be19b2b 100644
--- a/src/lzo1x_c.ch
+++ b/src/lzo1x_c.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1x_d.ch b/src/lzo1x_d.ch
index 5107f5f..b6c6d99 100644
--- a/src/lzo1x_d.ch
+++ b/src/lzo1x_d.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1x_d1.c b/src/lzo1x_d1.c
index b31f6de..68faf48 100644
--- a/src/lzo1x_d1.c
+++ b/src/lzo1x_d1.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1x_d2.c b/src/lzo1x_d2.c
index abe9463..8b7c316 100644
--- a/src/lzo1x_d2.c
+++ b/src/lzo1x_d2.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1x_d3.c b/src/lzo1x_d3.c
index 8bde36f..b3d430f 100644
--- a/src/lzo1x_d3.c
+++ b/src/lzo1x_d3.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1x_o.c b/src/lzo1x_o.c
index be596a7..9fdf306 100644
--- a/src/lzo1x_o.c
+++ b/src/lzo1x_o.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1x_oo.ch b/src/lzo1x_oo.ch
index 82871bb..bb16fd4 100644
--- a/src/lzo1x_oo.ch
+++ b/src/lzo1x_oo.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -118,7 +118,7 @@ DO_OPTIMIZE          (       lzo_bytep in , lzo_uint  in_len,
         {
             t = 15;
             while (*ip == 0)
-                t += 255, ip++;
+                { t += 255; ip++; }
             t += *ip++;
         }
         lit = t + 3;
@@ -240,7 +240,7 @@ match:
                         {
                             t = 31;
                             while (*ip == 0)
-                                t += 255, ip++;
+                                { t += 255; ip++; }
                             t += *ip++;
                         }
                         m_pos = op - 1;
@@ -256,7 +256,7 @@ match:
                         {
                             t = 7;
                             while (*ip == 0)
-                                t += 255, ip++;
+                                { t += 255; ip++; }
                             t += *ip++;
                         }
                         m_pos -= *ip++ >> 2;
diff --git a/src/lzo1y_1.c b/src/lzo1y_1.c
index 5e1186b..30e9ffc 100644
--- a/src/lzo1y_1.c
+++ b/src/lzo1y_1.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1y_9x.c b/src/lzo1y_9x.c
index d905a17..983a880 100644
--- a/src/lzo1y_9x.c
+++ b/src/lzo1y_9x.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1y_d1.c b/src/lzo1y_d1.c
index 78e372c..cbfa23c 100644
--- a/src/lzo1y_d1.c
+++ b/src/lzo1y_d1.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1y_d2.c b/src/lzo1y_d2.c
index 2f14724..76fec55 100644
--- a/src/lzo1y_d2.c
+++ b/src/lzo1y_d2.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1y_d3.c b/src/lzo1y_d3.c
index 9c61750..08324d6 100644
--- a/src/lzo1y_d3.c
+++ b/src/lzo1y_d3.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1y_o.c b/src/lzo1y_o.c
index f6d2c0a..1e32b75 100644
--- a/src/lzo1y_o.c
+++ b/src/lzo1y_o.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1z_9x.c b/src/lzo1z_9x.c
index 8914daf..082baa4 100644
--- a/src/lzo1z_9x.c
+++ b/src/lzo1z_9x.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1z_d1.c b/src/lzo1z_d1.c
index 53d4dbc..3b7b996 100644
--- a/src/lzo1z_d1.c
+++ b/src/lzo1z_d1.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1z_d2.c b/src/lzo1z_d2.c
index bb21364..6515af4 100644
--- a/src/lzo1z_d2.c
+++ b/src/lzo1z_d2.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo1z_d3.c b/src/lzo1z_d3.c
index 784bb7f..d7eae4c 100644
--- a/src/lzo1z_d3.c
+++ b/src/lzo1z_d3.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo2a_9x.c b/src/lzo2a_9x.c
index 0e14916..cc1401c 100644
--- a/src/lzo2a_9x.c
+++ b/src/lzo2a_9x.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo2a_d.ch b/src/lzo2a_d.ch
index dcd2b54..cbbb79e 100644
--- a/src/lzo2a_d.ch
+++ b/src/lzo2a_d.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo2a_d1.c b/src/lzo2a_d1.c
index 5694738..20a167c 100644
--- a/src/lzo2a_d1.c
+++ b/src/lzo2a_d1.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo2a_d2.c b/src/lzo2a_d2.c
index 5bf1a21..0d7ce52 100644
--- a/src/lzo2a_d2.c
+++ b/src/lzo2a_d2.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo_conf.h b/src/lzo_conf.h
index 0690181..aa9a2b6 100644
--- a/src/lzo_conf.h
+++ b/src/lzo_conf.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -65,7 +65,7 @@
 #endif
 #endif /* !defined(__LZO_IN_MINILZO) */
 
-#if !defined(__LZOCONF_H_INCLUDED) || (LZO_VERSION+0 != 0x2090)
+#if !defined(__LZOCONF_H_INCLUDED) || (LZO_VERSION+0 != 0x20a0)
 #  error "version mismatch"
 #endif
 
diff --git a/src/lzo_crc.c b/src/lzo_crc.c
index b35ec23..56235e2 100644
--- a/src/lzo_crc.c
+++ b/src/lzo_crc.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@
 
 /***********************************************************************
 // crc32 checksum
-// adapted from free code by Mark Adler <madler@alumni.caltech.edu>
+// adapted from free code by Mark Adler <madler at alumni.caltech.edu>
 // see http://www.zlib.org/
 ************************************************************************/
 
diff --git a/src/lzo_dict.h b/src/lzo_dict.h
index 68ec43f..e48addb 100644
--- a/src/lzo_dict.h
+++ b/src/lzo_dict.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo_dll.ch b/src/lzo_dll.ch
index 6fda0bc..d66839e 100644
--- a/src/lzo_dll.ch
+++ b/src/lzo_dll.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo_func.h b/src/lzo_func.h
index 3c204da..f3ac8e3 100644
--- a/src/lzo_func.h
+++ b/src/lzo_func.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo_init.c b/src/lzo_init.c
index 142e95c..31fdabe 100644
--- a/src/lzo_init.c
+++ b/src/lzo_init.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo_mchw.ch b/src/lzo_mchw.ch
index bcfec46..94bedc3 100644
--- a/src/lzo_mchw.ch
+++ b/src/lzo_mchw.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo_ptr.c b/src/lzo_ptr.c
index 38359ff..d2def7f 100644
--- a/src/lzo_ptr.c
+++ b/src/lzo_ptr.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo_ptr.h b/src/lzo_ptr.h
index 736c7c5..8d7ee44 100644
--- a/src/lzo_ptr.h
+++ b/src/lzo_ptr.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo_str.c b/src/lzo_str.c
index 3364e8a..beac725 100644
--- a/src/lzo_str.c
+++ b/src/lzo_str.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/lzo_supp.h b/src/lzo_supp.h
index 87307f9..a2c9021 100644
--- a/src/lzo_supp.h
+++ b/src/lzo_supp.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -71,12 +71,12 @@
 #if (LZO_OS_POSIX)
 #  if (LZO_OS_POSIX_AIX)
 #    define HAVE_SYS_RESOURCE_H 1
-#  elif (LZO_OS_POSIX_FREEBSD || LZO_OS_POSIX_MACOSX || LZO_OS_POSIX_NETBSD || LZO_OS_POSIX_OPENBSD)
+#  elif (LZO_OS_POSIX_DARWIN || LZO_OS_POSIX_FREEBSD || LZO_OS_POSIX_NETBSD || LZO_OS_POSIX_OPENBSD)
 #    define HAVE_STRINGS_H 1
 #    undef HAVE_MALLOC_H
 #  elif (LZO_OS_POSIX_HPUX || LZO_OS_POSIX_INTERIX)
 #    define HAVE_ALLOCA_H 1
-#  elif (LZO_OS_POSIX_MACOSX && LZO_LIBC_MSL)
+#  elif (LZO_OS_POSIX_DARWIN && LZO_LIBC_MSL)
 #    undef HAVE_SYS_TIME_H
 #    undef HAVE_SYS_TYPES_H
 #  elif (LZO_OS_POSIX_SOLARIS || LZO_OS_POSIX_SUNOS)
@@ -154,7 +154,7 @@
 #  undef HAVE_UTIME_H
 #  undef HAVE_SYS_TIME_H
 #  define HAVE_SYS_UTIME_H 1
-#elif (LZO_CC_GHS || LZO_CC_INTELC || LZO_CC_MSC)
+#elif (LZO_CC_CLANG_C2 || LZO_CC_CLANG_MSC || LZO_CC_GHS || LZO_CC_INTELC_MSC || LZO_CC_MSC)
 #  undef HAVE_DIRENT_H
 #  undef HAVE_UNISTD_H
 #  undef HAVE_UTIME_H
@@ -352,7 +352,7 @@
 #if (LZO_OS_POSIX)
 #  if (LZO_OS_POSIX_AIX)
 #    define HAVE_GETRUSAGE 1
-#  elif (LZO_OS_POSIX_MACOSX && LZO_LIBC_MSL)
+#  elif (LZO_OS_POSIX_DARWIN && LZO_LIBC_MSL)
 #    undef HAVE_CHOWN
 #    undef HAVE_LSTAT
 #  elif (LZO_OS_POSIX_UNICOS)
@@ -448,7 +448,7 @@
 #elif (LZO_CC_IBMC)
 #  undef HAVE_SNPRINTF
 #  undef HAVE_VSNPRINTF
-#elif (LZO_CC_INTELC)
+#elif (LZO_CC_CLANG_MSC || LZO_CC_INTELC_MSC)
 #  ifndef snprintf
 #  define snprintf _snprintf
 #  endif
@@ -457,7 +457,7 @@
 #  endif
 #elif (LZO_CC_LCCWIN32)
 #  define utime _utime
-#elif (LZO_CC_MSC)
+#elif (LZO_CC_CLANG_C2 || LZO_CC_MSC)
 #  if (_MSC_VER < 600)
 #    undef HAVE_STRFTIME
 #  endif
@@ -471,7 +471,7 @@
 #    ifndef vsnprintf
 #    define vsnprintf _vsnprintf
 #    endif
-#  else
+#  elif (_MSC_VER < 1900)
 #    ifndef snprintf
 #    define snprintf _snprintf
 #    endif
@@ -656,8 +656,6 @@ extern "C" {
 #endif
 #if (LZO_BROKEN_CDECL_ALT_SYNTAX)
 typedef void __lzo_cdecl_sighandler (*lzo_sighandler_t)(lzo_signo_t);
-#elif defined(RETSIGTYPE)
-typedef RETSIGTYPE (__lzo_cdecl_sighandler *lzo_sighandler_t)(lzo_signo_t);
 #else
 typedef void (__lzo_cdecl_sighandler *lzo_sighandler_t)(lzo_signo_t);
 #endif
@@ -812,7 +810,7 @@ typedef unsigned short wchar_t;
 #if (HAVE_SIGNAL_H)
 #  include <signal.h>
 #endif
-#if (TIME_WITH_SYS_TIME)
+#if (HAVE_SYS_TIME_H && HAVE_TIME_H)
 #  include <sys/time.h>
 #  include <time.h>
 #elif (HAVE_TIME_H)
@@ -1513,18 +1511,17 @@ LZOLIB_EXTERN(int, lzo_spawnve) (int mode, const char* fn, const char* const * a
 #  endif
 #endif
     LZOCHK_ASSERT(1 == 1)
-    LZOCHK_ASSERT(__LZO_MASK_GEN(1u,1) == 1)
-    LZOCHK_ASSERT(__LZO_MASK_GEN(1u,2) == 3)
-    LZOCHK_ASSERT(__LZO_MASK_GEN(1u,3) == 7)
-    LZOCHK_ASSERT(__LZO_MASK_GEN(1u,8) == 255)
+    LZOCHK_ASSERT(__LZO_MASK_GEN(1u,1) == 1u)
+    LZOCHK_ASSERT(__LZO_MASK_GEN(1u,2) == 3u)
+    LZOCHK_ASSERT(__LZO_MASK_GEN(1u,3) == 7u)
+    LZOCHK_ASSERT(__LZO_MASK_GEN(1u,8) == 255u)
 #if (LZO_SIZEOF_INT >= 2)
     LZOCHK_ASSERT(__LZO_MASK_GEN(1,15) == 32767)
     LZOCHK_ASSERT(__LZO_MASK_GEN(1u,16) == 0xffffU)
     LZOCHK_ASSERT(__LZO_MASK_GEN(0u,16) == 0u)
-#else
+#endif
     LZOCHK_ASSERT(__LZO_MASK_GEN(1ul,16) == 0xffffUL)
     LZOCHK_ASSERT(__LZO_MASK_GEN(0ul,16) == 0ul)
-#endif
 #if (LZO_SIZEOF_INT >= 4)
     LZOCHK_ASSERT(__LZO_MASK_GEN(1,31) == 2147483647)
     LZOCHK_ASSERT(__LZO_MASK_GEN(1u,32) == 0xffffffffU)
@@ -1922,6 +1919,14 @@ LZOLIB_EXTERN(int, lzo_spawnve) (int mode, const char* fn, const char* const * a
     LZOCHK_ASSERT(sizeof(size_t) == sizeof(void*))
     LZOCHK_ASSERT(sizeof(lzo_intptr_t) == sizeof(void *))
 #endif
+#if (LZO_ABI_IP32W64)
+    LZOCHK_ASSERT(sizeof(int) == 4)
+    LZOCHK_ASSERT(sizeof(void*) == 4)
+    LZOCHK_ASSERT(sizeof(ptrdiff_t) == sizeof(void*))
+    LZOCHK_ASSERT(sizeof(size_t) == sizeof(void*))
+    LZOCHK_ASSERT(sizeof(lzo_intptr_t) == sizeof(void *))
+    LZOCHK_ASSERT(LZO_WORDSIZE == 8)
+#endif
 #if (LZO_ARCH_I086)
     LZOCHK_ASSERT(sizeof(size_t) == 2)
     LZOCHK_ASSERT(sizeof(lzo_intptr_t) == sizeof(void *))
@@ -2537,7 +2542,7 @@ LZOLIB_PUBLIC(int, lzo_getopt) (lzo_getopt_p g,
         if (!s || s[1] != ':')
         {
             if (!a[0])
-                ++g->optind, g->shortpos = 0;
+                { ++g->optind; g->shortpos = 0; }
             if (!s)
             {
                 g->optopt = c;
@@ -2546,7 +2551,7 @@ LZOLIB_PUBLIC(int, lzo_getopt) (lzo_getopt_p g,
         }
         else
         {
-            ++g->optind, g->shortpos = 0;
+            ++g->optind; g->shortpos = 0;
             if (a[0])
                 g->optarg = a;
             else if (s[2] != ':')
@@ -2656,7 +2661,7 @@ LZOLIB_PUBLIC(lzo_hvoid_p, lzo_halloc) (lzo_hsize_t size)
     p = lmalloc(size);
 #else
     if (size < LZO_STATIC_CAST(size_t, -1))
-        p = malloc((size_t) size);
+        p = malloc(LZO_STATIC_CAST(size_t, size));
 #endif
 }
 #endif
@@ -2866,25 +2871,25 @@ LZOLIB_PUBLIC(long, lzo_safe_hwrite) (int fd, const lzo_hvoid_p buf, long size)
 #if !defined(LZOLIB_PUBLIC)
 #  define LZOLIB_PUBLIC(r,f)    r __LZOLIB_FUNCNAME(f)
 #endif
-#if 1 && (LZO_OS_POSIX_LINUX && LZO_ARCH_AMD64 && LZO_ASM_SYNTAX_GNUC)
+#if 1 && (LZO_OS_POSIX_LINUX && LZO_ARCH_AMD64 && LZO_ASM_SYNTAX_GNUC && !LZO_CFG_NO_SYSCALL)
 #ifndef lzo_pclock_syscall_clock_gettime
 #define lzo_pclock_syscall_clock_gettime lzo_pclock_syscall_clock_gettime
 #endif
 __lzo_static_noinline long lzo_pclock_syscall_clock_gettime(long clockid, struct timespec *ts)
 {
     unsigned long r = 228;
-    __asm__ __volatile__("syscall\n" : "=a" (r) : "0" (r), "D" (clockid), "S" (ts) __LZO_ASM_CLOBBER_LIST_CC_MEMORY);
+    __asm__ __volatile__("syscall\n" : "=a" (r), "=m" (*ts) : "0" (r), "D" (clockid), "S" (ts) __LZO_ASM_CLOBBER_LIST_CC);
     return LZO_ICAST(long, r);
 }
 #endif
-#if 1 && (LZO_OS_POSIX_LINUX && LZO_ARCH_I386 && LZO_ASM_SYNTAX_GNUC) && defined(lzo_int64l_t)
+#if 1 && (LZO_OS_POSIX_LINUX && LZO_ARCH_I386 && LZO_ASM_SYNTAX_GNUC && !LZO_CFG_NO_SYSCALL) && defined(lzo_int64l_t)
 #ifndef lzo_pclock_syscall_clock_gettime
 #define lzo_pclock_syscall_clock_gettime lzo_pclock_syscall_clock_gettime
 #endif
 __lzo_static_noinline long lzo_pclock_syscall_clock_gettime(long clockid, struct timespec *ts)
 {
     unsigned long r = 265;
-    __asm__ __volatile__("pushl %%ebx\n pushl %%edx\n popl %%ebx\n int $0x80\n popl %%ebx\n" : "=a" (r) : "0" (r), "d" (clockid), "c" (ts) __LZO_ASM_CLOBBER_LIST_CC_MEMORY);
+    __asm__ __volatile__("pushl %%ebx\n pushl %%edx\n popl %%ebx\n int $0x80\n popl %%ebx\n": "=a" (r), "=m" (*ts) : "0" (r), "d" (clockid), "c" (ts) __LZO_ASM_CLOBBER_LIST_CC);
     return LZO_ICAST(long, r);
 }
 #endif
@@ -3283,14 +3288,6 @@ LZOLIB_PUBLIC(int, lzo_pclock_flush_cpu_cache) (lzo_pclock_handle_p h, unsigned
     LZO_UNUSED(h); LZO_UNUSED(flags);
     return -1;
 }
-#if defined(__LZOLIB_PCLOCK_NEED_WARN_POP)
-#  if (LZO_CC_MSC && (_MSC_VER >= 1200))
-#    pragma warning(pop)
-#  else
-#    error "__LZOLIB_PCLOCK_NEED_WARN_POP"
-#  endif
-#  undef __LZOLIB_PCLOCK_NEED_WARN_POP
-#endif
 #endif
 #if defined(LZO_WANT_ACCLIB_MISC)
 #  undef LZO_WANT_ACCLIB_MISC
@@ -3510,11 +3507,6 @@ LZOLIB_PUBLIC(lzo_uint32e_t, lzo_muldiv32u) (lzo_uint32e_t a, lzo_uint32e_t b, l
     return r;
 }
 #endif
-#if 0
-LZOLIB_PUBLIC_NOINLINE(int, lzo_syscall_clock_gettime) (int c)
-{
-}
-#endif
 #if (LZO_OS_WIN16)
 LZO_EXTERN_C void __far __pascal DebugBreak(void);
 #endif
@@ -3642,7 +3634,8 @@ LZO_EXTERN_C int __lzo_cdecl _setargv(void) { return __setargv(); }
 #endif
 #endif
 #if (LZO_OS_WIN32 || LZO_OS_WIN64)
-#if (LZO_CC_INTELC || LZO_CC_MSC)
+#if (LZO_CC_MSC && (_MSC_VER >= 1900))
+#elif (LZO_CC_INTELC || LZO_CC_MSC)
 LZO_EXTERN_C int __lzo_cdecl __setargv(void);
 LZO_EXTERN_C int __lzo_cdecl _setargv(void);
 LZO_EXTERN_C int __lzo_cdecl _setargv(void) { return __setargv(); }
diff --git a/src/lzo_swd.ch b/src/lzo_swd.ch
index 4a73a6b..20bc461 100644
--- a/src/lzo_swd.ch
+++ b/src/lzo_swd.ch
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -514,12 +514,13 @@ void swd_search(lzo_swd_p s, lzo_uint node, lzo_uint cnt)
     const lzo_bytep b  = s_b(s);
     const lzo_bytep bp = s_b(s) + s->bp;
     const lzo_bytep bx = s_b(s) + s->bp + s->look;
+    swd_uintp succ3 = s_succ3(s);
     unsigned char scan_end1;
 
     assert(s->m_len > 0);
 
     scan_end1 = bp[m_len - 1];
-    for ( ; cnt-- > 0; node = s_succ3(s)[node])
+    for ( ; cnt-- > 0; node = succ3[node])
     {
         p1 = bp;
         p2 = b + node;
diff --git a/src/lzo_util.c b/src/lzo_util.c
index 2f8059f..f1d72e3 100644
--- a/src/lzo_util.c
+++ b/src/lzo_util.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -44,7 +44,7 @@ static const char lzo_copyright_[] =
 #else
     "\r\n\n"
     "LZO data compression library.\n"
-    "$Copyright: LZO Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\n"
+    "$Copyright: LZO Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\n"
     "<markus@oberhumer.com>\n"
     "http://www.oberhumer.com $\n\n"
     "$Id: LZO version: v" LZO_VERSION_STRING ", " LZO_VERSION_DATE " $\n"
@@ -93,7 +93,7 @@ _lzo_version_date(void)
 
 /***********************************************************************
 // adler32 checksum
-// adapted from free code by Mark Adler <madler@alumni.caltech.edu>
+// adapted from free code by Mark Adler <madler at alumni.caltech.edu>
 // see http://www.zlib.org/
 ************************************************************************/
 
diff --git a/src/stats1a.h b/src/stats1a.h
index 8edfd90..c72d2c1 100644
--- a/src/stats1a.h
+++ b/src/stats1a.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/stats1b.h b/src/stats1b.h
index 20274cd..52011b9 100644
--- a/src/stats1b.h
+++ b/src/stats1b.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/src/stats1c.h b/src/stats1c.h
index 8804c2c..0bbd841 100644
--- a/src/stats1c.h
+++ b/src/stats1c.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/tests/align.c b/tests/align.c
index 59bf833..e159bf0 100644
--- a/tests/align.c
+++ b/tests/align.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/tests/chksum.c b/tests/chksum.c
index fb4fb0d..fc492da 100644
--- a/tests/chksum.c
+++ b/tests/chksum.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/tests/promote.c b/tests/promote.c
index 1bf8d63..f516f28 100644
--- a/tests/promote.c
+++ b/tests/promote.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/tests/sizes.c b/tests/sizes.c
index 6be9c1d..18a81b0 100644
--- a/tests/sizes.c
+++ b/tests/sizes.c
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/util/check.sh b/util/check.sh
index 9c7790a..806c840 100644
--- a/util/check.sh
+++ b/util/check.sh
@@ -8,7 +8,7 @@ set -e
 # on a complete directory tree.
 # It is not suitable for accurate timings.
 #
-# Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 #
 
 if test "X$LZOTEST" = X; then
diff --git a/util/checkasm.sh b/util/checkasm.sh
index aef5ec0..668a875 100644
--- a/util/checkasm.sh
+++ b/util/checkasm.sh
@@ -8,7 +8,7 @@ set -e
 # on a complete directory tree.
 # It is not suitable for accurate timings.
 #
-# Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 #
 
 if test "X$LZOTEST" = X; then
diff --git a/util/notime.pl b/util/notime.pl
index a4e92b0..b5be12d 100644
--- a/util/notime.pl
+++ b/util/notime.pl
@@ -9,7 +9,7 @@
 ##  Description:
 ##      Remove timing values from a table created by table.pl
 ##
-##  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+##  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ##
 ##---------------------------------------------------------------------------##
 
diff --git a/util/overlap.sh b/util/overlap.sh
index 2e1ffa4..439844e 100644
--- a/util/overlap.sh
+++ b/util/overlap.sh
@@ -7,7 +7,7 @@ set -e
 # This script runs the overlap example program
 # on a complete directory tree.
 #
-# Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 #
 
 OVERLAP="./examples/overlap"
diff --git a/util/shortf.pl b/util/shortf.pl
index 44a2e83..500eb45 100644
--- a/util/shortf.pl
+++ b/util/shortf.pl
@@ -9,7 +9,7 @@
 ##  Description:
 ##      Create short files for compression test
 ##
-##  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+##  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ##
 ##---------------------------------------------------------------------------##
 
diff --git a/util/table.pl b/util/table.pl
index abc193e..3fc977f 100644
--- a/util/table.pl
+++ b/util/table.pl
@@ -9,7 +9,7 @@
 ##  Description:
 ##      Convert the output of the LZO lzotest program into a nice table.
 ##
-##  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+##  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ##
 ##---------------------------------------------------------------------------##
 
diff --git a/util/uncompr.pl b/util/uncompr.pl
index d6fafb0..a487ca6 100644
--- a/util/uncompr.pl
+++ b/util/uncompr.pl
@@ -9,7 +9,7 @@
 ##  Description:
 ##      Create incompressible files for compression test
 ##
-##  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+##  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ##
 ##---------------------------------------------------------------------------##