Next step: compile jni sources correctly.

179 files changed, 0 insertions, 24341 deletions

diff --git a/lzo/src/.deps/lzo1.Plo b/lzo/src/.deps/lzo1.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1_99.Plo b/lzo/src/.deps/lzo1_99.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1_99.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1a.Plo b/lzo/src/.deps/lzo1a.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1a.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1a_99.Plo b/lzo/src/.deps/lzo1a_99.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1a_99.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1b_1.Plo b/lzo/src/.deps/lzo1b_1.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1b_1.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1b_2.Plo b/lzo/src/.deps/lzo1b_2.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1b_2.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1b_3.Plo b/lzo/src/.deps/lzo1b_3.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1b_3.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1b_4.Plo b/lzo/src/.deps/lzo1b_4.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1b_4.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1b_5.Plo b/lzo/src/.deps/lzo1b_5.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1b_5.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1b_6.Plo b/lzo/src/.deps/lzo1b_6.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1b_6.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1b_7.Plo b/lzo/src/.deps/lzo1b_7.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1b_7.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1b_8.Plo b/lzo/src/.deps/lzo1b_8.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1b_8.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1b_9.Plo b/lzo/src/.deps/lzo1b_9.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1b_9.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1b_99.Plo b/lzo/src/.deps/lzo1b_99.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1b_99.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1b_9x.Plo b/lzo/src/.deps/lzo1b_9x.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1b_9x.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1b_cc.Plo b/lzo/src/.deps/lzo1b_cc.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1b_cc.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1b_d1.Plo b/lzo/src/.deps/lzo1b_d1.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1b_d1.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1b_d2.Plo b/lzo/src/.deps/lzo1b_d2.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1b_d2.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1b_rr.Plo b/lzo/src/.deps/lzo1b_rr.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1b_rr.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1b_xx.Plo b/lzo/src/.deps/lzo1b_xx.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1b_xx.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1c_1.Plo b/lzo/src/.deps/lzo1c_1.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1c_1.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1c_2.Plo b/lzo/src/.deps/lzo1c_2.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1c_2.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1c_3.Plo b/lzo/src/.deps/lzo1c_3.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1c_3.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1c_4.Plo b/lzo/src/.deps/lzo1c_4.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1c_4.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1c_5.Plo b/lzo/src/.deps/lzo1c_5.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1c_5.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1c_6.Plo b/lzo/src/.deps/lzo1c_6.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1c_6.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1c_7.Plo b/lzo/src/.deps/lzo1c_7.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1c_7.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1c_8.Plo b/lzo/src/.deps/lzo1c_8.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1c_8.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1c_9.Plo b/lzo/src/.deps/lzo1c_9.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1c_9.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1c_99.Plo b/lzo/src/.deps/lzo1c_99.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1c_99.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1c_9x.Plo b/lzo/src/.deps/lzo1c_9x.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1c_9x.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1c_cc.Plo b/lzo/src/.deps/lzo1c_cc.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1c_cc.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1c_d1.Plo b/lzo/src/.deps/lzo1c_d1.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1c_d1.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1c_d2.Plo b/lzo/src/.deps/lzo1c_d2.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1c_d2.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1c_rr.Plo b/lzo/src/.deps/lzo1c_rr.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1c_rr.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1c_xx.Plo b/lzo/src/.deps/lzo1c_xx.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1c_xx.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1f_1.Plo b/lzo/src/.deps/lzo1f_1.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1f_1.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1f_9x.Plo b/lzo/src/.deps/lzo1f_9x.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1f_9x.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1f_d1.Plo b/lzo/src/.deps/lzo1f_d1.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1f_d1.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1f_d2.Plo b/lzo/src/.deps/lzo1f_d2.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1f_d2.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1x_1.Plo b/lzo/src/.deps/lzo1x_1.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1x_1.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1x_1k.Plo b/lzo/src/.deps/lzo1x_1k.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1x_1k.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1x_1l.Plo b/lzo/src/.deps/lzo1x_1l.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1x_1l.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1x_1o.Plo b/lzo/src/.deps/lzo1x_1o.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1x_1o.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1x_9x.Plo b/lzo/src/.deps/lzo1x_9x.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1x_9x.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1x_d1.Plo b/lzo/src/.deps/lzo1x_d1.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1x_d1.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1x_d2.Plo b/lzo/src/.deps/lzo1x_d2.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1x_d2.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1x_d3.Plo b/lzo/src/.deps/lzo1x_d3.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1x_d3.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1x_o.Plo b/lzo/src/.deps/lzo1x_o.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1x_o.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1y_1.Plo b/lzo/src/.deps/lzo1y_1.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1y_1.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1y_9x.Plo b/lzo/src/.deps/lzo1y_9x.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1y_9x.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1y_d1.Plo b/lzo/src/.deps/lzo1y_d1.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1y_d1.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1y_d2.Plo b/lzo/src/.deps/lzo1y_d2.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1y_d2.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1y_d3.Plo b/lzo/src/.deps/lzo1y_d3.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1y_d3.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1y_o.Plo b/lzo/src/.deps/lzo1y_o.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1y_o.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1z_9x.Plo b/lzo/src/.deps/lzo1z_9x.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1z_9x.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1z_d1.Plo b/lzo/src/.deps/lzo1z_d1.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1z_d1.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1z_d2.Plo b/lzo/src/.deps/lzo1z_d2.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1z_d2.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo1z_d3.Plo b/lzo/src/.deps/lzo1z_d3.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo1z_d3.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo2a_9x.Plo b/lzo/src/.deps/lzo2a_9x.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo2a_9x.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo2a_d1.Plo b/lzo/src/.deps/lzo2a_d1.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo2a_d1.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo2a_d2.Plo b/lzo/src/.deps/lzo2a_d2.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo2a_d2.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo_crc.Plo b/lzo/src/.deps/lzo_crc.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo_crc.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo_init.Plo b/lzo/src/.deps/lzo_init.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo_init.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo_ptr.Plo b/lzo/src/.deps/lzo_ptr.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo_ptr.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo_str.Plo b/lzo/src/.deps/lzo_str.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo_str.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/.deps/lzo_util.Plo b/lzo/src/.deps/lzo_util.Plo
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/src/.deps/lzo_util.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/src/Makefile b/lzo/src/Makefile
deleted file mode 100644
index 2765207c..00000000
--- a/lzo/src/Makefile
+++ /dev/null
@@ -1,600 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# src/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-#
-# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-#
-
-srcdir = .
-top_srcdir = ..
-pkgdatadir = $(datadir)/lzo
-pkglibdir = $(libdir)/lzo
-pkgincludedir = $(includedir)/lzo
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-target_triplet = i686-pc-linux-gnu
-subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-am__DEPENDENCIES_1 = lzo1c_s1.lo lzo1c_s2.lo \
-	lzo1f_f1.lo lzo1f_f2.lo lzo1x_f1.lo \
-	lzo1x_f2.lo lzo1x_s1.lo lzo1x_s2.lo \
-	lzo1y_f1.lo lzo1y_f2.lo lzo1y_s1.lo \
-	lzo1y_s2.lo
-am_liblzo2_la_OBJECTS = lzo_crc.lo lzo_init.lo lzo_ptr.lo lzo_str.lo \
-	lzo_util.lo lzo1.lo lzo1_99.lo lzo1a.lo lzo1a_99.lo lzo1b_1.lo \
-	lzo1b_2.lo lzo1b_3.lo lzo1b_4.lo lzo1b_5.lo lzo1b_6.lo \
-	lzo1b_7.lo lzo1b_8.lo lzo1b_9.lo lzo1b_99.lo lzo1b_9x.lo \
-	lzo1b_cc.lo lzo1b_d1.lo lzo1b_d2.lo lzo1b_rr.lo lzo1b_xx.lo \
-	lzo1c_1.lo lzo1c_2.lo lzo1c_3.lo lzo1c_4.lo lzo1c_5.lo \
-	lzo1c_6.lo lzo1c_7.lo lzo1c_8.lo lzo1c_9.lo lzo1c_99.lo \
-	lzo1c_9x.lo lzo1c_cc.lo lzo1c_d1.lo lzo1c_d2.lo lzo1c_rr.lo \
-	lzo1c_xx.lo lzo1f_1.lo lzo1f_9x.lo lzo1f_d1.lo lzo1f_d2.lo \
-	lzo1x_1.lo lzo1x_9x.lo lzo1x_d1.lo lzo1x_d2.lo lzo1x_d3.lo \
-	lzo1x_o.lo lzo1x_1k.lo lzo1x_1l.lo lzo1x_1o.lo lzo1y_1.lo \
-	lzo1y_9x.lo lzo1y_d1.lo lzo1y_d2.lo lzo1y_d3.lo lzo1y_o.lo \
-	lzo1z_9x.lo lzo1z_d1.lo lzo1z_d2.lo lzo1z_d3.lo lzo2a_9x.lo \
-	lzo2a_d1.lo lzo2a_d2.lo
-liblzo2_la_OBJECTS = $(am_liblzo2_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(liblzo2_la_SOURCES)
-DIST_SOURCES = $(liblzo2_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-VPATH = :/home/fries/Development/android/source/external/lzo/asm/i386/src_gas
-ACLOCAL = ${SHELL} /home/fries/Development/android/source/external/lzo/autoconf/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/fries/Development/android/source/external/lzo/autoconf/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /home/fries/Development/android/source/external/lzo/autoconf/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/fries/Development/android/source/external/lzo/autoconf/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/fries/Development/android/source/external/lzo/autoconf/missing --run automake-1.9
-AWK = mawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = $(LZO_CFLAGS) $(configure_CFLAGS) $(LZO_EXTRA_CFLAGS)
-CPP = gcc -E
-CPPFLAGS = $(LZO_CPPFLAGS) $(configure_CPPFLAGS) $(LZO_EXTRA_CPPFLAGS)
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-ECHO = echo
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = grep -E
-EXEEXT = 
-F77 = 
-FFLAGS = 
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS = 
-LZO_ASM_VPATH = :/home/fries/Development/android/source/external/lzo/asm/i386/src_gas
-LZO_CFLAGS = 
-LZO_CPPFLAGS = 
-LZO_EXTRA_CFLAGS = 
-LZO_EXTRA_CPPFLAGS = 
-LZO_USE_ASM_FALSE = #
-LZO_USE_ASM_TRUE = 
-MAINT = #
-MAINTAINER_MODE_FALSE = 
-MAINTAINER_MODE_TRUE = #
-MAKEINFO = ${SHELL} /home/fries/Development/android/source/external/lzo/autoconf/missing --run makeinfo
-OBJEXT = o
-PACKAGE = lzo
-PACKAGE_BUGREPORT = markus@oberhumer.com
-PACKAGE_NAME = lzo
-PACKAGE_STRING = lzo 2.03
-PACKAGE_TARNAME = lzo
-PACKAGE_VERSION = 2.03
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/bash
-STRIP = strip
-VERSION = 2.03
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = 
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-configure_CFLAGS = -g -O2
-configure_CPPFLAGS = -DLZO_HAVE_CONFIG_H -DLZO_USE_ASM
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/fries/Development/android/source/external/lzo/autoconf/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-mkdir_p = mkdir -p --
-oldincludedir = /usr/include
-prefix = /usr/local
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target = i686-pc-linux-gnu
-target_alias = 
-target_cpu = i686
-target_os = linux-gnu
-target_vendor = pc
-SUFFIXES = .S
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
-lib_LTLIBRARIES = liblzo2.la
-liblzo2_la_LDFLAGS = -version-info 2:0:0
-liblzo2_la_SOURCES = \
-    lzo_crc.c lzo_init.c lzo_ptr.c lzo_str.c lzo_util.c \
-    lzo1.c lzo1_99.c \
-    lzo1a.c lzo1a_99.c \
-    lzo1b_1.c lzo1b_2.c lzo1b_3.c lzo1b_4.c lzo1b_5.c lzo1b_6.c \
-    lzo1b_7.c lzo1b_8.c lzo1b_9.c lzo1b_99.c lzo1b_9x.c \
-    lzo1b_cc.c lzo1b_d1.c lzo1b_d2.c lzo1b_rr.c lzo1b_xx.c \
-    lzo1c_1.c lzo1c_2.c lzo1c_3.c lzo1c_4.c lzo1c_5.c lzo1c_6.c \
-    lzo1c_7.c lzo1c_8.c lzo1c_9.c lzo1c_99.c lzo1c_9x.c \
-    lzo1c_cc.c lzo1c_d1.c lzo1c_d2.c lzo1c_rr.c lzo1c_xx.c \
-    lzo1f_1.c lzo1f_9x.c lzo1f_d1.c lzo1f_d2.c \
-    lzo1x_1.c lzo1x_9x.c lzo1x_d1.c lzo1x_d2.c lzo1x_d3.c \
-    lzo1x_o.c lzo1x_1k.c lzo1x_1l.c lzo1x_1o.c \
-    lzo1y_1.c lzo1y_9x.c lzo1y_d1.c lzo1y_d2.c lzo1y_d3.c lzo1y_o.c \
-    lzo1z_9x.c lzo1z_d1.c lzo1z_d2.c lzo1z_d3.c \
-    lzo2a_9x.c lzo2a_d1.c lzo2a_d2.c
-
-EXTRA_DIST = \
-    lzo1_cm.ch lzo1_d.ch lzo1a_cm.ch lzo1a_cr.ch lzo1b_c.ch \
-    lzo1b_cm.ch lzo1b_cr.ch lzo1b_d.ch lzo1b_r.ch \
-    lzo1b_sm.ch lzo1b_tm.ch lzo1f_d.ch lzo1x_c.ch \
-    lzo1x_d.ch lzo1x_oo.ch lzo2a_d.ch \
-    lzo_dll.ch lzo_mchw.ch lzo_swd.ch \
-    compr1b.h compr1c.h config1.h config1a.h config1b.h config1c.h \
-    config1f.h config1x.h config1y.h config1z.h config2a.h \
-    lzo1a_de.h lzo1b_cc.h lzo1b_de.h lzo1c_cc.h lzo_conf.h lzo_dict.h \
-    lzo_ptr.h stats1a.h stats1b.h stats1c.h miniacc.h
-
-liblzo2_la_LIBADD = $(LZO_ASM_OBJECTS)
-liblzo2_la_DEPENDENCIES = $(liblzo2_la_LIBADD)
-
-# /***********************************************************************
-# // assembler support
-# ************************************************************************/
-LZO_ASM_OBJECTS = \
-	lzo1c_s1.lo lzo1c_s2.lo \
-	lzo1f_f1.lo lzo1f_f2.lo \
-	lzo1x_f1.lo lzo1x_f2.lo lzo1x_s1.lo lzo1x_s2.lo \
-	lzo1y_f1.lo lzo1y_f2.lo lzo1y_s1.lo lzo1y_s2.lo
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: # $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-liblzo2.la: $(liblzo2_la_OBJECTS) $(liblzo2_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(liblzo2_la_LDFLAGS) $(liblzo2_la_OBJECTS) $(liblzo2_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-include ./$(DEPDIR)/lzo1.Plo
-include ./$(DEPDIR)/lzo1_99.Plo
-include ./$(DEPDIR)/lzo1a.Plo
-include ./$(DEPDIR)/lzo1a_99.Plo
-include ./$(DEPDIR)/lzo1b_1.Plo
-include ./$(DEPDIR)/lzo1b_2.Plo
-include ./$(DEPDIR)/lzo1b_3.Plo
-include ./$(DEPDIR)/lzo1b_4.Plo
-include ./$(DEPDIR)/lzo1b_5.Plo
-include ./$(DEPDIR)/lzo1b_6.Plo
-include ./$(DEPDIR)/lzo1b_7.Plo
-include ./$(DEPDIR)/lzo1b_8.Plo
-include ./$(DEPDIR)/lzo1b_9.Plo
-include ./$(DEPDIR)/lzo1b_99.Plo
-include ./$(DEPDIR)/lzo1b_9x.Plo
-include ./$(DEPDIR)/lzo1b_cc.Plo
-include ./$(DEPDIR)/lzo1b_d1.Plo
-include ./$(DEPDIR)/lzo1b_d2.Plo
-include ./$(DEPDIR)/lzo1b_rr.Plo
-include ./$(DEPDIR)/lzo1b_xx.Plo
-include ./$(DEPDIR)/lzo1c_1.Plo
-include ./$(DEPDIR)/lzo1c_2.Plo
-include ./$(DEPDIR)/lzo1c_3.Plo
-include ./$(DEPDIR)/lzo1c_4.Plo
-include ./$(DEPDIR)/lzo1c_5.Plo
-include ./$(DEPDIR)/lzo1c_6.Plo
-include ./$(DEPDIR)/lzo1c_7.Plo
-include ./$(DEPDIR)/lzo1c_8.Plo
-include ./$(DEPDIR)/lzo1c_9.Plo
-include ./$(DEPDIR)/lzo1c_99.Plo
-include ./$(DEPDIR)/lzo1c_9x.Plo
-include ./$(DEPDIR)/lzo1c_cc.Plo
-include ./$(DEPDIR)/lzo1c_d1.Plo
-include ./$(DEPDIR)/lzo1c_d2.Plo
-include ./$(DEPDIR)/lzo1c_rr.Plo
-include ./$(DEPDIR)/lzo1c_xx.Plo
-include ./$(DEPDIR)/lzo1f_1.Plo
-include ./$(DEPDIR)/lzo1f_9x.Plo
-include ./$(DEPDIR)/lzo1f_d1.Plo
-include ./$(DEPDIR)/lzo1f_d2.Plo
-include ./$(DEPDIR)/lzo1x_1.Plo
-include ./$(DEPDIR)/lzo1x_1k.Plo
-include ./$(DEPDIR)/lzo1x_1l.Plo
-include ./$(DEPDIR)/lzo1x_1o.Plo
-include ./$(DEPDIR)/lzo1x_9x.Plo
-include ./$(DEPDIR)/lzo1x_d1.Plo
-include ./$(DEPDIR)/lzo1x_d2.Plo
-include ./$(DEPDIR)/lzo1x_d3.Plo
-include ./$(DEPDIR)/lzo1x_o.Plo
-include ./$(DEPDIR)/lzo1y_1.Plo
-include ./$(DEPDIR)/lzo1y_9x.Plo
-include ./$(DEPDIR)/lzo1y_d1.Plo
-include ./$(DEPDIR)/lzo1y_d2.Plo
-include ./$(DEPDIR)/lzo1y_d3.Plo
-include ./$(DEPDIR)/lzo1y_o.Plo
-include ./$(DEPDIR)/lzo1z_9x.Plo
-include ./$(DEPDIR)/lzo1z_d1.Plo
-include ./$(DEPDIR)/lzo1z_d2.Plo
-include ./$(DEPDIR)/lzo1z_d3.Plo
-include ./$(DEPDIR)/lzo2a_9x.Plo
-include ./$(DEPDIR)/lzo2a_d1.Plo
-include ./$(DEPDIR)/lzo2a_d2.Plo
-include ./$(DEPDIR)/lzo_crc.Plo
-include ./$(DEPDIR)/lzo_init.Plo
-include ./$(DEPDIR)/lzo_ptr.Plo
-include ./$(DEPDIR)/lzo_str.Plo
-include ./$(DEPDIR)/lzo_util.Plo
-
-.c.o:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c $<
-
-.c.obj:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=yes \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-libLTLIBRARIES
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man 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 uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES
-
-
-.S.o:
-	$(CC) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(CC) -c $<
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lzo/src/Makefile.am b/lzo/src/Makefile.am
deleted file mode 100644
index e5f6ca01..00000000
--- a/lzo/src/Makefile.am
+++ /dev/null
@@ -1,68 +0,0 @@
-## Process this file with automake to create Makefile.in
-#
-# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-#
-
-VPATH = @srcdir@@LZO_ASM_VPATH@
-SUFFIXES = .S
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
-CPPFLAGS = $(LZO_CPPFLAGS) $(configure_CPPFLAGS) $(LZO_EXTRA_CPPFLAGS)
-CFLAGS = $(LZO_CFLAGS) $(configure_CFLAGS) $(LZO_EXTRA_CFLAGS)
-
-lib_LTLIBRARIES = liblzo2.la
-
-liblzo2_la_LDFLAGS = -version-info 2:0:0
-
-liblzo2_la_SOURCES = \
-    lzo_crc.c lzo_init.c lzo_ptr.c lzo_str.c lzo_util.c \
-    lzo1.c lzo1_99.c \
-    lzo1a.c lzo1a_99.c \
-    lzo1b_1.c lzo1b_2.c lzo1b_3.c lzo1b_4.c lzo1b_5.c lzo1b_6.c \
-    lzo1b_7.c lzo1b_8.c lzo1b_9.c lzo1b_99.c lzo1b_9x.c \
-    lzo1b_cc.c lzo1b_d1.c lzo1b_d2.c lzo1b_rr.c lzo1b_xx.c \
-    lzo1c_1.c lzo1c_2.c lzo1c_3.c lzo1c_4.c lzo1c_5.c lzo1c_6.c \
-    lzo1c_7.c lzo1c_8.c lzo1c_9.c lzo1c_99.c lzo1c_9x.c \
-    lzo1c_cc.c lzo1c_d1.c lzo1c_d2.c lzo1c_rr.c lzo1c_xx.c \
-    lzo1f_1.c lzo1f_9x.c lzo1f_d1.c lzo1f_d2.c \
-    lzo1x_1.c lzo1x_9x.c lzo1x_d1.c lzo1x_d2.c lzo1x_d3.c \
-    lzo1x_o.c lzo1x_1k.c lzo1x_1l.c lzo1x_1o.c \
-    lzo1y_1.c lzo1y_9x.c lzo1y_d1.c lzo1y_d2.c lzo1y_d3.c lzo1y_o.c \
-    lzo1z_9x.c lzo1z_d1.c lzo1z_d2.c lzo1z_d3.c \
-    lzo2a_9x.c lzo2a_d1.c lzo2a_d2.c
-
-EXTRA_DIST = \
-    lzo1_cm.ch lzo1_d.ch lzo1a_cm.ch lzo1a_cr.ch lzo1b_c.ch \
-    lzo1b_cm.ch lzo1b_cr.ch lzo1b_d.ch lzo1b_r.ch \
-    lzo1b_sm.ch lzo1b_tm.ch lzo1f_d.ch lzo1x_c.ch \
-    lzo1x_d.ch lzo1x_oo.ch lzo2a_d.ch \
-    lzo_dll.ch lzo_mchw.ch lzo_swd.ch \
-    compr1b.h compr1c.h config1.h config1a.h config1b.h config1c.h \
-    config1f.h config1x.h config1y.h config1z.h config2a.h \
-    lzo1a_de.h lzo1b_cc.h lzo1b_de.h lzo1c_cc.h lzo_conf.h lzo_dict.h \
-    lzo_ptr.h stats1a.h stats1b.h stats1c.h miniacc.h
-
-liblzo2_la_LIBADD = $(LZO_ASM_OBJECTS)
-liblzo2_la_DEPENDENCIES = $(liblzo2_la_LIBADD)
-
-
-# /***********************************************************************
-# // assembler support
-# ************************************************************************/
-
-if LZO_USE_ASM
-
-LZO_ASM_OBJECTS = \
-	lzo1c_s1.lo lzo1c_s2.lo \
-	lzo1f_f1.lo lzo1f_f2.lo \
-	lzo1x_f1.lo lzo1x_f2.lo lzo1x_s1.lo lzo1x_s2.lo \
-	lzo1y_f1.lo lzo1y_f2.lo lzo1y_s1.lo lzo1y_s2.lo
-
-.S.o:
-	$(CC) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(CC) -c $<
-
-endif
-
diff --git a/lzo/src/Makefile.in b/lzo/src/Makefile.in
deleted file mode 100644
index 90cf4e22..00000000
--- a/lzo/src/Makefile.in
+++ /dev/null
@@ -1,600 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-#
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-@LZO_USE_ASM_TRUE@am__DEPENDENCIES_1 = lzo1c_s1.lo lzo1c_s2.lo \
-@LZO_USE_ASM_TRUE@	lzo1f_f1.lo lzo1f_f2.lo lzo1x_f1.lo \
-@LZO_USE_ASM_TRUE@	lzo1x_f2.lo lzo1x_s1.lo lzo1x_s2.lo \
-@LZO_USE_ASM_TRUE@	lzo1y_f1.lo lzo1y_f2.lo lzo1y_s1.lo \
-@LZO_USE_ASM_TRUE@	lzo1y_s2.lo
-am_liblzo2_la_OBJECTS = lzo_crc.lo lzo_init.lo lzo_ptr.lo lzo_str.lo \
-	lzo_util.lo lzo1.lo lzo1_99.lo lzo1a.lo lzo1a_99.lo lzo1b_1.lo \
-	lzo1b_2.lo lzo1b_3.lo lzo1b_4.lo lzo1b_5.lo lzo1b_6.lo \
-	lzo1b_7.lo lzo1b_8.lo lzo1b_9.lo lzo1b_99.lo lzo1b_9x.lo \
-	lzo1b_cc.lo lzo1b_d1.lo lzo1b_d2.lo lzo1b_rr.lo lzo1b_xx.lo \
-	lzo1c_1.lo lzo1c_2.lo lzo1c_3.lo lzo1c_4.lo lzo1c_5.lo \
-	lzo1c_6.lo lzo1c_7.lo lzo1c_8.lo lzo1c_9.lo lzo1c_99.lo \
-	lzo1c_9x.lo lzo1c_cc.lo lzo1c_d1.lo lzo1c_d2.lo lzo1c_rr.lo \
-	lzo1c_xx.lo lzo1f_1.lo lzo1f_9x.lo lzo1f_d1.lo lzo1f_d2.lo \
-	lzo1x_1.lo lzo1x_9x.lo lzo1x_d1.lo lzo1x_d2.lo lzo1x_d3.lo \
-	lzo1x_o.lo lzo1x_1k.lo lzo1x_1l.lo lzo1x_1o.lo lzo1y_1.lo \
-	lzo1y_9x.lo lzo1y_d1.lo lzo1y_d2.lo lzo1y_d3.lo lzo1y_o.lo \
-	lzo1z_9x.lo lzo1z_d1.lo lzo1z_d2.lo lzo1z_d3.lo lzo2a_9x.lo \
-	lzo2a_d1.lo lzo2a_d2.lo
-liblzo2_la_OBJECTS = $(am_liblzo2_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(liblzo2_la_SOURCES)
-DIST_SOURCES = $(liblzo2_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-VPATH = @srcdir@@LZO_ASM_VPATH@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = $(LZO_CFLAGS) $(configure_CFLAGS) $(LZO_EXTRA_CFLAGS)
-CPP = @CPP@
-CPPFLAGS = $(LZO_CPPFLAGS) $(configure_CPPFLAGS) $(LZO_EXTRA_CPPFLAGS)
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LZO_ASM_VPATH = @LZO_ASM_VPATH@
-LZO_CFLAGS = @LZO_CFLAGS@
-LZO_CPPFLAGS = @LZO_CPPFLAGS@
-LZO_EXTRA_CFLAGS = @LZO_EXTRA_CFLAGS@
-LZO_EXTRA_CPPFLAGS = @LZO_EXTRA_CPPFLAGS@
-LZO_USE_ASM_FALSE = @LZO_USE_ASM_FALSE@
-LZO_USE_ASM_TRUE = @LZO_USE_ASM_TRUE@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-configure_CFLAGS = @configure_CFLAGS@
-configure_CPPFLAGS = @configure_CPPFLAGS@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-SUFFIXES = .S
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
-lib_LTLIBRARIES = liblzo2.la
-liblzo2_la_LDFLAGS = -version-info 2:0:0
-liblzo2_la_SOURCES = \
-    lzo_crc.c lzo_init.c lzo_ptr.c lzo_str.c lzo_util.c \
-    lzo1.c lzo1_99.c \
-    lzo1a.c lzo1a_99.c \
-    lzo1b_1.c lzo1b_2.c lzo1b_3.c lzo1b_4.c lzo1b_5.c lzo1b_6.c \
-    lzo1b_7.c lzo1b_8.c lzo1b_9.c lzo1b_99.c lzo1b_9x.c \
-    lzo1b_cc.c lzo1b_d1.c lzo1b_d2.c lzo1b_rr.c lzo1b_xx.c \
-    lzo1c_1.c lzo1c_2.c lzo1c_3.c lzo1c_4.c lzo1c_5.c lzo1c_6.c \
-    lzo1c_7.c lzo1c_8.c lzo1c_9.c lzo1c_99.c lzo1c_9x.c \
-    lzo1c_cc.c lzo1c_d1.c lzo1c_d2.c lzo1c_rr.c lzo1c_xx.c \
-    lzo1f_1.c lzo1f_9x.c lzo1f_d1.c lzo1f_d2.c \
-    lzo1x_1.c lzo1x_9x.c lzo1x_d1.c lzo1x_d2.c lzo1x_d3.c \
-    lzo1x_o.c lzo1x_1k.c lzo1x_1l.c lzo1x_1o.c \
-    lzo1y_1.c lzo1y_9x.c lzo1y_d1.c lzo1y_d2.c lzo1y_d3.c lzo1y_o.c \
-    lzo1z_9x.c lzo1z_d1.c lzo1z_d2.c lzo1z_d3.c \
-    lzo2a_9x.c lzo2a_d1.c lzo2a_d2.c
-
-EXTRA_DIST = \
-    lzo1_cm.ch lzo1_d.ch lzo1a_cm.ch lzo1a_cr.ch lzo1b_c.ch \
-    lzo1b_cm.ch lzo1b_cr.ch lzo1b_d.ch lzo1b_r.ch \
-    lzo1b_sm.ch lzo1b_tm.ch lzo1f_d.ch lzo1x_c.ch \
-    lzo1x_d.ch lzo1x_oo.ch lzo2a_d.ch \
-    lzo_dll.ch lzo_mchw.ch lzo_swd.ch \
-    compr1b.h compr1c.h config1.h config1a.h config1b.h config1c.h \
-    config1f.h config1x.h config1y.h config1z.h config2a.h \
-    lzo1a_de.h lzo1b_cc.h lzo1b_de.h lzo1c_cc.h lzo_conf.h lzo_dict.h \
-    lzo_ptr.h stats1a.h stats1b.h stats1c.h miniacc.h
-
-liblzo2_la_LIBADD = $(LZO_ASM_OBJECTS)
-liblzo2_la_DEPENDENCIES = $(liblzo2_la_LIBADD)
-
-# /***********************************************************************
-# // assembler support
-# ************************************************************************/
-@LZO_USE_ASM_TRUE@LZO_ASM_OBJECTS = \
-@LZO_USE_ASM_TRUE@	lzo1c_s1.lo lzo1c_s2.lo \
-@LZO_USE_ASM_TRUE@	lzo1f_f1.lo lzo1f_f2.lo \
-@LZO_USE_ASM_TRUE@	lzo1x_f1.lo lzo1x_f2.lo lzo1x_s1.lo lzo1x_s2.lo \
-@LZO_USE_ASM_TRUE@	lzo1y_f1.lo lzo1y_f2.lo lzo1y_s1.lo lzo1y_s2.lo
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-liblzo2.la: $(liblzo2_la_OBJECTS) $(liblzo2_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(liblzo2_la_LDFLAGS) $(liblzo2_la_OBJECTS) $(liblzo2_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1_99.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1a.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1a_99.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1b_1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1b_2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1b_3.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1b_4.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1b_5.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1b_6.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1b_7.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1b_8.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1b_9.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1b_99.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1b_9x.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1b_cc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1b_d1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1b_d2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1b_rr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1b_xx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1c_1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1c_2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1c_3.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1c_4.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1c_5.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1c_6.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1c_7.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1c_8.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1c_9.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1c_99.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1c_9x.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1c_cc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1c_d1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1c_d2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1c_rr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1c_xx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1f_1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1f_9x.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1f_d1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1f_d2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1x_1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1x_1k.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1x_1l.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1x_1o.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1x_9x.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1x_d1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1x_d2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1x_d3.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1x_o.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1y_1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1y_9x.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1y_d1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1y_d2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1y_d3.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1y_o.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1z_9x.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1z_d1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1z_d2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo1z_d3.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo2a_9x.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo2a_d1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo2a_d2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo_crc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo_init.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo_ptr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo_str.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzo_util.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-libLTLIBRARIES
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man 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 uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES
-
-
-@LZO_USE_ASM_TRUE@.S.o:
-@LZO_USE_ASM_TRUE@	$(CC) -c $<
-
-@LZO_USE_ASM_TRUE@.S.lo:
-@LZO_USE_ASM_TRUE@	$(LIBTOOL) --mode=compile $(CC) -c $<
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lzo/src/compr1b.h b/lzo/src/compr1b.h
deleted file mode 100644
index de46b0a5..00000000
--- a/lzo/src/compr1b.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* compr1b.h --
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define LZO_NEED_DICT_H 1
-#include "config1b.h"
-
-
-#if !defined(COMPRESS_ID)
-#define COMPRESS_ID     LZO_CPP_ECONCAT2(DD_BITS,CLEVEL)
-#endif
-
-
-#include "lzo1b_c.ch"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_COMPRESS \
-    LZO_CPP_ECONCAT3(lzo1b_,COMPRESS_ID,_compress)
-
-#define LZO_COMPRESS_FUNC \
-    LZO_CPP_ECONCAT3(_lzo1b_,COMPRESS_ID,_compress_func)
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-const lzo_compress_t LZO_COMPRESS_FUNC = do_compress;
-
-LZO_PUBLIC(int)
-LZO_COMPRESS ( const lzo_bytep in,  lzo_uint  in_len,
-                     lzo_bytep out, lzo_uintp out_len,
-                     lzo_voidp wrkmem )
-{
-    return _lzo1b_do_compress(in,in_len,out,out_len,wrkmem,do_compress);
-}
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/compr1c.h b/lzo/src/compr1c.h
deleted file mode 100644
index 44dcdcf2..00000000
--- a/lzo/src/compr1c.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* compr1c.h --
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define LZO_NEED_DICT_H 1
-#include "config1c.h"
-
-
-#if !defined(COMPRESS_ID)
-#define COMPRESS_ID     LZO_CPP_ECONCAT2(DD_BITS,CLEVEL)
-#endif
-
-
-#include "lzo1b_c.ch"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_COMPRESS \
-    LZO_CPP_ECONCAT3(lzo1c_,COMPRESS_ID,_compress)
-
-#define LZO_COMPRESS_FUNC \
-    LZO_CPP_ECONCAT3(_lzo1c_,COMPRESS_ID,_compress_func)
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-const lzo_compress_t LZO_COMPRESS_FUNC = do_compress;
-
-LZO_PUBLIC(int)
-LZO_COMPRESS ( const lzo_bytep in,  lzo_uint  in_len,
-                     lzo_bytep out, lzo_uintp out_len,
-                     lzo_voidp wrkmem )
-{
-    return _lzo1c_do_compress(in,in_len,out,out_len,wrkmem,do_compress);
-}
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/config1.h b/lzo/src/config1.h
deleted file mode 100644
index 14dc1317..00000000
--- a/lzo/src/config1.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* config1.h -- configuration for the LZO1 algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-#ifndef __LZO_CONFIG1_H
-#define __LZO_CONFIG1_H 1
-
-#include "lzo_conf.h"
-#include "lzo/lzo1.h"
-
-#define LZO_NO_R1 1
-#include "config1a.h"
-
-#endif /* already included */
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/config1a.h b/lzo/src/config1a.h
deleted file mode 100644
index 3c0f24cf..00000000
--- a/lzo/src/config1a.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* config1a.h -- configuration for the LZO1A algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_CONFIG1A_H
-#define __LZO_CONFIG1A_H 1
-
-#include "lzo_conf.h"
-#include "lzo/lzo1a.h"
-
-#undef LZO_COLLECT_STATS    /* no support for stats here */
-
-
-/***********************************************************************
-// algorithm configuration
-************************************************************************/
-
-/* run bits (4 - 5) - the compressor and the decompressor
- * must use the same value. */
-#if !defined(RBITS)
-#  define RBITS     5
-#endif
-
-/* dictionary depth (0 - 6) - this only affects the compressor.
- * 0 is fastest, 6 is best compression ratio */
-#if !defined(DDBITS)
-#  define DDBITS    0
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio */
-#if !defined(CLEVEL)
-#  define CLEVEL    1           /* fastest by default */
-#endif
-
-
-/* check configuration */
-#if (RBITS < 4 || RBITS > 5)
-#  error "invalid RBITS"
-#endif
-#if (DDBITS < 0 || DDBITS > 6)
-#  error "invalid DDBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-#  error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// internal configuration
-************************************************************************/
-
-/* add a special code so that the decompressor can detect the
- * end of the compressed data block (overhead is 3 bytes per block) */
-#undef LZO_EOF_CODE
-
-
-/***********************************************************************
-// algorithm internal configuration
-************************************************************************/
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH        LZO_HASH_LZO_INCREMENTAL_A
-#endif
-
-/* config */
-#define R_BITS          RBITS
-#define DD_BITS         DDBITS
-#ifndef D_BITS
-#define D_BITS          16
-#endif
-
-
-/***********************************************************************
-// optimization and debugging
-************************************************************************/
-
-/* Collect statistics */
-#if 0 && !defined(LZO_COLLECT_STATS)
-#  define LZO_COLLECT_STATS 1
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define M3O_BITS        M2O_BITS
-#define M3L_BITS        CHAR_BIT
-#define M3_MAX_LEN      (M3_MIN_LEN + LZO_SIZE(M3L_BITS) - 1)
-#define _MAX_OFFSET     _M2_MAX_OFFSET
-#define LZO_NO_M3 1
-
-#include "lzo1b_de.h"
-#include "stats1b.h"
-
-#include "lzo1b_cc.h"
-
-
-/***********************************************************************
-// check for total LZO1/LZO1A compatibility
-************************************************************************/
-
-#undef M2_MARKER
-#define M2_MARKER   (1 << M2O_BITS)
-
-#if (R_BITS != 5)
-#  error
-#endif
-#if (M2O_BITS != 5)
-#  error
-#endif
-#if (M3O_BITS != 5)
-#  error
-#endif
-#if (M2_MIN_LEN != 3)
-#  error
-#endif
-#if (M2_MAX_LEN != 8)
-#  error
-#endif
-#if (M3_MIN_LEN != 9)
-#  error
-#endif
-#if (M3_MAX_LEN != 264)
-#  error
-#endif
-#if (_M2_MAX_OFFSET != (1u << 13))
-#  error
-#endif
-#if (_M2_MAX_OFFSET != _M3_MAX_OFFSET)
-#  error
-#endif
-#if (_M2_MAX_OFFSET != _MAX_OFFSET)
-#  error
-#endif
-#if (R0MIN != 32)
-#  error
-#endif
-#if (R0MAX != 287)
-#  error
-#endif
-#if (R0FAST != 280)
-#  error
-#endif
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/config1b.h b/lzo/src/config1b.h
deleted file mode 100644
index 33bb638d..00000000
--- a/lzo/src/config1b.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* config1b.h -- configuration for the LZO1B algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_CONFIG1B_H
-#define __LZO_CONFIG1B_H 1
-
-#include "lzo_conf.h"
-#include "lzo/lzo1b.h"
-
-
-/***********************************************************************
-// algorithm configuration
-************************************************************************/
-
-/* run bits (4 - 5) - the compressor and the decompressor
- * must use the same value. */
-#if !defined(RBITS)
-#  define RBITS     5
-#endif
-
-/* dictionary depth (0 - 6) - this only affects the compressor.
- * 0 is fastest, 6 is best compression ratio */
-#if !defined(DDBITS)
-#  define DDBITS    0
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio */
-#if !defined(CLEVEL)
-#  define CLEVEL    1           /* fastest by default */
-#endif
-
-
-/* check configuration */
-#if (RBITS < 4 || RBITS > 5)
-#  error "invalid RBITS"
-#endif
-#if (DDBITS < 0 || DDBITS > 6)
-#  error "invalid DDBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-#  error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// internal configuration
-************************************************************************/
-
-/* add a special code so that the decompressor can detect the
- * end of the compressed data block (overhead is 3 bytes per block) */
-#define LZO_EOF_CODE 1
-
-
-/***********************************************************************
-// algorithm internal configuration
-************************************************************************/
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH        LZO_HASH_LZO_INCREMENTAL_A
-#endif
-
-/* config */
-#define R_BITS          RBITS
-#define DD_BITS         DDBITS
-#ifndef D_BITS
-#define D_BITS          14
-#endif
-
-
-/***********************************************************************
-// optimization and debugging
-************************************************************************/
-
-/* Collect statistics */
-#if 0 && !defined(LZO_COLLECT_STATS)
-#  define LZO_COLLECT_STATS 1
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#include "lzo1b_de.h"
-#include "stats1b.h"
-
-#include "lzo1b_cc.h"
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/config1c.h b/lzo/src/config1c.h
deleted file mode 100644
index 32ca1f3a..00000000
--- a/lzo/src/config1c.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* config1c.h -- configuration for the LZO1C algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_CONFIG1C_H
-#define __LZO_CONFIG1C_H 1
-
-#include "lzo_conf.h"
-#include "lzo/lzo1c.h"
-
-
-/***********************************************************************
-// algorithm configuration
-************************************************************************/
-
-/* run bits (4 - 5) - the compressor and the decompressor
- * must use the same value. */
-#if !defined(RBITS)
-#  define RBITS     5
-#endif
-
-/* dictionary depth (0 - 6) - this only affects the compressor.
- * 0 is fastest, 6 is best compression ratio */
-#if !defined(DDBITS)
-#  define DDBITS    0
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio */
-#if !defined(CLEVEL)
-#  define CLEVEL    1           /* fastest by default */
-#endif
-
-
-/* check configuration */
-#if (RBITS < 4 || RBITS > 5)
-#  error "invalid RBITS"
-#endif
-#if (DDBITS < 0 || DDBITS > 6)
-#  error "invalid DDBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-#  error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// internal configuration
-************************************************************************/
-
-/* add a special code so that the decompressor can detect the
- * end of the compressed data block (overhead is 3 bytes per block) */
-#define LZO_EOF_CODE 1
-
-
-/***********************************************************************
-// algorithm internal configuration
-************************************************************************/
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH        LZO_HASH_LZO_INCREMENTAL_A
-#endif
-
-/* config */
-#define R_BITS          RBITS
-#define DD_BITS         DDBITS
-#ifndef D_BITS
-#define D_BITS          14
-#endif
-
-
-/***********************************************************************
-// optimization and debugging
-************************************************************************/
-
-/* Collect statistics */
-#if 0 && !defined(LZO_COLLECT_STATS)
-#  define LZO_COLLECT_STATS 1
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* good parameters when using a blocksize of 8kB */
-#define M3O_BITS        6
-#undef LZO_DETERMINISTIC
-
-
-#include "lzo1b_de.h"
-#include "stats1c.h"
-
-#include "lzo1c_cc.h"
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/config1f.h b/lzo/src/config1f.h
deleted file mode 100644
index 6a77efc2..00000000
--- a/lzo/src/config1f.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* config1f.h -- configuration for the LZO1F algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_CONFIG1F_H
-#define __LZO_CONFIG1F_H 1
-
-#include "lzo_conf.h"
-#include "lzo/lzo1f.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_EOF_CODE 1
-#undef LZO_DETERMINISTIC
-
-#define M2_MAX_OFFSET   0x0800
-#define M3_MAX_OFFSET   0x3fff
-
-#define M2_MIN_LEN      3
-#define M2_MAX_LEN      8
-#define M3_MIN_LEN      3
-#define M3_MAX_LEN      33
-
-#define M3_MARKER       224
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#ifndef MIN_LOOKAHEAD
-#define MIN_LOOKAHEAD       (M2_MAX_LEN + 1)
-#endif
-
-#if defined(LZO_NEED_DICT_H)
-
-#ifndef LZO_HASH
-#define LZO_HASH            LZO_HASH_LZO_INCREMENTAL_A
-#endif
-#define DL_MIN_LEN          M2_MIN_LEN
-#include "lzo_dict.h"
-
-#endif
-
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/config1x.h b/lzo/src/config1x.h
deleted file mode 100644
index f52d1b88..00000000
--- a/lzo/src/config1x.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* config1x.h -- configuration for the LZO1X algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_CONFIG1X_H
-#define __LZO_CONFIG1X_H 1
-
-#if !defined(LZO1X) && !defined(LZO1Y) && !defined(LZO1Z)
-#  define LZO1X 1
-#endif
-
-#include "lzo_conf.h"
-#if !defined(__LZO_IN_MINILZO)
-#include "lzo/lzo1x.h"
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#ifndef LZO_EOF_CODE
-#define LZO_EOF_CODE 1
-#endif
-#undef LZO_DETERMINISTIC
-
-#define M1_MAX_OFFSET   0x0400
-#ifndef M2_MAX_OFFSET
-#define M2_MAX_OFFSET   0x0800
-#endif
-#define M3_MAX_OFFSET   0x4000
-#define M4_MAX_OFFSET   0xbfff
-
-#define MX_MAX_OFFSET   (M1_MAX_OFFSET + M2_MAX_OFFSET)
-
-#define M1_MIN_LEN      2
-#define M1_MAX_LEN      2
-#define M2_MIN_LEN      3
-#ifndef M2_MAX_LEN
-#define M2_MAX_LEN      8
-#endif
-#define M3_MIN_LEN      3
-#define M3_MAX_LEN      33
-#define M4_MIN_LEN      3
-#define M4_MAX_LEN      9
-
-#define M1_MARKER       0
-#define M2_MARKER       64
-#define M3_MARKER       32
-#define M4_MARKER       16
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#ifndef MIN_LOOKAHEAD
-#define MIN_LOOKAHEAD       (M2_MAX_LEN + 1)
-#endif
-
-#if defined(LZO_NEED_DICT_H)
-
-#ifndef LZO_HASH
-#define LZO_HASH            LZO_HASH_LZO_INCREMENTAL_B
-#endif
-#define DL_MIN_LEN          M2_MIN_LEN
-#include "lzo_dict.h"
-
-#endif
-
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/config1y.h b/lzo/src/config1y.h
deleted file mode 100644
index ed5a7e4e..00000000
--- a/lzo/src/config1y.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* config1y.h -- configuration for the LZO1Y algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_CONFIG1Y_H
-#define __LZO_CONFIG1Y_H 1
-
-#if !defined(LZO1Y)
-#  define LZO1Y 1
-#endif
-
-#include "lzo_conf.h"
-#include "lzo/lzo1y.h"
-
-#define M2_MAX_LEN      14
-#define M2_MAX_OFFSET   0x0400
-#include "config1x.h"
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/config1z.h b/lzo/src/config1z.h
deleted file mode 100644
index 27ef74e0..00000000
--- a/lzo/src/config1z.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* config1z.h -- configuration for the LZO1Z algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_CONFIG1Z_H
-#define __LZO_CONFIG1Z_H 1
-
-#if !defined(LZO1Z)
-#  define LZO1Z 1
-#endif
-
-#include "lzo_conf.h"
-#include "lzo/lzo1z.h"
-
-#define M2_MAX_OFFSET   0x0700
-#include "config1x.h"
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/config2a.h b/lzo/src/config2a.h
deleted file mode 100644
index f290132d..00000000
--- a/lzo/src/config2a.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* config2a.h -- configuration for the LZO2A algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_CONFIG2A_H
-#define __LZO_CONFIG2A_H 1
-
-#include "lzo_conf.h"
-#include "lzo/lzo2a.h"
-
-
-/***********************************************************************
-// algorithm configuration
-************************************************************************/
-
-/* dictionary depth (0 - 6) - this only affects the compressor.
- * 0 is fastest, 6 is best compression ratio */
-#if !defined(DDBITS)
-#  define DDBITS    0
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio */
-#if !defined(CLEVEL)
-#  define CLEVEL    1           /* fastest by default */
-#endif
-
-
-/* check configuration */
-#if (DDBITS < 0 || DDBITS > 6)
-#  error "invalid DDBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-#  error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// internal configuration
-************************************************************************/
-
-#if 1
-#define SWD_N        8191           /* size of ring buffer */
-#else
-#define SWD_N       16383           /* size of ring buffer */
-#endif
-
-#define M1_MIN_LEN  2
-#define M1_MAX_LEN  5
-#define M2_MIN_LEN  3
-#define M3_MIN_LEN  3
-
-
-/* add a special code so that the decompressor can detect the
- * end of the compressed data block (overhead is 3 bytes per block) */
-#define LZO_EOF_CODE 1
-
-#undef LZO_DETERMINISTIC
-
-
-/***********************************************************************
-// algorithm internal configuration
-************************************************************************/
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH        LZO_HASH_LZO_INCREMENTAL_A
-#endif
-
-/* config */
-#define DD_BITS         DDBITS
-#ifndef D_BITS
-#define D_BITS          14
-#endif
-
-
-
-/***********************************************************************
-// optimization and debugging
-************************************************************************/
-
-/* Collect statistics */
-#if 0 && !defined(LZO_COLLECT_STATS)
-#  define LZO_COLLECT_STATS 1
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* get bits */
-#define _NEEDBITS \
-    { _NEEDBYTE; b |= ((lzo_uint32) _NEXTBYTE) << k; k += 8; assert(k <= 32); }
-#define NEEDBITS(j)     { assert((j) < 8); if (k < (j)) _NEEDBITS }
-
-/* set bits */
-#define SETBITS(j,x)    { b |= (x) << k; k += (j); assert(k <= 32); }
-
-/* access bits */
-#define MASKBITS(j)     (b & ((((lzo_uint32)1 << (j)) - 1)))
-
-/* drop bits */
-#define DUMPBITS(j)     { assert(k >= j); b >>= (j); k -= (j); }
-
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1.c b/lzo/src/lzo1.c
deleted file mode 100644
index edf1c3af..00000000
--- a/lzo/src/lzo1.c
+++ /dev/null
@@ -1,638 +0,0 @@
-/* lzo1.c -- implementation of the LZO1 algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo_conf.h"
-#include "lzo/lzo1.h"
-
-
-/***********************************************************************
-// The next two defines can be changed to customize LZO1.
-// The default version is LZO1-5/1.
-************************************************************************/
-
-/* run bits (3 - 5) - the compressor and the decompressor
- * must use the same value. */
-#if !defined(RBITS)
-#  define RBITS     5
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio */
-#if !defined(CLEVEL)
-#  define CLEVEL    1           /* fastest by default */
-#endif
-
-
-/* check configuration */
-#if (RBITS < 3 || RBITS > 5)
-#  error "invalid RBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-#  error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// You should not have to change anything below this line.
-************************************************************************/
-
-/*
-     Format of the marker byte
-
-
-     76543210
-     --------
-     00000000   a long run (a 'R0' run) - there are short and long R0 runs
-     000rrrrr   a short run with len r
-     mmmooooo   a short match (len = 2+m, o = offset low bits)
-     111ooooo   a long match (o = offset low bits)
-*/
-
-
-#define RSIZE   (1 << RBITS)
-#define RMASK   (RSIZE - 1)
-
-#define OBITS   RBITS               /* offset and run-length use same bits */
-#define OSIZE   (1 << OBITS)
-#define OMASK   (OSIZE - 1)
-
-#define MBITS   (8 - OBITS)
-#define MSIZE   (1 << MBITS)
-#define MMASK   (MSIZE - 1)
-
-
-/* sanity checks */
-#if (OBITS < 3 || OBITS > 5)
-#  error "invalid OBITS"
-#endif
-#if (MBITS < 3 || MBITS > 5)
-#  error "invalid MBITS"
-#endif
-
-
-/***********************************************************************
-// some macros to improve readability
-************************************************************************/
-
-/* Minimum len of a match */
-#define MIN_MATCH           3
-#define THRESHOLD           (MIN_MATCH - 1)
-
-/* Minimum len of match coded in 2 bytes */
-#define MIN_MATCH_SHORT     MIN_MATCH
-
-/* Maximum len of match coded in 2 bytes */
-#define MAX_MATCH_SHORT     (THRESHOLD + (MSIZE - 2))
-/* MSIZE - 2: 0 is used to indicate runs,
- *            MSIZE-1 is used to indicate a long match */
-
-/* Minimum len of match coded in 3 bytes */
-#define MIN_MATCH_LONG      (MAX_MATCH_SHORT + 1)
-
-/* Maximum len of match coded in 3 bytes */
-#define MAX_MATCH_LONG      (MIN_MATCH_LONG + 255)
-
-/* Maximum offset of a match */
-#define MAX_OFFSET          (1 << (8 + OBITS))
-
-
-/*
-
-RBITS | MBITS  MIN  THR.  MSIZE  MAXS  MINL  MAXL   MAXO  R0MAX R0FAST
-======+===============================================================
-  3   |   5      3    2     32    32    33    288   2048    263   256
-  4   |   4      3    2     16    16    17    272   4096    271   264
-  5   |   3      3    2      8     8     9    264   8192    287   280
-
- */
-
-
-/***********************************************************************
-// internal configuration
-// all of these affect compression only
-************************************************************************/
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH    LZO_HASH_LZO_INCREMENTAL_A
-#endif
-#define D_INDEX1(d,p)       d = DM(DMUL(0x21,DX2(p,5,5)) >> 5)
-#define D_INDEX2(d,p)       d = d ^ D_MASK
-
-#define DBITS       (8 + RBITS)
-#include "lzo_dict.h"
-#define DVAL_LEN    DVAL_LOOKAHEAD
-
-
-/***********************************************************************
-// get algorithm info, return memory required for compression
-************************************************************************/
-
-LZO_EXTERN(lzo_uint) lzo1_info ( int *rbits, int *clevel );
-
-LZO_PUBLIC(lzo_uint)
-lzo1_info ( int *rbits, int *clevel )
-{
-    if (rbits)
-        *rbits = RBITS;
-    if (clevel)
-        *clevel = CLEVEL;
-    return D_SIZE * lzo_sizeof(lzo_bytep);
-}
-
-
-/***********************************************************************
-// decode a R0 literal run (a long run)
-************************************************************************/
-
-#define R0MIN   (RSIZE)             /* Minimum len of R0 run of literals */
-#define R0MAX   (R0MIN + 255)       /* Maximum len of R0 run of literals */
-#define R0FAST  (R0MAX & ~7u)       /* R0MAX aligned to 8 byte boundary */
-
-#if (R0MAX - R0FAST != 7) || ((R0FAST & 7) != 0)
-#  error "something went wrong"
-#endif
-
-/* 7 special codes from R0FAST+1 .. R0MAX
- * these codes mean long R0 runs with lengths
- * 512, 1024, 2048, 4096, 8192, 16384, 32768 */
-
-
-/***********************************************************************
-// LZO1 decompress a block of data.
-//
-// Could be easily translated into assembly code.
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1_decompress  ( const lzo_bytep in , lzo_uint  in_len,
-                         lzo_bytep out, lzo_uintp out_len,
-                         lzo_voidp wrkmem )
-{
-    lzo_bytep op;
-    const lzo_bytep ip;
-    const lzo_bytep const ip_end = in + in_len;
-    lzo_uint t;
-
-    LZO_UNUSED(wrkmem);
-
-    op = out;
-    ip = in;
-    while (ip < ip_end)
-    {
-        t = *ip++;  /* get marker */
-
-        if (t < R0MIN)          /* a literal run */
-        {
-            if (t == 0)             /* a R0 literal run */
-            {
-                t = *ip++;
-                if (t >= R0FAST - R0MIN)            /* a long R0 run */
-                {
-                    t -= R0FAST - R0MIN;
-                    if (t == 0)
-                        t = R0FAST;
-                    else
-                    {
-#if 0
-                        t = 256u << ((unsigned) t);
-#else
-                        /* help the optimizer */
-                        lzo_uint tt = 256;
-                        do tt <<= 1; while (--t > 0);
-                        t = tt;
-#endif
-                    }
-                    MEMCPY8_DS(op,ip,t);
-                    continue;
-                }
-                t += R0MIN;
-            }
-            MEMCPY_DS(op,ip,t);
-        }
-        else                    /* a match */
-        {
-            lzo_uint tt;
-            /* get match offset */
-            const lzo_bytep m_pos = op - 1;
-            m_pos -= (lzo_uint)(t & OMASK) | (((lzo_uint) *ip++) << OBITS);
-
-            /* get match len */
-            if (t >= ((MSIZE - 1) << OBITS))                /* all m-bits set */
-                tt = (MIN_MATCH_LONG - THRESHOLD) + *ip++;  /* a long match */
-            else
-                tt = t >> OBITS;                            /* a short match */
-
-            assert(m_pos >= out);
-            assert(m_pos <  op);
-            /* a half unrolled loop */
-            *op++ = *m_pos++;
-            *op++ = *m_pos++;
-            MEMCPY_DS(op,m_pos,tt);
-        }
-    }
-
-    *out_len = pd(op, out);
-
-    /* the next line is the only check in the decompressor ! */
-    return (ip == ip_end ? LZO_E_OK :
-           (ip < ip_end  ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
-}
-
-
-/***********************************************************************
-// code a literal run
-************************************************************************/
-
-static
-#if LZO_ARCH_AVR
-__lzo_noinline
-#endif
-lzo_bytep
-store_run(lzo_bytep op, const lzo_bytep ii, lzo_uint r_len)
-{
-    assert(r_len > 0);
-
-    /* code a long R0 run */
-    if (r_len >= 512)
-    {
-        unsigned r_bits = 7;        /* 256 << 7 == 32768 */
-        do {
-            while (r_len >= (256u << r_bits))
-            {
-                r_len -= (256u << r_bits);
-                *op++ = 0; *op++ = LZO_BYTE((R0FAST - R0MIN) + r_bits);
-                MEMCPY8_DS(op, ii, (256u << r_bits));
-            }
-        } while (--r_bits > 0);
-    }
-    while (r_len >= R0FAST)
-    {
-        r_len -= R0FAST;
-        *op++ = 0; *op++ = R0FAST - R0MIN;
-        MEMCPY8_DS(op, ii, R0FAST);
-    }
-
-    if (r_len >= R0MIN)
-    {
-        /* code a short R0 run */
-        *op++ = 0; *op++ = LZO_BYTE(r_len - R0MIN);
-        MEMCPY_DS(op, ii, r_len);
-    }
-    else if (r_len > 0)
-    {
-        /* code a 'normal' run */
-        *op++ = LZO_BYTE(r_len);
-        MEMCPY_DS(op, ii, r_len);
-    }
-
-    assert(r_len == 0);
-    return op;
-}
-
-
-
-/***********************************************************************
-// LZO1 compress a block of data.
-//
-// Could be translated into assembly code without too much effort.
-//
-// I apologize for the spaghetti code, but it really helps the optimizer.
-************************************************************************/
-
-static int
-do_compress    ( const lzo_bytep in , lzo_uint  in_len,
-                       lzo_bytep out, lzo_uintp out_len,
-                       lzo_voidp wrkmem )
-{
-    const lzo_bytep ip;
-#if defined(__LZO_HASH_INCREMENTAL)
-    lzo_xint dv;
-#endif
-    lzo_bytep op;
-    const lzo_bytep m_pos;
-    const lzo_bytep const ip_end = in+in_len - DVAL_LEN - MIN_MATCH_LONG;
-    const lzo_bytep const in_end = in+in_len - DVAL_LEN;
-    const lzo_bytep ii;
-    lzo_dict_p const dict = (lzo_dict_p) wrkmem;
-
-#if !defined(NDEBUG)
-    const lzo_bytep m_pos_sav;
-#endif
-
-    op = out;
-    ip = in;
-    ii = ip;                /* point to start of literal run */
-    if (in_len <= MIN_MATCH_LONG + DVAL_LEN + 1)
-        goto the_end;
-
-    /* init dictionary */
-#if (LZO_DETERMINISTIC)
-    BZERO8_PTR(wrkmem,sizeof(lzo_dict_t),D_SIZE);
-#endif
-
-    DVAL_FIRST(dv,ip);
-    UPDATE_D(dict,0,dv,ip,in);
-    ip++;
-    DVAL_NEXT(dv,ip);
-
-    do {
-        LZO_DEFINE_UNINITIALIZED_VAR(lzo_uint, m_off, 0);
-        lzo_uint dindex;
-
-        DINDEX1(dindex,ip);
-        GINDEX(m_pos,m_off,dict,dindex,in);
-        if (LZO_CHECK_MPOS(m_pos,m_off,in,ip,MAX_OFFSET))
-            goto literal;
-        if (m_pos[0] == ip[0] && m_pos[1] == ip[1] && m_pos[2] == ip[2])
-            goto match;
-        DINDEX2(dindex,ip);
-        GINDEX(m_pos,m_off,dict,dindex,in);
-        if (LZO_CHECK_MPOS(m_pos,m_off,in,ip,MAX_OFFSET))
-            goto literal;
-        if (m_pos[0] == ip[0] && m_pos[1] == ip[1] && m_pos[2] == ip[2])
-            goto match;
-        goto literal;
-
-
-literal:
-        UPDATE_I(dict,0,dindex,ip,in);
-        if (++ip >= ip_end)
-            break;
-        continue;
-
-match:
-        UPDATE_I(dict,0,dindex,ip,in);
-#if !defined(NDEBUG) && (LZO_DICT_USE_PTR)
-        m_pos_sav = m_pos;
-#endif
-        m_pos += 3;
-        {
-    /* we have found a match (of at least length 3) */
-#if !defined(NDEBUG) && !(LZO_DICT_USE_PTR)
-            assert((m_pos_sav = ip - m_off) == (m_pos - 3));
-#endif
-            /* 1) store the current literal run */
-            if (pd(ip,ii) > 0)
-            {
-                lzo_uint t = pd(ip,ii);
-#if 1
-                /* OPTIMIZED: inline the copying of a short run */
-                if (t < R0MIN)
-                {
-                    *op++ = LZO_BYTE(t);
-                    MEMCPY_DS(op, ii, t);
-                }
-                else
-#endif
-                    op = store_run(op,ii,t);
-            }
-
-            /* 2a) compute match len */
-            ii = ip;        /* point to start of current match */
-
-            /* we already matched MIN_MATCH bytes,
-             * m_pos also already advanced MIN_MATCH bytes */
-            ip += MIN_MATCH;
-            assert(m_pos < ip);
-
-            /* try to match another MIN_MATCH_LONG - MIN_MATCH bytes
-             * to see if we get a long match */
-
-#define PS  *m_pos++ != *ip++
-
-#if (MIN_MATCH_LONG - MIN_MATCH == 2)                   /* MBITS == 2 */
-            if (PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 6)                 /* MBITS == 3 */
-            if (PS || PS || PS || PS || PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 14)                /* MBITS == 4 */
-            if (PS || PS || PS || PS || PS || PS || PS ||
-                PS || PS || PS || PS || PS || PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 30)                /* MBITS == 5 */
-            if (PS || PS || PS || PS || PS || PS || PS || PS ||
-                PS || PS || PS || PS || PS || PS || PS || PS ||
-                PS || PS || PS || PS || PS || PS || PS || PS ||
-                PS || PS || PS || PS || PS || PS)
-#else
-#  error "MBITS not yet implemented"
-#endif
-            {
-                lzo_uint m_len;
-
-            /* 2b) code a short match */
-                    assert(pd(ip,m_pos) == m_off);
-                --ip;   /* ran one too far, point back to non-match */
-                m_len = pd(ip, ii);
-                    assert(m_len >= MIN_MATCH_SHORT);
-                    assert(m_len <= MAX_MATCH_SHORT);
-                    assert(m_off > 0);
-                    assert(m_off <= MAX_OFFSET);
-                    assert(ii-m_off == m_pos_sav);
-                    assert(lzo_memcmp(m_pos_sav,ii,m_len) == 0);
-                --m_off;
-                /* code short match len + low offset bits */
-                *op++ = LZO_BYTE(((m_len - THRESHOLD) << OBITS) |
-                                 (m_off & OMASK));
-                /* code high offset bits */
-                *op++ = LZO_BYTE(m_off >> OBITS);
-
-
-            /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-
-#define SI      /* nothing */
-#define DI      ++ii; DVAL_NEXT(dv,ii); UPDATE_D(dict,0,dv,ii,in);
-#define XI      assert(ii < ip); ii = ip; DVAL_FIRST(dv,(ip));
-
-#if (CLEVEL == 9) || (CLEVEL >= 7 && MBITS <= 4) || (CLEVEL >= 5 && MBITS <= 3)
-            /* Insert the whole match (ii+1)..(ip-1) into dictionary.  */
-                ++ii;
-                do {
-                    DVAL_NEXT(dv,ii);
-                    UPDATE_D(dict,0,dv,ii,in);
-                } while (++ii < ip);
-                DVAL_NEXT(dv,ii);
-                assert(ii == ip);
-                DVAL_ASSERT(dv,ip);
-#elif (CLEVEL >= 3)
-                SI   DI DI   XI
-#elif (CLEVEL >= 2)
-                SI   DI      XI
-#else
-                             XI
-#endif
-
-            }
-            else
-            {
-            /* we've found a long match - see how far we can still go */
-                const lzo_bytep end;
-                lzo_uint m_len;
-
-                assert(ip <= in_end);
-                assert(ii == ip - MIN_MATCH_LONG);
-
-                if (pd(in_end,ip) <= (MAX_MATCH_LONG - MIN_MATCH_LONG))
-                    end = in_end;
-                else
-                {
-                    end = ip + (MAX_MATCH_LONG - MIN_MATCH_LONG);
-                    assert(end < in_end);
-                }
-
-                while (ip < end  &&  *m_pos == *ip)
-                    m_pos++, ip++;
-                assert(ip <= in_end);
-
-            /* 2b) code the long match */
-                m_len = pd(ip, ii);
-                    assert(m_len >= MIN_MATCH_LONG);
-                    assert(m_len <= MAX_MATCH_LONG);
-                    assert(m_off > 0);
-                    assert(m_off <= MAX_OFFSET);
-                    assert(ii-m_off == m_pos_sav);
-                    assert(lzo_memcmp(m_pos_sav,ii,m_len) == 0);
-                    assert(pd(ip,m_pos) == m_off);
-                --m_off;
-                /* code long match flag + low offset bits */
-                *op++ = LZO_BYTE(((MSIZE - 1) << OBITS) | (m_off & OMASK));
-                /* code high offset bits */
-                *op++ = LZO_BYTE(m_off >> OBITS);
-                /* code match len */
-                *op++ = LZO_BYTE(m_len - MIN_MATCH_LONG);
-
-
-            /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-#if (CLEVEL == 9)
-            /* Insert the whole match (ii+1)..(ip-1) into dictionary.  */
-            /* This is not recommended because it is slow. */
-                ++ii;
-                do {
-                    DVAL_NEXT(dv,ii);
-                    UPDATE_D(dict,0,dv,ii,in);
-                } while (++ii < ip);
-                DVAL_NEXT(dv,ii);
-                assert(ii == ip);
-                DVAL_ASSERT(dv,ip);
-#elif (CLEVEL >= 8)
-                SI   DI DI DI DI DI DI DI DI   XI
-#elif (CLEVEL >= 7)
-                SI   DI DI DI DI DI DI DI      XI
-#elif (CLEVEL >= 6)
-                SI   DI DI DI DI DI DI         XI
-#elif (CLEVEL >= 5)
-                SI   DI DI DI DI               XI
-#elif (CLEVEL >= 4)
-                SI   DI DI DI                  XI
-#elif (CLEVEL >= 3)
-                SI   DI DI                     XI
-#elif (CLEVEL >= 2)
-                SI   DI                        XI
-#else
-                                               XI
-#endif
-            }
-
-            /* ii now points to the start of next literal run */
-            assert(ii == ip);
-        }
-    } while (ip < ip_end);
-
-
-
-the_end:
-    assert(ip <= in_end);
-
-
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
-    /* return -1 if op == out to indicate that we
-     * couldn't compress and didn't copy anything.
-     */
-    if (op == out)
-    {
-        *out_len = 0;
-        return LZO_E_NOT_COMPRESSIBLE;
-    }
-#endif
-
-
-    /* store the final literal run */
-    if (pd(in_end+DVAL_LEN,ii) > 0)
-        op = store_run(op,ii,pd(in_end+DVAL_LEN,ii));
-
-    *out_len = pd(op, out);
-    return 0;               /* compression went ok */
-}
-
-
-/***********************************************************************
-// compress public entry point.
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1_compress ( const lzo_bytep in , lzo_uint  in_len,
-                      lzo_bytep out, lzo_uintp out_len,
-                      lzo_voidp wrkmem )
-{
-    int r = LZO_E_OK;
-
-    /* don't try to compress a block that's too short */
-    if (in_len == 0)
-        *out_len = 0;
-    else if (in_len <= MIN_MATCH_LONG + DVAL_LEN + 1)
-    {
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
-        r = LZO_E_NOT_COMPRESSIBLE;
-#else
-        *out_len = pd(store_run(out,in,in_len), out);
-#endif
-    }
-    else
-        r = do_compress(in,in_len,out,out_len,wrkmem);
-
-    return r;
-}
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/lzo1_99.c b/lzo/src/lzo1_99.c
deleted file mode 100644
index b23695d2..00000000
--- a/lzo/src/lzo1_99.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* lzo1_99.c -- implementation of the LZO1-99 algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-
-#define COMPRESS_ID     99
-
-#define DDBITS          3
-#define CLEVEL          9
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_NEED_DICT_H 1
-#include "config1.h"
-
-
-/***********************************************************************
-// compression internal entry point.
-************************************************************************/
-
-static int
-_lzo1_do_compress ( const lzo_bytep in,  lzo_uint  in_len,
-                          lzo_bytep out, lzo_uintp out_len,
-                          lzo_voidp wrkmem,
-                          lzo_compress_t func )
-{
-    int r;
-
-    /* don't try to compress a block that's too short */
-    if (in_len == 0)
-    {
-        *out_len = 0;
-        r = LZO_E_OK;
-    }
-    else if (in_len <= MIN_LOOKAHEAD + 1)
-    {
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
-        *out_len = 0;
-        r = LZO_E_NOT_COMPRESSIBLE;
-#else
-        *out_len = pd(STORE_RUN(out,in,in_len), out);
-        r = (*out_len > in_len) ? LZO_E_OK : LZO_E_ERROR;
-#endif
-    }
-    else
-        r = func(in,in_len,out,out_len,wrkmem);
-
-    return r;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if !defined(COMPRESS_ID)
-#define COMPRESS_ID     _LZO_ECONCAT2(DD_BITS,CLEVEL)
-#endif
-
-
-#define LZO_CODE_MATCH_INCLUDE_FILE     "lzo1_cm.ch"
-#include "lzo1b_c.ch"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_COMPRESS \
-    LZO_CPP_ECONCAT3(lzo1_,COMPRESS_ID,_compress)
-
-#define LZO_COMPRESS_FUNC \
-    LZO_CPP_ECONCAT3(_lzo1_,COMPRESS_ID,_compress_func)
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-LZO_COMPRESS ( const lzo_bytep in,  lzo_uint  in_len,
-                     lzo_bytep out, lzo_uintp out_len,
-                     lzo_voidp wrkmem )
-{
-    return _lzo1_do_compress(in,in_len,out,out_len,wrkmem,do_compress);
-}
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/lzo1_cm.ch b/lzo/src/lzo1_cm.ch
deleted file mode 100644
index 148c9faf..00000000
--- a/lzo/src/lzo1_cm.ch
+++ /dev/null
@@ -1,55 +0,0 @@
-/* lzo1_cm.ch -- implementation of the LZO1 compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#include "lzo1a_cm.ch"
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/lzo1_d.ch b/lzo/src/lzo1_d.ch
deleted file mode 100644
index 40a5bfdc..00000000
--- a/lzo/src/lzo1_d.ch
+++ /dev/null
@@ -1,158 +0,0 @@
-/* lzo1_d.ch -- common decompression stuff
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-
-#if defined(LZO_TEST_OVERRUN)
-#  if !defined(LZO_TEST_OVERRUN_INPUT)
-#    define LZO_TEST_OVERRUN_INPUT       2
-#  endif
-#  if !defined(LZO_TEST_OVERRUN_OUTPUT)
-#    define LZO_TEST_OVERRUN_OUTPUT      2
-#  endif
-#  if !defined(LZO_TEST_OVERRUN_LOOKBEHIND)
-#    define LZO_TEST_OVERRUN_LOOKBEHIND  1
-#  endif
-#endif
-
-
-/***********************************************************************
-// Overrun detection is internally handled by these macros:
-//
-//   TEST_IP    test input overrun at loop begin
-//   NEED_IP    test input overrun at every input byte
-//
-//   TEST_OP    test output overrun at loop begin
-//   NEED_OP    test output overrun at every output byte
-//
-//   TEST_LB    test match position
-//
-// The fastest decompressor results when testing for no overruns
-// and using LZO_EOF_CODE.
-************************************************************************/
-
-#undef TEST_IP
-#undef TEST_OP
-#undef TEST_LB
-#undef TEST_LBO
-#undef NEED_IP
-#undef NEED_OP
-#undef HAVE_TEST_IP
-#undef HAVE_TEST_OP
-#undef HAVE_NEED_IP
-#undef HAVE_NEED_OP
-#undef HAVE_ANY_IP
-#undef HAVE_ANY_OP
-
-
-#if defined(LZO_TEST_OVERRUN_INPUT)
-#  if (LZO_TEST_OVERRUN_INPUT >= 1)
-#    define TEST_IP             (ip < ip_end)
-#  endif
-#  if (LZO_TEST_OVERRUN_INPUT >= 2)
-#    define NEED_IP(x) \
-            if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x))  goto input_overrun
-#  endif
-#endif
-
-#if defined(LZO_TEST_OVERRUN_OUTPUT)
-#  if (LZO_TEST_OVERRUN_OUTPUT >= 1)
-#    define TEST_OP             (op <= op_end)
-#  endif
-#  if (LZO_TEST_OVERRUN_OUTPUT >= 2)
-#    undef TEST_OP              /* don't need both of the tests here */
-#    define NEED_OP(x) \
-            if ((lzo_uint)(op_end - op) < (lzo_uint)(x))  goto output_overrun
-#  endif
-#endif
-
-#if defined(LZO_TEST_OVERRUN_LOOKBEHIND)
-#  define TEST_LB(m_pos)        if (m_pos < out || m_pos >= op) goto lookbehind_overrun
-#  define TEST_LBO(m_pos,o)     if (m_pos < out || m_pos >= op - (o)) goto lookbehind_overrun
-#else
-#  define TEST_LB(m_pos)        ((void) 0)
-#  define TEST_LBO(m_pos,o)     ((void) 0)
-#endif
-
-
-#if !defined(LZO_EOF_CODE) && !defined(TEST_IP)
-   /* if we have no EOF code, we have to test for the end of the input */
-#  define TEST_IP               (ip < ip_end)
-#endif
-
-
-#if defined(TEST_IP)
-#  define HAVE_TEST_IP 1
-#else
-#  define TEST_IP               1
-#endif
-#if defined(TEST_OP)
-#  define HAVE_TEST_OP 1
-#else
-#  define TEST_OP               1
-#endif
-
-#if defined(NEED_IP)
-#  define HAVE_NEED_IP 1
-#else
-#  define NEED_IP(x)            ((void) 0)
-#endif
-#if defined(NEED_OP)
-#  define HAVE_NEED_OP 1
-#else
-#  define NEED_OP(x)            ((void) 0)
-#endif
-
-
-#if defined(HAVE_TEST_IP) || defined(HAVE_NEED_IP)
-#  define HAVE_ANY_IP 1
-#endif
-#if defined(HAVE_TEST_OP) || defined(HAVE_NEED_OP)
-#  define HAVE_ANY_OP 1
-#endif
-
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1a.c b/lzo/src/lzo1a.c
deleted file mode 100644
index 37020dd6..00000000
--- a/lzo/src/lzo1a.c
+++ /dev/null
@@ -1,660 +0,0 @@
-/* lzo1a.c -- implementation of the LZO1A algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo_conf.h"
-#include "lzo/lzo1a.h"
-
-
-/***********************************************************************
-// The next two defines can be changed to customize LZO1A.
-// The default version is LZO1A-5/1.
-************************************************************************/
-
-/* run bits (3 - 5) - the compressor and the decompressor
- * must use the same value. */
-#if !defined(RBITS)
-#  define RBITS     5
-#endif
-
-/* compression level (1 - 9) - this only affects the compressor.
- * 1 is fastest, 9 is best compression ratio
- */
-#if !defined(CLEVEL)
-#  define CLEVEL    1           /* fastest by default */
-#endif
-
-
-/* Collect statistics */
-#if 0 && !defined(LZO_COLLECT_STATS)
-#  define LZO_COLLECT_STATS 1
-#endif
-
-
-/***********************************************************************
-// You should not have to change anything below this line.
-************************************************************************/
-
-/* check configuration */
-#if (RBITS < 3 || RBITS > 5)
-#  error "invalid RBITS"
-#endif
-#if (CLEVEL < 1 || CLEVEL > 9)
-#  error "invalid CLEVEL"
-#endif
-
-
-/***********************************************************************
-// internal configuration
-// all of these affect compression only
-************************************************************************/
-
-/* choose the hashing strategy */
-#ifndef LZO_HASH
-#define LZO_HASH    LZO_HASH_LZO_INCREMENTAL_A
-#endif
-#define D_INDEX1(d,p)       d = DM(DMUL(0x21,DX2(p,5,5)) >> 5)
-#define D_INDEX2(d,p)       d = d ^ D_MASK
-
-#include "lzo1a_de.h"
-#include "stats1a.h"
-
-
-/* check other constants */
-#if (LBITS < 5 || LBITS > 8)
-#  error "invalid LBITS"
-#endif
-
-
-#if (LZO_COLLECT_STATS)
-   static lzo1a_stats_t lzo_statistics;
-   lzo1a_stats_t *lzo1a_stats = &lzo_statistics;
-#  define lzo_stats lzo1a_stats
-#endif
-
-
-/***********************************************************************
-// get algorithm info, return memory required for compression
-************************************************************************/
-
-LZO_EXTERN(lzo_uint) lzo1a_info ( int *rbits, int *clevel );
-
-LZO_PUBLIC(lzo_uint)
-lzo1a_info ( int *rbits, int *clevel )
-{
-    if (rbits)
-        *rbits = RBITS;
-    if (clevel)
-        *clevel = CLEVEL;
-    return D_SIZE * lzo_sizeof(lzo_bytep);
-}
-
-
-/***********************************************************************
-// LZO1A decompress a block of data.
-//
-// Could be easily translated into assembly code.
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1a_decompress ( const lzo_bytep in , lzo_uint  in_len,
-                         lzo_bytep out, lzo_uintp out_len,
-                         lzo_voidp wrkmem )
-{
-    register lzo_bytep op;
-    register const lzo_bytep ip;
-    register lzo_uint t;
-    register const lzo_bytep m_pos;
-    const lzo_bytep const ip_end = in + in_len;
-
-    LZO_UNUSED(wrkmem);
-
-    op = out;
-    ip = in;
-    while (ip < ip_end)
-    {
-        t = *ip++;      /* get marker */
-        LZO_STATS(lzo_stats->marker[t]++);
-
-        if (t == 0)             /* a R0 literal run */
-        {
-            t = *ip++;
-            if (t >= R0FAST - R0MIN)            /* a long R0 run */
-            {
-                t -= R0FAST - R0MIN;
-                if (t == 0)
-                    t = R0FAST;
-                else
-                {
-#if 0
-                    t = 256u << ((unsigned) t);
-#else
-                    /* help the optimizer */
-                    lzo_uint tt = 256;
-                    do tt <<= 1; while (--t > 0);
-                    t = tt;
-#endif
-                }
-                MEMCPY8_DS(op,ip,t);
-                continue;
-            }
-            t += R0MIN;
-            goto literal;
-        }
-        else if (t < R0MIN)     /* a short literal run */
-        {
-literal:
-            MEMCPY_DS(op,ip,t);
-
-        /* after a literal a match must follow */
-            while (ip < ip_end)
-            {
-                t = *ip++;          /* get R1 marker */
-                if (t >= R0MIN)
-                    goto match;
-
-            /* R1 match - a context sensitive 3 byte match + 1 byte literal */
-                assert((t & OMASK) == t);
-                m_pos = op - MIN_OFFSET;
-                m_pos -= t | (((lzo_uint) *ip++) << OBITS);
-                assert(m_pos >= out); assert(m_pos < op);
-                *op++ = m_pos[0];
-                *op++ = m_pos[1];
-                *op++ = m_pos[2];
-                *op++ = *ip++;
-            }
-        }
-        else                    /* a match */
-        {
-match:
-            /* get match offset */
-            m_pos = op - MIN_OFFSET;
-            m_pos -= (t & OMASK) | (((lzo_uint) *ip++) << OBITS);
-            assert(m_pos >= out); assert(m_pos < op);
-
-            /* get match len */
-            if (t < ((MSIZE - 1) << OBITS))         /* a short match */
-            {
-                t >>= OBITS;
-                *op++ = *m_pos++;
-                *op++ = *m_pos++;
-                MEMCPY_DS(op,m_pos,t);
-            }
-            else                                     /* a long match */
-            {
-#if (LBITS < 8)
-                t = (MIN_MATCH_LONG - THRESHOLD) + ((lzo_uint)(*ip++) & LMASK);
-#else
-                t = (MIN_MATCH_LONG - THRESHOLD) + (lzo_uint)(*ip++);
-#endif
-                *op++ = *m_pos++;
-                *op++ = *m_pos++;
-                MEMCPY_DS(op,m_pos,t);
-#if (LBITS < 8)
-                /* a very short literal following a long match */
-                t = ip[-1] >> LBITS;
-                if (t) do
-                    *op++ = *ip++;
-                while (--t);
-#endif
-            }
-        }
-    }
-
-    *out_len = pd(op, out);
-
-    /* the next line is the only check in the decompressor */
-    return (ip == ip_end ? LZO_E_OK :
-           (ip < ip_end  ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
-}
-
-
-
-/***********************************************************************
-// LZO1A compress a block of data.
-//
-// I apologize for the spaghetti code, but it really helps the optimizer.
-************************************************************************/
-
-#include "lzo1a_cr.ch"
-
-static int
-do_compress    ( const lzo_bytep in , lzo_uint  in_len,
-                       lzo_bytep out, lzo_uintp out_len,
-                       lzo_voidp wrkmem )
-{
-    register const lzo_bytep ip;
-#if defined(__LZO_HASH_INCREMENTAL)
-    lzo_xint dv;
-#endif
-    const lzo_bytep m_pos;
-    lzo_bytep op;
-    const lzo_bytep const ip_end = in+in_len - DVAL_LEN - MIN_MATCH_LONG;
-    const lzo_bytep const in_end = in+in_len - DVAL_LEN;
-    const lzo_bytep ii;
-    lzo_dict_p const dict = (lzo_dict_p) wrkmem;
-    const lzo_bytep r1 = ip_end;    /* pointer for R1 match (none yet) */
-#if (LBITS < 8)
-    const lzo_bytep im = ip_end;    /* pointer to last match start */
-#endif
-
-#if !defined(NDEBUG)
-    const lzo_bytep m_pos_sav;
-#endif
-
-    op = out;
-    ip = in;
-    ii = ip;            /* point to start of current literal run */
-
-    /* init dictionary */
-#if (LZO_DETERMINISTIC)
-    BZERO8_PTR(wrkmem,sizeof(lzo_dict_t),D_SIZE);
-#endif
-
-    DVAL_FIRST(dv,ip); UPDATE_D(dict,0,dv,ip,in); ip++;
-    DVAL_NEXT(dv,ip);
-
-    do {
-        LZO_DEFINE_UNINITIALIZED_VAR(lzo_uint, m_off, 0);
-        lzo_uint dindex;
-
-        DINDEX1(dindex,ip);
-        GINDEX(m_pos,m_off,dict,dindex,in);
-        if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,MAX_OFFSET))
-            goto literal;
-        if (m_pos[0] == ip[0] && m_pos[1] == ip[1] && m_pos[2] == ip[2])
-            goto match;
-        DINDEX2(dindex,ip);
-        GINDEX(m_pos,m_off,dict,dindex,in);
-        if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,MAX_OFFSET))
-            goto literal;
-        if (m_pos[0] == ip[0] && m_pos[1] == ip[1] && m_pos[2] == ip[2])
-            goto match;
-        goto literal;
-
-literal:
-        UPDATE_I(dict,0,dindex,ip,in);
-        if (++ip >= ip_end)
-            break;
-        continue;
-
-match:
-        UPDATE_I(dict,0,dindex,ip,in);
-#if !defined(NDEBUG) && (LZO_DICT_USE_PTR)
-        assert(m_pos == NULL || m_pos >= in);
-        m_pos_sav = m_pos;
-#endif
-        m_pos += 3;
-        {
-    /* we have found a match (of at least length 3) */
-
-#if !defined(NDEBUG) && !(LZO_DICT_USE_PTR)
-            assert((m_pos_sav = ip - m_off) == (m_pos - 3));
-#endif
-
-            assert(m_pos >= in);
-            assert(ip < ip_end);
-
-            /* 1) store the current literal run */
-            if (pd(ip,ii) > 0)
-            {
-                lzo_uint t = pd(ip,ii);
-
-                if (ip - r1 == MIN_MATCH + 1)
-                {
-                /* Code a context sensitive R1 match.
-                 * This is tricky and somewhat difficult to explain:
-                 * multiplex a literal run of length 1 into the previous
-                 * short match of length MIN_MATCH.
-                 * The key idea is:
-                 *  - after a short run a match MUST follow
-                 *  - therefore the value m = 000 in the mmmooooo marker is free
-                 *  - use 000ooooo to indicate a MIN_MATCH match (this
-                 *    is already coded) plus a 1 byte literal
-                 */
-                    assert(t == 1);
-                    /* modify marker byte */
-                    assert((op[-2] >> OBITS) == (MIN_MATCH - THRESHOLD));
-                    op[-2] &= OMASK;
-                    assert((op[-2] >> OBITS) == 0);
-                    /* copy 1 literal */
-                    *op++ = *ii;
-                    LZO_STATS(lzo_stats->r1_matches++);
-                    r1 = ip;                /* set new R1 pointer */
-                }
-                else if (t < R0MIN)
-                {
-                    /* inline the copying of a short run */
-#if (LBITS < 8)
-                    if (t < (1 << (8-LBITS)) && ii - im >= MIN_MATCH_LONG)
-                    {
-                    /* Code a very short literal run into the
-                     * previous long match length byte.
-                     */
-                        LZO_STATS(lzo_stats->lit_runs_after_long_match++);
-                        LZO_STATS(lzo_stats->lit_run_after_long_match[t]++);
-                        assert(ii - im <= MAX_MATCH_LONG);
-                        assert((op[-1] >> LBITS) == 0);
-                        op[-1] |= t << LBITS;
-                        MEMCPY_DS(op, ii, t);
-                    }
-                    else
-#endif
-                    {
-                        LZO_STATS(lzo_stats->lit_runs++);
-                        LZO_STATS(lzo_stats->lit_run[t]++);
-                        *op++ = LZO_BYTE(t);
-                        MEMCPY_DS(op, ii, t);
-                        r1 = ip;                /* set new R1 pointer */
-                    }
-                }
-                else if (t < R0FAST)
-                {
-                    /* inline the copying of a short R0 run */
-                    LZO_STATS(lzo_stats->r0short_runs++);
-                    *op++ = 0; *op++ = LZO_BYTE(t - R0MIN);
-                    MEMCPY_DS(op, ii, t);
-                    r1 = ip;                /* set new R1 pointer */
-                }
-                else
-                    op = store_run(op,ii,t);
-            }
-#if (LBITS < 8)
-            im = ip;
-#endif
-
-
-            /* 2) compute match len */
-            ii = ip;        /* point to start of current match */
-
-            /* we already matched MIN_MATCH bytes,
-             * m_pos also already advanced MIN_MATCH bytes */
-            ip += MIN_MATCH;
-            assert(m_pos < ip);
-
-            /* try to match another MIN_MATCH_LONG - MIN_MATCH bytes
-             * to see if we get a long match */
-
-#define PS  *m_pos++ != *ip++
-
-#if (MIN_MATCH_LONG - MIN_MATCH == 2)                   /* MBITS == 2 */
-            if (PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 6)                 /* MBITS == 3 */
-            if (PS || PS || PS || PS || PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 14)                /* MBITS == 4 */
-            if (PS || PS || PS || PS || PS || PS || PS ||
-                PS || PS || PS || PS || PS || PS || PS)
-#elif (MIN_MATCH_LONG - MIN_MATCH == 30)                /* MBITS == 5 */
-            if (PS || PS || PS || PS || PS || PS || PS || PS ||
-                PS || PS || PS || PS || PS || PS || PS || PS ||
-                PS || PS || PS || PS || PS || PS || PS || PS ||
-                PS || PS || PS || PS || PS || PS)
-#else
-#  error "MBITS not yet implemented"
-#endif
-            {
-            /* we've found a short match */
-                lzo_uint m_len;
-
-            /* 2a) compute match parameters */
-                    assert(ip-m_pos == (int)m_off);
-                --ip;   /* ran one too far, point back to non-match */
-                m_len = pd(ip, ii);
-                    assert(m_len >= MIN_MATCH_SHORT);
-                    assert(m_len <= MAX_MATCH_SHORT);
-                    assert(m_off >= MIN_OFFSET);
-                    assert(m_off <= MAX_OFFSET);
-                    assert(ii-m_off == m_pos_sav);
-                    assert(lzo_memcmp(m_pos_sav,ii,m_len) == 0);
-                m_off -= MIN_OFFSET;
-
-            /* 2b) code a short match */
-                /* code short match len + low offset bits */
-                *op++ = LZO_BYTE(((m_len - THRESHOLD) << OBITS) |
-                                 (m_off & OMASK));
-                /* code high offset bits */
-                *op++ = LZO_BYTE(m_off >> OBITS);
-
-
-#if (LZO_COLLECT_STATS)
-                lzo_stats->short_matches++;
-                lzo_stats->short_match[m_len]++;
-                if (m_off < OSIZE)
-                    lzo_stats->short_match_offset_osize[m_len]++;
-                if (m_off < 256)
-                    lzo_stats->short_match_offset_256[m_len]++;
-                if (m_off < 1024)
-                    lzo_stats->short_match_offset_1024[m_len]++;
-#endif
-
-
-            /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-
-#define SI      /* nothing */
-#define DI      ++ii; DVAL_NEXT(dv,ii); UPDATE_D(dict,0,dv,ii,in);
-#define XI      assert(ii < ip); ii = ip; DVAL_FIRST(dv,(ip));
-
-#if (CLEVEL == 9) || (CLEVEL >= 7 && MBITS <= 4) || (CLEVEL >= 5 && MBITS <= 3)
-            /* Insert the whole match (ii+1)..(ip-1) into dictionary.  */
-                ++ii;
-                do {
-                    DVAL_NEXT(dv,ii);
-                    UPDATE_D(dict,0,dv,ii,in);
-                } while (++ii < ip);
-                DVAL_NEXT(dv,ii);
-                assert(ii == ip);
-                DVAL_ASSERT(dv,ip);
-#elif (CLEVEL >= 3)
-                SI   DI DI   XI
-#elif (CLEVEL >= 2)
-                SI   DI      XI
-#else
-                             XI
-#endif
-
-            }
-            else
-            {
-            /* we've found a long match - see how far we can still go */
-                const lzo_bytep end;
-                lzo_uint m_len;
-
-                assert(ip <= in_end);
-                assert(ii == ip - MIN_MATCH_LONG);
-
-                if (pd(in_end,ip) <= (MAX_MATCH_LONG - MIN_MATCH_LONG))
-                    end = in_end;
-                else
-                {
-                    end = ip + (MAX_MATCH_LONG - MIN_MATCH_LONG);
-                    assert(end < in_end);
-                }
-
-                while (ip < end  &&  *m_pos == *ip)
-                    m_pos++, ip++;
-                assert(ip <= in_end);
-
-            /* 2a) compute match parameters */
-                m_len = pd(ip, ii);
-                    assert(m_len >= MIN_MATCH_LONG);
-                    assert(m_len <= MAX_MATCH_LONG);
-                    assert(m_off >= MIN_OFFSET);
-                    assert(m_off <= MAX_OFFSET);
-                    assert(ii-m_off == m_pos_sav);
-                    assert(lzo_memcmp(m_pos_sav,ii,m_len) == 0);
-                    assert(pd(ip,m_pos) == m_off);
-                m_off -= MIN_OFFSET;
-
-            /* 2b) code the long match */
-                /* code long match flag + low offset bits */
-                *op++ = LZO_BYTE(((MSIZE - 1) << OBITS) | (m_off & OMASK));
-                /* code high offset bits */
-                *op++ = LZO_BYTE(m_off >> OBITS);
-                /* code match len */
-                *op++ = LZO_BYTE(m_len - MIN_MATCH_LONG);
-
-
-#if (LZO_COLLECT_STATS)
-                lzo_stats->long_matches++;
-                lzo_stats->long_match[m_len]++;
-#endif
-
-
-            /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-#if (CLEVEL == 9)
-            /* Insert the whole match (ii+1)..(ip-1) into dictionary.  */
-            /* This is not recommended because it is slow. */
-                ++ii;
-                do {
-                    DVAL_NEXT(dv,ii);
-                    UPDATE_D(dict,0,dv,ii,in);
-                } while (++ii < ip);
-                DVAL_NEXT(dv,ii);
-                assert(ii == ip);
-                DVAL_ASSERT(dv,ip);
-#elif (CLEVEL >= 8)
-                SI   DI DI DI DI DI DI DI DI   XI
-#elif (CLEVEL >= 7)
-                SI   DI DI DI DI DI DI DI      XI
-#elif (CLEVEL >= 6)
-                SI   DI DI DI DI DI DI         XI
-#elif (CLEVEL >= 5)
-                SI   DI DI DI DI               XI
-#elif (CLEVEL >= 4)
-                SI   DI DI DI                  XI
-#elif (CLEVEL >= 3)
-                SI   DI DI                     XI
-#elif (CLEVEL >= 2)
-                SI   DI                        XI
-#else
-                                               XI
-#endif
-            }
-
-            /* ii now points to the start of the next literal run */
-            assert(ii == ip);
-        }
-
-    } while (ip < ip_end);
-
-    assert(ip <= in_end);
-
-
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
-    /* return -1 if op == out to indicate that we
-     * couldn't compress and didn't copy anything.
-     */
-    if (op == out)
-    {
-        *out_len = 0;
-        return LZO_E_NOT_COMPRESSIBLE;
-    }
-#endif
-
-    /* store the final literal run */
-    if (pd(in_end+DVAL_LEN,ii) > 0)
-        op = store_run(op,ii,pd(in_end+DVAL_LEN,ii));
-
-    *out_len = pd(op, out);
-    return 0;               /* compression went ok */
-}
-
-
-/***********************************************************************
-// LZO1A compress public entry point.
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1a_compress ( const lzo_bytep in , lzo_uint  in_len,
-                       lzo_bytep out, lzo_uintp out_len,
-                       lzo_voidp wrkmem )
-{
-    int r = LZO_E_OK;
-
-
-#if (LZO_COLLECT_STATS)
-    lzo_memset(lzo_stats,0,sizeof(*lzo_stats));
-    lzo_stats->rbits  = RBITS;
-    lzo_stats->clevel = CLEVEL;
-    lzo_stats->dbits  = DBITS;
-    lzo_stats->lbits  = LBITS;
-    lzo_stats->min_match_short = MIN_MATCH_SHORT;
-    lzo_stats->max_match_short = MAX_MATCH_SHORT;
-    lzo_stats->min_match_long  = MIN_MATCH_LONG;
-    lzo_stats->max_match_long  = MAX_MATCH_LONG;
-    lzo_stats->min_offset      = MIN_OFFSET;
-    lzo_stats->max_offset      = MAX_OFFSET;
-    lzo_stats->r0min  = R0MIN;
-    lzo_stats->r0fast = R0FAST;
-    lzo_stats->r0max  = R0MAX;
-    lzo_stats->in_len = in_len;
-#endif
-
-
-    /* don't try to compress a block that's too short */
-    if (in_len == 0)
-        *out_len = 0;
-    else if (in_len <= MIN_MATCH_LONG + DVAL_LEN + 1)
-    {
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
-        r = LZO_E_NOT_COMPRESSIBLE;
-#else
-        *out_len = pd(store_run(out,in,in_len), out);
-#endif
-    }
-    else
-        r = do_compress(in,in_len,out,out_len,wrkmem);
-
-
-#if (LZO_COLLECT_STATS)
-    lzo_stats->short_matches -= lzo_stats->r1_matches;
-    lzo_stats->short_match[MIN_MATCH] -= lzo_stats->r1_matches;
-    lzo_stats->out_len = *out_len;
-#endif
-
-    return r;
-}
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/lzo1a_99.c b/lzo/src/lzo1a_99.c
deleted file mode 100644
index 57f5f32d..00000000
--- a/lzo/src/lzo1a_99.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* lzo1a_99.c -- implementation of the LZO1A-99 algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-
-#define COMPRESS_ID     99
-
-#define DDBITS          3
-#define CLEVEL          9
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_NEED_DICT_H 1
-#include "config1a.h"
-
-
-/***********************************************************************
-// compression internal entry point.
-************************************************************************/
-
-static int
-_lzo1a_do_compress ( const lzo_bytep in,  lzo_uint  in_len,
-                           lzo_bytep out, lzo_uintp out_len,
-                           lzo_voidp wrkmem,
-                           lzo_compress_t func )
-{
-    int r;
-
-    /* don't try to compress a block that's too short */
-    if (in_len == 0)
-    {
-        *out_len = 0;
-        r = LZO_E_OK;
-    }
-    else if (in_len <= MIN_LOOKAHEAD + 1)
-    {
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
-        *out_len = 0;
-        r = LZO_E_NOT_COMPRESSIBLE;
-#else
-        *out_len = pd(STORE_RUN(out,in,in_len), out);
-        r = (*out_len > in_len) ? LZO_E_OK : LZO_E_ERROR;
-#endif
-    }
-    else
-        r = func(in,in_len,out,out_len,wrkmem);
-
-    return r;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if !defined(COMPRESS_ID)
-#define COMPRESS_ID     _LZO_ECONCAT2(DD_BITS,CLEVEL)
-#endif
-
-
-#define LZO_CODE_MATCH_INCLUDE_FILE     "lzo1a_cm.ch"
-#include "lzo1b_c.ch"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_COMPRESS \
-    LZO_CPP_ECONCAT3(lzo1a_,COMPRESS_ID,_compress)
-
-#define LZO_COMPRESS_FUNC \
-    LZO_CPP_ECONCAT3(_lzo1a_,COMPRESS_ID,_compress_func)
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-LZO_COMPRESS ( const lzo_bytep in,  lzo_uint  in_len,
-                     lzo_bytep out, lzo_uintp out_len,
-                     lzo_voidp wrkmem )
-{
-    return _lzo1a_do_compress(in,in_len,out,out_len,wrkmem,do_compress);
-}
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/lzo1a_cm.ch b/lzo/src/lzo1a_cm.ch
deleted file mode 100644
index d86b891e..00000000
--- a/lzo/src/lzo1a_cm.ch
+++ /dev/null
@@ -1,245 +0,0 @@
-/* lzo1a_cm.ch -- implementation of the LZO1A compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-
-/***********************************************************************
-// code the match in LZO1 compatible format
-************************************************************************/
-
-#define THRESHOLD   (M2_MIN_LEN - 1)
-#define MSIZE       LZO_SIZE(M2L_BITS)
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if (DD_BITS == 0)
-
-        /* we already matched M2_MIN_LEN bytes,
-         * m_pos also already advanced M2_MIN_LEN bytes */
-        ip += M2_MIN_LEN;
-        assert(m_pos < ip);
-
-        /* try to match another M2_MAX_LEN + 1 - M2_MIN_LEN bytes
-         * to see if we get more than a M2 match */
-#define M2_OR_M3    (MATCH_M2)
-
-#else /* (DD_BITS == 0) */
-
-        /* we already matched m_len bytes */
-        assert(m_len >= M2_MIN_LEN);
-        ip += m_len;
-        assert(ip <= in_end);
-
-#define M2_OR_M3    (m_len <= M2_MAX_LEN)
-
-#endif /* (DD_BITS == 0) */
-
-
-        if (M2_OR_M3)
-        {
-        /* we've found a short match */
-            assert(ip <= in_end);
-
-        /* 2a) compute match parameters */
-#if (DD_BITS == 0)
-                assert(pd(ip,m_pos) == m_off);
-            --ip;   /* ran one too far, point back to non-match */
-            m_len = ip - ii;
-#endif
-                assert(m_len >= M2_MIN_LEN);
-                assert(m_len <= M2_MAX_LEN);
-
-                assert(m_off >= M2_MIN_OFFSET);
-                assert(m_off <= M2_MAX_OFFSET);
-                assert(ii-m_off == m_pos_sav);
-                assert(lzo_memcmp(m_pos_sav,ii,m_len) == 0);
-
-        /* 2b) code the match */
-            m_off -= M2_MIN_OFFSET;
-            /* code short match len + low offset bits */
-            *op++ = LZO_BYTE(((m_len - THRESHOLD) << M2O_BITS) |
-                             (m_off & M2O_MASK));
-            /* code high offset bits */
-            *op++ = LZO_BYTE(m_off >> M2O_BITS);
-
-
-            if (ip >= ip_end)
-            {
-                ii = ip;
-                break;
-            }
-
-
-        /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-
-#if (CLEVEL == 9) || (CLEVEL >= 7 && M2L_BITS <= 4) || (CLEVEL >= 5 && M2L_BITS <= 3)
-        /* Insert the whole match (ii+1)..(ip-1) into dictionary.  */
-            ++ii;
-            do {
-                DVAL_NEXT(dv,ii);
-#if 0
-                UPDATE_D(dict,drun,dv,ii,in);
-#else
-                dict[ DINDEX(dv,ii) ] = DENTRY(ii,in);
-#endif
-                MI
-            } while (++ii < ip);
-            DVAL_NEXT(dv,ii);
-            assert(ii == ip);
-            DVAL_ASSERT(dv,ip);
-#elif (CLEVEL >= 3)
-            SI   DI DI   XI
-#elif (CLEVEL >= 2)
-            SI   DI      XI
-#else
-                         XI
-#endif
-        }
-
-        else
-
-        {
-        /* we've found a long match - see how far we can still go */
-            const lzo_bytep end;
-
-            assert(ip <= in_end);
-            assert(ii == ip - (M2_MAX_LEN + 1));
-            assert(lzo_memcmp(m_pos_sav,ii,(lzo_uint)(ip-ii)) == 0);
-
-#if (DD_BITS > 0)
-            assert(m_len == (lzo_uint)(ip-ii));
-            m_pos = ip - m_off;
-            assert(m_pos == m_pos_sav + m_len);
-#endif
-
-            if (pd(in_end,ip) <= (M3_MAX_LEN - M3_MIN_LEN))
-                end = in_end;
-            else
-            {
-                end = ip + (M3_MAX_LEN - M3_MIN_LEN);
-                assert(end < in_end);
-            }
-
-            while (ip < end  &&  *m_pos == *ip)
-                m_pos++, ip++;
-            assert(ip <= in_end);
-
-            /* 2a) compute match parameters */
-            m_len = pd(ip, ii);
-                assert(m_len >= M3_MIN_LEN);
-                assert(m_len <= M3_MAX_LEN);
-
-                assert(m_off >= M3_MIN_OFFSET);
-                assert(m_off <= M3_MAX_OFFSET);
-                assert(ii-m_off == m_pos_sav);
-                assert(lzo_memcmp(m_pos_sav,ii,m_len) == 0);
-                assert(pd(ip,m_pos) == m_off);
-
-        /* 2b) code the match */
-            m_off -= M3_MIN_OFFSET - M3_EOF_OFFSET;
-            /* code long match flag + low offset bits */
-            *op++ = LZO_BYTE(((MSIZE - 1) << M3O_BITS) | (m_off & M3O_MASK));
-            /* code high offset bits */
-            *op++ = LZO_BYTE(m_off >> M3O_BITS);
-            /* code match len */
-            *op++ = LZO_BYTE(m_len - M3_MIN_LEN);
-
-
-            if (ip >= ip_end)
-            {
-                ii = ip;
-                break;
-            }
-
-
-        /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-#if (CLEVEL == 9)
-        /* Insert the whole match (ii+1)..(ip-1) into dictionary.  */
-        /* This is not recommended because it can be slow. */
-            ++ii;
-            do {
-                DVAL_NEXT(dv,ii);
-#if 0
-                UPDATE_D(dict,drun,dv,ii,in);
-#else
-                dict[ DINDEX(dv,ii) ] = DENTRY(ii,in);
-#endif
-                MI
-            } while (++ii < ip);
-            DVAL_NEXT(dv,ii);
-            assert(ii == ip);
-            DVAL_ASSERT(dv,ip);
-#elif (CLEVEL >= 8)
-            SI   DI DI DI DI DI DI DI DI   XI
-#elif (CLEVEL >= 7)
-            SI   DI DI DI DI DI DI DI      XI
-#elif (CLEVEL >= 6)
-            SI   DI DI DI DI DI DI         XI
-#elif (CLEVEL >= 5)
-            SI   DI DI DI DI               XI
-#elif (CLEVEL >= 4)
-            SI   DI DI DI                  XI
-#elif (CLEVEL >= 3)
-            SI   DI DI                     XI
-#elif (CLEVEL >= 2)
-            SI   DI                        XI
-#else
-                                           XI
-#endif
-        }
-
-        /* ii now points to the start of the next literal run */
-        assert(ii == ip);
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/lzo1a_cr.ch b/lzo/src/lzo1a_cr.ch
deleted file mode 100644
index 9e58e23a..00000000
--- a/lzo/src/lzo1a_cr.ch
+++ /dev/null
@@ -1,131 +0,0 @@
-/* lzo1a_cr.ch -- literal run handling for the the LZO1A algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the LZO package and is subject
-   to change.
- */
-
-
-#ifndef __LZO1A_CR_H
-#define __LZO1A_CR_H 1
-
-
-/***********************************************************************
-// code a literal run
-************************************************************************/
-
-static lzo_bytep
-store_run(lzo_bytep const oo, const lzo_bytep const ii, lzo_uint r_len)
-{
-    register lzo_bytep op;
-    register const lzo_bytep ip;
-    register lzo_uint t;
-
-    op = oo;
-    ip = ii;
-    assert(r_len > 0);
-
-    /* code a long R0 run */
-    if (r_len >= 512)
-    {
-        unsigned r_bits = 6;        /* 256 << 6 == 16384 */
-        lzo_uint tt = 32768u;
-
-        while (r_len >= (t = tt))
-        {
-            r_len -= t;
-            *op++ = 0; *op++ = (R0MAX - R0MIN);
-            MEMCPY8_DS(op, ip, t);
-            LZO_STATS(lzo_stats->r0long_runs++);
-        }
-        tt >>= 1;
-        do {
-            if (r_len >= (t = tt))
-            {
-                r_len -= t;
-                *op++ = 0; *op++ = LZO_BYTE((R0FAST - R0MIN) + r_bits);
-                MEMCPY8_DS(op, ip, t);
-                LZO_STATS(lzo_stats->r0long_runs++);
-            }
-            tt >>= 1;
-        } while (--r_bits > 0);
-    }
-    assert(r_len < 512);
-
-    while (r_len >= (t = R0FAST))
-    {
-        r_len -= t;
-        *op++ = 0; *op++ = (R0FAST - R0MIN);
-        MEMCPY8_DS(op, ip, t);
-        LZO_STATS(lzo_stats->r0fast_runs++);
-    }
-
-    t = r_len;
-    if (t >= R0MIN)
-    {
-        /* code a short R0 run */
-        *op++ = 0; *op++ = LZO_BYTE(t - R0MIN);
-        MEMCPY_DS(op, ip, t);
-        LZO_STATS(lzo_stats->r0short_runs++);
-    }
-    else if (t > 0)
-    {
-        /* code a short literal run */
-        LZO_STATS(lzo_stats->lit_runs++);
-        LZO_STATS(lzo_stats->lit_run[t]++);
-        *op++ = LZO_BYTE(t);
-        MEMCPY_DS(op, ip, t);
-    }
-
-    return op;
-}
-
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1a_de.h b/lzo/src/lzo1a_de.h
deleted file mode 100644
index 3e4b05a0..00000000
--- a/lzo/src/lzo1a_de.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/* lzo1a_de.h -- definitions for the the LZO1A algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the LZO package and is subject
-   to change.
- */
-
-
-#ifndef __LZO_DEFS_H
-#define __LZO_DEFS_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/*
-     Format of the marker byte
-
-
-     76543210
-     --------
-     00000000   a long literal run ('R0' run) - there are short and long R0 runs
-     000rrrrr   a short literal run with len r
-     mmmooooo   a short match (len = 2+m, o = offset low bits)
-     111ooooo   a long match (o = offset low bits)
-*/
-
-
-#define RSIZE   (1 << RBITS)
-#define RMASK   (RSIZE - 1)
-
-#define MBITS   (8 - OBITS)
-#define MSIZE   (1 << MBITS)
-#define MMASK   (MSIZE - 1)
-
-#define OBITS   RBITS               /* offset and run-length use same bits */
-#define OSIZE   (1 << OBITS)
-#define OMASK   (OSIZE - 1)
-
-
-/* additional bits for coding the length in a long match */
-#define LBITS   8
-#define LSIZE   (1 << LBITS)
-#define LMASK   (LSIZE - 1)
-
-
-/***********************************************************************
-// some macros to improve readability
-************************************************************************/
-
-/* Minimum len of a match */
-#define MIN_MATCH           3
-#define THRESHOLD           (MIN_MATCH - 1)
-
-/* Min-/Maximum len of a match coded in 2 bytes */
-#define MIN_MATCH_SHORT     (MIN_MATCH)
-#define MAX_MATCH_SHORT     (MIN_MATCH_SHORT + (MSIZE - 2) - 1)
-/* why (MSIZE - 2) ? because 0 is used to mark runs,
- *                   and MSIZE-1 is used to mark a long match */
-
-/* Min-/Maximum len of a match coded in 3 bytes */
-#define MIN_MATCH_LONG      (MAX_MATCH_SHORT + 1)
-#define MAX_MATCH_LONG      (MIN_MATCH_LONG + LSIZE - 1)
-
-/* Min-/Maximum offset of a match */
-#define MIN_OFFSET          1
-#define MAX_OFFSET          (1 << (CHAR_BIT + OBITS))
-
-
-/* R0 literal run (a long run) */
-
-#define R0MIN   (RSIZE)             /* Minimum len of R0 run of literals */
-#define R0MAX   (R0MIN + 255)       /* Maximum len of R0 run of literals */
-#define R0FAST  (R0MAX & ~7)        /* R0MAX aligned to 8 byte boundary */
-
-#if (R0MAX - R0FAST != 7) || ((R0FAST & 7) != 0)
-#  error "something went wrong"
-#endif
-
-/* 7 special codes from R0FAST+1 .. R0MAX
- * these codes mean long R0 runs with lengths
- * 512, 1024, 2048, 4096, 8192, 16384, 32768 */
-
-
-/*
-
-RBITS | MBITS  MIN  THR.  MSIZE  MAXS  MINL  MAXL   MAXO  R0MAX R0FAST
-======+===============================================================
-  3   |   5      3    2     32    32    33    288   2048    263   256
-  4   |   4      3    2     16    16    17    272   4096    271   264
-  5   |   3      3    2      8     8     9    264   8192    287   280
-
- */
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define DBITS       13
-#include "lzo_dict.h"
-#define DVAL_LEN    DVAL_LOOKAHEAD
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1b_1.c b/lzo/src/lzo1b_1.c
deleted file mode 100644
index bad1486a..00000000
--- a/lzo/src/lzo1b_1.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1b_1.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     1
-
-#define DDBITS          0
-#define CLEVEL          1
-#include "compr1b.h"
-
diff --git a/lzo/src/lzo1b_2.c b/lzo/src/lzo1b_2.c
deleted file mode 100644
index 0d456b8a..00000000
--- a/lzo/src/lzo1b_2.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1b_2.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     2
-
-#define DDBITS          0
-#define CLEVEL          2
-#include "compr1b.h"
-
diff --git a/lzo/src/lzo1b_3.c b/lzo/src/lzo1b_3.c
deleted file mode 100644
index af7b12da..00000000
--- a/lzo/src/lzo1b_3.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1b_3.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     3
-
-#define DDBITS          0
-#define CLEVEL          3
-#include "compr1b.h"
-
diff --git a/lzo/src/lzo1b_4.c b/lzo/src/lzo1b_4.c
deleted file mode 100644
index 9ce8abf3..00000000
--- a/lzo/src/lzo1b_4.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1b_4.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     4
-
-#define DDBITS          1
-#define CLEVEL          2
-#include "compr1b.h"
-
diff --git a/lzo/src/lzo1b_5.c b/lzo/src/lzo1b_5.c
deleted file mode 100644
index 6052f5fd..00000000
--- a/lzo/src/lzo1b_5.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1b_5.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     5
-
-#define DDBITS          1
-#define CLEVEL          3
-#include "compr1b.h"
-
diff --git a/lzo/src/lzo1b_6.c b/lzo/src/lzo1b_6.c
deleted file mode 100644
index d31511ab..00000000
--- a/lzo/src/lzo1b_6.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1b_6.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     6
-
-#define DDBITS          1
-#define CLEVEL          5
-#include "compr1b.h"
-
diff --git a/lzo/src/lzo1b_7.c b/lzo/src/lzo1b_7.c
deleted file mode 100644
index 5545458b..00000000
--- a/lzo/src/lzo1b_7.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1b_7.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     7
-
-#define DDBITS          2
-#define CLEVEL          3
-#include "compr1b.h"
-
diff --git a/lzo/src/lzo1b_8.c b/lzo/src/lzo1b_8.c
deleted file mode 100644
index 693d90ed..00000000
--- a/lzo/src/lzo1b_8.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1b_8.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     8
-
-#define DDBITS          2
-#define CLEVEL          8
-#include "compr1b.h"
-
diff --git a/lzo/src/lzo1b_9.c b/lzo/src/lzo1b_9.c
deleted file mode 100644
index e6d3fb46..00000000
--- a/lzo/src/lzo1b_9.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1b_9.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     9
-
-#define DDBITS          2
-#define CLEVEL          9
-#include "compr1b.h"
-
diff --git a/lzo/src/lzo1b_99.c b/lzo/src/lzo1b_99.c
deleted file mode 100644
index a0e44462..00000000
--- a/lzo/src/lzo1b_99.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* lzo1b_99.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     99
-
-#define DDBITS          3
-#define CLEVEL          9
-
-#define D_BITS          16
-#define MATCH_IP_END        in_end
-#include "compr1b.h"
-
diff --git a/lzo/src/lzo1b_9x.c b/lzo/src/lzo1b_9x.c
deleted file mode 100644
index e00186d5..00000000
--- a/lzo/src/lzo1b_9x.c
+++ /dev/null
@@ -1,368 +0,0 @@
-/* lzo1b_9x.c -- implementation of the LZO1B-999 compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1b.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define SWD_N          0xffffL          /* size of ring buffer */
-#define SWD_THRESHOLD       2           /* lower limit for match length */
-#define SWD_F            2048           /* upper limit for match length */
-
-
-#define LZO1B 1
-#define LZO_COMPRESS_T  lzo1b_999_t
-#define lzo_swd_t       lzo1b_999_swd_t
-#include "lzo_mchw.ch"
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static lzo_bytep
-code_match ( LZO_COMPRESS_T *c, lzo_bytep op, lzo_uint m_len, lzo_uint m_off )
-{
-    if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET)
-    {
-        assert(m_len >= M2_MIN_LEN);
-        assert(m_off >= M2_MIN_OFFSET);
-
-        m_off -= M2_MIN_OFFSET;
-        /* code match len + low offset bits */
-        *op++ = LZO_BYTE(((m_len - (M2_MIN_LEN - 2)) << M2O_BITS) |
-                          (m_off & M2O_MASK));
-        /* code high offset bits */
-        *op++ = LZO_BYTE(m_off >> M2O_BITS);
-        c->m2_m++;
-    }
-    else
-    {
-        assert(m_len >= M3_MIN_LEN);
-        assert(m_off <= M3_MAX_OFFSET);
-
-        m_off -= M3_MIN_OFFSET - M3_EOF_OFFSET;
-        /* code match len */
-        if (m_len <= M3_MAX_LEN)
-            *op++ = LZO_BYTE(M3_MARKER | (m_len - (M3_MIN_LEN - 1)));
-        else
-        {
-            assert(m_len >= M4_MIN_LEN);
-            /* code M4 match len flag */
-            *op++ = M4_MARKER;
-            /* code match len */
-            m_len -= M4_MIN_LEN - 1;
-            while (m_len > 255)
-            {
-                m_len -= 255;
-                *op++ = 0;
-            }
-            assert(m_len > 0);
-            *op++ = LZO_BYTE(m_len);
-        }
-        /* code low offset bits */
-        *op++ = LZO_BYTE(m_off & M3O_MASK);
-        /* code high offset bits */
-        *op++ = LZO_BYTE(m_off >> M3O_BITS);
-
-        c->r1_m_len = 0;
-        c->m3_m++;
-    }
-    return op;
-}
-
-
-/***********************************************************************
-// this is a public function, but there is no prototype in a header file
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1b_999_compress_callback ( const lzo_bytep in , lzo_uint  in_len,
-                                    lzo_bytep out, lzo_uintp out_len,
-                                    lzo_voidp wrkmem,
-                                    lzo_callback_p cb,
-                                    lzo_uint max_chain );
-
-LZO_PUBLIC(int)
-lzo1b_999_compress_callback ( const lzo_bytep in , lzo_uint  in_len,
-                                    lzo_bytep out, lzo_uintp out_len,
-                                    lzo_voidp wrkmem,
-                                    lzo_callback_p cb,
-                                    lzo_uint max_chain )
-{
-    lzo_bytep op;
-    const lzo_bytep ii;
-    lzo_uint lit;
-    lzo_uint m_len, m_off;
-    LZO_COMPRESS_T cc;
-    LZO_COMPRESS_T * const c = &cc;
-    lzo_swd_p const swd = (lzo_swd_p) wrkmem;
-    int r;
-
-    /* sanity check */
-    LZO_COMPILE_TIME_ASSERT(LZO1B_999_MEM_COMPRESS >= SIZEOF_LZO_SWD_T)
-
-    c->init = 0;
-    c->ip = c->in = in;
-    c->in_end = in + in_len;
-    c->cb = cb;
-    c->r1_r = c->m3_r = c->m2_m = c->m3_m = 0;
-
-    op = out;
-    ii = c->ip;             /* point to start of literal run */
-    lit = 0;
-    c->r1_m_len = 0;
-
-    r = init_match(c,swd,NULL,0,0);
-    if (r != 0)
-        return r;
-    if (max_chain > 0)
-        swd->max_chain = max_chain;
-
-    r = find_match(c,swd,0,0);
-    if (r != 0)
-        return r;
-    while (c->look > 0)
-    {
-        int lazy_match_min_gain = -1;
-        lzo_uint ahead = 0;
-
-        m_len = c->m_len;
-        m_off = c->m_off;
-
-#if 0
-        printf("%5ld: %5d len:%3d off:%5d\n", (c->ip-c->look)-in, c->look,
-                m_len, m_off);
-#endif
-
-        assert(c->ip - c->look >= in);
-        if (lit == 0)
-            ii = c->ip - c->look;
-        assert(ii + lit == c->ip - c->look);
-        assert(swd->b_char == *(c->ip - c->look));
-
-        if ((m_len < M2_MIN_LEN) ||
-            (m_len < M3_MIN_LEN && m_off > M2_MAX_OFFSET))
-        {
-            m_len = 0;
-        }
-        else
-        {
-            assert(c->ip - c->look - m_off >= in);
-            assert(c->ip - c->look - m_off + m_len < c->ip);
-            assert(lzo_memcmp(c->ip - c->look, c->ip - c->look - m_off,
-                              m_len) == 0);
-
-            if (lit > 0)
-            {
-                /* we have a current literal run: do not try a lazy match,
-                   if the literal could be coded into a r1 match */
-                if (lit == 1 && c->r1_m_len == M2_MIN_LEN)
-                    lazy_match_min_gain = -1;
-                else
-                    lazy_match_min_gain = 1;
-
-#if (M2_MIN_LEN == 2)
-                if (m_len == 2)
-                {
-                    /* don't code a match of len 2 if we have to
-                       code a literal run. Code a literal instead. */
-                    m_len = 0;
-                }
-#endif
-#if (M2_MIN_LEN == M3_MIN_LEN)
-                if (m_len == M2_MIN_LEN && m_off > M2_MAX_OFFSET)
-                {
-                    /* don't code a M3 match of len 3 if we have to
-                       code a literal run. Code a literal instead. */
-                    m_len = 0;
-                }
-#endif
-            }
-            else
-            {
-                /* no current literal run: only try a lazy match,
-                   if the literal could be coded into a r1 match */
-                if (c->r1_m_len == M2_MIN_LEN)
-                    lazy_match_min_gain = 0;
-                else
-                    lazy_match_min_gain = -1;
-            }
-        }
-
-
-        /* try a lazy match */
-        if (m_len == 0)
-            lazy_match_min_gain = -1;
-        if (lazy_match_min_gain >= 0 && c->look > m_len)
-        {
-            assert(m_len > 0);
-
-            r = find_match(c,swd,1,0);
-            assert(r == 0); LZO_UNUSED(r);
-            assert(c->look > 0);
-
-            if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET &&
-                c->m_off > M2_MAX_OFFSET)
-                lazy_match_min_gain += 1;
-
-            if (c->m_len >= m_len + lazy_match_min_gain)
-            {
-                c->lazy++;
-#if !defined(NDEBUG)
-                m_len = c->m_len;
-                m_off = c->m_off;
-                assert(lzo_memcmp(c->ip - c->look, c->ip - c->look - m_off,
-                                  m_len) == 0);
-#endif
-                lit++;
-                assert(ii + lit == c->ip - c->look);
-                continue;
-            }
-            else
-            {
-                ahead = 1;
-                assert(ii + lit + 1 == c->ip - c->look);
-            }
-            assert(m_len > 0);
-        }
-        assert(ii + lit + ahead == c->ip - c->look);
-
-
-        if (m_len == 0)
-        {
-            /* a literal */
-            lit++;
-            r = find_match(c,swd,1,0);
-            assert(r == 0); LZO_UNUSED(r);
-        }
-        else
-        {
-            /* 1 - store run */
-            if (lit > 0)
-            {
-                /* code current literal run */
-                if (lit == 1 && c->r1_m_len == M2_MIN_LEN)
-                {
-                    /* Code a context sensitive R1 match. */
-                    assert((op[-2] >> M2O_BITS) == (M2_MARKER >> M2O_BITS));
-                    op[-2] &= M2O_MASK;
-                    assert((op[-2] >> M2O_BITS) == 0);
-                    /* copy 1 literal */
-                    *op++ = *ii++;
-                    assert(ii + ahead == c->ip - c->look);
-                    c->r1_r++;
-                }
-                else
-                {
-                    op = STORE_RUN(op,ii,lit);
-                }
-                if (lit < R0FAST)
-                    c->r1_m_len = m_len;
-                else
-                    c->r1_m_len = 0;
-                lit = 0;
-            }
-            else
-                c->r1_m_len = 0;
-
-            /* 2 - code match */
-            op = code_match(c,op,m_len,m_off);
-            r = find_match(c,swd,m_len,1+ahead);
-            assert(r == 0); LZO_UNUSED(r);
-        }
-
-        c->codesize = pd(op, out);
-    }
-
-
-    /* store final run */
-    if (lit > 0)
-        op = STORE_RUN(op,ii,lit);
-
-#if defined(LZO_EOF_CODE)
-    *op++ = M3_MARKER | 1;
-    *op++ = 0;
-    *op++ = 0;
-#endif
-
-    c->codesize = pd(op, out);
-    assert(c->textsize == in_len);
-
-    *out_len = pd(op, out);
-
-    if (c->cb && c->cb->nprogress)
-        (*c->cb->nprogress)(c->cb, c->textsize, c->codesize, 0);
-
-#if 0
-    printf("%ld %ld -> %ld: %ld %ld %ld %ld %ld\n",
-        (long) c->textsize, (long)in_len, (long) c->codesize,
-        c->r1_r, c->m3_r, c->m2_m, c->m3_m, c->lazy);
-#endif
-    return LZO_E_OK;
-}
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1b_999_compress  ( const lzo_bytep in , lzo_uint  in_len,
-                            lzo_bytep out, lzo_uintp out_len,
-                            lzo_voidp wrkmem )
-{
-    return lzo1b_999_compress_callback(in,in_len,out,out_len,wrkmem,
-                                       (lzo_callback_p) 0, 0);
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1b_c.ch b/lzo/src/lzo1b_c.ch
deleted file mode 100644
index a17e3adb..00000000
--- a/lzo/src/lzo1b_c.ch
+++ /dev/null
@@ -1,273 +0,0 @@
-/* lzo1b_c.ch -- implementation of the LZO1B compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if !defined(LZO_HAVE_R1) && !defined(LZO_NO_R1)
-#  define LZO_HAVE_R1 1
-#endif
-
-#if !defined(LZO_HAVE_M3) && !defined(LZO_NO_M3)
-#  if (M3O_BITS < 8)
-#    define LZO_HAVE_M3 1
-#  endif
-#endif
-
-
-#define MI      /*empty*/
-#define SI      MI
-#if (DD_BITS > 0)
-#define DI      ++ii; DVAL_NEXT(dv,ii); UPDATE_D(dict,drun,dv,ii,in); MI
-#define XI      assert(ii < ip); ii = ip; DVAL_FIRST(dv,(ip));
-#else
-#define DI      ++ii; DINDEX1(dindex,ii); UPDATE_I(dict,0,dindex,ii,in); MI
-#define XI      assert(ii < ip); ii = ip;
-#endif
-
-
-/***********************************************************************
-// compress a block of data.
-//
-// I really apologize for this spaghetti code.
-************************************************************************/
-
-LZO_PRIVATE(int)
-do_compress    ( const lzo_bytep in , lzo_uint  in_len,
-                       lzo_bytep out, lzo_uintp out_len,
-                       lzo_voidp wrkmem )
-{
-    register const lzo_bytep ip;
-#if (DD_BITS > 0)
-#if defined(__LZO_HASH_INCREMENTAL)
-    lzo_xint dv;
-#endif
-    unsigned drun = 0;
-#endif
-    lzo_bytep op;
-    const lzo_bytep const in_end = in + in_len;
-    const lzo_bytep const ip_end = in + in_len - MIN_LOOKAHEAD;
-    const lzo_bytep ii;
-#if defined(LZO_HAVE_R1)
-    const lzo_bytep r1 = ip_end;    /* pointer for R1 match (none yet) */
-#endif
-#if defined(LZO_HAVE_M3)
-    lzo_bytep m3 = out + 1;         /* pointer after last m3/m4 match */
-#endif
-
-    lzo_dict_p const dict = (lzo_dict_p) wrkmem;
-
-
-#if (LZO_COLLECT_STATS)
-    lzo_stats->r_bits   = R_BITS;
-    lzo_stats->m3o_bits = M3O_BITS;
-    lzo_stats->dd_bits  = DD_BITS;
-    lzo_stats->clevel   = CLEVEL;
-    lzo_stats->d_bits   = D_BITS;
-    lzo_stats->min_lookahead  = MIN_LOOKAHEAD;
-    lzo_stats->max_lookbehind = MAX_LOOKBEHIND;
-    lzo_stats->compress_id    = LZO_CPP_MACRO_EXPAND(COMPRESS_ID);
-#endif
-
-    /* init dictionary */
-#if (LZO_DETERMINISTIC)
-    BZERO8_PTR(wrkmem,sizeof(lzo_dict_t),D_SIZE);
-#endif
-
-
-    op = out;
-    ip = in;
-    ii = ip;            /* point to start of current literal run */
-
-
-#if (DD_BITS > 0)
-    DVAL_FIRST(dv,ip);
-    UPDATE_D(dict,drun,dv,ip,in);
-    ip++;
-    DVAL_NEXT(dv,ip);
-#else
-    ip++;
-#endif
-
-    assert(ip < ip_end);
-    for (;;)
-    {
-        const lzo_bytep m_pos;
-#if !defined(NDEBUG)
-        const lzo_bytep m_pos_sav = NULL;
-#endif
-        LZO_DEFINE_UNINITIALIZED_VAR(lzo_uint, m_off, 0);
-#if (DD_BITS == 0)
-        lzo_uint dindex;
-#endif
-        lzo_uint m_len;
-
-
-/***********************************************************************
-// search for a match
-************************************************************************/
-
-#if !defined(LZO_SEARCH_MATCH_INCLUDE_FILE)
-#  define LZO_SEARCH_MATCH_INCLUDE_FILE     "lzo1b_sm.ch"
-#endif
-
-#include LZO_SEARCH_MATCH_INCLUDE_FILE
-
-
-#if !defined(LZO_TEST_MATCH_INCLUDE_FILE)
-#  define LZO_TEST_MATCH_INCLUDE_FILE       "lzo1b_tm.ch"
-#endif
-
-#include LZO_TEST_MATCH_INCLUDE_FILE
-
-
-
-/***********************************************************************
-// found a literal
-************************************************************************/
-
-
-    /* a literal */
-literal:
-#if (DD_BITS == 0)
-        UPDATE_I(dict,0,dindex,ip,in);
-#endif
-        if (++ip >= ip_end)
-            break;
-#if (DD_BITS > 0)
-        DVAL_NEXT(dv,ip);
-#endif
-        continue;
-
-
-
-/***********************************************************************
-// found a match
-************************************************************************/
-
-match:
-#if (DD_BITS == 0)
-        UPDATE_I(dict,0,dindex,ip,in);
-#endif
-        /* we have found a match of at least M2_MIN_LEN */
-
-
-#if !defined(LZO_CODE_RUN_INCLUDE_FILE)
-#  define LZO_CODE_RUN_INCLUDE_FILE     "lzo1b_cr.ch"
-#endif
-
-#include LZO_CODE_RUN_INCLUDE_FILE
-
-
-        /* ii now points to the start of the current match */
-        assert(ii == ip);
-
-
-/***********************************************************************
-// code the match
-************************************************************************/
-
-#if !defined(LZO_CODE_MATCH_INCLUDE_FILE)
-#  define LZO_CODE_MATCH_INCLUDE_FILE   "lzo1b_cm.ch"
-#endif
-
-#include LZO_CODE_MATCH_INCLUDE_FILE
-
-
-        /* ii now points to the start of the next literal run */
-        assert(ii == ip);
-
-    }
-
-
-/***********************************************************************
-// end of block
-************************************************************************/
-
-    assert(ip <= in_end);
-
-#if (LZO_COLLECT_STATS)
-    {
-        lzo_uint i;
-        const lzo_bytep p;
-
-        for (i = 0; i < D_SIZE; i++)
-        {
-            p = dict[i];
-            if (BOUNDS_CHECKING_OFF_IN_EXPR(p == NULL || p < in || p > in_end))
-                lzo_stats->unused_dict_entries++;
-        }
-        lzo_stats->unused_dict_entries_percent =
-            100.0 * lzo_stats->unused_dict_entries / D_SIZE;
-    }
-#endif
-
-
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
-    /* return if op == out to indicate that we
-     * couldn't compress and didn't copy anything.
-     */
-    if (op == out)
-    {
-        *out_len = 0;
-        return LZO_E_NOT_COMPRESSIBLE;
-    }
-#endif
-
-    /* store the final literal run */
-    if (pd(in_end,ii) > 0)
-    {
-        lzo_uint t = pd(in_end,ii);
-        op = STORE_RUN(op,ii,t);
-    }
-
-    *out_len = pd(op, out);
-    return LZO_E_OK;                /* compression went ok */
-}
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/lzo1b_cc.c b/lzo/src/lzo1b_cc.c
deleted file mode 100644
index cc7c2e87..00000000
--- a/lzo/src/lzo1b_cc.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* lzo1b_cc.c -- LZO1B compression internal entry point
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define LZO_NEED_DICT_H 1
-#include "config1b.h"
-
-
-/***********************************************************************
-// compression internal entry point.
-************************************************************************/
-
-int _lzo1b_do_compress   ( const lzo_bytep in,  lzo_uint  in_len,
-                                 lzo_bytep out, lzo_uintp out_len,
-                                 lzo_voidp wrkmem,
-                                 lzo_compress_t func )
-{
-    int r;
-#if defined(LZO_TEST_COMPRESS_OVERRUN)
-    lzo_uint avail_out = *out_len;
-#endif
-
-
-#if (LZO_COLLECT_STATS)
-    _lzo1b_stats_init(lzo_stats);
-    lzo_stats->in_len = in_len;
-#endif
-
-
-    /* don't try to compress a block that's too short */
-    if (in_len == 0)
-    {
-        *out_len = 0;
-        r = LZO_E_OK;
-    }
-    else if (in_len <= MIN_LOOKAHEAD + 1)
-    {
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
-        *out_len = 0;
-        r = LZO_E_NOT_COMPRESSIBLE;
-#else
-        *out_len = pd(STORE_RUN(out,in,in_len), out);
-        r = (*out_len > in_len) ? LZO_E_OK : LZO_E_ERROR;
-#endif
-    }
-    else
-        r = func(in,in_len,out,out_len,wrkmem);
-
-
-#if defined(LZO_EOF_CODE)
-#if defined(LZO_TEST_COMPRESS_OVERRUN)
-    if (r == LZO_E_OK && avail_out - *out_len < 3)
-        r = LZO_E_COMPRESS_OVERRUN;
-#endif
-    if (r == LZO_E_OK)
-    {
-        lzo_bytep op = out + *out_len;
-        op[0] = M3_MARKER | 1;
-        op[1] = 0;
-        op[2] = 0;
-        *out_len += 3;
-    }
-#endif
-
-
-#if (LZO_COLLECT_STATS)
-    lzo_stats->out_len = *out_len;
-    lzo_stats->match_bytes =
-       1 * lzo_stats->m1_matches + 2 * lzo_stats->m2_matches +
-       3 * lzo_stats->m3_matches + 4 * lzo_stats->m4_matches;
-    _lzo1b_stats_calc(lzo_stats);
-#endif
-
-    return r;
-}
-
-
-/***********************************************************************
-// note: this is not thread safe, but as it is used for finetuning only
-//       we don't care
-************************************************************************/
-
-#undef lzo_stats
-/* lzo_stats_t is still defined */
-
-
-#if (LZO_COLLECT_STATS)
-
-static lzo_stats_t lzo_statistics;
-lzo_stats_t * const lzo1b_stats = &lzo_statistics;
-
-
-void _lzo1b_stats_init(lzo_stats_t *lzo_stats)
-{
-    lzo_memset(lzo_stats,0,sizeof(*lzo_stats));
-}
-
-
-void _lzo1b_stats_calc(lzo_stats_t *lzo_stats)
-{
-    lzo_stats->matches =
-       lzo_stats->m1_matches + lzo_stats->m2_matches +
-       lzo_stats->m3_matches + lzo_stats->m4_matches;
-
-    lzo_stats->literal_overhead = lzo_stats->lit_runs +
-       2 * (lzo_stats->r0short_runs + lzo_stats->r0fast_runs +
-            lzo_stats->r0long_runs);
-    lzo_stats->literal_bytes = lzo_stats->literals +
-       lzo_stats->literal_overhead;
-
-#if 0
-    assert(lzo_stats->match_bytes + lzo_stats->literal_bytes ==
-       lzo_stats->out_len);
-#endif
-
-    lzo_stats->m2_matches -= lzo_stats->r1_matches;
-    lzo_stats->m2_match[M2_MIN_LEN] -= lzo_stats->r1_matches;
-
-    if (lzo_stats->literals > 0)
-        lzo_stats->literal_overhead_percent =
-           100.0 * lzo_stats->literal_overhead / lzo_stats->literals;
-}
-
-
-#endif
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1b_cc.h b/lzo/src/lzo1b_cc.h
deleted file mode 100644
index fef3556c..00000000
--- a/lzo/src/lzo1b_cc.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* lzo1b_cc.h -- definitions for the the LZO1B compression driver
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO1B_CC_H
-#define __LZO1B_CC_H 1
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-extern const lzo_compress_t _lzo1b_1_compress_func;
-extern const lzo_compress_t _lzo1b_2_compress_func;
-extern const lzo_compress_t _lzo1b_3_compress_func;
-extern const lzo_compress_t _lzo1b_4_compress_func;
-extern const lzo_compress_t _lzo1b_5_compress_func;
-extern const lzo_compress_t _lzo1b_6_compress_func;
-extern const lzo_compress_t _lzo1b_7_compress_func;
-extern const lzo_compress_t _lzo1b_8_compress_func;
-extern const lzo_compress_t _lzo1b_9_compress_func;
-
-extern const lzo_compress_t _lzo1b_99_compress_func;
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_EXTERN(lzo_bytep )
-_lzo1b_store_run ( lzo_bytep const oo, const lzo_bytep const ii,
-                   lzo_uint r_len);
-
-#define STORE_RUN   _lzo1b_store_run
-
-
-lzo_compress_t _lzo1b_get_compress_func(int clevel);
-
-int _lzo1b_do_compress   ( const lzo_bytep in,  lzo_uint  in_len,
-                                 lzo_bytep out, lzo_uintp out_len,
-                                 lzo_voidp wrkmem,
-                                 lzo_compress_t func );
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
-
diff --git a/lzo/src/lzo1b_cm.ch b/lzo/src/lzo1b_cm.ch
deleted file mode 100644
index 7bd50a78..00000000
--- a/lzo/src/lzo1b_cm.ch
+++ /dev/null
@@ -1,297 +0,0 @@
-/* lzo1b_cm.ch -- implementation of the LZO1B compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-
-/***********************************************************************
-// code the match
-************************************************************************/
-
-#if (DD_BITS == 0)
-
-        /* we already matched M2_MIN_LEN bytes,
-         * m_pos also already advanced M2_MIN_LEN bytes */
-        ip += M2_MIN_LEN;
-        assert(m_pos < ip);
-
-        /* try to match another M2_MAX_LEN + 1 - M2_MIN_LEN bytes
-         * to see if we get more than a M2 match */
-#define M2_OR_M3    (MATCH_M2)
-
-#else /* (DD_BITS == 0) */
-
-        /* we already matched m_len bytes */
-        assert(m_len >= M2_MIN_LEN);
-        ip += m_len;
-        assert(ip <= in_end);
-
-#define M2_OR_M3    (m_len <= M2_MAX_LEN)
-
-#endif /* (DD_BITS == 0) */
-
-
-
-        if (M2_OR_M3)
-        {
-        /* we've found a M2 or M3 match */
-            assert(ip <= in_end);
-
-        /* 2a) compute match parameters */
-#if (DD_BITS == 0)
-            assert(pd(ip,m_pos) == m_off);
-            --ip;   /* ran one too far, point back to non-match */
-            m_len = pd(ip, ii);
-#endif
-
-        /* 2a2) verify match parameters */
-            assert(m_len >= M2_MIN_LEN);
-            assert(m_len <= M2_MAX_LEN);
-            assert(m_len <= M3_MAX_LEN);
-
-            assert(m_off >= M2_MIN_OFFSET);
-            assert(m_off >= M3_MIN_OFFSET);
-            assert(m_off <= M3_MAX_OFFSET);
-            assert(ii-m_off == m_pos_sav);
-            assert(lzo_memcmp(m_pos_sav,ii,m_len) == 0);
-
-        /* 2b) code the match */
-#if (_M2_MAX_OFFSET != _M3_MAX_OFFSET)
-            if (m_off <= M2_MAX_OFFSET)
-            {
-#else
-                assert(m_off <= M2_MAX_OFFSET);
-#endif
-                m_off -= M2_MIN_OFFSET;
-                /* code match len + low offset bits */
-                *op++ = LZO_BYTE(((m_len - (M2_MIN_LEN - 2)) << M2O_BITS) |
-                                  (m_off & M2O_MASK));
-                /* code high offset bits */
-                *op++ = LZO_BYTE(m_off >> M2O_BITS);
-                LZO_STATS(lzo_stats->m2_matches++);
-                LZO_STATS(lzo_stats->m2_match[m_len]++);
-#if (_M2_MAX_OFFSET != _M3_MAX_OFFSET)
-            }
-            else
-            {
-#if defined(LZO_HAVE_R1)
-#if (M3_MIN_LEN == M2_MIN_LEN)
-                r1 = ip_end;    /* invalidate R1 pointer */
-#endif
-#endif
-                assert(m_len >= M3_MIN_LEN);
-                m_off -= M3_MIN_OFFSET - M3_EOF_OFFSET;
-                /* code match len */
-                *op++ = LZO_BYTE(M3_MARKER | (m_len - (M3_MIN_LEN - 1)));
-                /* code low offset bits */
-                *op++ = LZO_BYTE(m_off & M3O_MASK);
-                /* code high offset bits */
-                *op++ = LZO_BYTE(m_off >> M3O_BITS);
-                LZO_STATS(lzo_stats->m3_matches++);
-                LZO_STATS(lzo_stats->m3_match[m_len]++);
-#if defined(LZO_HAVE_M3)
-                m3 = op;        /* set M3 pointer */
-#endif
-            }
-#endif /* (_M2_MAX_OFFSET != _M3_MAX_OFFSET) */
-
-
-            if (ip >= ip_end)
-            {
-                ii = ip;
-                break;
-            }
-
-
-        /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-
-#if (CLEVEL == 9) || (CLEVEL >= 7 && M2L_BITS <= 4) || (CLEVEL >= 5 && M2L_BITS <= 3)
-        /* Insert the whole match (ii+1)..(ip-1) into dictionary.  */
-            ++ii;
-            do {
-                DVAL_NEXT(dv,ii);
-#if 0
-                UPDATE_D(dict,drun,dv,ii,in);
-#else
-                dict[ DINDEX(dv,ii) ] = DENTRY(ii,in);
-#endif
-                MI
-            } while (++ii < ip);
-            DVAL_NEXT(dv,ii);
-            assert(ii == ip);
-            DVAL_ASSERT(dv,ip);
-#elif (CLEVEL >= 3)
-            SI   DI DI   XI
-#elif (CLEVEL >= 2)
-            SI   DI      XI
-#else
-                         XI
-#endif
-        }
-
-        else
-
-        {
-        /* we've found a M3 or M4 match - see how far we can still go */
-            assert(ip <= in_end);
-            assert(lzo_memcmp(m_pos_sav,ii,(lzo_uint)(ip-ii)) == 0);
-
-        /* 2a) compute match parameters */
-#if !defined(MATCH_IP_END)
-            assert(ii == ip - (M2_MAX_LEN + 1));
-#if (DD_BITS > 0)
-            assert(m_len == (lzo_uint)(ip-ii));
-            m_pos = ip - m_off;
-            assert(m_pos == m_pos_sav + m_len);
-#endif
-            {
-                const lzo_bytep end;
-                end = in_end;
-                while (ip < end  &&  *m_pos == *ip)
-                    m_pos++, ip++;
-                assert(ip <= in_end);
-                m_len = pd(ip, ii);
-            }
-            assert(pd(ip,m_pos) == m_off);
-#endif
-
-        /* 2a2) verify match parameters */
-            assert(m_len >= M3_MIN_LEN);
-
-            assert(m_off >= M3_MIN_OFFSET);
-            assert(m_off >= M4_MIN_OFFSET);
-            assert(m_off <= M3_MAX_OFFSET);
-            assert(m_off <= M4_MAX_OFFSET);
-            assert(ii-m_off == m_pos_sav);
-            assert(lzo_memcmp(m_pos_sav,ii,m_len) == 0);
-
-        /* 2b) code the match */
-            if (m_len <= M3_MAX_LEN)
-            {
-                /* code match len */
-                *op++ = LZO_BYTE(M3_MARKER | (m_len - (M3_MIN_LEN - 1)));
-                LZO_STATS(lzo_stats->m3_matches++);
-                LZO_STATS(lzo_stats->m3_match[m_len]++);
-            }
-            else
-            {
-                assert(m_len >= M4_MIN_LEN);
-                /* code M4 match len flag */
-                *op++ = M4_MARKER;
-                /* code match len */
-                m_len -= M4_MIN_LEN - 1;
-                while (m_len > 255)
-                {
-                    m_len -= 255;
-                    *op++ = 0;
-                }
-                assert(m_len > 0);
-                *op++ = LZO_BYTE(m_len);
-                LZO_STATS(lzo_stats->m4_matches++);
-            }
-
-            m_off -= M3_MIN_OFFSET - M3_EOF_OFFSET;
-            /* code low offset bits */
-            *op++ = LZO_BYTE(m_off & M3O_MASK);
-            /* code high offset bits */
-            *op++ = LZO_BYTE(m_off >> M3O_BITS);
-
-#if defined(LZO_HAVE_M3)
-            m3 = op;        /* set M3 pointer */
-#endif
-
-
-            if (ip >= ip_end)
-            {
-                ii = ip;
-                break;
-            }
-
-
-        /* 2c) Insert phrases (beginning with ii+1) into the dictionary. */
-#if (CLEVEL == 9)
-        /* Insert the whole match (ii+1)..(ip-1) into dictionary.  */
-        /* This is not recommended because it can be slow. */
-            ++ii;
-            do {
-                DVAL_NEXT(dv,ii);
-#if 0
-                UPDATE_D(dict,drun,dv,ii,in);
-#else
-                dict[ DINDEX(dv,ii) ] = DENTRY(ii,in);
-#endif
-                MI
-            } while (++ii < ip);
-            DVAL_NEXT(dv,ii);
-            assert(ii == ip);
-            DVAL_ASSERT(dv,ip);
-#elif (CLEVEL >= 8)
-            SI   DI DI DI DI DI DI DI DI   XI
-#elif (CLEVEL >= 7)
-            SI   DI DI DI DI DI DI DI      XI
-#elif (CLEVEL >= 6)
-            SI   DI DI DI DI DI DI         XI
-#elif (CLEVEL >= 5)
-            SI   DI DI DI DI               XI
-#elif (CLEVEL >= 4)
-            SI   DI DI DI                  XI
-#elif (CLEVEL >= 3)
-            SI   DI DI                     XI
-#elif (CLEVEL >= 2)
-            SI   DI                        XI
-#else
-                                           XI
-#endif
-        }
-
-        /* ii now points to the start of the next literal run */
-        assert(ii == ip);
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/lzo1b_cr.ch b/lzo/src/lzo1b_cr.ch
deleted file mode 100644
index 61cc7f6e..00000000
--- a/lzo/src/lzo1b_cr.ch
+++ /dev/null
@@ -1,129 +0,0 @@
-/* lzo1b_cr.ch -- implementation of the LZO1B compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-
-/***********************************************************************
-// store the current literal run
-************************************************************************/
-
-        assert(ip < ip_end);
-        if (pd(ip,ii) > 0)
-        {
-            lzo_uint t = pd(ip,ii);
-
-#if defined(LZO_HAVE_R1)
-            if (ip == r1)
-            {
-                /* Code a context sensitive R1 match. */
-                LZO_STATS(lzo_stats->literals += t);
-                LZO_STATS(lzo_stats->r1_matches++);
-                assert(t == 1);
-                /* modify marker byte */
-                assert((op[-2] >> M2O_BITS) == (M2_MARKER >> M2O_BITS));
-                op[-2] &= M2O_MASK;
-                assert((op[-2] >> M2O_BITS) == 0);
-                /* copy 1 literal */
-                *op++ = *ii++;
-                r1 = ip + (M2_MIN_LEN + 1);     /* set new R1 pointer */
-            }
-            else
-#endif
-            if (t < R0MIN)
-            {
-                /* inline the copying of a short run */
-                LZO_STATS(lzo_stats->literals += t);
-                LZO_STATS(lzo_stats->lit_runs++);
-                LZO_STATS(lzo_stats->lit_run[t]++);
-#if defined(LZO_HAVE_M3)
-                if (t < LZO_SIZE(8-M3O_BITS) && op == m3)
-                {
-                /* Code a very short literal run into the low offset bits
-                 * of the previous M3/M4 match.
-                 */
-                    LZO_STATS(lzo_stats->lit_runs_after_m3_match++);
-                    LZO_STATS(lzo_stats->lit_run_after_m3_match[t]++);
-                    assert((m3[-2] >> M3O_BITS) == 0);
-                    m3[-2] |= LZO_BYTE(t << M3O_BITS);
-                }
-                else
-#endif
-                {
-                    *op++ = LZO_BYTE(t);
-                }
-                MEMCPY_DS(op, ii, t);
-#if defined(LZO_HAVE_R1)
-                r1 = ip + (M2_MIN_LEN + 1);     /* set new R1 pointer */
-#endif
-            }
-            else if (t < R0FAST)
-            {
-                /* inline the copying of a short R0 run */
-                LZO_STATS(lzo_stats->literals += t);
-                LZO_STATS(lzo_stats->r0short_runs++);
-                *op++ = 0; *op++ = LZO_BYTE(t - R0MIN);
-                MEMCPY_DS(op, ii, t);
-#if defined(LZO_HAVE_R1)
-                r1 = ip + (M2_MIN_LEN + 1);     /* set new R1 pointer */
-#endif
-            }
-            else
-            {
-                op = STORE_RUN(op,ii,t);
-                ii = ip;
-            }
-        }
-
-
-        /* ii now points to the start of the current match */
-        assert(ii == ip);
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/lzo1b_d.ch b/lzo/src/lzo1b_d.ch
deleted file mode 100644
index fe5f3611..00000000
--- a/lzo/src/lzo1b_d.ch
+++ /dev/null
@@ -1,285 +0,0 @@
-/* lzo1b_d.ch -- implementation of the LZO1B decompression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo1_d.ch"
-
-
-/***********************************************************************
-// decompress a block of data.
-************************************************************************/
-
-LZO_PUBLIC(int)
-DO_DECOMPRESS    ( const lzo_bytep in , lzo_uint  in_len,
-                         lzo_bytep out, lzo_uintp out_len,
-                         lzo_voidp wrkmem )
-{
-    register lzo_bytep op;
-    register const lzo_bytep ip;
-    register lzo_uint t;
-    register const lzo_bytep m_pos;
-
-    const lzo_bytep const ip_end = in + in_len;
-#if defined(HAVE_ANY_OP)
-    lzo_bytep const op_end = out + *out_len;
-#endif
-
-    LZO_UNUSED(wrkmem);
-
-    op = out;
-    ip = in;
-
-    while (TEST_IP && TEST_OP)
-    {
-        t = *ip++;      /* get marker */
-
-        if (t < R0MIN)      /* a literal run */
-        {
-            if (t == 0)             /* a R0 literal run */
-            {
-                NEED_IP(1);
-                t = *ip++;
-                if (t >= R0FAST - R0MIN)            /* a long R0 run */
-                {
-                    t -= R0FAST - R0MIN;
-                    if (t == 0)
-                        t = R0FAST;
-                    else
-                    {
-#if 0
-                        t = 256u << ((unsigned) t);
-#else
-                        /* help the optimizer */
-                        lzo_uint tt = 256;
-                        do tt <<= 1; while (--t > 0);
-                        t = tt;
-#endif
-                    }
-
-                    NEED_IP(t); NEED_OP(t);
-#if 1 && defined(LZO_UNALIGNED_OK_4)
-                    do {
-                        UA_COPY32(op+0, ip+0);
-                        UA_COPY32(op+4, ip+4);
-                        op += 8; ip += 8;
-                        t -= 8;
-                    } while (t > 0);
-#else
-                    MEMCPY8_DS(op,ip,t);
-#endif
-                    continue;
-                }
-                t += R0MIN;                         /* a short R0 run */
-            }
-
-            NEED_IP(t); NEED_OP(t);
-            /* copy literal run */
-#if 1 && defined(LZO_UNALIGNED_OK_4)
-            if (t >= 4)
-            {
-                do {
-                    UA_COPY32(op, ip);
-                    op += 4; ip += 4; t -= 4;
-                } while (t >= 4);
-                if (t > 0) do *op++ = *ip++; while (--t > 0);
-            }
-            else
-#endif
-            {
-#if (M3O_BITS < 7)
-literal1:
-#endif
-                do *op++ = *ip++; while (--t > 0);
-            }
-
-#if (M3O_BITS == 7)
-literal2:
-#endif
-
-            /* after a literal a match must follow */
-            while (TEST_IP && TEST_OP)
-            {
-                t = *ip++;          /* get R1 marker */
-                if (t >= R0MIN)
-                    goto match;
-
-                NEED_IP(2); NEED_OP(M2_MIN_LEN + 1);
-
-            /* R1 match - a M2_MIN_LEN match + 1 byte literal */
-                assert((t & M2O_MASK) == t);
-                m_pos = op - M2_MIN_OFFSET;
-                m_pos -= t | (((lzo_uint) *ip++) << M2O_BITS);
-                assert(m_pos >= out); assert(m_pos < op);
-                TEST_LB(m_pos);
-                COPY_M2;
-                *op++ = *ip++;
-            }
-
-#if defined(HAVE_TEST_IP) || defined(HAVE_TEST_OP)
-            break;
-#endif
-        }
-
-match:
-
-        if (t >= M2_MARKER)             /* a M2 match */
-        {
-            /* get match offset */
-            NEED_IP(1);
-            m_pos = op - M2_MIN_OFFSET;
-            m_pos -= (t & M2O_MASK) | (((lzo_uint) *ip++) << M2O_BITS);
-            assert(m_pos >= out); assert(m_pos < op);
-            TEST_LB(m_pos);
-
-            /* get match len */
-            t = (t >> M2O_BITS) - 1;
-            NEED_OP(t + M2_MIN_LEN - 1);
-            COPY_M2X;
-            MEMCPY_DS(op,m_pos,t);
-        }
-        else                            /* a M3 or M4 match */
-        {
-            /* get match len */
-            t &= M3L_MASK;
-            if (t == 0)         /* a M4 match */
-            {
-                NEED_IP(1);
-                while (*ip == 0)
-                {
-                    t += 255;
-                    ip++;
-                    NEED_IP(1);
-                }
-                t += (M4_MIN_LEN - M3_MIN_LEN) + *ip++;
-            }
-
-            /* get match offset */
-            NEED_IP(2);
-            m_pos = op - (M3_MIN_OFFSET - M3_EOF_OFFSET);
-            m_pos -= *ip++ & M3O_MASK;
-            m_pos -= (lzo_uint)(*ip++) << M3O_BITS;
-#if defined(LZO_EOF_CODE)
-            if (m_pos == op)
-                goto eof_found;
-#endif
-
-            /* copy match */
-            assert(m_pos >= out); assert(m_pos < op);
-            TEST_LB(m_pos); NEED_OP(t + M3_MIN_LEN - 1);
-#if defined(LZO_UNALIGNED_OK_4)
-            if (t >= 2 * 4 - (M3_MIN_LEN - 1) && (op - m_pos) >= 4)
-            {
-                UA_COPY32(op, m_pos);
-                op += 4; m_pos += 4; t -= 4 - (M3_MIN_LEN - 1);
-                do {
-                    UA_COPY32(op, m_pos);
-                    op += 4; m_pos += 4; t -= 4;
-                } while (t >= 4);
-                if (t > 0) do *op++ = *m_pos++; while (--t > 0);
-            }
-            else
-#endif
-            {
-            COPY_M3X;
-            MEMCPY_DS(op,m_pos,t);
-            }
-
-
-#if (M3O_BITS < 7)
-            t = ip[-2] >> M3O_BITS;
-            if (t)
-            {
-                NEED_IP(t); NEED_OP(t);
-                goto literal1;
-            }
-#elif (M3O_BITS == 7)
-            /* optimized version */
-            if (ip[-2] & (1 << M3O_BITS))
-            {
-                NEED_IP(1); NEED_OP(1);
-                *op++ = *ip++;
-                goto literal2;
-            }
-#endif
-        }
-    }
-
-
-#if defined(LZO_EOF_CODE)
-#if defined(HAVE_TEST_IP) || defined(HAVE_TEST_OP)
-    /* no EOF code was found */
-    *out_len = pd(op, out);
-    return LZO_E_EOF_NOT_FOUND;
-#endif
-
-eof_found:
-    assert(t == 1);
-#endif
-    *out_len = pd(op, out);
-    return (ip == ip_end ? LZO_E_OK :
-           (ip < ip_end  ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
-
-
-#if defined(HAVE_NEED_IP)
-input_overrun:
-    *out_len = pd(op, out);
-    return LZO_E_INPUT_OVERRUN;
-#endif
-
-#if defined(HAVE_NEED_OP)
-output_overrun:
-    *out_len = pd(op, out);
-    return LZO_E_OUTPUT_OVERRUN;
-#endif
-
-#if defined(LZO_TEST_OVERRUN_LOOKBEHIND)
-lookbehind_overrun:
-    *out_len = pd(op, out);
-    return LZO_E_LOOKBEHIND_OVERRUN;
-#endif
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1b_d1.c b/lzo/src/lzo1b_d1.c
deleted file mode 100644
index 3b15686b..00000000
--- a/lzo/src/lzo1b_d1.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1b_d1.c -- LZO1B decompression
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1b.h"
-
-#undef LZO_TEST_OVERRUN
-#define DO_DECOMPRESS       lzo1b_decompress
-
-#include "lzo1b_d.ch"
diff --git a/lzo/src/lzo1b_d2.c b/lzo/src/lzo1b_d2.c
deleted file mode 100644
index 1c54d583..00000000
--- a/lzo/src/lzo1b_d2.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1b_d2.c -- LZO1B decompression with overrun testing
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1b.h"
-
-#define LZO_TEST_OVERRUN 1
-#define DO_DECOMPRESS       lzo1b_decompress_safe
-
-#include "lzo1b_d.ch"
diff --git a/lzo/src/lzo1b_de.h b/lzo/src/lzo1b_de.h
deleted file mode 100644
index 5cba46f3..00000000
--- a/lzo/src/lzo1b_de.h
+++ /dev/null
@@ -1,347 +0,0 @@
-/* lzo1b_de.h -- definitions for the the LZO1B/LZO1C algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_DEFS_H
-#define __LZO_DEFS_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/*
-     Format of the marker byte
-
-     76543210
-     --------
-     00000000   R0 - a long literal run ('R0' run)
-     000rrrrr   R  - a short literal run with len r
-     00100000   M4 - a very long match
-     001mmmmm   M3 - a long match  (len = m+M3_MIN_LEN)
-     mmmooooo   M2 - a short match (len = m+M2_MIN_LEN, o = offset low bits)
-
-                M1 is not used !
-*/
-
-
-#ifndef R_BITS
-#define R_BITS              (5)
-#endif
-
-
-#ifndef M1L_BITS
-#define M1L_BITS            (0)
-#endif
-#ifndef M2L_BITS
-#define M2L_BITS            (CHAR_BIT - M2O_BITS)
-#endif
-#ifndef M3L_BITS
-#define M3L_BITS            (R_BITS)
-#endif
-#ifndef M4L_BITS
-#define M4L_BITS            (CHAR_BIT)
-#endif
-
-#ifndef M1O_BITS
-#define M1O_BITS            (6)
-#endif
-#ifndef M2O_BITS
-#define M2O_BITS            (R_BITS)
-#endif
-#ifndef M3O_BITS
-#define M3O_BITS            (CHAR_BIT)
-#endif
-#ifndef M4O_BITS
-#define M4O_BITS            (M3O_BITS)              /* must be the same */
-#endif
-
-#ifndef M1X_BITS
-#define M1X_BITS            (M1O_BITS)
-#endif
-#ifndef M2X_BITS
-#define M2X_BITS            (M2O_BITS + CHAR_BIT)
-#endif
-#ifndef M3X_BITS
-#define M3X_BITS            (M3O_BITS + CHAR_BIT)
-#endif
-#ifndef M4X_BITS
-#define M4X_BITS            M3X_BITS
-#endif
-
-
-#define __MIN_OFFSET(bits)  1
-#define __MAX_OFFSET(bits)  LZO_LSIZE(bits)
-
-#define M1_MIN_OFFSET       __MIN_OFFSET(M1X_BITS)
-#define M2_MIN_OFFSET       __MIN_OFFSET(M2X_BITS)
-#define M3_MIN_OFFSET       __MIN_OFFSET(M3X_BITS)
-#define M4_MIN_OFFSET       M3_MIN_OFFSET
-
-#if defined(LZO_EOF_CODE) && !defined(M3_EOF_OFFSET)
-#define M3_EOF_OFFSET       1
-#else
-#define M3_EOF_OFFSET       0
-#endif
-
-#ifndef _M1_MAX_OFFSET
-#define _M1_MAX_OFFSET      __MAX_OFFSET(M1X_BITS)
-#endif
-#ifndef _M2_MAX_OFFSET
-#define _M2_MAX_OFFSET      __MAX_OFFSET(M2X_BITS)
-#endif
-#ifndef _M3_MAX_OFFSET
-#define _M3_MAX_OFFSET      (__MAX_OFFSET(M3X_BITS) - M3_EOF_OFFSET)
-#endif
-#ifndef _M4_MAX_OFFSET
-#define _M4_MAX_OFFSET      _M3_MAX_OFFSET
-#endif
-#ifndef _MAX_OFFSET
-#define _MAX_OFFSET         _M4_MAX_OFFSET
-#endif
-
-#if (M3_EOF_OFFSET > 0) && (_M2_MAX_OFFSET == _M3_MAX_OFFSET + M3_EOF_OFFSET)
-#  undef _M2_MAX_OFFSET
-#  define _M2_MAX_OFFSET    _M3_MAX_OFFSET
-#endif
-#if (_M2_MAX_OFFSET > _M3_MAX_OFFSET)
-#  error
-#endif
-
-#define M1_MAX_OFFSET       ((lzo_uint) _M1_MAX_OFFSET)
-#define M2_MAX_OFFSET       ((lzo_uint) _M2_MAX_OFFSET)
-#define M3_MAX_OFFSET       ((lzo_uint) _M3_MAX_OFFSET)
-#define M4_MAX_OFFSET       ((lzo_uint) _M4_MAX_OFFSET)
-#define MAX_OFFSET          ((lzo_uint) _MAX_OFFSET)
-
-
-#ifndef M1_MIN_LEN
-#define M1_MIN_LEN          (2)
-#endif
-#ifndef M2_MIN_LEN
-#define M2_MIN_LEN          (3)
-#endif
-#ifndef M3_MIN_LEN
-#if (M3X_BITS == M2X_BITS)
-#define M3_MIN_LEN          (M2_MAX_LEN + 1)
-#else
-#define M3_MIN_LEN          (4)
-#endif
-#endif
-#ifndef M4_MIN_LEN
-#define M4_MIN_LEN          (M3_MAX_LEN + 1)
-#endif
-
-#ifndef M1_MAX_LEN
-#define M1_MAX_LEN          (M1_MIN_LEN + LZO_SIZE(M1L_BITS) - 1)
-#endif
-#ifndef M2_MAX_LEN
-#define M2_MAX_LEN          (M2_MIN_LEN + LZO_SIZE(M2L_BITS) - 3)
-#endif
-#ifndef M3_MAX_LEN
-#define M3_MAX_LEN          (M3_MIN_LEN + LZO_SIZE(M3L_BITS) - 2)
-#endif
-#ifndef M4_MAX_LEN
-#define M4_MAX_LEN          (ULONG_MAX)
-#endif
-
-
-#define M1O_MASK            LZO_MASK(M1O_BITS)
-#define M1L_MASK            LZO_MASK(M1L_BITS)
-#define M2O_MASK            LZO_MASK(M2O_BITS)
-#define M2L_MASK            LZO_MASK(M2L_BITS)
-#define M3O_MASK            LZO_MASK(M3O_BITS)
-#define M3L_MASK            LZO_MASK(M3L_BITS)
-#define M4O_MASK            LZO_MASK(M4O_BITS)
-#define M4L_MASK            LZO_MASK(M4L_BITS)
-
-
-#define M1_MARKER           (1 << M1O_BITS)
-#define M2_MARKER           (2 << M2O_BITS)
-#define M3_MARKER           (1 << M3L_BITS)
-#define M4_MARKER           M3_MARKER
-
-
-/***********************************************************************
-// R0 literal run (a long run)
-************************************************************************/
-
-#ifndef R0MIN
-#define R0MIN   (LZO_SIZE(R_BITS))  /* Minimum len of R0 run of literals */
-#endif
-#define R0MAX   (R0MIN + 256 - 1)   /* Maximum len of R0 run of literals */
-
-#if (R0MAX - (R0MAX & ~7u) >= 7)
-#define R0FAST  (R0MAX & ~7u)       /* R0MAX aligned to 8 byte boundary */
-#else
-#define R0FAST  (R0MAX & ~15u)      /* R0MAX aligned to 8 byte boundary */
-#endif
-
-#if (R0MAX - R0FAST < 7) || ((R0FAST & 7) != 0)
-#  error "something went wrong"
-#endif
-#if (R0FAST * 2 < 512)
-#  error "R0FAST is not big enough"
-#endif
-
-/* 7 special codes from R0FAST+1 .. R0MAX
- * these codes mean long R0 runs with lengths
- * 512, 1024, 2048, 4096, 8192, 16384, 32768
- */
-
-
-
-/***********************************************************************
-// matching
-************************************************************************/
-
-#define PS  *m_pos++ != *ip++
-
-
-/* We already matched M2_MIN_LEN bytes.
- * Try to match another M2_MAX_LEN - M2_MIN_LEN bytes. */
-
-#if (M2_MAX_LEN - M2_MIN_LEN == 4)
-#  define MATCH_M2X     (PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 5)
-#  define MATCH_M2X     (PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 6)
-#  define MATCH_M2X     (PS || PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 7)
-#  define MATCH_M2X     (PS || PS || PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 13)
-#  define MATCH_M2X     (PS || PS || PS || PS || PS || PS || PS || PS || \
-                         PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 14)
-#  define MATCH_M2X     (PS || PS || PS || PS || PS || PS || PS || PS || \
-                         PS || PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 16)
-#  define MATCH_M2X     (PS || PS || PS || PS || PS || PS || PS || PS || \
-                         PS || PS || PS || PS || PS || PS || PS || PS)
-#elif (M2_MAX_LEN - M2_MIN_LEN == 29)
-#  define MATCH_M2X     (PS || PS || PS || PS || PS || PS || PS || PS || \
-                         PS || PS || PS || PS || PS || PS || PS || PS || \
-                         PS || PS || PS || PS || PS || PS || PS || PS || \
-                         PS || PS || PS || PS || PS)
-#else
-#  error "MATCH_M2X not yet implemented"
-#endif
-
-
-/* We already matched M2_MIN_LEN bytes.
- * Try to match another M2_MAX_LEN + 1 - M2_MIN_LEN bytes
- * to see if we get more than a M2 match */
-
-#define MATCH_M2        (MATCH_M2X || PS)
-
-
-/***********************************************************************
-// copying
-************************************************************************/
-
-#define _CP             *op++ = *m_pos++
-
-#if (M2_MIN_LEN == 2)
-#  define COPY_M2X      _CP
-#elif (M2_MIN_LEN == 3)
-#  define COPY_M2X      _CP; _CP
-#elif (M2_MIN_LEN == 4)
-#  define COPY_M2X      _CP; _CP; _CP
-#else
-#  error "COPY_M2X not yet implemented"
-#endif
-
-#if (M3_MIN_LEN == 3)
-#  define COPY_M3X      _CP; _CP
-#elif (M3_MIN_LEN == 4)
-#  define COPY_M3X      _CP; _CP; _CP
-#elif (M3_MIN_LEN == 9)
-#  define COPY_M3X      _CP; _CP; _CP; _CP; _CP; _CP; _CP; _CP
-#else
-#  error "COPY_M3X not yet implemented"
-#endif
-
-#define COPY_M2         COPY_M2X; *op++ = *m_pos++
-#define COPY_M3         COPY_M3X; *op++ = *m_pos++
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if defined(LZO_NEED_DICT_H)
-
-#define DL_MIN_LEN          M2_MIN_LEN
-#define D_INDEX1(d,p)       d = DM(DMUL(0x21,DX3(p,5,5,6)) >> 5)
-#define D_INDEX2(d,p)       d = (d & (D_MASK & 0x7ff)) ^ (D_HIGH | 0x1f)
-#include "lzo_dict.h"
-
-#ifndef MIN_LOOKAHEAD
-#define MIN_LOOKAHEAD       (M2_MAX_LEN + 1)
-#endif
-#ifndef MAX_LOOKBEHIND
-#define MAX_LOOKBEHIND      (MAX_OFFSET)
-#endif
-
-#endif /* defined(LZO_NEED_DICT_H) */
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1b_r.ch b/lzo/src/lzo1b_r.ch
deleted file mode 100644
index c8ebbc54..00000000
--- a/lzo/src/lzo1b_r.ch
+++ /dev/null
@@ -1,120 +0,0 @@
-/* lzo1b_r.ch -- literal run handling for the the LZO1B/LZO1C algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/***********************************************************************
-// store a literal run (internal)
-************************************************************************/
-
-LZO_PUBLIC(lzo_bytep )
-STORE_RUN ( lzo_bytep const oo, const lzo_bytep const ii, lzo_uint r_len)
-{
-    register lzo_bytep op;
-    register const lzo_bytep ip;
-    register lzo_uint t;
-
-    LZO_STATS(lzo_stats->literals += r_len);
-
-    op = oo;
-    ip = ii;
-    assert(r_len > 0);
-
-    /* code a long R0 run */
-    if (r_len >= 512)
-    {
-        unsigned r_bits = 6;        /* 256 << 6 == 16384 */
-        lzo_uint tt = 32768u;
-
-        while (r_len >= (t = tt))
-        {
-            r_len -= t;
-            *op++ = 0; *op++ = (R0FAST - R0MIN) + 7;
-            MEMCPY8_DS(op, ip, t);
-            LZO_STATS(lzo_stats->r0long_runs++);
-        }
-        tt >>= 1;
-        do {
-            if (r_len >= (t = tt))
-            {
-                r_len -= t;
-                *op++ = 0; *op++ = LZO_BYTE((R0FAST - R0MIN) + r_bits);
-                MEMCPY8_DS(op, ip, t);
-                LZO_STATS(lzo_stats->r0long_runs++);
-            }
-            tt >>= 1;
-        } while (--r_bits > 0);
-    }
-    assert(r_len < 512);
-
-    while (r_len >= (t = R0FAST))
-    {
-        r_len -= t;
-        *op++ = 0; *op++ = (R0FAST - R0MIN);
-        MEMCPY8_DS(op, ip, t);
-        LZO_STATS(lzo_stats->r0fast_runs++);
-    }
-
-    t = r_len;
-    if (t >= R0MIN)
-    {
-        /* code a short R0 run */
-        *op++ = 0; *op++ = LZO_BYTE(t - R0MIN);
-        MEMCPY_DS(op, ip, t);
-        LZO_STATS(lzo_stats->r0short_runs++);
-    }
-    else if (t > 0)
-    {
-        /* code a short literal run */
-        LZO_STATS(lzo_stats->lit_runs++);
-        LZO_STATS(lzo_stats->lit_run[t]++);
-        *op++ = LZO_BYTE(t);
-        MEMCPY_DS(op, ip, t);
-    }
-
-    return op;
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1b_rr.c b/lzo/src/lzo1b_rr.c
deleted file mode 100644
index e9eb24c8..00000000
--- a/lzo/src/lzo1b_rr.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* lzo1b_rr.c -- literal run handling
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1b.h"
-
-#include "lzo1b_r.ch"
diff --git a/lzo/src/lzo1b_sm.ch b/lzo/src/lzo1b_sm.ch
deleted file mode 100644
index 89ba3a77..00000000
--- a/lzo/src/lzo1b_sm.ch
+++ /dev/null
@@ -1,213 +0,0 @@
-/* lzo1b_sm.ch -- implementation of the LZO1B compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-
-/***********************************************************************
-// search for a match
-************************************************************************/
-
-#if (DD_BITS == 0)
-
-        /* search ip in the dictionary */
-        DINDEX1(dindex,ip);
-        GINDEX(m_pos,m_off,dict,dindex,in);
-        if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,M3_MAX_OFFSET))
-            goto literal;
-#if 1
-        if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
-            goto try_match;
-        DINDEX2(dindex,ip);
-#endif
-        GINDEX(m_pos,m_off,dict,dindex,in);
-        if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,M3_MAX_OFFSET))
-            goto literal;
-        if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
-            goto try_match;
-        goto literal;
-
-
-#else /* (DD_BITS == 0) */
-
-
-
-        /* search ip in the deepened dictionary */
-        {
-            lzo_dict_p d = &dict [ DINDEX(dv,ip) ];
-            const lzo_bytep ip_sav;
-            unsigned j = DD_SIZE;
-            lzo_uint x_len;
-            LZO_DEFINE_UNINITIALIZED_VAR(lzo_uint, x_off, 0);
-
-            DVAL_ASSERT(dv,ip);
-
-            ip_sav = ip;
-            m_len = 0;
-            do {
-#if !defined(NDEBUG)
-                const lzo_bytep z_pos = NULL;
-#endif
-#if (LZO_DICT_USE_PTR)
-                m_pos = *d;
-                assert((z_pos = m_pos) == *d);
-#if (LZO_DETERMINISTIC)
-                assert(m_pos == NULL || m_pos >= in);
-                assert(m_pos == NULL || m_pos < ip);
-#endif
-#else
-                x_off = *d;
-#endif
-                assert(ip == ip_sav);
-
-                if (LZO_CHECK_MPOS(m_pos,x_off,in,ip,MAX_OFFSET))
-#if (CLEVEL == 9)
-                    *d = DENTRY(ip,in);
-#else
-                    ((void)(0));
-#endif
-                else if (m_pos[m_len] != ip[m_len])
-                    ((void)(0));
-                else if (*m_pos++ == *ip++ && *m_pos++ == *ip++ && *m_pos++ == *ip++)
-                {
-#if !(LZO_DICT_USE_PTR)
-                    assert((z_pos = ip - 3 - x_off) == (m_pos - 3));
-#endif
-                    /* a match */
-                    if (MATCH_M2)
-                    {
-                        x_len = pd((ip - 1), ip_sav);
-                        if (x_len > m_len)
-                        {
-                            m_len = x_len;
-                            m_off = x_off;
-                            assert((m_pos_sav = z_pos) != NULL);
-                        }
-#if (CLEVEL == 9)
-                        /* try to find a closer match */
-                        else if (x_len == m_len && x_off < m_off)
-                        {
-                            m_off = x_off;
-                            assert((m_pos_sav = z_pos) != NULL);
-                        }
-#endif
-                    }
-                    else
-                    {
-                        assert((ip - ip_sav) == M2_MAX_LEN + 1);
-#if (CLEVEL == 9)
-#if defined(MATCH_IP_END)
-                        {
-                            const lzo_bytep end;
-                            end = MATCH_IP_END;
-                            while (ip < end  &&  *m_pos == *ip)
-                                m_pos++, ip++;
-                            assert(ip <= in_end);
-                            x_len = pd(ip, ip_sav);
-                        }
-                        if (x_len > m_len)
-                        {
-                            m_len = x_len;
-                            m_off = x_off;
-                            assert((m_pos_sav = z_pos) != NULL);
-                            if (ip >= MATCH_IP_END)
-                            {
-                                ip = ip_sav;
-#if 0
-                                /* not needed - we are at the end */
-                                d -= DD_SIZE - j;
-                                assert(d == &dict [ DINDEX(dv,ip) ]);
-                                UPDATE_P(d,drun,ip,in);
-#endif
-                                goto match;
-                            }
-                        }
-                        else if (x_len == m_len && x_off < m_off)
-                        {
-                            m_off = x_off;
-                            assert((m_pos_sav = z_pos) != NULL);
-                        }
-#else
-                        /* try to find a closer match */
-                        if (m_len < M2_MAX_LEN + 1 || x_off < m_off)
-                        {
-                            m_len = M2_MAX_LEN + 1;
-                            m_off = x_off;
-                            assert((m_pos_sav = z_pos) != NULL);
-                        }
-#endif
-#else
-                        /* don't search for a longer/closer match */
-                        m_len = M2_MAX_LEN + 1;
-                        m_off = x_off;
-                        assert((m_pos_sav = z_pos) != NULL);
-                        ip = ip_sav;
-                        d -= DD_SIZE - j;
-                        assert(d == &dict [ DINDEX(dv,ip) ]);
-                        UPDATE_P(d,drun,ip,in);
-                        goto match;
-#endif
-                    }
-                    ip = ip_sav;
-                }
-                else
-                    ip = ip_sav;
-                d++;
-            } while (--j > 0);
-            assert(ip == ip_sav);
-
-            d -= DD_SIZE;
-            assert(d == &dict [ DINDEX(dv,ip) ]);
-            UPDATE_P(d,drun,ip,in);
-        }
-
-#endif /* (DD_BITS == 0) */
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/lzo1b_tm.ch b/lzo/src/lzo1b_tm.ch
deleted file mode 100644
index 94c79e2a..00000000
--- a/lzo/src/lzo1b_tm.ch
+++ /dev/null
@@ -1,102 +0,0 @@
-/* lzo1b_tm.ch -- implementation of the LZO1B compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-
-/***********************************************************************
-// test for a potential match
-************************************************************************/
-
-
-#if (DD_BITS == 0)
-
-try_match:
-#if !defined(NDEBUG) && (LZO_DICT_USE_PTR)
-#if (LZO_DETERMINISTIC)
-        assert(m_pos == NULL || m_pos >= in);
-        assert(m_pos == NULL || m_pos < ip);
-#endif
-        m_pos_sav = m_pos;
-#endif
-        if (m_pos[0] == ip[0] && m_pos[1] == ip[1] && m_pos[2] == ip[2])
-        {
-            m_pos += 3;
-            goto match;
-        }
-
-
-#else /* (DD_BITS == 0) */
-
-
-    /* test potential match */
-
-        if (m_len > M2_MIN_LEN)
-            goto match;
-        if (m_len == M2_MIN_LEN)
-        {
-#if (_MAX_OFFSET == _M2_MAX_OFFSET)
-            goto match;
-#else
-            if (m_off <= M2_MAX_OFFSET)
-                goto match;
-#if 0 && (M3_MIN_LEN == M2_MIN_LEN)
-            if (ip == ii)
-                goto match;
-#endif
-#endif
-        }
-        goto literal;
-
-
-#endif /* (DD_BITS == 0) */
-
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/lzo1b_xx.c b/lzo/src/lzo1b_xx.c
deleted file mode 100644
index 49d4dd12..00000000
--- a/lzo/src/lzo1b_xx.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* lzo1b_xx.c -- LZO1B compression public entry point
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1b.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static const lzo_compress_t * const c_funcs [9] =
-{
-    &_lzo1b_1_compress_func,
-    &_lzo1b_2_compress_func,
-    &_lzo1b_3_compress_func,
-    &_lzo1b_4_compress_func,
-    &_lzo1b_5_compress_func,
-    &_lzo1b_6_compress_func,
-    &_lzo1b_7_compress_func,
-    &_lzo1b_8_compress_func,
-    &_lzo1b_9_compress_func
-};
-
-
-lzo_compress_t _lzo1b_get_compress_func(int clevel)
-{
-    const lzo_compress_t *f;
-
-    if (clevel < LZO1B_BEST_SPEED || clevel > LZO1B_BEST_COMPRESSION)
-    {
-        if (clevel == LZO1B_DEFAULT_COMPRESSION)
-            clevel = LZO1B_BEST_SPEED;
-        else
-            return 0;
-    }
-    f = c_funcs[clevel-1];
-    assert(f && *f);
-    return *f;
-}
-
-
-LZO_PUBLIC(int)
-lzo1b_compress ( const lzo_bytep src, lzo_uint  src_len,
-                       lzo_bytep dst, lzo_uintp dst_len,
-                       lzo_voidp wrkmem,
-                       int clevel )
-{
-    lzo_compress_t f;
-
-    f = _lzo1b_get_compress_func(clevel);
-    if (!f)
-        return LZO_E_ERROR;
-    return _lzo1b_do_compress(src,src_len,dst,dst_len,wrkmem,f);
-}
-
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1c_1.c b/lzo/src/lzo1c_1.c
deleted file mode 100644
index 98dbfae7..00000000
--- a/lzo/src/lzo1c_1.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1c_1.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     1
-
-#define DDBITS          0
-#define CLEVEL          1
-#include "compr1c.h"
-
diff --git a/lzo/src/lzo1c_2.c b/lzo/src/lzo1c_2.c
deleted file mode 100644
index 181fa9dc..00000000
--- a/lzo/src/lzo1c_2.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1c_2.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     2
-
-#define DDBITS          0
-#define CLEVEL          2
-#include "compr1c.h"
-
diff --git a/lzo/src/lzo1c_3.c b/lzo/src/lzo1c_3.c
deleted file mode 100644
index 9f5ea878..00000000
--- a/lzo/src/lzo1c_3.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1c_3.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     3
-
-#define DDBITS          0
-#define CLEVEL          3
-#include "compr1c.h"
-
diff --git a/lzo/src/lzo1c_4.c b/lzo/src/lzo1c_4.c
deleted file mode 100644
index 61e4b5d3..00000000
--- a/lzo/src/lzo1c_4.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1c_4.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     4
-
-#define DDBITS          1
-#define CLEVEL          2
-#include "compr1c.h"
-
diff --git a/lzo/src/lzo1c_5.c b/lzo/src/lzo1c_5.c
deleted file mode 100644
index 0efcf2ad..00000000
--- a/lzo/src/lzo1c_5.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1c_5.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     5
-
-#define DDBITS          1
-#define CLEVEL          3
-#include "compr1c.h"
-
diff --git a/lzo/src/lzo1c_6.c b/lzo/src/lzo1c_6.c
deleted file mode 100644
index 5074171b..00000000
--- a/lzo/src/lzo1c_6.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1c_6.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     6
-
-#define DDBITS          1
-#define CLEVEL          5
-#include "compr1c.h"
-
diff --git a/lzo/src/lzo1c_7.c b/lzo/src/lzo1c_7.c
deleted file mode 100644
index 437f0445..00000000
--- a/lzo/src/lzo1c_7.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1c_7.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     7
-
-#define DDBITS          2
-#define CLEVEL          3
-#include "compr1c.h"
-
diff --git a/lzo/src/lzo1c_8.c b/lzo/src/lzo1c_8.c
deleted file mode 100644
index 2a6a67ed..00000000
--- a/lzo/src/lzo1c_8.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1c_8.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     8
-
-#define DDBITS          2
-#define CLEVEL          8
-#include "compr1c.h"
-
diff --git a/lzo/src/lzo1c_9.c b/lzo/src/lzo1c_9.c
deleted file mode 100644
index df961e18..00000000
--- a/lzo/src/lzo1c_9.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1c_9.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     9
-
-#define DDBITS          2
-#define CLEVEL          9
-#include "compr1c.h"
-
diff --git a/lzo/src/lzo1c_99.c b/lzo/src/lzo1c_99.c
deleted file mode 100644
index 0cc1c2d3..00000000
--- a/lzo/src/lzo1c_99.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* lzo1c_99.c -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define COMPRESS_ID     99
-
-#define DDBITS          3
-#define CLEVEL          9
-
-#define D_BITS          16
-#define MATCH_IP_END        in_end
-#include "compr1c.h"
-
diff --git a/lzo/src/lzo1c_9x.c b/lzo/src/lzo1c_9x.c
deleted file mode 100644
index 4b7091ff..00000000
--- a/lzo/src/lzo1c_9x.c
+++ /dev/null
@@ -1,382 +0,0 @@
-/* lzo1c_9x.c -- implementation of the LZO1C-999 compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1c.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define SWD_N           16383           /* size of ring buffer */
-#define SWD_THRESHOLD       2           /* lower limit for match length */
-#define SWD_F            2048           /* upper limit for match length */
-
-
-#define LZO1C 1
-#define LZO_COMPRESS_T  lzo1c_999_t
-#define lzo_swd_t       lzo1c_999_swd_t
-#include "lzo_mchw.ch"
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static lzo_bytep
-code_match ( LZO_COMPRESS_T *c, lzo_bytep op, lzo_uint m_len, lzo_uint m_off )
-{
-    if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET)
-    {
-        assert(m_len >= M2_MIN_LEN);
-        assert(m_off >= M2_MIN_OFFSET);
-
-        m_off -= M2_MIN_OFFSET;
-        /* code match len + low offset bits */
-        *op++ = LZO_BYTE(((m_len - (M2_MIN_LEN - 2)) << M2O_BITS) |
-                          (m_off & M2O_MASK));
-        /* code high offset bits */
-        *op++ = LZO_BYTE(m_off >> M2O_BITS);
-        c->m2_m++;
-    }
-    else
-    {
-        assert(m_len >= M3_MIN_LEN);
-        assert(m_off <= M3_MAX_OFFSET);
-
-        m_off -= M3_MIN_OFFSET - M3_EOF_OFFSET;
-        /* code match len */
-        if (m_len <= M3_MAX_LEN)
-            *op++ = LZO_BYTE(M3_MARKER | (m_len - (M3_MIN_LEN - 1)));
-        else
-        {
-            assert(m_len >= M4_MIN_LEN);
-            /* code M4 match len flag */
-            *op++ = M4_MARKER;
-            /* code match len */
-            m_len -= M4_MIN_LEN - 1;
-            while (m_len > 255)
-            {
-                m_len -= 255;
-                *op++ = 0;
-            }
-            assert(m_len > 0);
-            *op++ = LZO_BYTE(m_len);
-        }
-        /* code low offset bits */
-        *op++ = LZO_BYTE(m_off & M3O_MASK);
-        /* code high offset bits */
-        *op++ = LZO_BYTE(m_off >> M3O_BITS);
-
-        c->r1_m_len = 0;
-        c->m3 = op;
-        c->m3_m++;
-    }
-    return op;
-}
-
-
-/***********************************************************************
-// this is a public function, but there is no prototype in a header file
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1c_999_compress_callback ( const lzo_bytep in , lzo_uint  in_len,
-                                    lzo_bytep out, lzo_uintp out_len,
-                                    lzo_voidp wrkmem,
-                                    lzo_callback_p cb,
-                                    lzo_uint max_chain );
-
-LZO_PUBLIC(int)
-lzo1c_999_compress_callback ( const lzo_bytep in , lzo_uint  in_len,
-                                    lzo_bytep out, lzo_uintp out_len,
-                                    lzo_voidp wrkmem,
-                                    lzo_callback_p cb,
-                                    lzo_uint max_chain )
-{
-    lzo_bytep op;
-    const lzo_bytep ii;
-    lzo_uint lit;
-    lzo_uint m_len, m_off;
-    LZO_COMPRESS_T cc;
-    LZO_COMPRESS_T * const c = &cc;
-    lzo_swd_p const swd = (lzo_swd_p) wrkmem;
-    int r;
-
-    /* sanity check */
-    LZO_COMPILE_TIME_ASSERT(LZO1C_999_MEM_COMPRESS >= SIZEOF_LZO_SWD_T)
-
-    c->init = 0;
-    c->ip = c->in = in;
-    c->in_end = in + in_len;
-    c->cb = cb;
-    c->r1_r = c->m3_r = c->m2_m = c->m3_m = 0;
-
-    op = out;
-    ii = c->ip;             /* point to start of literal run */
-    lit = 0;
-    c->r1_m_len = 0;
-    c->m3 = out + 1;        /* pointer after last m3/m4 match */
-
-    r = init_match(c,swd,NULL,0,0);
-    if (r != 0)
-        return r;
-    if (max_chain > 0)
-        swd->max_chain = max_chain;
-
-    r = find_match(c,swd,0,0);
-    if (r != 0)
-        return r;
-    while (c->look > 0)
-    {
-        int lazy_match_min_gain = -1;
-        lzo_uint ahead = 0;
-
-        m_len = c->m_len;
-        m_off = c->m_off;
-
-#if 0
-        printf("%5ld: %5d len:%3d off:%5d\n", (c->ip-c->look)-in, c->look,
-                m_len, m_off);
-#endif
-
-        assert(c->ip - c->look >= in);
-        if (lit == 0)
-            ii = c->ip - c->look;
-        assert(ii + lit == c->ip - c->look);
-        assert(swd->b_char == *(c->ip - c->look));
-
-        if ((m_len < M2_MIN_LEN) ||
-            (m_len < M3_MIN_LEN && m_off > M2_MAX_OFFSET))
-        {
-            m_len = 0;
-        }
-        else
-        {
-            assert(c->ip - c->look - m_off >= in);
-            assert(c->ip - c->look - m_off + m_len < c->ip);
-            assert(lzo_memcmp(c->ip - c->look, c->ip - c->look - m_off,
-                              m_len) == 0);
-
-            if (lit > 0)
-            {
-                /* we have a current literal run: do not try a lazy match,
-                   if the literal could be coded into a r1 or m3 match */
-                if (lit == 1 && c->r1_m_len == M2_MIN_LEN)
-                    lazy_match_min_gain = -1;
-                else if (lit == 3 && op == c->m3)
-                    lazy_match_min_gain = -1;
-                else if (lit < 3 && op == c->m3)
-                    lazy_match_min_gain = 0;
-                else
-                    lazy_match_min_gain = 1;
-
-#if (M2_MIN_LEN == 2)
-                if (m_len == 2)
-                {
-                    /* don't code a match of len 2 if we have to
-                       code a literal run. Code a literal instead. */
-                    m_len = 0;
-                }
-#endif
-#if (M2_MIN_LEN == M3_MIN_LEN)
-                if (m_len == M2_MIN_LEN && m_off > M2_MAX_OFFSET)
-                {
-                    /* don't code a M3 match of len 3 if we have to
-                       code a literal run. Code a literal instead. */
-                    m_len = 0;
-                }
-#endif
-            }
-            else
-            {
-                /* no current literal run: only try a lazy match,
-                   if the literal could be coded into a r1 or m3 match */
-                if (c->r1_m_len == M2_MIN_LEN || op == c->m3)
-                    lazy_match_min_gain = 0;
-                else
-                    lazy_match_min_gain = -1;
-            }
-        }
-
-
-        /* try a lazy match */
-        if (m_len == 0)
-            lazy_match_min_gain = -1;
-        if (lazy_match_min_gain >= 0 && c->look > m_len)
-        {
-            assert(m_len > 0);
-
-            r = find_match(c,swd,1,0);
-            assert(r == 0); LZO_UNUSED(r);
-            assert(c->look > 0);
-
-            if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET &&
-                c->m_off > M2_MAX_OFFSET)
-                lazy_match_min_gain += 1;
-
-            if (c->m_len >= m_len + lazy_match_min_gain)
-            {
-                c->lazy++;
-#if !defined(NDEBUG)
-                m_len = c->m_len;
-                m_off = c->m_off;
-                assert(lzo_memcmp(c->ip - c->look, c->ip - c->look - m_off,
-                                  m_len) == 0);
-#endif
-                lit++;
-                assert(ii + lit == c->ip - c->look);
-                continue;
-            }
-            else
-            {
-                ahead = 1;
-                assert(ii + lit + 1 == c->ip - c->look);
-            }
-            assert(m_len > 0);
-        }
-        assert(ii + lit + ahead == c->ip - c->look);
-
-
-        if (m_len == 0)
-        {
-            /* a literal */
-            lit++;
-            r = find_match(c,swd,1,0);
-            assert(r == 0); LZO_UNUSED(r);
-        }
-        else
-        {
-            /* 1 - store run */
-            if (lit > 0)
-            {
-                /* code current literal run */
-                if (lit == 1 && c->r1_m_len == M2_MIN_LEN)
-                {
-                    /* Code a context sensitive R1 match. */
-                    assert((op[-2] >> M2O_BITS) == (M2_MARKER >> M2O_BITS));
-                    op[-2] &= M2O_MASK;
-                    assert((op[-2] >> M2O_BITS) == 0);
-                    /* copy 1 literal */
-                    *op++ = *ii++;
-                    assert(ii + ahead == c->ip - c->look);
-                    c->r1_r++;
-                }
-                else if (lit < 4 && op == c->m3)
-                {
-                    assert((c->m3[-2] >> M3O_BITS) == 0);
-                    c->m3[-2] |= LZO_BYTE(lit << M3O_BITS);
-                    MEMCPY_DS(op, ii, lit);
-                    assert(ii + ahead == c->ip - c->look);
-                    c->m3_r++;
-                }
-                else
-                {
-                    op = STORE_RUN(op,ii,lit);
-                }
-                if (lit < R0FAST)
-                    c->r1_m_len = m_len;
-                else
-                    c->r1_m_len = 0;
-                lit = 0;
-            }
-            else
-                c->r1_m_len = 0;
-
-            /* 2 - code match */
-            op = code_match(c,op,m_len,m_off);
-            r = find_match(c,swd,m_len,1+ahead);
-            assert(r == 0); LZO_UNUSED(r);
-        }
-
-        c->codesize = pd(op, out);
-    }
-
-
-    /* store final run */
-    if (lit > 0)
-        op = STORE_RUN(op,ii,lit);
-
-#if defined(LZO_EOF_CODE)
-    *op++ = M3_MARKER | 1;
-    *op++ = 0;
-    *op++ = 0;
-#endif
-
-    c->codesize = pd(op, out);
-    assert(c->textsize == in_len);
-
-    *out_len = pd(op, out);
-
-    if (c->cb && c->cb->nprogress)
-        (*c->cb->nprogress)(c->cb, c->textsize, c->codesize, 0);
-
-#if 0
-    printf("%ld %ld -> %ld: %ld %ld %ld %ld %ld\n",
-        (long) c->textsize, (long)in_len, (long) c->codesize,
-        c->r1_r, c->m3_r, c->m2_m, c->m3_m, c->lazy);
-#endif
-    return LZO_E_OK;
-}
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1c_999_compress  ( const lzo_bytep in , lzo_uint  in_len,
-                            lzo_bytep out, lzo_uintp out_len,
-                            lzo_voidp wrkmem )
-{
-    return lzo1c_999_compress_callback(in,in_len,out,out_len,wrkmem,
-                                       (lzo_callback_p) 0, 0);
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1c_cc.c b/lzo/src/lzo1c_cc.c
deleted file mode 100644
index 9618cf3c..00000000
--- a/lzo/src/lzo1c_cc.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* lzo1c_cc.c -- LZO1C compression internal entry point
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define LZO_NEED_DICT_H 1
-#include "config1c.h"
-
-
-/***********************************************************************
-// compression internal entry point.
-************************************************************************/
-
-int _lzo1c_do_compress   ( const lzo_bytep in,  lzo_uint  in_len,
-                                 lzo_bytep out, lzo_uintp out_len,
-                                 lzo_voidp wrkmem,
-                                 lzo_compress_t func )
-{
-    int r;
-#if defined(LZO_TEST_COMPRESS_OVERRUN)
-    lzo_uint avail_out = *out_len;
-#endif
-
-
-#if (LZO_COLLECT_STATS)
-    _lzo1c_stats_init(lzo_stats);
-    lzo_stats->in_len = in_len;
-#endif
-
-
-    /* don't try to compress a block that's too short */
-    if (in_len == 0)
-    {
-        *out_len = 0;
-        r = LZO_E_OK;
-    }
-    else if (in_len <= MIN_LOOKAHEAD + 1)
-    {
-#if defined(LZO_RETURN_IF_NOT_COMPRESSIBLE)
-        *out_len = 0;
-        r = LZO_E_NOT_COMPRESSIBLE;
-#else
-        *out_len = pd(STORE_RUN(out,in,in_len), out);
-        r = (*out_len > in_len) ? LZO_E_OK : LZO_E_ERROR;
-#endif
-    }
-    else
-        r = func(in,in_len,out,out_len,wrkmem);
-
-
-#if defined(LZO_EOF_CODE)
-#if defined(LZO_TEST_COMPRESS_OVERRUN)
-    if (r == LZO_E_OK && avail_out - *out_len < 3)
-        r = LZO_E_COMPRESS_OVERRUN;
-#endif
-    if (r == LZO_E_OK)
-    {
-        lzo_bytep op = out + *out_len;
-        op[0] = M3_MARKER | 1;
-        op[1] = 0;
-        op[2] = 0;
-        *out_len += 3;
-    }
-#endif
-
-
-#if (LZO_COLLECT_STATS)
-    lzo_stats->out_len = *out_len;
-    lzo_stats->match_bytes =
-       1 * lzo_stats->m1_matches + 2 * lzo_stats->m2_matches +
-       3 * lzo_stats->m3_matches + 4 * lzo_stats->m4_matches;
-    _lzo1c_stats_calc(lzo_stats);
-#endif
-
-    return r;
-}
-
-
-/***********************************************************************
-// note: this is not thread safe, but as it is used for finetuning only
-//       we don't care
-************************************************************************/
-
-#undef lzo_stats
-/* lzo_stats_t is still defined */
-
-
-#if (LZO_COLLECT_STATS)
-
-static lzo_stats_t lzo_statistics;
-lzo_stats_t * const lzo1c_stats = &lzo_statistics;
-
-
-void _lzo1c_stats_init(lzo_stats_t *lzo_stats)
-{
-    lzo_memset(lzo_stats,0,sizeof(*lzo_stats));
-}
-
-
-void _lzo1c_stats_calc(lzo_stats_t *lzo_stats)
-{
-    lzo_stats->matches =
-       lzo_stats->m1_matches + lzo_stats->m2_matches +
-       lzo_stats->m3_matches + lzo_stats->m4_matches;
-
-    lzo_stats->literal_overhead = lzo_stats->lit_runs +
-       2 * (lzo_stats->r0short_runs + lzo_stats->r0fast_runs +
-            lzo_stats->r0long_runs);
-    lzo_stats->literal_bytes = lzo_stats->literals +
-       lzo_stats->literal_overhead;
-
-#if 0
-    assert(lzo_stats->match_bytes + lzo_stats->literal_bytes ==
-       lzo_stats->out_len);
-#endif
-
-    lzo_stats->m2_matches -= lzo_stats->r1_matches;
-    lzo_stats->m2_match[M2_MIN_LEN] -= lzo_stats->r1_matches;
-
-    if (lzo_stats->literals > 0)
-        lzo_stats->literal_overhead_percent =
-           100.0 * lzo_stats->literal_overhead / lzo_stats->literals;
-}
-
-
-#endif
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1c_cc.h b/lzo/src/lzo1c_cc.h
deleted file mode 100644
index c2f081da..00000000
--- a/lzo/src/lzo1c_cc.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* lzo1c_cc.h -- definitions for the the LZO1C compression driver
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO1C_CC_H
-#define __LZO1C_CC_H 1
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-extern const lzo_compress_t _lzo1c_1_compress_func;
-extern const lzo_compress_t _lzo1c_2_compress_func;
-extern const lzo_compress_t _lzo1c_3_compress_func;
-extern const lzo_compress_t _lzo1c_4_compress_func;
-extern const lzo_compress_t _lzo1c_5_compress_func;
-extern const lzo_compress_t _lzo1c_6_compress_func;
-extern const lzo_compress_t _lzo1c_7_compress_func;
-extern const lzo_compress_t _lzo1c_8_compress_func;
-extern const lzo_compress_t _lzo1c_9_compress_func;
-
-extern const lzo_compress_t _lzo1c_99_compress_func;
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_EXTERN(lzo_bytep )
-_lzo1c_store_run ( lzo_bytep const oo, const lzo_bytep const ii,
-                   lzo_uint r_len);
-
-#define STORE_RUN   _lzo1c_store_run
-
-
-lzo_compress_t _lzo1c_get_compress_func(int clevel);
-
-int _lzo1c_do_compress   ( const lzo_bytep in,  lzo_uint  in_len,
-                                 lzo_bytep out, lzo_uintp out_len,
-                                 lzo_voidp wrkmem,
-                                 lzo_compress_t func );
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
-
diff --git a/lzo/src/lzo1c_d1.c b/lzo/src/lzo1c_d1.c
deleted file mode 100644
index 940820cf..00000000
--- a/lzo/src/lzo1c_d1.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1c_d1.c -- LZO1C decompression
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1c.h"
-
-#undef LZO_TEST_OVERRUN
-#define DO_DECOMPRESS       lzo1c_decompress
-
-#include "lzo1b_d.ch"
diff --git a/lzo/src/lzo1c_d2.c b/lzo/src/lzo1c_d2.c
deleted file mode 100644
index b055311f..00000000
--- a/lzo/src/lzo1c_d2.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1c_d2.c -- LZO1C decompression with overrun testing
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1c.h"
-
-#define LZO_TEST_OVERRUN 1
-#define DO_DECOMPRESS       lzo1c_decompress_safe
-
-#include "lzo1b_d.ch"
diff --git a/lzo/src/lzo1c_rr.c b/lzo/src/lzo1c_rr.c
deleted file mode 100644
index 6a516f68..00000000
--- a/lzo/src/lzo1c_rr.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* lzo1c_rr.c -- literal run handling
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1c.h"
-
-#include "lzo1b_r.ch"
diff --git a/lzo/src/lzo1c_xx.c b/lzo/src/lzo1c_xx.c
deleted file mode 100644
index c9af645d..00000000
--- a/lzo/src/lzo1c_xx.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* lzo1c_xx.c -- LZO1C compression public entry point
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1c.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static const lzo_compress_t * const c_funcs [9] =
-{
-    &_lzo1c_1_compress_func,
-    &_lzo1c_2_compress_func,
-    &_lzo1c_3_compress_func,
-    &_lzo1c_4_compress_func,
-    &_lzo1c_5_compress_func,
-    &_lzo1c_6_compress_func,
-    &_lzo1c_7_compress_func,
-    &_lzo1c_8_compress_func,
-    &_lzo1c_9_compress_func
-};
-
-
-lzo_compress_t _lzo1c_get_compress_func(int clevel)
-{
-    const lzo_compress_t *f;
-
-    if (clevel < LZO1C_BEST_SPEED || clevel > LZO1C_BEST_COMPRESSION)
-    {
-        if (clevel == LZO1C_DEFAULT_COMPRESSION)
-            clevel = LZO1C_BEST_SPEED;
-        else
-            return 0;
-    }
-    f = c_funcs[clevel-1];
-    assert(f && *f);
-    return *f;
-}
-
-
-LZO_PUBLIC(int)
-lzo1c_compress ( const lzo_bytep src, lzo_uint  src_len,
-                       lzo_bytep dst, lzo_uintp dst_len,
-                       lzo_voidp wrkmem,
-                       int clevel )
-{
-    lzo_compress_t f;
-
-    f = _lzo1c_get_compress_func(clevel);
-    if (!f)
-        return LZO_E_ERROR;
-    return _lzo1c_do_compress(src,src_len,dst,dst_len,wrkmem,f);
-}
-
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1f_1.c b/lzo/src/lzo1f_1.c
deleted file mode 100644
index 269887ef..00000000
--- a/lzo/src/lzo1f_1.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* lzo1f_1.c -- implementation of the LZO1F-1 compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo_conf.h"
-#include "lzo/lzo1f.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define M2_MAX_OFFSET   0x0800
-#define M3_MAX_OFFSET   0x3fff
-#define M3_MARKER       224
-
-
-#ifndef LZO_HASH
-#define LZO_HASH        LZO_HASH_LZO_INCREMENTAL_A
-#endif
-#define D_BITS          14
-#define D_INDEX1(d,p)   d = DM(DMUL(0x21,DX3(p,5,5,6)) >> 5)
-#define D_INDEX2(d,p)   d = (d & (D_MASK & 0x7ff)) ^ (D_HIGH | 0x1f)
-#include "lzo_dict.h"
-
-
-/***********************************************************************
-// compress a block of data.
-************************************************************************/
-
-static __lzo_noinline
-int do_compress          ( const lzo_bytep in , lzo_uint  in_len,
-                                 lzo_bytep out, lzo_uintp out_len,
-                                 lzo_voidp wrkmem )
-{
-    register const lzo_bytep ip;
-    lzo_bytep op;
-    const lzo_bytep const in_end = in + in_len;
-    const lzo_bytep const ip_end = in + in_len - 9;
-    const lzo_bytep ii;
-    lzo_dict_p const dict = (lzo_dict_p) wrkmem;
-
-    op = out;
-    ip = in;
-    ii = ip;
-
-    ip++;
-    for (;;)
-    {
-        register const lzo_bytep m_pos;
-        LZO_DEFINE_UNINITIALIZED_VAR(lzo_uint, m_off, 0);
-        lzo_uint m_len;
-        lzo_uint dindex;
-        lzo_uint lit;
-
-        DINDEX1(dindex,ip);
-        GINDEX(m_pos,m_off,dict,dindex,in);
-        if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,M3_MAX_OFFSET))
-            goto literal;
-#if 1
-        if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
-            goto try_match;
-        DINDEX2(dindex,ip);
-#endif
-        GINDEX(m_pos,m_off,dict,dindex,in);
-        if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,M3_MAX_OFFSET))
-            goto literal;
-        if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
-            goto try_match;
-        goto literal;
-
-
-try_match:
-#if 0 && defined(LZO_UNALIGNED_OK_2)
-        if (UA_GET16(m_pos) != UA_GET16(ip))
-#else
-        if (m_pos[0] != ip[0] || m_pos[1] != ip[1])
-#endif
-        {
-        }
-        else
-        {
-            if (m_pos[2] == ip[2])
-            {
-                m_pos += 3;
-#if 0
-                if (m_off <= M2_MAX_OFFSET)
-                    goto match;
-                if (lit <= 3)
-                    goto match;
-                if (lit == 3)           /* better compression, but slower */
-                {
-                    assert(op - 2 > out); op[-2] |= LZO_BYTE(3);
-                    *op++ = *ii++; *op++ = *ii++; *op++ = *ii++;
-                    goto code_match;
-                }
-                if (*m_pos == ip[3])
-#endif
-                    goto match;
-            }
-        }
-
-
-    /* a literal */
-literal:
-        UPDATE_I(dict,0,dindex,ip,in);
-        if (++ip >= ip_end)
-            break;
-        continue;
-
-
-    /* a match */
-match:
-        UPDATE_I(dict,0,dindex,ip,in);
-        /* store current literal run */
-        lit = pd(ip,ii);
-        if (lit > 0)
-        {
-            register lzo_uint t = lit;
-
-            if (t < 4 && op > out)
-                op[-2] |= LZO_BYTE(t);
-            else if (t <= 31)
-                *op++ = LZO_BYTE(t);
-            else
-            {
-                register lzo_uint tt = t - 31;
-
-                *op++ = 0;
-                while (tt > 255)
-                {
-                    tt -= 255;
-                    *op++ = 0;
-                }
-                assert(tt > 0);
-                *op++ = LZO_BYTE(tt);
-            }
-            do *op++ = *ii++; while (--t > 0);
-        }
-        assert(ii == ip);
-
-
-        /* code the match */
-        ip += 3;
-        if (*m_pos++ != *ip++ || *m_pos++ != *ip++ || *m_pos++ != *ip++ ||
-            *m_pos++ != *ip++ || *m_pos++ != *ip++ || *m_pos++ != *ip++)
-        {
-            --ip;
-            m_len = pd(ip, ii);
-            assert(m_len >= 3); assert(m_len <= 8);
-
-            if (m_off <= M2_MAX_OFFSET)
-            {
-                m_off -= 1;
-                *op++ = LZO_BYTE(((m_len - 2) << 5) | ((m_off & 7) << 2));
-                *op++ = LZO_BYTE(m_off >> 3);
-            }
-            else if (m_len == 3 && m_off <= 2*M2_MAX_OFFSET && lit > 0)
-            {
-                m_off -= 1;
-                /* m_off -= M2_MAX_OFFSET; */
-                *op++ = LZO_BYTE(((m_off & 7) << 2));
-                *op++ = LZO_BYTE(m_off >> 3);
-            }
-            else
-            {
-                *op++ = LZO_BYTE(M3_MARKER | (m_len - 2));
-                *op++ = LZO_BYTE((m_off & 63) << 2);
-                *op++ = LZO_BYTE(m_off >> 6);
-            }
-        }
-        else
-        {
-            {
-                const lzo_bytep end;
-                end = in_end;
-                while (ip < end && *m_pos == *ip)
-                    m_pos++, ip++;
-                m_len = pd(ip, ii);
-            }
-            assert(m_len >= 3);
-
-            if (m_len <= 33)
-                *op++ = LZO_BYTE(M3_MARKER | (m_len - 2));
-            else
-            {
-                m_len -= 33;
-                *op++ = M3_MARKER | 0;
-                while (m_len > 255)
-                {
-                    m_len -= 255;
-                    *op++ = 0;
-                }
-                assert(m_len > 0);
-                *op++ = LZO_BYTE(m_len);
-            }
-            *op++ = LZO_BYTE((m_off & 63) << 2);
-            *op++ = LZO_BYTE(m_off >> 6);
-        }
-
-        ii = ip;
-        if (ip >= ip_end)
-            break;
-    }
-
-
-    /* store final literal run */
-    if (pd(in_end,ii) > 0)
-    {
-        register lzo_uint t = pd(in_end,ii);
-
-        if (t < 4 && op > out)
-            op[-2] |= LZO_BYTE(t);
-        else if (t <= 31)
-            *op++ = LZO_BYTE(t);
-        else
-        {
-            register lzo_uint tt = t - 31;
-
-            *op++ = 0;
-            while (tt > 255)
-            {
-                tt -= 255;
-                *op++ = 0;
-            }
-            assert(tt > 0);
-            *op++ = LZO_BYTE(tt);
-        }
-        do *op++ = *ii++; while (--t > 0);
-    }
-
-    *out_len = pd(op, out);
-    return LZO_E_OK;
-}
-
-
-/***********************************************************************
-// public entry point
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1f_1_compress ( const lzo_bytep in , lzo_uint  in_len,
-                         lzo_bytep out, lzo_uintp out_len,
-                         lzo_voidp wrkmem )
-{
-    lzo_bytep op = out;
-    int r = LZO_E_OK;
-
-    if (in_len == 0)
-        *out_len = 0;
-    else if (in_len <= 10)
-    {
-        *op++ = LZO_BYTE(in_len);
-        do *op++ = *in++; while (--in_len > 0);
-        *out_len = pd(op, out);
-    }
-    else
-        r = do_compress(in,in_len,out,out_len,wrkmem);
-
-    if (r == LZO_E_OK)
-    {
-        op = out + *out_len;
-        op[0] = M3_MARKER | 1;
-        op[1] = 0;
-        op[2] = 0;
-        *out_len += 3;
-    }
-
-    return r;
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1f_9x.c b/lzo/src/lzo1f_9x.c
deleted file mode 100644
index 3846651a..00000000
--- a/lzo/src/lzo1f_9x.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/* lzo1f_9x.c -- implementation of the LZO1F-999 compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1f.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define SWD_N           16383           /* size of ring buffer */
-#define SWD_THRESHOLD       2           /* lower limit for match length */
-#define SWD_F            2048           /* upper limit for match length */
-
-
-#define LZO1F 1
-#define LZO_COMPRESS_T  lzo1f_999_t
-#define lzo_swd_t       lzo1f_999_swd_t
-#include "lzo_mchw.ch"
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static lzo_bytep
-code_match ( LZO_COMPRESS_T *c, lzo_bytep op, lzo_uint m_len, lzo_uint m_off )
-{
-    if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET)
-    {
-        m_off -= 1;
-        *op++ = LZO_BYTE(((m_len - 2) << 5) | ((m_off & 7) << 2));
-        *op++ = LZO_BYTE(m_off >> 3);
-        c->m2_m++;
-    }
-    else if (m_len == M2_MIN_LEN && m_off <= 2 * M2_MAX_OFFSET &&
-             c->r1_lit > 0)
-    {
-        assert(m_off > M2_MAX_OFFSET);
-        m_off -= 1 + M2_MAX_OFFSET;
-        *op++ = LZO_BYTE(((m_off & 7) << 2));
-        *op++ = LZO_BYTE(m_off >> 3);
-        c->r1_r++;
-    }
-    else
-    {
-        if (m_len <= M3_MAX_LEN)
-            *op++ = LZO_BYTE(M3_MARKER | (m_len - 2));
-        else
-        {
-            m_len -= M3_MAX_LEN;
-            *op++ = M3_MARKER | 0;
-            while (m_len > 255)
-            {
-                m_len -= 255;
-                *op++ = 0;
-            }
-            assert(m_len > 0);
-            *op++ = LZO_BYTE(m_len);
-        }
-        *op++ = LZO_BYTE((m_off & 63) << 2);
-        *op++ = LZO_BYTE(m_off >> 6);
-        c->m3_m++;
-    }
-
-    return op;
-}
-
-
-static lzo_bytep
-STORE_RUN ( lzo_bytep op, const lzo_bytep ii, lzo_uint t, lzo_bytep out )
-{
-    if (t < 4 && op > out)
-        op[-2] |= LZO_BYTE(t);
-    else if (t <= 31)
-        *op++ = LZO_BYTE(t);
-    else
-    {
-        lzo_uint tt = t - 31;
-
-        *op++ = 0;
-        while (tt > 255)
-        {
-            tt -= 255;
-            *op++ = 0;
-        }
-        assert(tt > 0);
-        *op++ = LZO_BYTE(tt);
-    }
-    do *op++ = *ii++; while (--t > 0);
-
-    return op;
-}
-
-
-/***********************************************************************
-// this is a public function, but there is no prototype in a header file
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1f_999_compress_callback ( const lzo_bytep in , lzo_uint  in_len,
-                                    lzo_bytep out, lzo_uintp out_len,
-                                    lzo_voidp wrkmem,
-                                    lzo_callback_p cb,
-                                    lzo_uint max_chain );
-
-LZO_PUBLIC(int)
-lzo1f_999_compress_callback ( const lzo_bytep in , lzo_uint  in_len,
-                                    lzo_bytep out, lzo_uintp out_len,
-                                    lzo_voidp wrkmem,
-                                    lzo_callback_p cb,
-                                    lzo_uint max_chain )
-{
-    lzo_bytep op;
-    const lzo_bytep ii;
-    lzo_uint lit;
-    lzo_uint m_len, m_off;
-    LZO_COMPRESS_T cc;
-    LZO_COMPRESS_T * const c = &cc;
-    lzo_swd_p const swd = (lzo_swd_p) wrkmem;
-    int r;
-
-    /* sanity check */
-    LZO_COMPILE_TIME_ASSERT(LZO1F_999_MEM_COMPRESS >= SIZEOF_LZO_SWD_T)
-
-    c->init = 0;
-    c->ip = c->in = in;
-    c->in_end = in + in_len;
-    c->cb = cb;
-    c->r1_r = c->m2_m = c->m3_m = 0;
-
-    op = out;
-    ii = c->ip;             /* point to start of literal run */
-    lit = 0;
-    c->r1_lit = c->r1_m_len = 0;
-
-    r = init_match(c,swd,NULL,0,0);
-    if (r != 0)
-        return r;
-    if (max_chain > 0)
-        swd->max_chain = max_chain;
-
-    r = find_match(c,swd,0,0);
-    if (r != 0)
-        return r;
-    while (c->look > 0)
-    {
-        int lazy_match_min_gain = -1;
-        lzo_uint ahead = 0;
-
-        m_len = c->m_len;
-        m_off = c->m_off;
-
-        assert(c->ip - c->look >= in);
-        if (lit == 0)
-            ii = c->ip - c->look;
-        assert(ii + lit == c->ip - c->look);
-        assert(swd->b_char == *(c->ip - c->look));
-
-        if ((m_len < M2_MIN_LEN) ||
-            (m_len < M3_MIN_LEN && m_off > M2_MAX_OFFSET))
-        {
-            m_len = 0;
-        }
-        else
-        {
-            assert(c->ip - c->look - m_off >= in);
-            assert(c->ip - c->look - m_off + m_len < c->ip);
-            assert(lzo_memcmp(c->ip - c->look, c->ip - c->look - m_off,
-                              m_len) == 0);
-
-            if (lit < 3)
-                lazy_match_min_gain = 1;
-            else if (lit == 3)
-                lazy_match_min_gain = 3;
-            else if (lit == 31)
-                lazy_match_min_gain = 3;
-            else
-                lazy_match_min_gain = 1;
-        }
-
-        /* try a lazy match */
-        if (m_len > 0 && lazy_match_min_gain >= 0 && c->look > m_len)
-        {
-            r = find_match(c,swd,1,0);
-            assert(r == 0); LZO_UNUSED(r);
-            assert(c->look > 0);
-
-            if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET &&
-                c->m_off > M2_MAX_OFFSET)
-            {
-                lazy_match_min_gain += 1;
-            }
-            else if (c->m_len <= M2_MAX_LEN &&
-                     c->m_off <= M2_MAX_OFFSET &&
-                     m_off > M2_MAX_OFFSET)
-            {
-                if (lazy_match_min_gain > 0)
-                    lazy_match_min_gain -= 1;
-            }
-            else if (m_len == M2_MIN_LEN && c->m_len == M2_MIN_LEN &&
-                     c->m_off <= 2 * M2_MAX_OFFSET &&
-                     m_off > M2_MAX_OFFSET)
-            {
-                if (lazy_match_min_gain > 0)
-                    lazy_match_min_gain -= 1;
-            }
-
-            if (c->m_len >= m_len + lazy_match_min_gain)
-            {
-                c->lazy++;
-#if !defined(NDEBUG)
-                m_len = c->m_len;
-                m_off = c->m_off;
-                assert(lzo_memcmp(c->ip - c->look, c->ip - c->look - m_off,
-                                  m_len) == 0);
-#endif
-                lit++;
-                assert(ii + lit == c->ip - c->look);
-                continue;
-            }
-            else
-            {
-                ahead = 1;
-                assert(ii + lit + 1 == c->ip - c->look);
-            }
-            assert(m_len > 0);
-        }
-        assert(ii + lit + ahead == c->ip - c->look);
-
-
-        if (m_len == 0)
-        {
-            /* a literal */
-            lit++;
-            r = find_match(c,swd,1,0);
-            assert(r == 0); LZO_UNUSED(r);
-        }
-        else
-        {
-            /* 1 - store run */
-            if (lit > 0)
-            {
-                op = STORE_RUN(op,ii,lit,out);
-                c->r1_m_len = m_len;
-                c->r1_lit = lit;
-                lit = 0;
-            }
-            else
-                c->r1_lit = c->r1_m_len = 0;
-
-            /* 2 - code match */
-            op = code_match(c,op,m_len,m_off);
-            r = find_match(c,swd,m_len,1+ahead);
-            assert(r == 0); LZO_UNUSED(r);
-        }
-
-        c->codesize = pd(op, out);
-    }
-
-
-    /* store final run */
-    if (lit > 0)
-        op = STORE_RUN(op,ii,lit,out);
-
-#if defined(LZO_EOF_CODE)
-    *op++ = M3_MARKER | 1;
-    *op++ = 0;
-    *op++ = 0;
-#endif
-
-    c->codesize = pd(op, out);
-    assert(c->textsize == in_len);
-
-    *out_len = pd(op, out);
-
-    if (c->cb && c->cb->nprogress)
-        (*c->cb->nprogress)(c->cb, c->textsize, c->codesize, 0);
-
-#if 0
-    printf("%ld %ld -> %ld: %ld %ld %ld %ld\n",
-        (long) c->textsize, (long)in_len, (long) c->codesize,
-        c->r1_r, c->m2_m, c->m3_m, c->lazy);
-#endif
-    return LZO_E_OK;
-}
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1f_999_compress  ( const lzo_bytep in , lzo_uint  in_len,
-                            lzo_bytep out, lzo_uintp out_len,
-                            lzo_voidp wrkmem )
-{
-    return lzo1f_999_compress_callback(in,in_len,out,out_len,wrkmem,
-                                       (lzo_callback_p) 0, 0);
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1f_d.ch b/lzo/src/lzo1f_d.ch
deleted file mode 100644
index 9e942f51..00000000
--- a/lzo/src/lzo1f_d.ch
+++ /dev/null
@@ -1,226 +0,0 @@
-/* lzo1f_d.ch -- implementation of the LZO1F decompression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo1_d.ch"
-
-
-/***********************************************************************
-// decompress a block of data.
-************************************************************************/
-
-LZO_PUBLIC(int)
-DO_DECOMPRESS  ( const lzo_bytep in , lzo_uint  in_len,
-                       lzo_bytep out, lzo_uintp out_len,
-                       lzo_voidp wrkmem )
-{
-    register lzo_bytep op;
-    register const lzo_bytep ip;
-    register lzo_uint t;
-    register const lzo_bytep m_pos;
-
-    const lzo_bytep const ip_end = in + in_len;
-#if defined(HAVE_ANY_OP)
-    lzo_bytep const op_end = out + *out_len;
-#endif
-
-    LZO_UNUSED(wrkmem);
-
-    *out_len = 0;
-
-    op = out;
-    ip = in;
-
-    while (TEST_IP && TEST_OP)
-    {
-        t = *ip++;
-        if (t > 31)
-            goto match;
-
-        /* a literal run */
-        if (t == 0)
-        {
-            NEED_IP(1);
-            while (*ip == 0)
-            {
-                t += 255;
-                ip++;
-                NEED_IP(1);
-            }
-            t += 31 + *ip++;
-        }
-        /* copy literals */
-        assert(t > 0); NEED_OP(t); NEED_IP(t+1);
-#if defined(LZO_UNALIGNED_OK_4)
-        if (t >= 4)
-        {
-            do {
-                UA_COPY32(op, ip);
-                op += 4; ip += 4; t -= 4;
-            } while (t >= 4);
-            if (t > 0) do *op++ = *ip++; while (--t > 0);
-        }
-        else
-#endif
-        do *op++ = *ip++; while (--t > 0);
-
-        t = *ip++;
-
-        while (TEST_IP && TEST_OP)
-        {
-            /* handle matches */
-            if (t < 32)
-            {
-                m_pos = op - 1 - 0x800;
-                m_pos -= (t >> 2) & 7;
-                m_pos -= *ip++ << 3;
-                TEST_LB(m_pos); NEED_OP(3);
-                *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos++;
-            }
-            else
-            {
-match:
-                if (t < M3_MARKER)
-                {
-                    m_pos = op - 1;
-                    m_pos -= (t >> 2) & 7;
-                    m_pos -= *ip++ << 3;
-                    t >>= 5;
-                    TEST_LB(m_pos); assert(t > 0); NEED_OP(t+3-1);
-                    goto copy_match;
-                }
-                else
-                {
-                    t &= 31;
-                    if (t == 0)
-                    {
-                        NEED_IP(1);
-                        while (*ip == 0)
-                        {
-                            t += 255;
-                            ip++;
-                            NEED_IP(1);
-                        }
-                        t += 31 + *ip++;
-                    }
-                    NEED_IP(2);
-                    m_pos = op;
-#if defined(LZO_UNALIGNED_OK_2) && defined(LZO_ABI_LITTLE_ENDIAN)
-                    m_pos -= UA_GET16(ip) >> 2;
-                    ip += 2;
-#else
-                    m_pos -= *ip++ >> 2;
-                    m_pos -= *ip++ << 6;
-#endif
-                    if (m_pos == op)
-                        goto eof_found;
-                }
-
-                /* copy match */
-                TEST_LB(m_pos); assert(t > 0); NEED_OP(t+3-1);
-#if defined(LZO_UNALIGNED_OK_4)
-                if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4)
-                {
-                    UA_COPY32(op, m_pos);
-                    op += 4; m_pos += 4; t -= 4 - (3 - 1);
-                    do {
-                        UA_COPY32(op, m_pos);
-                        op += 4; m_pos += 4; t -= 4;
-                    } while (t >= 4);
-                    if (t > 0) do *op++ = *m_pos++; while (--t > 0);
-                }
-                else
-#endif
-                {
-copy_match:
-                *op++ = *m_pos++; *op++ = *m_pos++;
-                do *op++ = *m_pos++; while (--t > 0);
-                }
-            }
-            t = ip[-2] & 3;
-            if (t == 0)
-                break;
-
-            /* copy literals */
-            assert(t > 0); NEED_OP(t); NEED_IP(t+1);
-            do *op++ = *ip++; while (--t > 0);
-            t = *ip++;
-        }
-    }
-
-#if defined(HAVE_TEST_IP) || defined(HAVE_TEST_OP)
-    /* no EOF code was found */
-    *out_len = pd(op, out);
-    return LZO_E_EOF_NOT_FOUND;
-#endif
-
-eof_found:
-    assert(t == 1);
-    *out_len = pd(op, out);
-    return (ip == ip_end ? LZO_E_OK :
-           (ip < ip_end  ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
-
-
-#if defined(HAVE_NEED_IP)
-input_overrun:
-    *out_len = pd(op, out);
-    return LZO_E_INPUT_OVERRUN;
-#endif
-
-#if defined(HAVE_NEED_OP)
-output_overrun:
-    *out_len = pd(op, out);
-    return LZO_E_OUTPUT_OVERRUN;
-#endif
-
-#if defined(LZO_TEST_OVERRUN_LOOKBEHIND)
-lookbehind_overrun:
-    *out_len = pd(op, out);
-    return LZO_E_LOOKBEHIND_OVERRUN;
-#endif
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1f_d1.c b/lzo/src/lzo1f_d1.c
deleted file mode 100644
index 0b80696d..00000000
--- a/lzo/src/lzo1f_d1.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1f_d1.c -- LZO1F decompression
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1f.h"
-
-#undef LZO_TEST_OVERRUN
-#define DO_DECOMPRESS       lzo1f_decompress
-
-#include "lzo1f_d.ch"
diff --git a/lzo/src/lzo1f_d2.c b/lzo/src/lzo1f_d2.c
deleted file mode 100644
index 7bc407d1..00000000
--- a/lzo/src/lzo1f_d2.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1f_d2.c -- LZO1F decompression with overrun testing
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1f.h"
-
-#define LZO_TEST_OVERRUN 1
-#define DO_DECOMPRESS       lzo1f_decompress_safe
-
-#include "lzo1f_d.ch"
diff --git a/lzo/src/lzo1x_1.c b/lzo/src/lzo1x_1.c
deleted file mode 100644
index ca60c44a..00000000
--- a/lzo/src/lzo1x_1.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* lzo1x_1.c -- LZO1X-1 compression
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo_conf.h"
-#if 1 && defined(UA_GET32)
-#undef  LZO_DICT_USE_PTR
-#define LZO_DICT_USE_PTR 0
-#undef  lzo_dict_t
-#define lzo_dict_t unsigned short
-#endif
-
-#define LZO_NEED_DICT_H 1
-#ifndef D_BITS
-#define D_BITS          14
-#endif
-#define D_INDEX1(d,p)       d = DM(DMUL(0x21,DX3(p,5,5,6)) >> 5)
-#define D_INDEX2(d,p)       d = (d & (D_MASK & 0x7ff)) ^ (D_HIGH | 0x1f)
-#if 1
-#define DINDEX(dv,p)        DM(((DMUL(0x1824429d,dv)) >> (32-D_BITS)))
-#else
-#define DINDEX(dv,p)        DM((dv) + ((dv) >> (32-D_BITS)))
-#endif
-#include "config1x.h"
-#define LZO_DETERMINISTIC !(LZO_DICT_USE_PTR)
-
-#ifndef DO_COMPRESS
-#define DO_COMPRESS     lzo1x_1_compress
-#endif
-
-#include "lzo1x_c.ch"
diff --git a/lzo/src/lzo1x_1k.c b/lzo/src/lzo1x_1k.c
deleted file mode 100644
index 4d312221..00000000
--- a/lzo/src/lzo1x_1k.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* lzo1x_1k.c -- LZO1X-1(11) compression (needs only 8kB work memory)
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo_conf.h"
-#if 1 && defined(UA_GET32)
-#undef  LZO_DICT_USE_PTR
-#define LZO_DICT_USE_PTR 0
-#undef  lzo_dict_t
-#define lzo_dict_t unsigned short
-#endif
-
-#define LZO_NEED_DICT_H 1
-#ifndef D_BITS
-#define D_BITS          11
-#endif
-#define D_INDEX1(d,p)       d = DM(DMUL(0x21,DX2(p,3,5)) >> 5)
-#define D_INDEX2(d,p)       d = d ^ D_MASK
-#if 1
-#define DINDEX(dv,p)        DM(((DMUL(0x1824429d,dv)) >> (32-D_BITS)))
-#else
-#define DINDEX(dv,p)        DM((dv) + ((dv) >> (32-D_BITS)))
-#endif
-#include "config1x.h"
-#define LZO_DETERMINISTIC !(LZO_DICT_USE_PTR)
-
-#ifndef DO_COMPRESS
-#define DO_COMPRESS     lzo1x_1_11_compress
-#endif
-
-#include "lzo1x_c.ch"
diff --git a/lzo/src/lzo1x_1l.c b/lzo/src/lzo1x_1l.c
deleted file mode 100644
index 018bedd9..00000000
--- a/lzo/src/lzo1x_1l.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* lzo1x_1l.c -- LZO1X-1(12) compression
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo_conf.h"
-#if 1 && defined(UA_GET32)
-#undef  LZO_DICT_USE_PTR
-#define LZO_DICT_USE_PTR 0
-#undef  lzo_dict_t
-#define lzo_dict_t unsigned short
-#endif
-
-#define LZO_NEED_DICT_H 1
-#ifndef D_BITS
-#define D_BITS          12
-#endif
-#define D_INDEX1(d,p)       d = DM(DMUL(0x21,DX2(p,4,5)) >> 5)
-#define D_INDEX2(d,p)       d = d ^ D_MASK
-#if 1
-#define DINDEX(dv,p)        DM(((DMUL(0x1824429d,dv)) >> (32-D_BITS)))
-#else
-#define DINDEX(dv,p)        DM((dv) + ((dv) >> (32-D_BITS)))
-#endif
-#include "config1x.h"
-#define LZO_DETERMINISTIC !(LZO_DICT_USE_PTR)
-
-#ifndef DO_COMPRESS
-#define DO_COMPRESS     lzo1x_1_12_compress
-#endif
-
-#include "lzo1x_c.ch"
diff --git a/lzo/src/lzo1x_1o.c b/lzo/src/lzo1x_1o.c
deleted file mode 100644
index b3cba7e0..00000000
--- a/lzo/src/lzo1x_1o.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* lzo1x_1o.c -- LZO1X-1(15) compression
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo_conf.h"
-#if 1 && defined(UA_GET32)
-#undef  LZO_DICT_USE_PTR
-#define LZO_DICT_USE_PTR 0
-#undef  lzo_dict_t
-#define lzo_dict_t unsigned short
-#define D_BITS 13
-#endif
-
-#define LZO_NEED_DICT_H 1
-#ifndef D_BITS
-#define D_BITS          15
-#endif
-#define D_INDEX1(d,p)       d = DM(DMUL(0x21,DX3(p,5,5,6)) >> 5)
-#define D_INDEX2(d,p)       d = (d & (D_MASK & 0x7ff)) ^ (D_HIGH | 0x1f)
-#if 1
-#define DINDEX(dv,p)        DM(((DMUL(0x1824429d,dv)) >> (32-D_BITS)))
-#else
-#define DINDEX(dv,p)        DM((dv) + ((dv) >> (32-D_BITS)))
-#endif
-#include "config1x.h"
-#define LZO_DETERMINISTIC !(LZO_DICT_USE_PTR)
-
-#ifndef DO_COMPRESS
-#define DO_COMPRESS     lzo1x_1_15_compress
-#endif
-
-#include "lzo1x_c.ch"
diff --git a/lzo/src/lzo1x_9x.c b/lzo/src/lzo1x_9x.c
deleted file mode 100644
index f910a69e..00000000
--- a/lzo/src/lzo1x_9x.c
+++ /dev/null
@@ -1,885 +0,0 @@
-/* lzo1x_9x.c -- implementation of the LZO1X-999 compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#if !defined(LZO1X) && !defined(LZO1Y) && !defined(LZO1Z)
-#  define LZO1X 1
-#endif
-
-#if defined(LZO1X)
-#  include "config1x.h"
-#elif defined(LZO1Y)
-#  include "config1y.h"
-#elif defined(LZO1Z)
-#  include "config1z.h"
-#else
-#  error
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define SWD_N           M4_MAX_OFFSET   /* size of ring buffer */
-#define SWD_THRESHOLD       1           /* lower limit for match length */
-#define SWD_F            2048           /* upper limit for match length */
-
-#define SWD_BEST_OFF    (LZO_MAX3( M2_MAX_LEN, M3_MAX_LEN, M4_MAX_LEN ) + 1)
-
-#if defined(LZO1X)
-#  define LZO_COMPRESS_T                lzo1x_999_t
-#  define lzo_swd_t                     lzo1x_999_swd_t
-#elif defined(LZO1Y)
-#  define LZO_COMPRESS_T                lzo1y_999_t
-#  define lzo_swd_t                     lzo1y_999_swd_t
-#  define lzo1x_999_compress_internal   lzo1y_999_compress_internal
-#  define lzo1x_999_compress_dict       lzo1y_999_compress_dict
-#  define lzo1x_999_compress_level      lzo1y_999_compress_level
-#  define lzo1x_999_compress            lzo1y_999_compress
-#elif defined(LZO1Z)
-#  define LZO_COMPRESS_T                lzo1z_999_t
-#  define lzo_swd_t                     lzo1z_999_swd_t
-#  define lzo1x_999_compress_internal   lzo1z_999_compress_internal
-#  define lzo1x_999_compress_dict       lzo1z_999_compress_dict
-#  define lzo1x_999_compress_level      lzo1z_999_compress_level
-#  define lzo1x_999_compress            lzo1z_999_compress
-#else
-#  error
-#endif
-
-#if 0
-#  define HEAD3(b,p) \
-    ((((((lzo_xint)b[p]<<3)^b[p+1])<<3)^b[p+2]) & (SWD_HSIZE-1))
-#endif
-#if 0 && defined(LZO_UNALIGNED_OK_4) && defined(LZO_ABI_LITTLE_ENDIAN)
-#  define HEAD3(b,p) \
-    (((* (lzo_uint32p) &b[p]) ^ ((* (lzo_uint32p) &b[p])>>10)) & (SWD_HSIZE-1))
-#endif
-
-#include "lzo_mchw.ch"
-
-
-/* this is a public functions, but there is no prototype in a header file */
-LZO_EXTERN(int)
-lzo1x_999_compress_internal ( const lzo_bytep in , lzo_uint  in_len,
-                                    lzo_bytep out, lzo_uintp out_len,
-                                    lzo_voidp wrkmem,
-                              const lzo_bytep dict, lzo_uint dict_len,
-                                    lzo_callback_p cb,
-                                    int try_lazy_parm,
-                                    lzo_uint good_length,
-                                    lzo_uint max_lazy,
-                                    lzo_uint nice_length,
-                                    lzo_uint max_chain,
-                                    lzo_uint32 flags );
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static lzo_bytep
-code_match ( LZO_COMPRESS_T *c, lzo_bytep op, lzo_uint m_len, lzo_uint m_off )
-{
-    lzo_uint x_len = m_len;
-    lzo_uint x_off = m_off;
-
-    c->match_bytes += (unsigned long) m_len;
-
-#if 0
-/*
-    static lzo_uint last_m_len = 0, last_m_off = 0;
-    static lzo_uint prev_m_off[4];
-    static unsigned prev_m_off_ptr = 0;
-    unsigned i;
-
-    //if (m_len >= 3 && m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET)
-    if (m_len >= 3 && m_len <= M2_MAX_LEN)
-    {
-    //if (m_len == last_m_len && m_off == last_m_off)
-        //printf("last_m_len + last_m_off\n");
-    //else
-    if (m_off == last_m_off)
-        printf("last_m_off\n");
-    else
-    {
-        for (i = 0; i < 4; i++)
-            if (m_off == prev_m_off[i])
-                printf("prev_m_off %u: %5ld\n",i,(long)m_off);
-    }
-    }
-    last_m_len = m_len;
-    last_m_off = prev_m_off[prev_m_off_ptr] = m_off;
-    prev_m_off_ptr = (prev_m_off_ptr + 1) & 3;
-*/
-#endif
-
-    assert(op > c->out);
-    if (m_len == 2)
-    {
-        assert(m_off <= M1_MAX_OFFSET);
-        assert(c->r1_lit > 0); assert(c->r1_lit < 4);
-        m_off -= 1;
-#if defined(LZO1Z)
-        *op++ = LZO_BYTE(M1_MARKER | (m_off >> 6));
-        *op++ = LZO_BYTE(m_off << 2);
-#else
-        *op++ = LZO_BYTE(M1_MARKER | ((m_off & 3) << 2));
-        *op++ = LZO_BYTE(m_off >> 2);
-#endif
-        c->m1a_m++;
-    }
-#if defined(LZO1Z)
-    else if (m_len <= M2_MAX_LEN && (m_off <= M2_MAX_OFFSET || m_off == c->last_m_off))
-#else
-    else if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET)
-#endif
-    {
-        assert(m_len >= 3);
-#if defined(LZO1X)
-        m_off -= 1;
-        *op++ = LZO_BYTE(((m_len - 1) << 5) | ((m_off & 7) << 2));
-        *op++ = LZO_BYTE(m_off >> 3);
-        assert(op[-2] >= M2_MARKER);
-#elif defined(LZO1Y)
-        m_off -= 1;
-        *op++ = LZO_BYTE(((m_len + 1) << 4) | ((m_off & 3) << 2));
-        *op++ = LZO_BYTE(m_off >> 2);
-        assert(op[-2] >= M2_MARKER);
-#elif defined(LZO1Z)
-        if (m_off == c->last_m_off)
-            *op++ = LZO_BYTE(((m_len - 1) << 5) | (0x700 >> 6));
-        else
-        {
-            m_off -= 1;
-            *op++ = LZO_BYTE(((m_len - 1) << 5) | (m_off >> 6));
-            *op++ = LZO_BYTE(m_off << 2);
-        }
-#endif
-        c->m2_m++;
-    }
-    else if (m_len == M2_MIN_LEN && m_off <= MX_MAX_OFFSET && c->r1_lit >= 4)
-    {
-        assert(m_len == 3);
-        assert(m_off > M2_MAX_OFFSET);
-        m_off -= 1 + M2_MAX_OFFSET;
-#if defined(LZO1Z)
-        *op++ = LZO_BYTE(M1_MARKER | (m_off >> 6));
-        *op++ = LZO_BYTE(m_off << 2);
-#else
-        *op++ = LZO_BYTE(M1_MARKER | ((m_off & 3) << 2));
-        *op++ = LZO_BYTE(m_off >> 2);
-#endif
-        c->m1b_m++;
-    }
-    else if (m_off <= M3_MAX_OFFSET)
-    {
-        assert(m_len >= 3);
-        m_off -= 1;
-        if (m_len <= M3_MAX_LEN)
-            *op++ = LZO_BYTE(M3_MARKER | (m_len - 2));
-        else
-        {
-            m_len -= M3_MAX_LEN;
-            *op++ = M3_MARKER | 0;
-            while (m_len > 255)
-            {
-                m_len -= 255;
-                *op++ = 0;
-            }
-            assert(m_len > 0);
-            *op++ = LZO_BYTE(m_len);
-        }
-#if defined(LZO1Z)
-        *op++ = LZO_BYTE(m_off >> 6);
-        *op++ = LZO_BYTE(m_off << 2);
-#else
-        *op++ = LZO_BYTE(m_off << 2);
-        *op++ = LZO_BYTE(m_off >> 6);
-#endif
-        c->m3_m++;
-    }
-    else
-    {
-        lzo_uint k;
-
-        assert(m_len >= 3);
-        assert(m_off > 0x4000); assert(m_off <= 0xbfff);
-        m_off -= 0x4000;
-        k = (m_off & 0x4000) >> 11;
-        if (m_len <= M4_MAX_LEN)
-            *op++ = LZO_BYTE(M4_MARKER | k | (m_len - 2));
-        else
-        {
-            m_len -= M4_MAX_LEN;
-            *op++ = LZO_BYTE(M4_MARKER | k | 0);
-            while (m_len > 255)
-            {
-                m_len -= 255;
-                *op++ = 0;
-            }
-            assert(m_len > 0);
-            *op++ = LZO_BYTE(m_len);
-        }
-#if defined(LZO1Z)
-        *op++ = LZO_BYTE(m_off >> 6);
-        *op++ = LZO_BYTE(m_off << 2);
-#else
-        *op++ = LZO_BYTE(m_off << 2);
-        *op++ = LZO_BYTE(m_off >> 6);
-#endif
-        c->m4_m++;
-    }
-
-    c->last_m_len = x_len;
-    c->last_m_off = x_off;
-    return op;
-}
-
-
-static lzo_bytep
-STORE_RUN ( LZO_COMPRESS_T *c, lzo_bytep op, const lzo_bytep ii, lzo_uint t )
-{
-    c->lit_bytes += (unsigned long) t;
-
-    if (op == c->out && t <= 238)
-    {
-        *op++ = LZO_BYTE(17 + t);
-    }
-    else if (t <= 3)
-    {
-#if defined(LZO1Z)
-        op[-1] |= LZO_BYTE(t);
-#else
-        op[-2] |= LZO_BYTE(t);
-#endif
-        c->lit1_r++;
-    }
-    else if (t <= 18)
-    {
-        *op++ = LZO_BYTE(t - 3);
-        c->lit2_r++;
-    }
-    else
-    {
-        lzo_uint tt = t - 18;
-
-        *op++ = 0;
-        while (tt > 255)
-        {
-            tt -= 255;
-            *op++ = 0;
-        }
-        assert(tt > 0);
-        *op++ = LZO_BYTE(tt);
-        c->lit3_r++;
-    }
-    do *op++ = *ii++; while (--t > 0);
-
-    return op;
-}
-
-
-static lzo_bytep
-code_run ( LZO_COMPRESS_T *c, lzo_bytep op, const lzo_bytep ii,
-           lzo_uint lit, lzo_uint m_len )
-{
-    if (lit > 0)
-    {
-        assert(m_len >= 2);
-        op = STORE_RUN(c,op,ii,lit);
-        c->r1_m_len = m_len;
-        c->r1_lit = lit;
-    }
-    else
-    {
-        assert(m_len >= 3);
-        c->r1_m_len = 0;
-        c->r1_lit = 0;
-    }
-
-    return op;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static lzo_uint
-len_of_coded_match ( lzo_uint m_len, lzo_uint m_off, lzo_uint lit )
-{
-    lzo_uint n = 4;
-
-    if (m_len < 2)
-        return 0;
-    if (m_len == 2)
-        return (m_off <= M1_MAX_OFFSET && lit > 0 && lit < 4) ? 2 : 0;
-    if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET)
-        return 2;
-    if (m_len == M2_MIN_LEN && m_off <= MX_MAX_OFFSET && lit >= 4)
-        return 2;
-    if (m_off <= M3_MAX_OFFSET)
-    {
-        if (m_len <= M3_MAX_LEN)
-            return 3;
-        m_len -= M3_MAX_LEN;
-        while (m_len > 255)
-        {
-            m_len -= 255;
-            n++;
-        }
-        return n;
-    }
-    if (m_off <= M4_MAX_OFFSET)
-    {
-        if (m_len <= M4_MAX_LEN)
-            return 3;
-        m_len -= M4_MAX_LEN;
-        while (m_len > 255)
-        {
-            m_len -= 255;
-            n++;
-        }
-        return n;
-    }
-    return 0;
-}
-
-
-static lzo_uint
-min_gain(lzo_uint ahead, lzo_uint lit1, lzo_uint lit2, lzo_uint l1, lzo_uint l2, lzo_uint l3)
-{
-    lzo_uint lazy_match_min_gain;
-
-    assert (ahead >= 1);
-    lazy_match_min_gain = ahead;
-
-#if 0
-    if (l3)
-        lit2 -= ahead;
-#endif
-
-    if (lit1 <= 3)
-        lazy_match_min_gain += (lit2 <= 3) ? 0 : 2;
-    else if (lit1 <= 18)
-        lazy_match_min_gain += (lit2 <= 18) ? 0 : 1;
-
-    lazy_match_min_gain += (l2 - l1) * 2;
-    if (l3)
-        lazy_match_min_gain -= (ahead - l3) * 2;
-
-    if ((lzo_int) lazy_match_min_gain < 0)
-        lazy_match_min_gain = 0;
-
-#if 0
-    if (l1 == 2)
-        if (lazy_match_min_gain == 0)
-            lazy_match_min_gain = 1;
-#endif
-
-    return lazy_match_min_gain;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if !defined(NDEBUG)
-static
-void assert_match( const lzo_swd_p swd, lzo_uint m_len, lzo_uint m_off )
-{
-    const LZO_COMPRESS_T *c = swd->c;
-    lzo_uint d_off;
-
-    assert(m_len >= 2);
-    if (m_off <= (lzo_uint) (c->bp - c->in))
-    {
-        assert(c->bp - m_off + m_len < c->ip);
-        assert(lzo_memcmp(c->bp, c->bp - m_off, m_len) == 0);
-    }
-    else
-    {
-        assert(swd->dict != NULL);
-        d_off = m_off - (lzo_uint) (c->bp - c->in);
-        assert(d_off <= swd->dict_len);
-        if (m_len > d_off)
-        {
-            assert(lzo_memcmp(c->bp, swd->dict_end - d_off, d_off) == 0);
-            assert(c->in + m_len - d_off < c->ip);
-            assert(lzo_memcmp(c->bp + d_off, c->in, m_len - d_off) == 0);
-        }
-        else
-        {
-            assert(lzo_memcmp(c->bp, swd->dict_end - d_off, m_len) == 0);
-        }
-    }
-}
-#else
-#  define assert_match(a,b,c)   ((void)0)
-#endif
-
-
-#if defined(SWD_BEST_OFF)
-
-static void
-better_match ( const lzo_swd_p swd, lzo_uint *m_len, lzo_uint *m_off )
-{
-#if defined(LZO1Z)
-    const LZO_COMPRESS_T *c = swd->c;
-#endif
-
-    if (*m_len <= M2_MIN_LEN)
-        return;
-#if defined(LZO1Z)
-    if (*m_off == c->last_m_off && *m_len <= M2_MAX_LEN)
-        return;
-#if 1
-    if (*m_len >= M2_MIN_LEN + 1 && *m_len <= M2_MAX_LEN + 1 &&
-        c->last_m_off && swd->best_off[*m_len-1] == c->last_m_off)
-    {
-        *m_len = *m_len - 1;
-        *m_off = swd->best_off[*m_len];
-        return;
-    }
-#endif
-#endif
-
-    if (*m_off <= M2_MAX_OFFSET)
-        return;
-
-#if 1
-    /* M3/M4 -> M2 */
-    if (*m_off > M2_MAX_OFFSET &&
-        *m_len >= M2_MIN_LEN + 1 && *m_len <= M2_MAX_LEN + 1 &&
-        swd->best_off[*m_len-1] && swd->best_off[*m_len-1] <= M2_MAX_OFFSET)
-    {
-        *m_len = *m_len - 1;
-        *m_off = swd->best_off[*m_len];
-        return;
-    }
-#endif
-
-#if 1
-    /* M4 -> M2 */
-    if (*m_off > M3_MAX_OFFSET &&
-        *m_len >= M4_MAX_LEN + 1 && *m_len <= M2_MAX_LEN + 2 &&
-        swd->best_off[*m_len-2] && swd->best_off[*m_len-2] <= M2_MAX_OFFSET)
-    {
-        *m_len = *m_len - 2;
-        *m_off = swd->best_off[*m_len];
-        return;
-    }
-#endif
-
-#if 1
-    /* M4 -> M3 */
-    if (*m_off > M3_MAX_OFFSET &&
-        *m_len >= M4_MAX_LEN + 1 && *m_len <= M3_MAX_LEN + 1 &&
-        swd->best_off[*m_len-1] && swd->best_off[*m_len-1] <= M3_MAX_OFFSET)
-    {
-        *m_len = *m_len - 1;
-        *m_off = swd->best_off[*m_len];
-    }
-#endif
-}
-
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1x_999_compress_internal ( const lzo_bytep in , lzo_uint  in_len,
-                                    lzo_bytep out, lzo_uintp out_len,
-                                    lzo_voidp wrkmem,
-                              const lzo_bytep dict, lzo_uint dict_len,
-                                    lzo_callback_p cb,
-                                    int try_lazy_parm,
-                                    lzo_uint good_length,
-                                    lzo_uint max_lazy,
-                                    lzo_uint nice_length,
-                                    lzo_uint max_chain,
-                                    lzo_uint32 flags )
-{
-    lzo_bytep op;
-    const lzo_bytep ii;
-    lzo_uint lit;
-    lzo_uint m_len, m_off;
-    LZO_COMPRESS_T cc;
-    LZO_COMPRESS_T * const c = &cc;
-    lzo_swd_p const swd = (lzo_swd_p) wrkmem;
-    lzo_uint try_lazy;
-    int r;
-
-    /* sanity check */
-#if defined(LZO1X)
-    LZO_COMPILE_TIME_ASSERT(LZO1X_999_MEM_COMPRESS >= SIZEOF_LZO_SWD_T)
-#elif defined(LZO1Y)
-    LZO_COMPILE_TIME_ASSERT(LZO1Y_999_MEM_COMPRESS >= SIZEOF_LZO_SWD_T)
-#elif defined(LZO1Z)
-    LZO_COMPILE_TIME_ASSERT(LZO1Z_999_MEM_COMPRESS >= SIZEOF_LZO_SWD_T)
-#else
-#  error
-#endif
-
-/* setup parameter defaults */
-    /* number of lazy match tries */
-    try_lazy = (lzo_uint) try_lazy_parm;
-    if (try_lazy_parm < 0)
-        try_lazy = 1;
-    /* reduce lazy match search if we already have a match with this length */
-    if (good_length == 0)
-        good_length = 32;
-    /* do not try a lazy match if we already have a match with this length */
-    if (max_lazy == 0)
-        max_lazy = 32;
-    /* stop searching for longer matches than this one */
-    if (nice_length == 0)
-        nice_length = 0;
-    /* don't search more positions than this */
-    if (max_chain == 0)
-        max_chain = SWD_MAX_CHAIN;
-
-    c->init = 0;
-    c->ip = c->in = in;
-    c->in_end = in + in_len;
-    c->out = out;
-    c->cb = cb;
-    c->m1a_m = c->m1b_m = c->m2_m = c->m3_m = c->m4_m = 0;
-    c->lit1_r = c->lit2_r = c->lit3_r = 0;
-
-    op = out;
-    ii = c->ip;             /* point to start of literal run */
-    lit = 0;
-    c->r1_lit = c->r1_m_len = 0;
-
-    r = init_match(c,swd,dict,dict_len,flags);
-    if (r != 0)
-        return r;
-    if (max_chain > 0)
-        swd->max_chain = max_chain;
-    if (nice_length > 0)
-        swd->nice_length = nice_length;
-
-    r = find_match(c,swd,0,0);
-    if (r != 0)
-        return r;
-    while (c->look > 0)
-    {
-        lzo_uint ahead;
-        lzo_uint max_ahead;
-        lzo_uint l1, l2, l3;
-
-        c->codesize = pd(op, out);
-
-        m_len = c->m_len;
-        m_off = c->m_off;
-
-        assert(c->bp == c->ip - c->look);
-        assert(c->bp >= in);
-        if (lit == 0)
-            ii = c->bp;
-        assert(ii + lit == c->bp);
-        assert(swd->b_char == *(c->bp));
-
-        if ( m_len < 2 ||
-            (m_len == 2 && (m_off > M1_MAX_OFFSET || lit == 0 || lit >= 4)) ||
-#if 1
-            /* Do not accept this match for compressed-data compatibility
-             * with LZO v1.01 and before
-             * [ might be a problem for decompress() and optimize() ]
-             */
-            (m_len == 2 && op == out) ||
-#endif
-            (op == out && lit == 0))
-        {
-            /* a literal */
-            m_len = 0;
-        }
-        else if (m_len == M2_MIN_LEN)
-        {
-            /* compression ratio improves if we code a literal in some cases */
-            if (m_off > MX_MAX_OFFSET && lit >= 4)
-                m_len = 0;
-        }
-
-        if (m_len == 0)
-        {
-    /* a literal */
-            lit++;
-            swd->max_chain = max_chain;
-            r = find_match(c,swd,1,0);
-            assert(r == 0); LZO_UNUSED(r);
-            continue;
-        }
-
-    /* a match */
-#if defined(SWD_BEST_OFF)
-        if (swd->use_best_off)
-            better_match(swd,&m_len,&m_off);
-#endif
-        assert_match(swd,m_len,m_off);
-
-
-        /* shall we try a lazy match ? */
-        ahead = 0;
-        if (try_lazy == 0 || m_len >= max_lazy)
-        {
-            /* no */
-            l1 = 0;
-            max_ahead = 0;
-        }
-        else
-        {
-            /* yes, try a lazy match */
-            l1 = len_of_coded_match(m_len,m_off,lit);
-            assert(l1 > 0);
-#if 1
-            max_ahead = LZO_MIN(try_lazy, l1 - 1);
-#else
-            max_ahead = LZO_MIN3(try_lazy, l1, m_len - 1);
-#endif
-        }
-
-
-        while (ahead < max_ahead && c->look > m_len)
-        {
-            lzo_uint lazy_match_min_gain;
-
-            if (m_len >= good_length)
-                swd->max_chain = max_chain >> 2;
-            else
-                swd->max_chain = max_chain;
-            r = find_match(c,swd,1,0);
-            ahead++;
-
-            assert(r == 0); LZO_UNUSED(r);
-            assert(c->look > 0);
-            assert(ii + lit + ahead == c->bp);
-
-#if defined(LZO1Z)
-            if (m_off == c->last_m_off && c->m_off != c->last_m_off)
-                if (m_len >= M2_MIN_LEN && m_len <= M2_MAX_LEN)
-                    c->m_len = 0;
-#endif
-            if (c->m_len < m_len)
-                continue;
-#if 1
-            if (c->m_len == m_len && c->m_off >= m_off)
-                continue;
-#endif
-#if defined(SWD_BEST_OFF)
-            if (swd->use_best_off)
-                better_match(swd,&c->m_len,&c->m_off);
-#endif
-            l2 = len_of_coded_match(c->m_len,c->m_off,lit+ahead);
-            if (l2 == 0)
-                continue;
-#if 0
-            if (c->m_len == m_len && l2 >= l1)
-                continue;
-#endif
-
-
-#if 1
-            /* compressed-data compatibility [see above] */
-            l3 = (op == out) ? 0 : len_of_coded_match(ahead,m_off,lit);
-#else
-            l3 = len_of_coded_match(ahead,m_off,lit);
-#endif
-
-            lazy_match_min_gain = min_gain(ahead,lit,lit+ahead,l1,l2,l3);
-            if (c->m_len >= m_len + lazy_match_min_gain)
-            {
-                c->lazy++;
-                assert_match(swd,c->m_len,c->m_off);
-
-                if (l3)
-                {
-                    /* code previous run */
-                    op = code_run(c,op,ii,lit,ahead);
-                    lit = 0;
-                    /* code shortened match */
-                    op = code_match(c,op,ahead,m_off);
-                }
-                else
-                {
-                    lit += ahead;
-                    assert(ii + lit == c->bp);
-                }
-                goto lazy_match_done;
-            }
-        }
-
-
-        assert(ii + lit + ahead == c->bp);
-
-        /* 1 - code run */
-        op = code_run(c,op,ii,lit,m_len);
-        lit = 0;
-
-        /* 2 - code match */
-        op = code_match(c,op,m_len,m_off);
-        swd->max_chain = max_chain;
-        r = find_match(c,swd,m_len,1+ahead);
-        assert(r == 0); LZO_UNUSED(r);
-
-lazy_match_done: ;
-    }
-
-
-    /* store final run */
-    if (lit > 0)
-        op = STORE_RUN(c,op,ii,lit);
-
-#if defined(LZO_EOF_CODE)
-    *op++ = M4_MARKER | 1;
-    *op++ = 0;
-    *op++ = 0;
-#endif
-
-    c->codesize = pd(op, out);
-    assert(c->textsize == in_len);
-
-    *out_len = pd(op, out);
-
-    if (c->cb && c->cb->nprogress)
-        (*c->cb->nprogress)(c->cb, c->textsize, c->codesize, 0);
-
-#if 0
-    printf("%ld %ld -> %ld  %ld: %ld %ld %ld %ld %ld  %ld: %ld %ld %ld  %ld\n",
-        (long) c->textsize, (long) in_len, (long) c->codesize,
-        c->match_bytes, c->m1a_m, c->m1b_m, c->m2_m, c->m3_m, c->m4_m,
-        c->lit_bytes, c->lit1_r, c->lit2_r, c->lit3_r, c->lazy);
-#endif
-    assert(c->lit_bytes + c->match_bytes == in_len);
-
-    return LZO_E_OK;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1x_999_compress_level    ( const lzo_bytep in , lzo_uint  in_len,
-                                    lzo_bytep out, lzo_uintp out_len,
-                                    lzo_voidp wrkmem,
-                              const lzo_bytep dict, lzo_uint dict_len,
-                                    lzo_callback_p cb,
-                                    int compression_level )
-{
-    static const struct
-    {
-        int try_lazy_parm;
-        lzo_uint good_length;
-        lzo_uint max_lazy;
-        lzo_uint nice_length;
-        lzo_uint max_chain;
-        lzo_uint32 flags;
-    } c[9] = {
-        /* faster compression */
-        {   0,     0,     0,     8,    4,   0 },
-        {   0,     0,     0,    16,    8,   0 },
-        {   0,     0,     0,    32,   16,   0 },
-        {   1,     4,     4,    16,   16,   0 },
-        {   1,     8,    16,    32,   32,   0 },
-        {   1,     8,    16,   128,  128,   0 },
-        {   2,     8,    32,   128,  256,   0 },
-        {   2,    32,   128, SWD_F, 2048,   1 },
-        {   2, SWD_F, SWD_F, SWD_F, 4096,   1 }
-        /* max. compression */
-    };
-
-    if (compression_level < 1 || compression_level > 9)
-        return LZO_E_ERROR;
-
-    compression_level -= 1;
-    return lzo1x_999_compress_internal(in, in_len, out, out_len, wrkmem,
-                                       dict, dict_len, cb,
-                                       c[compression_level].try_lazy_parm,
-                                       c[compression_level].good_length,
-                                       c[compression_level].max_lazy,
-#if 0
-                                       c[compression_level].nice_length,
-#else
-                                       0,
-#endif
-                                       c[compression_level].max_chain,
-                                       c[compression_level].flags);
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo1x_999_compress_dict     ( const lzo_bytep in , lzo_uint  in_len,
-                                    lzo_bytep out, lzo_uintp out_len,
-                                    lzo_voidp wrkmem,
-                              const lzo_bytep dict, lzo_uint dict_len )
-{
-    return lzo1x_999_compress_level(in, in_len, out, out_len, wrkmem,
-                                    dict, dict_len, 0, 8);
-}
-
-LZO_PUBLIC(int)
-lzo1x_999_compress  ( const lzo_bytep in , lzo_uint  in_len,
-                            lzo_bytep out, lzo_uintp out_len,
-                            lzo_voidp wrkmem )
-{
-    return lzo1x_999_compress_level(in, in_len, out, out_len, wrkmem,
-                                    NULL, 0, (lzo_callback_p) 0, 8);
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1x_c.ch b/lzo/src/lzo1x_c.ch
deleted file mode 100644
index b2646249..00000000
--- a/lzo/src/lzo1x_c.ch
+++ /dev/null
@@ -1,433 +0,0 @@
-/* lzo1x_c.ch -- implementation of the LZO1[XY]-1 compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-
-#if 1 && defined(DO_COMPRESS) && !defined(do_compress)
-   /* choose a unique name to better help PGO optimizations */
-#  define do_compress       LZO_CPP_ECONCAT2(DO_COMPRESS,_core)
-#endif
-
-#if defined(UA_GET64) && (LZO_ABI_BIG_ENDIAN)
-#  define WANT_lzo_bitops_clz64 1
-#elif defined(UA_GET64) && (LZO_ABI_LITTLE_ENDIAN)
-#  define WANT_lzo_bitops_ctz64 1
-#elif defined(UA_GET32) && (LZO_ABI_BIG_ENDIAN)
-#  define WANT_lzo_bitops_clz32 1
-#elif defined(UA_GET32) && (LZO_ABI_LITTLE_ENDIAN)
-#  define WANT_lzo_bitops_ctz32 1
-#endif
-#include "lzo_func.ch"
-
-
-/***********************************************************************
-// compress a block of data.
-************************************************************************/
-
-static __lzo_noinline lzo_uint
-do_compress ( const lzo_bytep in , lzo_uint  in_len,
-                    lzo_bytep out, lzo_uintp out_len,
-                    lzo_uint  ti,  lzo_voidp wrkmem)
-{
-    register const lzo_bytep ip;
-    lzo_bytep op;
-    const lzo_bytep const in_end = in + in_len;
-    const lzo_bytep const ip_end = in + in_len - 20;
-    const lzo_bytep ii;
-    lzo_dict_p const dict = (lzo_dict_p) wrkmem;
-
-    op = out;
-    ip = in;
-    ii = ip;
-
-    ip += ti < 4 ? 4 - ti : 0;
-    for (;;)
-    {
-        const lzo_bytep m_pos;
-#if !(LZO_DETERMINISTIC)
-        LZO_DEFINE_UNINITIALIZED_VAR(lzo_uint, m_off, 0);
-        lzo_uint m_len;
-        lzo_uint dindex;
-next:
-        if __lzo_unlikely(ip >= ip_end)
-            break;
-        DINDEX1(dindex,ip);
-        GINDEX(m_pos,m_off,dict,dindex,in);
-        if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,M4_MAX_OFFSET))
-            goto literal;
-#if 1
-        if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
-            goto try_match;
-        DINDEX2(dindex,ip);
-#endif
-        GINDEX(m_pos,m_off,dict,dindex,in);
-        if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,M4_MAX_OFFSET))
-            goto literal;
-        if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
-            goto try_match;
-        goto literal;
-
-try_match:
-#if defined(UA_GET32)
-        if (UA_GET32(m_pos) != UA_GET32(ip))
-#else
-        if (m_pos[0] != ip[0] || m_pos[1] != ip[1] || m_pos[2] != ip[2] || m_pos[3] != ip[3])
-#endif
-        {
-            /* a literal */
-literal:
-            UPDATE_I(dict,0,dindex,ip,in);
-            ip += 1 + ((ip - ii) >> 5);
-            continue;
-        }
-/*match:*/
-        UPDATE_I(dict,0,dindex,ip,in);
-#else
-        lzo_uint m_off;
-        lzo_uint m_len;
-        {
-        lzo_uint32 dv;
-        lzo_uint dindex;
-literal:
-        ip += 1 + ((ip - ii) >> 5);
-next:
-        if __lzo_unlikely(ip >= ip_end)
-            break;
-        dv = UA_GET32(ip);
-        dindex = DINDEX(dv,ip);
-        GINDEX(m_off,m_pos,in+dict,dindex,in);
-        UPDATE_I(dict,0,dindex,ip,in);
-        if __lzo_unlikely(dv != UA_GET32(m_pos))
-            goto literal;
-        }
-#endif
-
-    /* a match */
-
-        ii -= ti; ti = 0;
-        {
-        register lzo_uint t = pd(ip,ii);
-        if (t != 0)
-        {
-            if (t <= 3)
-            {
-                op[-2] |= LZO_BYTE(t);
-#if defined(UA_COPY32)
-                UA_COPY32(op, ii);
-                op += t;
-#else
-                { do *op++ = *ii++; while (--t > 0); }
-#endif
-            }
-#if defined(UA_COPY32) || defined(UA_COPY64)
-            else if (t <= 16)
-            {
-                *op++ = LZO_BYTE(t - 3);
-#if defined(UA_COPY64)
-                UA_COPY64(op, ii);
-                UA_COPY64(op+8, ii+8);
-#else
-                UA_COPY32(op, ii);
-                UA_COPY32(op+4, ii+4);
-                UA_COPY32(op+8, ii+8);
-                UA_COPY32(op+12, ii+12);
-#endif
-                op += t;
-            }
-#endif
-            else
-            {
-                if (t <= 18)
-                    *op++ = LZO_BYTE(t - 3);
-                else
-                {
-                    register lzo_uint tt = t - 18;
-                    *op++ = 0;
-                    while __lzo_unlikely(tt > 255)
-                    {
-                        tt -= 255;
-#if 1 && (LZO_CC_MSC && (_MSC_VER >= 1400))
-                        * (volatile unsigned char *) op++ = 0;
-#else
-                        *op++ = 0;
-#endif
-                    }
-                    assert(tt > 0);
-                    *op++ = LZO_BYTE(tt);
-                }
-#if defined(UA_COPY32) || defined(UA_COPY64)
-                do {
-#if defined(UA_COPY64)
-                    UA_COPY64(op, ii);
-                    UA_COPY64(op+8, ii+8);
-#else
-                    UA_COPY32(op, ii);
-                    UA_COPY32(op+4, ii+4);
-                    UA_COPY32(op+8, ii+8);
-                    UA_COPY32(op+12, ii+12);
-#endif
-                    op += 16; ii += 16; t -= 16;
-                } while (t >= 16); if (t > 0)
-#endif
-                { do *op++ = *ii++; while (--t > 0); }
-            }
-        }
-        }
-        m_len = 4;
-        {
-#if defined(UA_GET64)
-        lzo_uint64 v;
-        v = UA_GET64(ip + m_len) ^ UA_GET64(m_pos + m_len);
-        if __lzo_unlikely(v == 0) {
-            do {
-                m_len += 8;
-                v = UA_GET64(ip + m_len) ^ UA_GET64(m_pos + m_len);
-                if __lzo_unlikely(ip + m_len >= ip_end)
-                    goto m_len_done;
-            } while (v == 0);
-        }
-#if (LZO_ABI_BIG_ENDIAN) && defined(lzo_bitops_clz64)
-        m_len += lzo_bitops_clz64(v) / CHAR_BIT;
-#elif (LZO_ABI_BIG_ENDIAN)
-        if ((v >> (64 - CHAR_BIT)) == 0) do {
-            v <<= CHAR_BIT;
-            m_len += 1;
-        } while ((v >> (64 - CHAR_BIT)) == 0);
-#elif (LZO_ABI_LITTLE_ENDIAN) && defined(lzo_bitops_ctz64)
-        m_len += lzo_bitops_ctz64(v) / CHAR_BIT;
-#elif (LZO_ABI_LITTLE_ENDIAN)
-        if ((v & UCHAR_MAX) == 0) do {
-            v >>= CHAR_BIT;
-            m_len += 1;
-        } while ((v & UCHAR_MAX) == 0);
-#else
-        if (ip[m_len] == m_pos[m_len]) do {
-            m_len += 1;
-        } while (ip[m_len] == m_pos[m_len]);
-#endif
-#elif defined(UA_GET32)
-        lzo_uint32 v;
-        v = UA_GET32(ip + m_len) ^ UA_GET32(m_pos + m_len);
-        if __lzo_unlikely(v == 0) {
-            do {
-                m_len += 4;
-                v = UA_GET32(ip + m_len) ^ UA_GET32(m_pos + m_len);
-                if __lzo_unlikely(ip + m_len >= ip_end)
-                    goto m_len_done;
-            } while (v == 0);
-        }
-#if (LZO_ABI_BIG_ENDIAN) && defined(lzo_bitops_clz32)
-        m_len += lzo_bitops_clz32(v) / CHAR_BIT;
-#elif (LZO_ABI_BIG_ENDIAN)
-        if ((v >> (32 - CHAR_BIT)) == 0) do {
-            v <<= CHAR_BIT;
-            m_len += 1;
-        } while ((v >> (32 - CHAR_BIT)) == 0);
-#elif (LZO_ABI_LITTLE_ENDIAN) && defined(lzo_bitops_ctz32)
-        m_len += lzo_bitops_ctz32(v) / CHAR_BIT;
-#elif (LZO_ABI_LITTLE_ENDIAN)
-        if ((v & UCHAR_MAX) == 0) do {
-            v >>= CHAR_BIT;
-            m_len += 1;
-        } while ((v & UCHAR_MAX) == 0);
-#else
-        if (ip[m_len] == m_pos[m_len]) do {
-            m_len += 1;
-        } while (ip[m_len] == m_pos[m_len]);
-#endif
-#else
-        if __lzo_unlikely(ip[m_len] == m_pos[m_len]) {
-            do {
-                m_len += 1;
-                if __lzo_unlikely(ip + m_len >= ip_end)
-                    goto m_len_done;
-            } while (ip[m_len] == m_pos[m_len]);
-        }
-#endif
-        }
-m_len_done:
-        m_off = pd(ip,m_pos);
-        ip += m_len;
-        ii = ip;
-        if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET)
-        {
-            m_off -= 1;
-#if defined(LZO1X)
-            *op++ = LZO_BYTE(((m_len - 1) << 5) | ((m_off & 7) << 2));
-            *op++ = LZO_BYTE(m_off >> 3);
-#elif defined(LZO1Y)
-            *op++ = LZO_BYTE(((m_len + 1) << 4) | ((m_off & 3) << 2));
-            *op++ = LZO_BYTE(m_off >> 2);
-#endif
-        }
-        else if (m_off <= M3_MAX_OFFSET)
-        {
-            m_off -= 1;
-            if (m_len <= M3_MAX_LEN)
-                *op++ = LZO_BYTE(M3_MARKER | (m_len - 2));
-            else
-            {
-                m_len -= M3_MAX_LEN;
-                *op++ = M3_MARKER | 0;
-                while __lzo_unlikely(m_len > 255)
-                {
-                    m_len -= 255;
-#if 1 && (LZO_CC_MSC && (_MSC_VER >= 1400))
-                    * (volatile unsigned char *) op++ = 0;
-#else
-                    *op++ = 0;
-#endif
-                }
-                *op++ = LZO_BYTE(m_len);
-            }
-            *op++ = LZO_BYTE(m_off << 2);
-            *op++ = LZO_BYTE(m_off >> 6);
-        }
-        else
-        {
-            m_off -= 0x4000;
-            if (m_len <= M4_MAX_LEN)
-                *op++ = LZO_BYTE(M4_MARKER | ((m_off >> 11) & 8) | (m_len - 2));
-            else
-            {
-                m_len -= M4_MAX_LEN;
-                *op++ = LZO_BYTE(M4_MARKER | ((m_off >> 11) & 8));
-                while __lzo_unlikely(m_len > 255)
-                {
-                    m_len -= 255;
-#if 1 && (LZO_CC_MSC && (_MSC_VER >= 1400))
-                    * (volatile unsigned char *) op++ = 0;
-#else
-                    *op++ = 0;
-#endif
-                }
-                *op++ = LZO_BYTE(m_len);
-            }
-            *op++ = LZO_BYTE(m_off << 2);
-            *op++ = LZO_BYTE(m_off >> 6);
-        }
-        goto next;
-    }
-
-    *out_len = pd(op, out);
-    return pd(in_end,ii-ti);
-}
-
-
-/***********************************************************************
-// public entry point
-************************************************************************/
-
-LZO_PUBLIC(int)
-DO_COMPRESS      ( const lzo_bytep in , lzo_uint  in_len,
-                         lzo_bytep out, lzo_uintp out_len,
-                         lzo_voidp wrkmem )
-{
-    const lzo_bytep ip = in;
-    lzo_bytep op = out;
-    lzo_uint l = in_len;
-    lzo_uint t = 0;
-
-    while (l > 20)
-    {
-        lzo_uint ll = l;
-        lzo_uintptr_t ll_end;
-#if 0 || (LZO_DETERMINISTIC)
-        ll = LZO_MIN(ll, 49152);
-#endif
-        ll_end = (lzo_uintptr_t)ip + ll;
-        if ((ll_end + ((t + ll) >> 5)) <= ll_end || (const lzo_bytep)(ll_end + ((t + ll) >> 5)) <= ip + ll)
-            break;
-#if (LZO_DETERMINISTIC)
-        lzo_memset(wrkmem, 0, ((lzo_uint)1 << D_BITS) * sizeof(lzo_dict_t));
-#endif
-        t = do_compress(ip,ll,op,out_len,t,wrkmem);
-        ip += ll;
-        op += *out_len;
-        l  -= ll;
-    }
-    t += l;
-
-    if (t > 0)
-    {
-        const lzo_bytep ii = in + in_len - t;
-
-        if (op == out && t <= 238)
-            *op++ = LZO_BYTE(17 + t);
-        else if (t <= 3)
-            op[-2] |= LZO_BYTE(t);
-        else if (t <= 18)
-            *op++ = LZO_BYTE(t - 3);
-        else
-        {
-            lzo_uint tt = t - 18;
-
-            *op++ = 0;
-            while (tt > 255)
-            {
-                tt -= 255;
-#if 1 && (LZO_CC_MSC && (_MSC_VER >= 1400))
-                /* prevent the compiler from transforming this loop
-                 * into a memset() call */
-                * (volatile unsigned char *) op++ = 0;
-#else
-                *op++ = 0;
-#endif
-            }
-            assert(tt > 0);
-            *op++ = LZO_BYTE(tt);
-        }
-        do *op++ = *ii++; while (--t > 0);
-    }
-
-    *op++ = M4_MARKER | 1;
-    *op++ = 0;
-    *op++ = 0;
-
-    *out_len = pd(op, out);
-    return LZO_E_OK;
-}
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/lzo1x_d.ch b/lzo/src/lzo1x_d.ch
deleted file mode 100644
index 49cf3266..00000000
--- a/lzo/src/lzo1x_d.ch
+++ /dev/null
@@ -1,496 +0,0 @@
-/* lzo1x_d.ch -- implementation of the LZO1X decompression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo1_d.ch"
-
-
-/***********************************************************************
-// decompress a block of data.
-************************************************************************/
-
-#if defined(DO_DECOMPRESS)
-LZO_PUBLIC(int)
-DO_DECOMPRESS  ( const lzo_bytep in , lzo_uint  in_len,
-                       lzo_bytep out, lzo_uintp out_len,
-                       lzo_voidp wrkmem )
-#endif
-{
-    register lzo_bytep op;
-    register const lzo_bytep ip;
-    register lzo_uint t;
-#if defined(COPY_DICT)
-    lzo_uint m_off;
-    const lzo_bytep dict_end;
-#else
-    register const lzo_bytep m_pos;
-#endif
-
-    const lzo_bytep const ip_end = in + in_len;
-#if defined(HAVE_ANY_OP)
-    lzo_bytep const op_end = out + *out_len;
-#endif
-#if defined(LZO1Z)
-    lzo_uint last_m_off = 0;
-#endif
-
-    LZO_UNUSED(wrkmem);
-
-#if defined(COPY_DICT)
-    if (dict)
-    {
-        if (dict_len > M4_MAX_OFFSET)
-        {
-            dict += dict_len - M4_MAX_OFFSET;
-            dict_len = M4_MAX_OFFSET;
-        }
-        dict_end = dict + dict_len;
-    }
-    else
-    {
-        dict_len = 0;
-        dict_end = NULL;
-    }
-#endif /* COPY_DICT */
-
-    *out_len = 0;
-
-    op = out;
-    ip = in;
-
-    if (*ip > 17)
-    {
-        t = *ip++ - 17;
-        if (t < 4)
-            goto match_next;
-        assert(t > 0); NEED_OP(t); NEED_IP(t+1);
-        do *op++ = *ip++; while (--t > 0);
-        goto first_literal_run;
-    }
-
-    while (TEST_IP && TEST_OP)
-    {
-        t = *ip++;
-        if (t >= 16)
-            goto match;
-        /* a literal run */
-        if (t == 0)
-        {
-            NEED_IP(1);
-            while (*ip == 0)
-            {
-                t += 255;
-                ip++;
-                NEED_IP(1);
-            }
-            t += 15 + *ip++;
-        }
-        /* copy literals */
-        assert(t > 0); NEED_OP(t+3); NEED_IP(t+4);
-#if defined(LZO_UNALIGNED_OK_8) && defined(LZO_UNALIGNED_OK_4)
-        t += 3;
-        if (t >= 8) do
-        {
-            UA_COPY64(op,ip);
-            op += 8; ip += 8; t -= 8;
-        } while (t >= 8);
-        if (t >= 4)
-        {
-            UA_COPY32(op,ip);
-            op += 4; ip += 4; t -= 4;
-        }
-        if (t > 0)
-        {
-            *op++ = *ip++;
-            if (t > 1) { *op++ = *ip++; if (t > 2) { *op++ = *ip++; } }
-        }
-#elif defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4)
-#if !defined(LZO_UNALIGNED_OK_4)
-        if (PTR_ALIGNED2_4(op,ip))
-        {
-#endif
-        UA_COPY32(op,ip);
-        op += 4; ip += 4;
-        if (--t > 0)
-        {
-            if (t >= 4)
-            {
-                do {
-                    UA_COPY32(op,ip);
-                    op += 4; ip += 4; t -= 4;
-                } while (t >= 4);
-                if (t > 0) do *op++ = *ip++; while (--t > 0);
-            }
-            else
-                do *op++ = *ip++; while (--t > 0);
-        }
-#if !defined(LZO_UNALIGNED_OK_4)
-        }
-        else
-#endif
-#endif
-#if !defined(LZO_UNALIGNED_OK_4) && !defined(LZO_UNALIGNED_OK_8)
-        {
-            *op++ = *ip++; *op++ = *ip++; *op++ = *ip++;
-            do *op++ = *ip++; while (--t > 0);
-        }
-#endif
-
-
-first_literal_run:
-
-
-        t = *ip++;
-        if (t >= 16)
-            goto match;
-#if defined(COPY_DICT)
-#if defined(LZO1Z)
-        m_off = (1 + M2_MAX_OFFSET) + (t << 6) + (*ip++ >> 2);
-        last_m_off = m_off;
-#else
-        m_off = (1 + M2_MAX_OFFSET) + (t >> 2) + (*ip++ << 2);
-#endif
-        NEED_OP(3);
-        t = 3; COPY_DICT(t,m_off)
-#else /* !COPY_DICT */
-#if defined(LZO1Z)
-        t = (1 + M2_MAX_OFFSET) + (t << 6) + (*ip++ >> 2);
-        m_pos = op - t;
-        last_m_off = t;
-#else
-        m_pos = op - (1 + M2_MAX_OFFSET);
-        m_pos -= t >> 2;
-        m_pos -= *ip++ << 2;
-#endif
-        TEST_LB(m_pos); NEED_OP(3);
-        *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos;
-#endif /* COPY_DICT */
-        goto match_done;
-
-
-        /* handle matches */
-        do {
-match:
-            if (t >= 64)                /* a M2 match */
-            {
-#if defined(COPY_DICT)
-#if defined(LZO1X)
-                m_off = 1 + ((t >> 2) & 7) + (*ip++ << 3);
-                t = (t >> 5) - 1;
-#elif defined(LZO1Y)
-                m_off = 1 + ((t >> 2) & 3) + (*ip++ << 2);
-                t = (t >> 4) - 3;
-#elif defined(LZO1Z)
-                m_off = t & 0x1f;
-                if (m_off >= 0x1c)
-                    m_off = last_m_off;
-                else
-                {
-                    m_off = 1 + (m_off << 6) + (*ip++ >> 2);
-                    last_m_off = m_off;
-                }
-                t = (t >> 5) - 1;
-#endif
-#else /* !COPY_DICT */
-#if defined(LZO1X)
-                m_pos = op - 1;
-                m_pos -= (t >> 2) & 7;
-                m_pos -= *ip++ << 3;
-                t = (t >> 5) - 1;
-#elif defined(LZO1Y)
-                m_pos = op - 1;
-                m_pos -= (t >> 2) & 3;
-                m_pos -= *ip++ << 2;
-                t = (t >> 4) - 3;
-#elif defined(LZO1Z)
-                {
-                    lzo_uint off = t & 0x1f;
-                    m_pos = op;
-                    if (off >= 0x1c)
-                    {
-                        assert(last_m_off > 0);
-                        m_pos -= last_m_off;
-                    }
-                    else
-                    {
-                        off = 1 + (off << 6) + (*ip++ >> 2);
-                        m_pos -= off;
-                        last_m_off = off;
-                    }
-                }
-                t = (t >> 5) - 1;
-#endif
-                TEST_LB(m_pos); assert(t > 0); NEED_OP(t+3-1);
-                goto copy_match;
-#endif /* COPY_DICT */
-            }
-            else if (t >= 32)           /* a M3 match */
-            {
-                t &= 31;
-                if (t == 0)
-                {
-                    NEED_IP(1);
-                    while (*ip == 0)
-                    {
-                        t += 255;
-                        ip++;
-                        NEED_IP(1);
-                    }
-                    t += 31 + *ip++;
-                }
-#if defined(COPY_DICT)
-#if defined(LZO1Z)
-                m_off = 1 + (ip[0] << 6) + (ip[1] >> 2);
-                last_m_off = m_off;
-#else
-                m_off = 1 + (ip[0] >> 2) + (ip[1] << 6);
-#endif
-#else /* !COPY_DICT */
-#if defined(LZO1Z)
-                {
-                    lzo_uint off = 1 + (ip[0] << 6) + (ip[1] >> 2);
-                    m_pos = op - off;
-                    last_m_off = off;
-                }
-#elif defined(LZO_UNALIGNED_OK_2) && defined(LZO_ABI_LITTLE_ENDIAN)
-                m_pos = op - 1;
-                m_pos -= UA_GET16(ip) >> 2;
-#else
-                m_pos = op - 1;
-                m_pos -= (ip[0] >> 2) + (ip[1] << 6);
-#endif
-#endif /* COPY_DICT */
-                ip += 2;
-            }
-            else if (t >= 16)           /* a M4 match */
-            {
-#if defined(COPY_DICT)
-                m_off = (t & 8) << 11;
-#else /* !COPY_DICT */
-                m_pos = op;
-                m_pos -= (t & 8) << 11;
-#endif /* COPY_DICT */
-                t &= 7;
-                if (t == 0)
-                {
-                    NEED_IP(1);
-                    while (*ip == 0)
-                    {
-                        t += 255;
-                        ip++;
-                        NEED_IP(1);
-                    }
-                    t += 7 + *ip++;
-                }
-#if defined(COPY_DICT)
-#if defined(LZO1Z)
-                m_off += (ip[0] << 6) + (ip[1] >> 2);
-#else
-                m_off += (ip[0] >> 2) + (ip[1] << 6);
-#endif
-                ip += 2;
-                if (m_off == 0)
-                    goto eof_found;
-                m_off += 0x4000;
-#if defined(LZO1Z)
-                last_m_off = m_off;
-#endif
-#else /* !COPY_DICT */
-#if defined(LZO1Z)
-                m_pos -= (ip[0] << 6) + (ip[1] >> 2);
-#elif defined(LZO_UNALIGNED_OK_2) && defined(LZO_ABI_LITTLE_ENDIAN)
-                m_pos -= UA_GET16(ip) >> 2;
-#else
-                m_pos -= (ip[0] >> 2) + (ip[1] << 6);
-#endif
-                ip += 2;
-                if (m_pos == op)
-                    goto eof_found;
-                m_pos -= 0x4000;
-#if defined(LZO1Z)
-                last_m_off = pd((const lzo_bytep)op, m_pos);
-#endif
-#endif /* COPY_DICT */
-            }
-            else                            /* a M1 match */
-            {
-#if defined(COPY_DICT)
-#if defined(LZO1Z)
-                m_off = 1 + (t << 6) + (*ip++ >> 2);
-                last_m_off = m_off;
-#else
-                m_off = 1 + (t >> 2) + (*ip++ << 2);
-#endif
-                NEED_OP(2);
-                t = 2; COPY_DICT(t,m_off)
-#else /* !COPY_DICT */
-#if defined(LZO1Z)
-                t = 1 + (t << 6) + (*ip++ >> 2);
-                m_pos = op - t;
-                last_m_off = t;
-#else
-                m_pos = op - 1;
-                m_pos -= t >> 2;
-                m_pos -= *ip++ << 2;
-#endif
-                TEST_LB(m_pos); NEED_OP(2);
-                *op++ = *m_pos++; *op++ = *m_pos;
-#endif /* COPY_DICT */
-                goto match_done;
-            }
-
-            /* copy match */
-#if defined(COPY_DICT)
-
-            NEED_OP(t+3-1);
-            t += 3-1; COPY_DICT(t,m_off)
-
-#else /* !COPY_DICT */
-
-            TEST_LB(m_pos); assert(t > 0); NEED_OP(t+3-1);
-#if defined(LZO_UNALIGNED_OK_8) && defined(LZO_UNALIGNED_OK_4)
-            if (op - m_pos >= 8)
-            {
-                t += (3 - 1);
-                if (t >= 8) do
-                {
-                    UA_COPY64(op,m_pos);
-                    op += 8; m_pos += 8; t -= 8;
-                } while (t >= 8);
-                if (t >= 4)
-                {
-                    UA_COPY32(op,m_pos);
-                    op += 4; m_pos += 4; t -= 4;
-                }
-                if (t > 0)
-                {
-                    *op++ = m_pos[0];
-                    if (t > 1) { *op++ = m_pos[1]; if (t > 2) { *op++ = m_pos[2]; } }
-                }
-            }
-            else
-#elif defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4)
-#if !defined(LZO_UNALIGNED_OK_4)
-            if (t >= 2 * 4 - (3 - 1) && PTR_ALIGNED2_4(op,m_pos))
-            {
-                assert((op - m_pos) >= 4);  /* both pointers are aligned */
-#else
-            if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4)
-            {
-#endif
-                UA_COPY32(op,m_pos);
-                op += 4; m_pos += 4; t -= 4 - (3 - 1);
-                do {
-                    UA_COPY32(op,m_pos);
-                    op += 4; m_pos += 4; t -= 4;
-                } while (t >= 4);
-                if (t > 0) do *op++ = *m_pos++; while (--t > 0);
-            }
-            else
-#endif
-            {
-copy_match:
-                *op++ = *m_pos++; *op++ = *m_pos++;
-                do *op++ = *m_pos++; while (--t > 0);
-            }
-
-#endif /* COPY_DICT */
-
-match_done:
-#if defined(LZO1Z)
-            t = ip[-1] & 3;
-#else
-            t = ip[-2] & 3;
-#endif
-            if (t == 0)
-                break;
-
-            /* copy literals */
-match_next:
-            assert(t > 0); assert(t < 4); NEED_OP(t); NEED_IP(t+1);
-#if 0
-            do *op++ = *ip++; while (--t > 0);
-#else
-            *op++ = *ip++;
-            if (t > 1) { *op++ = *ip++; if (t > 2) { *op++ = *ip++; } }
-#endif
-            t = *ip++;
-        } while (TEST_IP && TEST_OP);
-    }
-
-#if defined(HAVE_TEST_IP) || defined(HAVE_TEST_OP)
-    /* no EOF code was found */
-    *out_len = pd(op, out);
-    return LZO_E_EOF_NOT_FOUND;
-#endif
-
-eof_found:
-    assert(t == 1);
-    *out_len = pd(op, out);
-    return (ip == ip_end ? LZO_E_OK :
-           (ip < ip_end  ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
-
-
-#if defined(HAVE_NEED_IP)
-input_overrun:
-    *out_len = pd(op, out);
-    return LZO_E_INPUT_OVERRUN;
-#endif
-
-#if defined(HAVE_NEED_OP)
-output_overrun:
-    *out_len = pd(op, out);
-    return LZO_E_OUTPUT_OVERRUN;
-#endif
-
-#if defined(LZO_TEST_OVERRUN_LOOKBEHIND)
-lookbehind_overrun:
-    *out_len = pd(op, out);
-    return LZO_E_LOOKBEHIND_OVERRUN;
-#endif
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1x_d1.c b/lzo/src/lzo1x_d1.c
deleted file mode 100644
index aa61399f..00000000
--- a/lzo/src/lzo1x_d1.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1x_d1.c -- LZO1X decompression
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1x.h"
-
-#undef LZO_TEST_OVERRUN
-#define DO_DECOMPRESS       lzo1x_decompress
-
-#include "lzo1x_d.ch"
diff --git a/lzo/src/lzo1x_d2.c b/lzo/src/lzo1x_d2.c
deleted file mode 100644
index 10a3efe1..00000000
--- a/lzo/src/lzo1x_d2.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1x_d2.c -- LZO1X decompression with overrun testing
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1x.h"
-
-#define LZO_TEST_OVERRUN 1
-#define DO_DECOMPRESS       lzo1x_decompress_safe
-
-#include "lzo1x_d.ch"
diff --git a/lzo/src/lzo1x_d3.c b/lzo/src/lzo1x_d3.c
deleted file mode 100644
index 93cea502..00000000
--- a/lzo/src/lzo1x_d3.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* lzo1x_d3.c -- LZO1X decompression with preset dictionary
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1x.h"
-
-#define LZO_TEST_OVERRUN 1
-
-
-#define SLOW_MEMCPY(a,b,l)      { do *a++ = *b++; while (--l > 0); }
-#define FAST_MEMCPY(a,b,l)      { lzo_memcpy(a,b,l); a += l; }
-
-#if 1 && defined(FAST_MEMCPY)
-#  define DICT_MEMMOVE(op,m_pos,m_len,m_off) \
-        if (m_off >= (m_len)) \
-            FAST_MEMCPY(op,m_pos,m_len) \
-        else \
-            SLOW_MEMCPY(op,m_pos,m_len)
-#else
-#  define DICT_MEMMOVE(op,m_pos,m_len,m_off) \
-        SLOW_MEMCPY(op,m_pos,m_len)
-#endif
-
-#if !defined(FAST_MEMCPY)
-#  define FAST_MEMCPY   SLOW_MEMCPY
-#endif
-
-
-#define COPY_DICT_DICT(m_len,m_off) \
-    { \
-        register const lzo_bytep m_pos; \
-        m_off -= pd(op, out); assert(m_off > 0); \
-        if (m_off > dict_len) goto lookbehind_overrun; \
-        m_pos = dict_end - m_off; \
-        if (m_len > m_off) \
-        { \
-            m_len -= m_off; \
-            FAST_MEMCPY(op,m_pos,m_off) \
-            m_pos = out; \
-            SLOW_MEMCPY(op,m_pos,m_len) \
-        } \
-        else \
-            FAST_MEMCPY(op,m_pos,m_len) \
-    }
-
-#define COPY_DICT(m_len,m_off) \
-    assert(m_len >= 2); assert(m_off > 0); assert(op > out); \
-    if (m_off <= pd(op, out)) \
-    { \
-        register const lzo_bytep m_pos = op - m_off; \
-        DICT_MEMMOVE(op,m_pos,m_len,m_off) \
-    } \
-    else \
-        COPY_DICT_DICT(m_len,m_off)
-
-
-
-
-LZO_PUBLIC(int)
-lzo1x_decompress_dict_safe ( const lzo_bytep in,  lzo_uint  in_len,
-                                   lzo_bytep out, lzo_uintp out_len,
-                                   lzo_voidp wrkmem /* NOT USED */,
-                             const lzo_bytep dict, lzo_uint dict_len)
-
-
-#include "lzo1x_d.ch"
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1x_o.c b/lzo/src/lzo1x_o.c
deleted file mode 100644
index 76a5353e..00000000
--- a/lzo/src/lzo1x_o.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* lzo1x_o.c -- LZO1X compressed data optimizer
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1x.h"
-
-#define DO_OPTIMIZE     lzo1x_optimize
-
-#include "lzo1x_oo.ch"
diff --git a/lzo/src/lzo1x_oo.ch b/lzo/src/lzo1x_oo.ch
deleted file mode 100644
index 6bd2cf17..00000000
--- a/lzo/src/lzo1x_oo.ch
+++ /dev/null
@@ -1,369 +0,0 @@
-/* lzo1x_oo.ch -- LZO1X compressed data optimizer
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define TEST_IP     (ip < ip_end)
-#define TEST_OP     (op <= op_end)
-
-#define NO_LIT      LZO_UINT_MAX
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static void copy2(lzo_bytep ip, const lzo_bytep m_pos, lzo_uint off)
-{
-    assert(off > 0);
-    ip[0] = m_pos[0];
-    if (off == 1)
-        ip[1] = m_pos[0];
-    else
-        ip[1] = m_pos[1];
-}
-
-
-static void copy3(lzo_bytep ip, const lzo_bytep m_pos, lzo_uint off)
-{
-    assert(off > 0);
-    ip[0] = m_pos[0];
-    if (off == 1)
-    {
-        ip[2] = ip[1] = m_pos[0];
-    }
-    else if (off == 2)
-    {
-        ip[1] = m_pos[1];
-        ip[2] = m_pos[0];
-    }
-    else
-    {
-        ip[1] = m_pos[1];
-        ip[2] = m_pos[2];
-    }
-}
-
-
-/***********************************************************************
-// optimize a block of data.
-************************************************************************/
-
-LZO_PUBLIC(int)
-DO_OPTIMIZE          (       lzo_bytep in , lzo_uint  in_len,
-                             lzo_bytep out, lzo_uintp out_len,
-                             lzo_voidp wrkmem )
-{
-    lzo_bytep op;
-    lzo_bytep ip;
-    lzo_uint t;
-    lzo_bytep m_pos;
-    lzo_bytep const ip_end = in + in_len;
-    lzo_bytep const op_end = out + *out_len;
-    lzo_bytep litp = NULL;
-    lzo_uint lit = 0;
-    lzo_uint next_lit = NO_LIT;
-    lzo_uint nl;
-    unsigned long o_m1_a = 0, o_m1_b = 0, o_m2 = 0, o_m3_a = 0, o_m3_b = 0;
-
-    LZO_UNUSED(wrkmem);
-
-    *out_len = 0;
-
-    op = out;
-    ip = in;
-
-    assert(in_len >= 3);
-    if (*ip > 17)
-    {
-        t = *ip++ - 17;
-        if (t < 4)
-            goto match_next;
-        goto first_literal_run;
-    }
-    assert(*ip < 16 || (*ip == 17 && in_len == 3));
-
-    while (TEST_IP && TEST_OP)
-    {
-        t = *ip++;
-        if (t >= 16)
-            goto match;
-        /* a literal run */
-        litp = ip - 1;
-        if (t == 0)
-        {
-            t = 15;
-            while (*ip == 0)
-                t += 255, ip++;
-            t += *ip++;
-        }
-        lit = t + 3;
-        /* copy literals */
-copy_literal_run:
-        *op++ = *ip++; *op++ = *ip++; *op++ = *ip++;
-first_literal_run:
-        do *op++ = *ip++; while (--t > 0);
-
-
-        t = *ip++;
-
-        if (t >= 16)
-            goto match;
-#if defined(LZO1X)
-        m_pos = op - 1 - 0x800;
-#elif defined(LZO1Y)
-        m_pos = op - 1 - 0x400;
-#endif
-        m_pos -= t >> 2;
-        m_pos -= *ip++ << 2;
-        *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos++;
-        lit = 0;
-        goto match_done;
-
-
-        /* handle matches */
-        do {
-            if (t < 16)                     /* a M1 match */
-            {
-                m_pos = op - 1;
-                m_pos -= t >> 2;
-                m_pos -= *ip++ << 2;
-
-                if (litp == NULL)
-                    goto copy_m1;
-
-                /* assert that there was a match just before */
-                assert(lit >= 1 && lit <= 3);
-                assert(litp == ip - 2 - lit - 2);
-                assert((lzo_uint)(*litp & 3) == lit);
-                nl = ip[-2] & 3;
-                /* test if a match follows */
-                if (nl == 0 && lit == 1 && ip[0] >= 16)
-                {
-                    next_lit = nl;
-                    /* adjust length of previous short run */
-                    lit += 2;
-                    *litp = LZO_BYTE((*litp & ~3) | lit);
-                    /* copy over the 2 literals that replace the match */
-                    copy2(ip-2,m_pos,pd(op,m_pos));
-                    o_m1_a++;
-                }
-                /* test if a literal run follows */
-                else if (nl == 0 && ip[0] < 16 && ip[0] != 0 &&
-                         (lit + 2 + ip[0] < 16))
-                {
-                    t = *ip++;
-                    /* remove short run */
-                    *litp &= ~3;
-                    /* copy over the 2 literals that replace the match */
-                    copy2(ip-3+1,m_pos,pd(op,m_pos));
-                    /* move literals 1 byte ahead */
-                    litp += 2;
-                    if (lit > 0)
-                        lzo_memmove(litp+1,litp,lit);
-                    /* insert new length of long literal run */
-                    lit += 2 + t + 3; assert(lit <= 18);
-                    *litp = LZO_BYTE(lit - 3);
-
-                    o_m1_b++;
-                    *op++ = *m_pos++; *op++ = *m_pos++;
-                    goto copy_literal_run;
-                }
-copy_m1:
-                *op++ = *m_pos++; *op++ = *m_pos++;
-            }
-            else
-            {
-match:
-                if (t >= 64)                /* a M2 match */
-                {
-                    m_pos = op - 1;
-#if defined(LZO1X)
-                    m_pos -= (t >> 2) & 7;
-                    m_pos -= *ip++ << 3;
-                    t = (t >> 5) - 1;
-#elif defined(LZO1Y)
-                    m_pos -= (t >> 2) & 3;
-                    m_pos -= *ip++ << 2;
-                    t = (t >> 4) - 3;
-#endif
-                    if (litp == NULL)
-                        goto copy_m;
-
-                    nl = ip[-2] & 3;
-                    /* test if in beetween two long literal runs */
-                    if (t == 1 && lit > 3 && nl == 0 &&
-                        ip[0] < 16 && ip[0] != 0 && (lit + 3 + ip[0] < 16))
-                    {
-                        assert(*litp == lit - 3);
-                        t = *ip++;
-                        /* copy over the 3 literals that replace the match */
-                        copy3(ip-1-2,m_pos,pd(op,m_pos));
-                        /* set new length of previous literal run */
-                        lit += 3 + t + 3; assert(lit <= 18);
-                        *litp = LZO_BYTE(lit - 3);
-                        o_m2++;
-                        *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos++;
-                        goto copy_literal_run;
-                    }
-                }
-                else
-                {
-                    if (t >= 32)            /* a M3 match */
-                    {
-                        t &= 31;
-                        if (t == 0)
-                        {
-                            t = 31;
-                            while (*ip == 0)
-                                t += 255, ip++;
-                            t += *ip++;
-                        }
-                        m_pos = op - 1;
-                        m_pos -= *ip++ >> 2;
-                        m_pos -= *ip++ << 6;
-                    }
-                    else                    /* a M4 match */
-                    {
-                        m_pos = op;
-                        m_pos -= (t & 8) << 11;
-                        t &= 7;
-                        if (t == 0)
-                        {
-                            t = 7;
-                            while (*ip == 0)
-                                t += 255, ip++;
-                            t += *ip++;
-                        }
-                        m_pos -= *ip++ >> 2;
-                        m_pos -= *ip++ << 6;
-                        if (m_pos == op)
-                            goto eof_found;
-                        m_pos -= 0x4000;
-                    }
-                    if (litp == NULL)
-                        goto copy_m;
-
-                    nl = ip[-2] & 3;
-                    /* test if in beetween two matches */
-                    if (t == 1 && lit == 0 && nl == 0 && ip[0] >= 16)
-                    {
-                        assert(litp == ip - 3 - lit - 2);
-                        assert((lzo_uint)(*litp & 3) == lit);
-                        next_lit = nl;
-                        /* make a previous short run */
-                        lit += 3;
-                        *litp = LZO_BYTE((*litp & ~3) | lit);
-                        /* copy over the 3 literals that replace the match */
-                        copy3(ip-3,m_pos,pd(op,m_pos));
-                        o_m3_a++;
-                    }
-                    /* test if a literal run follows */
-                    else if (t == 1 && lit <= 3 && nl == 0 &&
-                             ip[0] < 16 && ip[0] != 0 && (lit + 3 + ip[0] < 16))
-                    {
-                        assert(litp == ip - 3 - lit - 2);
-                        assert((lzo_uint)(*litp & 3) == lit);
-                        t = *ip++;
-                        /* remove short run */
-                        *litp &= ~3;
-                        /* copy over the 3 literals that replace the match */
-                        copy3(ip-4+1,m_pos,pd(op,m_pos));
-                        /* move literals 1 byte ahead */
-                        litp += 2;
-                        if (lit > 0)
-                            lzo_memmove(litp+1,litp,lit);
-                        /* insert new length of long literal run */
-                        lit += 3 + t + 3; assert(lit <= 18);
-                        *litp = LZO_BYTE(lit - 3);
-
-                        o_m3_b++;
-                        *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos++;
-                        goto copy_literal_run;
-                    }
-                }
-copy_m:
-                *op++ = *m_pos++; *op++ = *m_pos++;
-                do *op++ = *m_pos++; while (--t > 0);
-            }
-
-match_done:
-            if (next_lit == NO_LIT)
-            {
-                t = ip[-2] & 3;
-                lit = t;
-                litp = ip - 2;
-            }
-            else
-                t = next_lit;
-            assert(t <= 3);
-            next_lit = NO_LIT;
-            if (t == 0)
-                break;
-            /* copy literals */
-match_next:
-            do *op++ = *ip++; while (--t > 0);
-            t = *ip++;
-        } while (TEST_IP && TEST_OP);
-    }
-
-    /* no EOF code was found */
-    *out_len = pd(op, out);
-    return LZO_E_EOF_NOT_FOUND;
-
-eof_found:
-    assert(t == 1);
-#if 0
-    printf("optimize: %5lu %5lu   %5lu   %5lu %5lu\n",
-           o_m1_a, o_m1_b, o_m2, o_m3_a, o_m3_b);
-#endif
-    LZO_UNUSED(o_m1_a); LZO_UNUSED(o_m1_b); LZO_UNUSED(o_m2);
-    LZO_UNUSED(o_m3_a); LZO_UNUSED(o_m3_b);
-    *out_len = pd(op, out);
-    return (ip == ip_end ? LZO_E_OK :
-           (ip < ip_end  ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo1y_1.c b/lzo/src/lzo1y_1.c
deleted file mode 100644
index e5490098..00000000
--- a/lzo/src/lzo1y_1.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* lzo1y_1.c -- LZO1Y-1 compression
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo_conf.h"
-#if 1 && defined(UA_GET32)
-#undef  LZO_DICT_USE_PTR
-#define LZO_DICT_USE_PTR 0
-#undef  lzo_dict_t
-#define lzo_dict_t unsigned short
-#endif
-
-#define LZO_NEED_DICT_H 1
-#ifndef D_BITS
-#define D_BITS          14
-#endif
-#define D_INDEX1(d,p)       d = DX3(p,5,5,6); d += d >> 5; d = DM(d)
-#define D_INDEX2(d,p)       d = (d & (D_MASK & 0x7ff)) ^ (D_HIGH | 0x1f)
-#if 1
-#define DINDEX(dv,p)        DM(((DMUL(0x1824429d,dv)) >> (32-D_BITS)))
-#else
-#define DINDEX(dv,p)        DM((dv) + ((dv) >> (32-D_BITS)))
-#endif
-#include "config1y.h"
-#define LZO_DETERMINISTIC !(LZO_DICT_USE_PTR)
-
-#ifndef DO_COMPRESS
-#define DO_COMPRESS     lzo1y_1_compress
-#endif
-
-#include "lzo1x_c.ch"
diff --git a/lzo/src/lzo1y_9x.c b/lzo/src/lzo1y_9x.c
deleted file mode 100644
index dc875768..00000000
--- a/lzo/src/lzo1y_9x.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* lzo1y_9x.c -- implementation of the LZO1Y-999 compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define LZO1Y 1
-#include "lzo1x_9x.c"
diff --git a/lzo/src/lzo1y_d1.c b/lzo/src/lzo1y_d1.c
deleted file mode 100644
index 59129bde..00000000
--- a/lzo/src/lzo1y_d1.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1y_d1.c -- LZO1Y decompression
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1y.h"
-
-#undef LZO_TEST_OVERRUN
-#define DO_DECOMPRESS       lzo1y_decompress
-
-#include "lzo1x_d.ch"
diff --git a/lzo/src/lzo1y_d2.c b/lzo/src/lzo1y_d2.c
deleted file mode 100644
index d2da8fa5..00000000
--- a/lzo/src/lzo1y_d2.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1y_d2.c -- LZO1Y decompression with overrun testing
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1y.h"
-
-#define LZO_TEST_OVERRUN 1
-#define DO_DECOMPRESS       lzo1y_decompress_safe
-
-#include "lzo1x_d.ch"
diff --git a/lzo/src/lzo1y_d3.c b/lzo/src/lzo1y_d3.c
deleted file mode 100644
index 58cae1d7..00000000
--- a/lzo/src/lzo1y_d3.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* lzo1y_d3.c -- LZO1Y decompression with preset dictionary
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1y.h"
-
-#define lzo1x_decompress_dict_safe  lzo1y_decompress_dict_safe
-
-#include "lzo1x_d3.c"
diff --git a/lzo/src/lzo1y_o.c b/lzo/src/lzo1y_o.c
deleted file mode 100644
index 702ca555..00000000
--- a/lzo/src/lzo1y_o.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* lzo1y_o.c -- LZO1Y compressed data optimizer
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1y.h"
-
-#define DO_OPTIMIZE     lzo1y_optimize
-
-#include "lzo1x_oo.ch"
diff --git a/lzo/src/lzo1z_9x.c b/lzo/src/lzo1z_9x.c
deleted file mode 100644
index 4c25ba39..00000000
--- a/lzo/src/lzo1z_9x.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* lzo1z_9x.c -- implementation of the LZO1Z-999 compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#define LZO1Z 1
-#include "lzo1x_9x.c"
diff --git a/lzo/src/lzo1z_d1.c b/lzo/src/lzo1z_d1.c
deleted file mode 100644
index e4e865c8..00000000
--- a/lzo/src/lzo1z_d1.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1z_d1.c -- LZO1Z decompression
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1z.h"
-
-#undef LZO_TEST_OVERRUN
-#define DO_DECOMPRESS       lzo1z_decompress
-
-#include "lzo1x_d.ch"
diff --git a/lzo/src/lzo1z_d2.c b/lzo/src/lzo1z_d2.c
deleted file mode 100644
index 96d12d61..00000000
--- a/lzo/src/lzo1z_d2.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo1z_d2.c -- LZO1Z decompression with overrun testing
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1z.h"
-
-#define LZO_TEST_OVERRUN 1
-#define DO_DECOMPRESS       lzo1z_decompress_safe
-
-#include "lzo1x_d.ch"
diff --git a/lzo/src/lzo1z_d3.c b/lzo/src/lzo1z_d3.c
deleted file mode 100644
index 1e9db9df..00000000
--- a/lzo/src/lzo1z_d3.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* lzo1z_d3.c -- LZO1Z decompression with preset dictionary
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config1z.h"
-
-#define lzo1x_decompress_dict_safe  lzo1z_decompress_dict_safe
-
-#include "lzo1x_d3.c"
diff --git a/lzo/src/lzo2a_9x.c b/lzo/src/lzo2a_9x.c
deleted file mode 100644
index cd54f192..00000000
--- a/lzo/src/lzo2a_9x.c
+++ /dev/null
@@ -1,364 +0,0 @@
-/* lzo2a_9x.c -- implementation of the LZO2A-999 compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-
-#include "config2a.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define SWD_THRESHOLD       1           /* lower limit for match length */
-#define SWD_F            2048           /* upper limit for match length */
-
-
-#define LZO2A 1
-#define LZO_COMPRESS_T  lzo2a_999_t
-#define lzo_swd_t       lzo2a_999_swd_t
-#include "lzo_mchw.ch"
-
-
-#if (LZO_CC_BORLANDC && LZO_MM_FLAT)
-#  if ((__BORLANDC__) >= 0x0450 && (__BORLANDC__) < 0x0460)
-     /* avoid internal compiler error */
-#    pragma option -Od
-#  endif
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define putbyte(x)      *op++ = LZO_BYTE(x)
-
-#define putbits(j,x) \
-    if (k == 0) bitp = op++; \
-    SETBITS(j,x); \
-    if (k >= 8) { *bitp = LZO_BYTE(MASKBITS(8)); DUMPBITS(8); \
-                    if (k > 0) bitp = op++; }
-
-#define putbit(x)       putbits(1,x)
-
-
-/***********************************************************************
-// this is a public function, but there is no prototype in a header file
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo2a_999_compress_callback ( const lzo_bytep in , lzo_uint  in_len,
-                                    lzo_bytep out, lzo_uintp out_len,
-                                    lzo_voidp wrkmem,
-                                    lzo_callback_p cb,
-                                    lzo_uint max_chain );
-
-LZO_PUBLIC(int)
-lzo2a_999_compress_callback ( const lzo_bytep in , lzo_uint  in_len,
-                                    lzo_bytep out, lzo_uintp out_len,
-                                    lzo_voidp wrkmem,
-                                    lzo_callback_p cb,
-                                    lzo_uint max_chain )
-{
-    lzo_bytep op;
-    lzo_bytep bitp = 0;
-    lzo_uint m_len, m_off;
-    LZO_COMPRESS_T cc;
-    LZO_COMPRESS_T * const c = &cc;
-    lzo_swd_p const swd = (lzo_swd_p) wrkmem;
-    int r;
-
-    lzo_uint32 b = 0;       /* bit buffer */
-    unsigned k = 0;         /* bits in bit buffer */
-
-    /* sanity check */
-    LZO_COMPILE_TIME_ASSERT(LZO2A_999_MEM_COMPRESS >= SIZEOF_LZO_SWD_T)
-
-    c->init = 0;
-    c->ip = c->in = in;
-    c->in_end = in + in_len;
-    c->cb = cb;
-    c->m1 = c->m2 = c->m3 = c->m4 = 0;
-
-    op = out;
-
-    r = init_match(c,swd,NULL,0,0);
-    if (r != 0)
-        return r;
-    if (max_chain > 0)
-        swd->max_chain = max_chain;
-
-    r = find_match(c,swd,0,0);
-    if (r != 0)
-        return r;
-    while (c->look > 0)
-    {
-        lzo_uint lazy_match_min_gain = 0;
-#if (SWD_N >= 8192)
-        lzo_uint extra1 = 0;
-#endif
-        lzo_uint extra2 = 0;
-        lzo_uint ahead = 0;
-
-        m_len = c->m_len;
-        m_off = c->m_off;
-
-#if (SWD_N >= 8192)
-        if (m_off >= 8192)
-        {
-            if (m_len < M3_MIN_LEN)
-                m_len = 0;
-            else
-                lazy_match_min_gain = 1;
-        }
-        else
-#endif
-        if (m_len >= M1_MIN_LEN && m_len <= M1_MAX_LEN && m_off <= 256)
-        {
-            lazy_match_min_gain = 2;
-#if (SWD_N >= 8192)
-            extra1 = 3;
-#endif
-            extra2 = 2;
-        }
-        else if (m_len >= 10)
-            lazy_match_min_gain = 1;
-        else if (m_len >= 3)
-        {
-            lazy_match_min_gain = 1;
-#if (SWD_N >= 8192)
-            extra1 = 1;
-#endif
-        }
-        else
-            m_len = 0;
-
-
-        /* try a lazy match */
-        if (lazy_match_min_gain > 0 && c->look > m_len)
-        {
-            unsigned char lit = LZO_BYTE(swd->b_char);
-
-            r = find_match(c,swd,1,0);
-            assert(r == 0); LZO_UNUSED(r);
-            assert(c->look > 0);
-
-#if (SWD_N >= 8192)
-            if (m_off < 8192 && c->m_off >= 8192)
-                lazy_match_min_gain += extra1;
-            else
-#endif
-            if (m_len >= M1_MIN_LEN && m_len <= M1_MAX_LEN && m_off <= 256)
-            {
-                if (!(c->m_len >= M1_MIN_LEN &&
-                      c->m_len <= M1_MAX_LEN && c->m_off <= 256))
-                    lazy_match_min_gain += extra2;
-            }
-            if (c->m_len >= M1_MIN_LEN &&
-                c->m_len <= M1_MAX_LEN && c->m_off <= 256)
-            {
-                    lazy_match_min_gain -= 1;
-            }
-
-            if ((lzo_int) lazy_match_min_gain < 1)
-                lazy_match_min_gain = 1;
-
-            if (c->m_len >= m_len + lazy_match_min_gain)
-            {
-                c->lazy++;
-#if !defined(NDEBUG)
-                m_len = c->m_len;
-                m_off = c->m_off;
-                assert(lzo_memcmp(c->ip - c->look, c->ip - c->look - m_off,
-                                  m_len) == 0);
-                assert(m_len >= 3 || (m_len >= 2 && m_off <= 256));
-#endif
-                /* code literal */
-                putbit(0);
-                putbyte(lit);
-                c->lit_bytes++;
-                continue;
-            }
-            else
-                ahead = 1;
-            assert(m_len > 0);
-        }
-
-
-        if (m_len == 0)
-        {
-            /* a literal */
-            putbit(0);
-            putbyte(swd->b_char);
-            c->lit_bytes++;
-            r = find_match(c,swd,1,0);
-            assert(r == 0); LZO_UNUSED(r);
-        }
-        else
-        {
-            assert(m_len >= M1_MIN_LEN);
-            assert(m_off > 0);
-            assert(m_off <= SWD_N);
-
-            /* 2 - code match */
-            if (m_len >= M1_MIN_LEN && m_len <= M1_MAX_LEN && m_off <= 256)
-            {
-                putbit(1);
-                putbit(0);
-                putbits(2,m_len - M1_MIN_LEN);
-                putbyte(m_off - 1);
-                c->m1++;
-            }
-#if (SWD_N >= 8192)
-            else if (m_off >= 8192)
-            {
-                unsigned len = m_len;
-                assert(m_len >= M3_MIN_LEN);
-                putbit(1);
-                putbit(1);
-                putbyte(m_off & 31);
-                putbyte(m_off >> 5);
-                putbit(1);
-                len -= M3_MIN_LEN - 1;
-                while (len > 255)
-                {
-                    len -= 255;
-                    putbyte(0);
-                }
-                putbyte(len);
-                c->m4++;
-            }
-#endif
-            else
-            {
-                assert(m_len >= 3);
-
-                putbit(1);
-                putbit(1);
-                if (m_len <= 9)
-                {
-                    putbyte(((m_len - 2) << 5) | (m_off & 31));
-                    putbyte(m_off >> 5);
-                    c->m2++;
-                }
-                else
-                {
-                    lzo_uint len = m_len;
-                    putbyte(m_off & 31);
-                    putbyte(m_off >> 5);
-#if (SWD_N >= 8192)
-                    putbit(0);
-#endif
-                    len -= 10 - 1;
-                    while (len > 255)
-                    {
-                        len -= 255;
-                        putbyte(0);
-                    }
-                    putbyte(len);
-                    c->m3++;
-                }
-            }
-            r = find_match(c,swd,m_len,1+ahead);
-            assert(r == 0); LZO_UNUSED(r);
-        }
-
-        c->codesize = pd(op, out);
-    }
-
-#if defined(LZO_EOF_CODE)
-    /* code EOF code */
-    putbit(1);
-    putbit(1);
-    putbyte(1 << 5);
-    putbyte(0);
-#endif
-
-    /* flush remaining bits */
-    assert(k < CHAR_BIT);
-    if (k > 0)
-    {
-        assert(b == MASKBITS(k));
-        assert(op - bitp > 1);
-        *bitp = LZO_BYTE(MASKBITS(k));
-        DUMPBITS(k);
-        assert(b == 0);
-        assert(k == 0);
-    }
-
-    assert(c->textsize == in_len);
-    c->codesize = pd(op, out);
-
-    *out_len = pd(op, out);
-
-    if (c->cb && c->cb->nprogress)
-        (*c->cb->nprogress)(c->cb, c->textsize, c->codesize, 0);
-
-#if 0
-    printf("%ld -> %ld: %ld %ld %ld %ld %ld %ld\n",
-        (long) c->textsize, (long) c->codesize,
-        c->lit_bytes, c->m1, c->m2, c->m3, c->m4, c->lazy);
-#endif
-    return LZO_E_OK;
-}
-
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-lzo2a_999_compress  ( const lzo_bytep in , lzo_uint  in_len,
-                            lzo_bytep out, lzo_uintp out_len,
-                            lzo_voidp wrkmem )
-{
-    return lzo2a_999_compress_callback(in,in_len,out,out_len,wrkmem,
-                                       (lzo_callback_p) 0, 0);
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo2a_d.ch b/lzo/src/lzo2a_d.ch
deleted file mode 100644
index 48e51caa..00000000
--- a/lzo/src/lzo2a_d.ch
+++ /dev/null
@@ -1,191 +0,0 @@
-/* lzo2a_d.ch -- implementation of the LZO2A decompression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo1_d.ch"
-
-
-/***********************************************************************
-// decompress a block of data.
-************************************************************************/
-
-#define _NEEDBYTE   NEED_IP(1)
-#define _NEXTBYTE   (*ip++)
-
-LZO_PUBLIC(int)
-DO_DECOMPRESS    ( const lzo_bytep in , lzo_uint  in_len,
-                         lzo_bytep out, lzo_uintp out_len,
-                         lzo_voidp wrkmem )
-{
-    register lzo_bytep op;
-    register const lzo_bytep ip;
-    register const lzo_bytep m_pos;
-
-    lzo_uint t;
-    const lzo_bytep const ip_end = in + in_len;
-#if defined(HAVE_ANY_OP)
-    lzo_bytep const op_end = out + *out_len;
-#endif
-
-    lzo_uint32 b = 0;       /* bit buffer */
-    unsigned k = 0;         /* bits in bit buffer */
-
-    LZO_UNUSED(wrkmem);
-
-    op = out;
-    ip = in;
-
-    while (TEST_IP && TEST_OP)
-    {
-        NEEDBITS(1);
-        if (MASKBITS(1) == 0)
-        {
-            DUMPBITS(1);
-            /* a literal */
-            NEED_IP(1); NEED_OP(1);
-            *op++ = *ip++;
-            continue;
-        }
-        DUMPBITS(1);
-
-        NEEDBITS(1);
-        if (MASKBITS(1) == 0)
-        {
-            DUMPBITS(1);
-            /* a M1 match */
-            NEEDBITS(2);
-            t = M1_MIN_LEN + (lzo_uint) MASKBITS(2);
-            DUMPBITS(2);
-            NEED_IP(1); NEED_OP(t);
-            m_pos = op - 1 - *ip++;
-            assert(m_pos >= out); assert(m_pos < op);
-            TEST_LB(m_pos);
-            MEMCPY_DS(op,m_pos,t);
-            continue;
-        }
-        DUMPBITS(1);
-
-        NEED_IP(2);
-        t = *ip++;
-        m_pos = op;
-        m_pos -= (t & 31) | (((lzo_uint) *ip++) << 5);
-        t >>= 5;
-        if (t == 0)
-        {
-#if (SWD_N >= 8192)
-            NEEDBITS(1);
-            t = MASKBITS(1);
-            DUMPBITS(1);
-            if (t == 0)
-                t = 10 - 1;
-            else
-            {
-                /* a M3 match */
-                m_pos -= 8192;      /* t << 13 */
-                t = M3_MIN_LEN - 1;
-            }
-#else
-            t = 10 - 1;
-#endif
-            NEED_IP(1);
-            while (*ip == 0)
-            {
-                t += 255;
-                ip++;
-                NEED_IP(1);
-            }
-            t += *ip++;
-        }
-        else
-        {
-#if defined(LZO_EOF_CODE)
-            if (m_pos == op)
-                goto eof_found;
-#endif
-            t += 2;
-        }
-        assert(m_pos >= out); assert(m_pos < op);
-        TEST_LB(m_pos);
-        NEED_OP(t);
-        MEMCPY_DS(op,m_pos,t);
-    }
-
-
-#if defined(LZO_EOF_CODE)
-#if defined(HAVE_TEST_IP) || defined(HAVE_TEST_OP)
-    /* no EOF code was found */
-    *out_len = pd(op, out);
-    return LZO_E_EOF_NOT_FOUND;
-#endif
-
-eof_found:
-    assert(t == 1);
-#endif
-    *out_len = pd(op, out);
-    return (ip == ip_end ? LZO_E_OK :
-           (ip < ip_end  ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
-
-
-#if defined(HAVE_NEED_IP)
-input_overrun:
-    *out_len = pd(op, out);
-    return LZO_E_INPUT_OVERRUN;
-#endif
-
-#if defined(HAVE_NEED_OP)
-output_overrun:
-    *out_len = pd(op, out);
-    return LZO_E_OUTPUT_OVERRUN;
-#endif
-
-#if defined(LZO_TEST_OVERRUN_LOOKBEHIND)
-lookbehind_overrun:
-    *out_len = pd(op, out);
-    return LZO_E_LOOKBEHIND_OVERRUN;
-#endif
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo2a_d1.c b/lzo/src/lzo2a_d1.c
deleted file mode 100644
index 55446d03..00000000
--- a/lzo/src/lzo2a_d1.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo2a_d1.c -- LZO2A decompression with overrun testing
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config2a.h"
-
-#undef LZO_TEST_OVERRUN
-#define DO_DECOMPRESS       lzo2a_decompress
-
-#include "lzo2a_d.ch"
diff --git a/lzo/src/lzo2a_d2.c b/lzo/src/lzo2a_d2.c
deleted file mode 100644
index 29859b38..00000000
--- a/lzo/src/lzo2a_d2.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* lzo2a_d2.c -- LZO2A decompression with overrun testing
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "config2a.h"
-
-#define LZO_TEST_OVERRUN 1
-#define DO_DECOMPRESS       lzo2a_decompress_safe
-
-#include "lzo2a_d.ch"
diff --git a/lzo/src/lzo_conf.h b/lzo/src/lzo_conf.h
deleted file mode 100644
index 5fcf9635..00000000
--- a/lzo/src/lzo_conf.h
+++ /dev/null
@@ -1,392 +0,0 @@
-/* lzo_conf.h -- main internal configuration file for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_CONF_H
-#define __LZO_CONF_H 1
-
-#if !defined(__LZO_IN_MINILZO)
-#if (LZO_CFG_FREESTANDING)
-#  define LZO_LIBC_FREESTANDING 1
-#  define LZO_OS_FREESTANDING 1
-#  define ACC_LIBC_FREESTANDING 1
-#  define ACC_OS_FREESTANDING 1
-#endif
-#if (LZO_CFG_NO_UNALIGNED)
-#  define ACC_CFG_NO_UNALIGNED 1
-#endif
-#if (LZO_ARCH_GENERIC)
-#  define ACC_ARCH_GENERIC 1
-#endif
-#if (LZO_ABI_NEUTRAL_ENDIAN)
-#  define ACC_ABI_NEUTRAL_ENDIAN 1
-#endif
-#if (LZO_HAVE_CONFIG_H)
-#  define ACC_CONFIG_NO_HEADER 1
-#endif
-#if defined(LZO_CFG_EXTRA_CONFIG_HEADER)
-#  include LZO_CFG_EXTRA_CONFIG_HEADER
-#endif
-#if defined(__LZOCONF_H) || defined(__LZOCONF_H_INCLUDED)
-#  error "include this file first"
-#endif
-#include "lzo/lzoconf.h"
-#endif
-
-#if (LZO_VERSION < 0x02000) || !defined(__LZOCONF_H_INCLUDED)
-#  error "version mismatch"
-#endif
-
-
-/***********************************************************************
-// pragmas
-************************************************************************/
-
-#if (LZO_CC_BORLANDC && LZO_ARCH_I086)
-#  pragma option -h         /* enable fast huge pointers */
-#endif
-
-#if (LZO_CC_MSC && (_MSC_VER >= 1000))
-#  pragma warning(disable: 4127 4701)
-#endif
-#if (LZO_CC_MSC && (_MSC_VER >= 1300))
-   /* avoid '-Wall' warnings in system header files */
-#  pragma warning(disable: 4820)
-   /* avoid warnings about inlining */
-#  pragma warning(disable: 4514 4710 4711)
-#endif
-
-#if (LZO_CC_SUNPROC)
-#if !defined(__cplusplus)
-#  pragma error_messages(off,E_END_OF_LOOP_CODE_NOT_REACHED)
-#  pragma error_messages(off,E_LOOP_NOT_ENTERED_AT_TOP)
-#  pragma error_messages(off,E_STATEMENT_NOT_REACHED)
-#endif
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if (__LZO_MMODEL_HUGE) && !(LZO_HAVE_MM_HUGE_PTR)
-#  error "this should not happen - check defines for __huge"
-#endif
-
-#if defined(__LZO_IN_MINILZO) || defined(LZO_CFG_FREESTANDING)
-#elif (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16)
-#  define ACC_WANT_ACC_INCD_H 1
-#  define ACC_WANT_ACC_INCE_H 1
-#  define ACC_WANT_ACC_INCI_H 1
-#elif 1
-#  include <string.h>
-#else
-#  define ACC_WANT_ACC_INCD_H 1
-#endif
-#include "miniacc.h"
-
-
-#if (LZO_CFG_FREESTANDING)
-#  undef HAVE_MEMCMP
-#  undef HAVE_MEMCPY
-#  undef HAVE_MEMMOVE
-#  undef HAVE_MEMSET
-#endif
-
-#if !(HAVE_MEMCMP)
-#  undef memcmp
-#  define memcmp(a,b,c)         lzo_memcmp(a,b,c)
-#elif !(__LZO_MMODEL_HUGE)
-#  undef lzo_memcmp
-#  define lzo_memcmp(a,b,c)     memcmp(a,b,c)
-#endif
-#if !(HAVE_MEMCPY)
-#  undef memcpy
-#  define memcpy(a,b,c)         lzo_memcpy(a,b,c)
-#elif !(__LZO_MMODEL_HUGE)
-#  undef lzo_memcpy
-#  define lzo_memcpy(a,b,c)     memcpy(a,b,c)
-#endif
-#if !(HAVE_MEMMOVE)
-#  undef memmove
-#  define memmove(a,b,c)        lzo_memmove(a,b,c)
-#elif !(__LZO_MMODEL_HUGE)
-#  undef lzo_memmove
-#  define lzo_memmove(a,b,c)    memmove(a,b,c)
-#endif
-#if !(HAVE_MEMSET)
-#  undef memset
-#  define memset(a,b,c)         lzo_memset(a,b,c)
-#elif !(__LZO_MMODEL_HUGE)
-#  undef lzo_memset
-#  define lzo_memset(a,b,c)     memset(a,b,c)
-#endif
-
-
-#undef NDEBUG
-#if (LZO_CFG_FREESTANDING)
-#  undef LZO_DEBUG
-#  define NDEBUG 1
-#  undef assert
-#  define assert(e) ((void)0)
-#else
-#  if !defined(LZO_DEBUG)
-#    define NDEBUG 1
-#  endif
-#  include <assert.h>
-#endif
-
-#if 0 && defined(__BOUNDS_CHECKING_ON)
-#  include <unchecked.h>
-#else
-#  define BOUNDS_CHECKING_OFF_DURING(stmt)      stmt
-#  define BOUNDS_CHECKING_OFF_IN_EXPR(expr)     (expr)
-#endif
-
-#if !defined(__lzo_inline)
-#  define __lzo_inline              /*empty*/
-#endif
-#if !defined(__lzo_forceinline)
-#  define __lzo_forceinline         /*empty*/
-#endif
-#if !defined(__lzo_noinline)
-#  define __lzo_noinline            /*empty*/
-#endif
-
-#if (LZO_CFG_PGO)
-#  undef __acc_likely
-#  undef __acc_unlikely
-#  undef __lzo_likely
-#  undef __lzo_unlikely
-#  define __acc_likely(e)       (e)
-#  define __acc_unlikely(e)     (e)
-#  define __lzo_likely(e)       (e)
-#  define __lzo_unlikely(e)     (e)
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#if 1
-#  define LZO_BYTE(x)       ((unsigned char) (x))
-#else
-#  define LZO_BYTE(x)       ((unsigned char) ((x) & 0xff))
-#endif
-
-#define LZO_MAX(a,b)        ((a) >= (b) ? (a) : (b))
-#define LZO_MIN(a,b)        ((a) <= (b) ? (a) : (b))
-#define LZO_MAX3(a,b,c)     ((a) >= (b) ? LZO_MAX(a,c) : LZO_MAX(b,c))
-#define LZO_MIN3(a,b,c)     ((a) <= (b) ? LZO_MIN(a,c) : LZO_MIN(b,c))
-
-#define lzo_sizeof(type)    ((lzo_uint) (sizeof(type)))
-
-#define LZO_HIGH(array)     ((lzo_uint) (sizeof(array)/sizeof(*(array))))
-
-/* this always fits into 16 bits */
-#define LZO_SIZE(bits)      (1u << (bits))
-#define LZO_MASK(bits)      (LZO_SIZE(bits) - 1)
-
-#define LZO_LSIZE(bits)     (1ul << (bits))
-#define LZO_LMASK(bits)     (LZO_LSIZE(bits) - 1)
-
-#define LZO_USIZE(bits)     ((lzo_uint) 1 << (bits))
-#define LZO_UMASK(bits)     (LZO_USIZE(bits) - 1)
-
-#if !defined(DMUL)
-#if 0
-   /* 32*32 multiplies may be faster than 64*64 on some 64-bit machines,
-    * but then we need extra casts from unsigned<->size_t */
-#  define DMUL(a,b) ((lzo_xint) ((lzo_uint32)(a) * (lzo_uint32)(b)))
-#else
-#  define DMUL(a,b) ((lzo_xint) ((a) * (b)))
-#endif
-#endif
-
-
-/***********************************************************************
-// compiler and architecture specific stuff
-************************************************************************/
-
-/* Some defines that indicate if memory can be accessed at unaligned
- * memory addresses. You should also test that this is actually faster
- * even if it is allowed by your system.
- */
-
-#if 1 && (LZO_ARCH_AMD64 || LZO_ARCH_I386 || LZO_ARCH_POWERPC)
-#  if (LZO_SIZEOF_SHORT == 2)
-#    define LZO_UNALIGNED_OK_2 1
-#  endif
-#  if (LZO_SIZEOF_INT == 4)
-#    define LZO_UNALIGNED_OK_4 1
-#  endif
-#endif
-#if 1 && (LZO_ARCH_AMD64)
-#  if defined(LZO_UINT64_MAX)
-#    define LZO_UNALIGNED_OK_8 1
-#  endif
-#endif
-#if (LZO_CFG_NO_UNALIGNED)
-#  undef LZO_UNALIGNED_OK_2
-#  undef LZO_UNALIGNED_OK_4
-#  undef LZO_UNALIGNED_OK_8
-#endif
-
-#undef UA_GET16
-#undef UA_SET16
-#undef UA_COPY16
-#undef UA_GET32
-#undef UA_SET32
-#undef UA_COPY32
-#undef UA_GET64
-#undef UA_SET64
-#undef UA_COPY64
-#if defined(LZO_UNALIGNED_OK_2)
-   LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(unsigned short) == 2)
-#  if 1 && defined(ACC_UA_COPY16)
-#    define UA_GET16        ACC_UA_GET16
-#    define UA_SET16        ACC_UA_SET16
-#    define UA_COPY16       ACC_UA_COPY16
-#  else
-#    define UA_GET16(p)     (* (__lzo_ua_volatile const lzo_ushortp) (__lzo_ua_volatile const lzo_voidp) (p))
-#    define UA_SET16(p,v)   ((* (__lzo_ua_volatile lzo_ushortp) (__lzo_ua_volatile lzo_voidp) (p)) = (unsigned short) (v))
-#    define UA_COPY16(d,s)  UA_SET16(d, UA_GET16(s))
-#  endif
-#endif
-#if defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4)
-   LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint32) == 4)
-#  if 1 && defined(ACC_UA_COPY32)
-#    define UA_GET32        ACC_UA_GET32
-#    define UA_SET32        ACC_UA_SET32
-#    define UA_COPY32       ACC_UA_COPY32
-#  else
-#    define UA_GET32(p)     (* (__lzo_ua_volatile const lzo_uint32p) (__lzo_ua_volatile const lzo_voidp) (p))
-#    define UA_SET32(p,v)   ((* (__lzo_ua_volatile lzo_uint32p) (__lzo_ua_volatile lzo_voidp) (p)) = (lzo_uint32) (v))
-#    define UA_COPY32(d,s)  UA_SET32(d, UA_GET32(s))
-#  endif
-#endif
-#if defined(LZO_UNALIGNED_OK_8)
-   LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint64) == 8)
-#  if 1 && defined(ACC_UA_COPY64)
-#    define UA_GET64        ACC_UA_GET64
-#    define UA_SET64        ACC_UA_SET64
-#    define UA_COPY64       ACC_UA_COPY64
-#  else
-#    define UA_GET64(p)     (* (__lzo_ua_volatile const lzo_uint64p) (__lzo_ua_volatile const lzo_voidp) (p))
-#    define UA_SET64(p,v)   ((* (__lzo_ua_volatile lzo_uint64p) (__lzo_ua_volatile lzo_voidp) (p)) = (lzo_uint64) (v))
-#    define UA_COPY64(d,s)  UA_SET64(d, UA_GET64(s))
-#  endif
-#endif
-
-
-/* Fast memcpy that copies multiples of 8 byte chunks.
- * len is the number of bytes.
- * note: all parameters must be lvalues, len >= 8
- *       dest and src advance, len is undefined afterwards
- */
-
-#define MEMCPY8_DS(dest,src,len) \
-    lzo_memcpy(dest,src,len); dest += len; src += len
-
-#define BZERO8_PTR(s,l,n) \
-    lzo_memset((lzo_voidp)(s),0,(lzo_uint)(l)*(n))
-
-#define MEMCPY_DS(dest,src,len) \
-    do *dest++ = *src++; while (--len > 0)
-
-
-/***********************************************************************
-// some globals
-************************************************************************/
-
-LZO_EXTERN(const lzo_bytep) lzo_copyright(void);
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#include "lzo_ptr.h"
-
-
-/* Generate compressed data in a deterministic way.
- * This is fully portable, and compression can be faster as well.
- * A reason NOT to be deterministic is when the block size is
- * very small (e.g. 8kB) or the dictionary is big, because
- * then the initialization of the dictionary becomes a relevant
- * magnitude for compression speed.
- */
-#ifndef LZO_DETERMINISTIC
-#define LZO_DETERMINISTIC 1
-#endif
-
-
-#ifndef LZO_DICT_USE_PTR
-#define LZO_DICT_USE_PTR 1
-#if 0 && (LZO_ARCH_I086)
-#  undef LZO_DICT_USE_PTR
-#  define LZO_DICT_USE_PTR 0
-#endif
-#endif
-
-#if (LZO_DICT_USE_PTR)
-#  define lzo_dict_t    const lzo_bytep
-#  define lzo_dict_p    lzo_dict_t __LZO_MMODEL *
-#else
-#  define lzo_dict_t    lzo_uint
-#  define lzo_dict_p    lzo_dict_t __LZO_MMODEL *
-#endif
-
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo_crc.c b/lzo/src/lzo_crc.c
deleted file mode 100644
index f5632cfc..00000000
--- a/lzo/src/lzo_crc.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* lzo_crc.c -- crc checksum for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo_conf.h"
-
-
-/***********************************************************************
-// crc32 checksum
-// adapted from free code by Mark Adler <madler@alumni.caltech.edu>
-// see http://www.zlib.org/
-************************************************************************/
-
-static const lzo_uint32 lzo_crc32_table[256] = {
-  0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
-  0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
-  0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
-  0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
-  0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
-  0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
-  0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
-  0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
-  0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
-  0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
-  0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
-  0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
-  0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
-  0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
-  0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
-  0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
-  0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
-  0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
-  0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
-  0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
-  0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
-  0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
-  0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
-  0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
-  0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
-  0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
-  0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
-  0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
-  0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
-  0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
-  0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
-  0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
-  0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
-  0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
-  0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
-  0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
-  0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
-  0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
-  0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
-  0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
-  0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
-  0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
-  0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
-  0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
-  0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
-  0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
-  0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
-  0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
-  0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
-  0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
-  0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
-  0x2d02ef8dL
-};
-
-
-LZO_PUBLIC(const lzo_uint32p)
-lzo_get_crc32_table(void)
-{
-    return lzo_crc32_table;
-}
-
-
-#if 1
-#define LZO_DO1(buf,i) \
-    crc = table[((unsigned)crc ^ buf[i]) & 0xff] ^ (crc >> 8)
-#else
-#define LZO_DO1(buf,i) \
-    crc = table[(unsigned char)((unsigned char)crc ^ buf[i])] ^ (crc >> 8)
-#endif
-#define LZO_DO2(buf,i)  LZO_DO1(buf,i); LZO_DO1(buf,i+1);
-#define LZO_DO4(buf,i)  LZO_DO2(buf,i); LZO_DO2(buf,i+2);
-#define LZO_DO8(buf,i)  LZO_DO4(buf,i); LZO_DO4(buf,i+4);
-#define LZO_DO16(buf,i) LZO_DO8(buf,i); LZO_DO8(buf,i+8);
-
-
-LZO_PUBLIC(lzo_uint32)
-lzo_crc32(lzo_uint32 c, const lzo_bytep buf, lzo_uint len)
-{
-    lzo_uint32 crc;
-#undef table
-#if 1
-#  define table lzo_crc32_table
-#else
-   const lzo_uint32 * table = lzo_crc32_table;
-#endif
-
-    if (buf == NULL)
-        return 0;
-
-    crc = (c & LZO_UINT32_C(0xffffffff)) ^ LZO_UINT32_C(0xffffffff);
-    if (len >= 16) do
-    {
-        LZO_DO16(buf,0);
-        buf += 16;
-        len -= 16;
-    } while (len >= 16);
-    if (len != 0) do
-    {
-        LZO_DO1(buf,0);
-        buf += 1;
-        len -= 1;
-    } while (len > 0);
-
-    return crc ^ LZO_UINT32_C(0xffffffff);
-#undef table
-}
-
-#undef LZO_DO1
-#undef LZO_DO2
-#undef LZO_DO4
-#undef LZO_DO8
-#undef LZO_DO16
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/lzo_dict.h b/lzo/src/lzo_dict.h
deleted file mode 100644
index 961522c2..00000000
--- a/lzo/src/lzo_dict.h
+++ /dev/null
@@ -1,324 +0,0 @@
-/* lzo_dict.h -- dictionary definitions for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_DICT_H
-#define __LZO_DICT_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-/***********************************************************************
-// dictionary size
-************************************************************************/
-
-/* dictionary needed for compression */
-#if !defined(D_BITS) && defined(DBITS)
-#  define D_BITS        DBITS
-#endif
-#if !defined(D_BITS)
-#  error "D_BITS is not defined"
-#endif
-#if (D_BITS < 16)
-#  define D_SIZE        LZO_SIZE(D_BITS)
-#  define D_MASK        LZO_MASK(D_BITS)
-#else
-#  define D_SIZE        LZO_USIZE(D_BITS)
-#  define D_MASK        LZO_UMASK(D_BITS)
-#endif
-#define D_HIGH          ((D_MASK >> 1) + 1)
-
-
-/* dictionary depth */
-#if !defined(DD_BITS)
-#  define DD_BITS       0
-#endif
-#define DD_SIZE         LZO_SIZE(DD_BITS)
-#define DD_MASK         LZO_MASK(DD_BITS)
-
-/* dictionary length */
-#if !defined(DL_BITS)
-#  define DL_BITS       (D_BITS - DD_BITS)
-#endif
-#if (DL_BITS < 16)
-#  define DL_SIZE       LZO_SIZE(DL_BITS)
-#  define DL_MASK       LZO_MASK(DL_BITS)
-#else
-#  define DL_SIZE       LZO_USIZE(DL_BITS)
-#  define DL_MASK       LZO_UMASK(DL_BITS)
-#endif
-
-
-#if (D_BITS != DL_BITS + DD_BITS)
-#  error "D_BITS does not match"
-#endif
-#if (D_BITS < 6 || D_BITS > 18)
-#  error "invalid D_BITS"
-#endif
-#if (DL_BITS < 6 || DL_BITS > 20)
-#  error "invalid DL_BITS"
-#endif
-#if (DD_BITS < 0 || DD_BITS > 6)
-#  error "invalid DD_BITS"
-#endif
-
-
-#if !defined(DL_MIN_LEN)
-#  define DL_MIN_LEN    3
-#endif
-#if !defined(DL_SHIFT)
-#  define DL_SHIFT      ((DL_BITS + (DL_MIN_LEN - 1)) / DL_MIN_LEN)
-#endif
-
-
-
-/***********************************************************************
-// dictionary access
-************************************************************************/
-
-#define LZO_HASH_GZIP                   1
-#define LZO_HASH_GZIP_INCREMENTAL       2
-#define LZO_HASH_LZO_INCREMENTAL_A      3
-#define LZO_HASH_LZO_INCREMENTAL_B      4
-
-#if !defined(LZO_HASH)
-#  error "choose a hashing strategy"
-#endif
-
-#undef DM
-#undef DX
-
-#if (DL_MIN_LEN == 3)
-#  define _DV2_A(p,shift1,shift2) \
-        (((( (lzo_xint)((p)[0]) << shift1) ^ (p)[1]) << shift2) ^ (p)[2])
-#  define _DV2_B(p,shift1,shift2) \
-        (((( (lzo_xint)((p)[2]) << shift1) ^ (p)[1]) << shift2) ^ (p)[0])
-#  define _DV3_B(p,shift1,shift2,shift3) \
-        ((_DV2_B((p)+1,shift1,shift2) << (shift3)) ^ (p)[0])
-#elif (DL_MIN_LEN == 2)
-#  define _DV2_A(p,shift1,shift2) \
-        (( (lzo_xint)(p[0]) << shift1) ^ p[1])
-#  define _DV2_B(p,shift1,shift2) \
-        (( (lzo_xint)(p[1]) << shift1) ^ p[2])
-#else
-#  error "invalid DL_MIN_LEN"
-#endif
-#define _DV_A(p,shift)      _DV2_A(p,shift,shift)
-#define _DV_B(p,shift)      _DV2_B(p,shift,shift)
-#define DA2(p,s1,s2) \
-        (((((lzo_xint)((p)[2]) << (s2)) + (p)[1]) << (s1)) + (p)[0])
-#define DS2(p,s1,s2) \
-        (((((lzo_xint)((p)[2]) << (s2)) - (p)[1]) << (s1)) - (p)[0])
-#define DX2(p,s1,s2) \
-        (((((lzo_xint)((p)[2]) << (s2)) ^ (p)[1]) << (s1)) ^ (p)[0])
-#define DA3(p,s1,s2,s3) ((DA2((p)+1,s2,s3) << (s1)) + (p)[0])
-#define DS3(p,s1,s2,s3) ((DS2((p)+1,s2,s3) << (s1)) - (p)[0])
-#define DX3(p,s1,s2,s3) ((DX2((p)+1,s2,s3) << (s1)) ^ (p)[0])
-#define DMS(v,s)        ((lzo_uint) (((v) & (D_MASK >> (s))) << (s)))
-#define DM(v)           DMS(v,0)
-
-
-#if (LZO_HASH == LZO_HASH_GZIP)
-   /* hash function like in gzip/zlib (deflate) */
-#  define _DINDEX(dv,p)     (_DV_A((p),DL_SHIFT))
-
-#elif (LZO_HASH == LZO_HASH_GZIP_INCREMENTAL)
-   /* incremental hash like in gzip/zlib (deflate) */
-#  define __LZO_HASH_INCREMENTAL 1
-#  define DVAL_FIRST(dv,p)  dv = _DV_A((p),DL_SHIFT)
-#  define DVAL_NEXT(dv,p)   dv = (((dv) << DL_SHIFT) ^ p[2])
-#  define _DINDEX(dv,p)     (dv)
-#  define DVAL_LOOKAHEAD    DL_MIN_LEN
-
-#elif (LZO_HASH == LZO_HASH_LZO_INCREMENTAL_A)
-   /* incremental LZO hash version A */
-#  define __LZO_HASH_INCREMENTAL 1
-#  define DVAL_FIRST(dv,p)  dv = _DV_A((p),5)
-#  define DVAL_NEXT(dv,p) \
-                dv ^= (lzo_xint)(p[-1]) << (2*5); dv = (((dv) << 5) ^ p[2])
-#  define _DINDEX(dv,p)     ((DMUL(0x9f5f,dv)) >> 5)
-#  define DVAL_LOOKAHEAD    DL_MIN_LEN
-
-#elif (LZO_HASH == LZO_HASH_LZO_INCREMENTAL_B)
-   /* incremental LZO hash version B */
-#  define __LZO_HASH_INCREMENTAL 1
-#  define DVAL_FIRST(dv,p)  dv = _DV_B((p),5)
-#  define DVAL_NEXT(dv,p) \
-                dv ^= p[-1]; dv = (((dv) >> 5) ^ ((lzo_xint)(p[2]) << (2*5)))
-#  define _DINDEX(dv,p)     ((DMUL(0x9f5f,dv)) >> 5)
-#  define DVAL_LOOKAHEAD    DL_MIN_LEN
-
-#else
-#  error "choose a hashing strategy"
-#endif
-
-
-#ifndef DINDEX
-#define DINDEX(dv,p)        ((lzo_uint)((_DINDEX(dv,p)) & DL_MASK) << DD_BITS)
-#endif
-#if !defined(DINDEX1) && defined(D_INDEX1)
-#define DINDEX1             D_INDEX1
-#endif
-#if !defined(DINDEX2) && defined(D_INDEX2)
-#define DINDEX2             D_INDEX2
-#endif
-
-
-
-#if !defined(__LZO_HASH_INCREMENTAL)
-#  define DVAL_FIRST(dv,p)  ((void) 0)
-#  define DVAL_NEXT(dv,p)   ((void) 0)
-#  define DVAL_LOOKAHEAD    0
-#endif
-
-
-#if !defined(DVAL_ASSERT)
-#if defined(__LZO_HASH_INCREMENTAL) && !defined(NDEBUG)
-#if (LZO_CC_CLANG || (LZO_CC_GNUC >= 0x020700ul) || LZO_CC_LLVM)
-static void __attribute__((__unused__))
-#else
-static void
-#endif
-DVAL_ASSERT(lzo_xint dv, const lzo_bytep p)
-{
-    lzo_xint df;
-    DVAL_FIRST(df,(p));
-    assert(DINDEX(dv,p) == DINDEX(df,p));
-}
-#else
-#  define DVAL_ASSERT(dv,p) ((void) 0)
-#endif
-#endif
-
-
-
-/***********************************************************************
-// dictionary updating
-************************************************************************/
-
-#if (LZO_DICT_USE_PTR)
-#  define DENTRY(p,in)                          (p)
-#  define GINDEX(m_pos,m_off,dict,dindex,in)    m_pos = dict[dindex]
-#else
-#  define DENTRY(p,in)                          ((lzo_dict_t) pd(p, in))
-#  define GINDEX(m_pos,m_off,dict,dindex,in)    m_off = dict[dindex]
-#endif
-
-
-#if (DD_BITS == 0)
-
-#  define UPDATE_D(dict,drun,dv,p,in)       dict[ DINDEX(dv,p) ] = DENTRY(p,in)
-#  define UPDATE_I(dict,drun,index,p,in)    dict[index] = DENTRY(p,in)
-#  define UPDATE_P(ptr,drun,p,in)           (ptr)[0] = DENTRY(p,in)
-
-#else
-
-#  define UPDATE_D(dict,drun,dv,p,in)   \
-        dict[ DINDEX(dv,p) + drun++ ] = DENTRY(p,in); drun &= DD_MASK
-#  define UPDATE_I(dict,drun,index,p,in)    \
-        dict[ (index) + drun++ ] = DENTRY(p,in); drun &= DD_MASK
-#  define UPDATE_P(ptr,drun,p,in)   \
-        (ptr) [ drun++ ] = DENTRY(p,in); drun &= DD_MASK
-
-#endif
-
-
-/***********************************************************************
-// test for a match
-************************************************************************/
-
-#if (LZO_DICT_USE_PTR)
-
-/* m_pos is either NULL or a valid pointer */
-#define LZO_CHECK_MPOS_DET(m_pos,m_off,in,ip,max_offset) \
-        (m_pos == NULL || (m_off = pd(ip, m_pos)) > max_offset)
-
-/* m_pos may point anywhere... */
-#define LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,max_offset) \
-    (BOUNDS_CHECKING_OFF_IN_EXPR(( \
-        m_pos = ip - (lzo_uint) PTR_DIFF(ip,m_pos), \
-        PTR_LT(m_pos,in) || \
-        (m_off = (lzo_uint) PTR_DIFF(ip,m_pos)) == 0 || \
-         m_off > max_offset )))
-
-#else
-
-#define LZO_CHECK_MPOS_DET(m_pos,m_off,in,ip,max_offset) \
-        (m_off == 0 || \
-         ((m_off = pd(ip, in) - m_off) > max_offset) || \
-         (m_pos = (ip) - (m_off), 0) )
-
-#define LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,max_offset) \
-        (pd(ip, in) <= m_off || \
-         ((m_off = pd(ip, in) - m_off) > max_offset) || \
-         (m_pos = (ip) - (m_off), 0) )
-
-#endif
-
-
-#if (LZO_DETERMINISTIC)
-#  define LZO_CHECK_MPOS    LZO_CHECK_MPOS_DET
-#else
-#  define LZO_CHECK_MPOS    LZO_CHECK_MPOS_NON_DET
-#endif
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo_dll.ch b/lzo/src/lzo_dll.ch
deleted file mode 100644
index 3f56a3b8..00000000
--- a/lzo/src/lzo_dll.ch
+++ /dev/null
@@ -1,67 +0,0 @@
-/* lzo_dll.ch -- DLL initialization of the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/***********************************************************************
-// Windows 16 bit + Watcom C + DLL
-************************************************************************/
-
-#if (LZO_OS_WIN16 && LZO_CC_WATCOMC) && defined(__SW_BD)
-
-/* don't pull in <windows.h> - we don't need it */
-#if 0
-BOOL FAR PASCAL LibMain ( HANDLE hInstance, WORD wDataSegment,
-                          WORD wHeapSize, LPSTR lpszCmdLine )
-#else
-int __far __pascal LibMain ( int a, short b, short c, long d )
-#endif
-{
-    LZO_UNUSED(a); LZO_UNUSED(b); LZO_UNUSED(c); LZO_UNUSED(d);
-    return 1;
-}
-
-#endif
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/lzo_func.ch b/lzo/src/lzo_func.ch
deleted file mode 100644
index a85b71f0..00000000
--- a/lzo/src/lzo_func.ch
+++ /dev/null
@@ -1,122 +0,0 @@
-/* lzo_func.ch -- functions
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-/***********************************************************************
-// bitops
-************************************************************************/
-
-#if (defined(_WIN32) || defined(_WIN64)) && ((LZO_CC_INTELC && (__INTEL_COMPILER >= 1000)) || (LZO_CC_MSC && (_MSC_VER >= 1400)))
-#include <intrin.h>
-#if !defined(lzo_bitops_clz32) && defined(WANT_lzo_bitops_clz32) && 0
-#pragma intrinsic(_BitScanReverse)
-static __lzo_inline unsigned lzo_bitops_clz32(lzo_uint32 v)
-{
-    unsigned long r;
-    (void) _BitScanReverse(&r, v);
-    return (unsigned) r;
-}
-#define lzo_bitops_clz32 lzo_bitops_clz32
-#endif
-#if !defined(lzo_bitops_clz64) && defined(WANT_lzo_bitops_clz64) && defined(LZO_UINT64_MAX) && 0
-#pragma intrinsic(_BitScanReverse64)
-static __lzo_inline unsigned lzo_bitops_clz64(lzo_uint64 v)
-{
-    unsigned long r;
-    (void) _BitScanReverse64(&r, v);
-    return (unsigned) r;
-}
-#define lzo_bitops_clz64 lzo_bitops_clz64
-#endif
-#if !defined(lzo_bitops_ctz32) && defined(WANT_lzo_bitops_ctz32)
-#pragma intrinsic(_BitScanForward)
-static __lzo_inline unsigned lzo_bitops_ctz32(lzo_uint32 v)
-{
-    unsigned long r;
-    (void) _BitScanForward(&r, v);
-    return (unsigned) r;
-}
-#define lzo_bitops_ctz32 lzo_bitops_ctz32
-#endif
-#if !defined(lzo_bitops_ctz64) && defined(WANT_lzo_bitops_ctz64) && defined(LZO_UINT64_MAX)
-#pragma intrinsic(_BitScanForward64)
-static __lzo_inline unsigned lzo_bitops_ctz64(lzo_uint64 v)
-{
-    unsigned long r;
-    (void) _BitScanForward64(&r, v);
-    return (unsigned) r;
-}
-#define lzo_bitops_ctz64 lzo_bitops_ctz64
-#endif
-
-#elif (LZO_CC_CLANG || (LZO_CC_GNUC >= 0x030400ul) || (LZO_CC_INTELC && (__INTEL_COMPILER >= 1000)) || (LZO_CC_LLVM && (!defined(__llvm_tools_version__) || (__llvm_tools_version__+0 >= 0x010500ul))))
-#if !defined(lzo_bitops_clz32) && defined(WANT_lzo_bitops_clz32)
-#define lzo_bitops_clz32(v) ((unsigned) __builtin_clz(v))
-#endif
-#if !defined(lzo_bitops_clz64) && defined(WANT_lzo_bitops_clz64) && defined(LZO_UINT64_MAX)
-#define lzo_bitops_clz64(v) ((unsigned) __builtin_clzll(v))
-#endif
-#if !defined(lzo_bitops_ctz32) && defined(WANT_lzo_bitops_ctz32)
-#define lzo_bitops_ctz32(v) ((unsigned) __builtin_ctz(v))
-#endif
-#if !defined(lzo_bitops_ctz64) && defined(WANT_lzo_bitops_ctz64) && defined(LZO_UINT64_MAX)
-#define lzo_bitops_ctz64(v) ((unsigned) __builtin_ctzll(v))
-#endif
-#if !defined(lzo_bitops_popcount32) && defined(WANT_lzo_bitops_popcount32)
-#define lzo_bitops_popcount32(v) ((unsigned) __builtin_popcount(v))
-#endif
-#if !defined(lzo_bitops_popcount32) && defined(WANT_lzo_bitops_popcount64) && defined(LZO_UINT64_MAX)
-#define lzo_bitops_popcount64(v) ((unsigned) __builtin_popcountll(v))
-#endif
-#endif
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo_init.c b/lzo/src/lzo_init.c
deleted file mode 100644
index 2872949c..00000000
--- a/lzo/src/lzo_init.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/* lzo_init.c -- initialization of the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo_conf.h"
-
-
-/***********************************************************************
-// Runtime check of the assumptions about the size of builtin types,
-// memory model, byte order and other low-level constructs.
-//
-// We are really paranoid here - LZO should either fail
-// at startup or not at all.
-//
-// Because of inlining much of these functions evaluates to nothing.
-//
-// And while many of the tests seem highly obvious and redundant they are
-// here to catch compiler/optimizer bugs. Yes, these do exist.
-************************************************************************/
-
-#if !defined(__LZO_IN_MINILZO)
-
-#define ACC_WANT_ACC_CHK_CH 1
-#undef ACCCHK_ASSERT
-#include "miniacc.h"
-
-    ACCCHK_ASSERT_IS_SIGNED_T(lzo_int)
-    ACCCHK_ASSERT_IS_UNSIGNED_T(lzo_uint)
-
-    ACCCHK_ASSERT_IS_SIGNED_T(lzo_int32)
-    ACCCHK_ASSERT_IS_UNSIGNED_T(lzo_uint32)
-    ACCCHK_ASSERT((LZO_UINT32_C(1) << (int)(8*sizeof(LZO_UINT32_C(1))-1)) > 0)
-    ACCCHK_ASSERT(sizeof(lzo_uint32) >= 4)
-#if defined(LZO_UINT64_MAX)
-    ACCCHK_ASSERT(sizeof(lzo_uint64) == 8)
-    ACCCHK_ASSERT_IS_SIGNED_T(lzo_int64)
-    ACCCHK_ASSERT_IS_UNSIGNED_T(lzo_uint64)
-#endif
-
-#if !defined(__LZO_UINTPTR_T_IS_POINTER)
-    ACCCHK_ASSERT_IS_UNSIGNED_T(lzo_uintptr_t)
-#endif
-    ACCCHK_ASSERT(sizeof(lzo_uintptr_t) >= sizeof(lzo_voidp))
-
-    ACCCHK_ASSERT_IS_UNSIGNED_T(lzo_xint)
-    ACCCHK_ASSERT(sizeof(lzo_xint) >= sizeof(lzo_uint32))
-    ACCCHK_ASSERT(sizeof(lzo_xint) >= sizeof(lzo_uint))
-    ACCCHK_ASSERT(sizeof(lzo_xint) == sizeof(lzo_uint32) || sizeof(lzo_xint) == sizeof(lzo_uint))
-
-#endif
-#undef ACCCHK_ASSERT
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define WANT_lzo_bitops_clz32 1
-#define WANT_lzo_bitops_clz64 1
-#define WANT_lzo_bitops_ctz32 1
-#define WANT_lzo_bitops_ctz64 1
-#include "lzo_func.ch"
-
-#if 0
-#define u2p(ptr,off) ((lzo_voidp) (((lzo_bytep)(lzo_voidp)(ptr)) + (off)))
-#else
-static __lzo_noinline lzo_voidp u2p(lzo_voidp ptr, lzo_uint off)
-{
-    return (lzo_voidp) ((lzo_bytep) ptr + off);
-}
-#endif
-
-LZO_PUBLIC(int)
-_lzo_config_check(void)
-{
-    lzo_bool r = 1;
-    union {
-        lzo_xint a[2]; unsigned char b[2*LZO_MAX(8,sizeof(lzo_xint))];
-#if defined(LZO_UNALIGNED_OK_8)
-        lzo_uint64 c[2];
-#endif
-        unsigned short x[2]; lzo_uint32 y[2]; lzo_uint z[2];
-    } u;
-    lzo_voidp p;
-
-    u.a[0] = u.a[1] = 0;
-    p = u2p(&u, 0);
-    r &= ((* (lzo_bytep) p) == 0);
-#if !defined(LZO_CFG_NO_CONFIG_CHECK)
-#if defined(LZO_ABI_BIG_ENDIAN)
-    u.a[0] = u.a[1] = 0; u.b[sizeof(lzo_uint) - 1] = 128;
-    p = u2p(&u, 0);
-    r &= ((* (lzo_uintp) p) == 128);
-#endif
-#if defined(LZO_ABI_LITTLE_ENDIAN)
-    u.a[0] = u.a[1] = 0; u.b[0] = 128;
-    p = u2p(&u, 0);
-    r &= ((* (lzo_uintp) p) == 128);
-#endif
-#if defined(LZO_UNALIGNED_OK_2)
-    u.a[0] = u.a[1] = 0;
-    u.b[0] = 1; u.b[sizeof(unsigned short) + 1] = 2;
-    p = u2p(&u, 1);
-    r &= ((* (lzo_ushortp) p) == 0);
-#endif
-#if defined(LZO_UNALIGNED_OK_4)
-    u.a[0] = u.a[1] = 0;
-    u.b[0] = 3; u.b[sizeof(lzo_uint32) + 1] = 4;
-    p = u2p(&u, 1);
-    r &= ((* (lzo_uint32p) p) == 0);
-#endif
-#if defined(LZO_UNALIGNED_OK_8)
-    u.c[0] = u.c[1] = 0;
-    u.b[0] = 5; u.b[sizeof(lzo_uint64) + 1] = 6;
-    p = u2p(&u, 1);
-    r &= ((* (lzo_uint64p) p) == 0);
-#endif
-#if defined(lzo_bitops_clz32)
-    { unsigned i; lzo_uint32 v = 1;
-    for (i = 0; i < 32; i++, v <<= 1)
-        r &= lzo_bitops_clz32(v) == 31 - i;
-    }
-#endif
-#if defined(lzo_bitops_clz64)
-    { unsigned i; lzo_uint64 v = 1;
-    for (i = 0; i < 64; i++, v <<= 1)
-        r &= lzo_bitops_clz64(v) == 63 - i;
-    }
-#endif
-#if defined(lzo_bitops_ctz32)
-    { unsigned i; lzo_uint32 v = 1;
-    for (i = 0; i < 32; i++, v <<= 1)
-        r &= lzo_bitops_ctz32(v) == i;
-    }
-#endif
-#if defined(lzo_bitops_ctz64)
-    { unsigned i; lzo_uint64 v = 1;
-    for (i = 0; i < 64; i++, v <<= 1)
-        r &= lzo_bitops_ctz64(v) == i;
-    }
-#endif
-#endif
-
-    return r == 1 ? LZO_E_OK : LZO_E_ERROR;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(int)
-__lzo_init_v2(unsigned v, int s1, int s2, int s3, int s4, int s5,
-                          int s6, int s7, int s8, int s9)
-{
-    int r;
-
-#if defined(__LZO_IN_MINILZO)
-#elif (LZO_CC_MSC && ((_MSC_VER) < 700))
-#else
-#define ACC_WANT_ACC_CHK_CH 1
-#undef ACCCHK_ASSERT
-#define ACCCHK_ASSERT(expr)  LZO_COMPILE_TIME_ASSERT(expr)
-#include "miniacc.h"
-#endif
-#undef ACCCHK_ASSERT
-
-    if (v == 0)
-        return LZO_E_ERROR;
-
-    r = (s1 == -1 || s1 == (int) sizeof(short)) &&
-        (s2 == -1 || s2 == (int) sizeof(int)) &&
-        (s3 == -1 || s3 == (int) sizeof(long)) &&
-        (s4 == -1 || s4 == (int) sizeof(lzo_uint32)) &&
-        (s5 == -1 || s5 == (int) sizeof(lzo_uint)) &&
-        (s6 == -1 || s6 == (int) lzo_sizeof_dict_t) &&
-        (s7 == -1 || s7 == (int) sizeof(char *)) &&
-        (s8 == -1 || s8 == (int) sizeof(lzo_voidp)) &&
-        (s9 == -1 || s9 == (int) sizeof(lzo_callback_t));
-    if (!r)
-        return LZO_E_ERROR;
-
-    r = _lzo_config_check();
-    if (r != LZO_E_OK)
-        return r;
-
-    return r;
-}
-
-
-#if !defined(__LZO_IN_MINILZO)
-#include "lzo_dll.ch"
-#endif
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/lzo_mchw.ch b/lzo/src/lzo_mchw.ch
deleted file mode 100644
index fec8d92b..00000000
--- a/lzo/src/lzo_mchw.ch
+++ /dev/null
@@ -1,248 +0,0 @@
-/* lzo_mchw.ch -- matching functions using a window
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-typedef struct
-{
-    unsigned init;
-
-    lzo_uint look;          /* bytes in lookahead buffer */
-
-    lzo_uint m_len;
-    lzo_uint m_off;
-
-    lzo_uint last_m_len;
-    lzo_uint last_m_off;
-
-    const lzo_bytep bp;
-    const lzo_bytep ip;
-    const lzo_bytep in;
-    const lzo_bytep in_end;
-    lzo_bytep out;
-
-    lzo_callback_p cb;
-
-    lzo_uint textsize;      /* text size counter */
-    lzo_uint codesize;      /* code size counter */
-    lzo_uint printcount;    /* counter for reporting progress every 1K bytes */
-
-    /* some stats */
-    unsigned long lit_bytes;
-    unsigned long match_bytes;
-    unsigned long rep_bytes;
-    unsigned long lazy;
-
-#if defined(LZO1B)
-    lzo_uint r1_m_len;
-
-    /* some stats */
-    unsigned long r1_r, m3_r, m2_m, m3_m;
-#endif
-
-#if defined(LZO1C)
-    lzo_uint r1_m_len;
-    lzo_bytep m3;
-
-    /* some stats */
-    unsigned long r1_r, m3_r, m2_m, m3_m;
-#endif
-
-#if defined(LZO1F)
-    lzo_uint r1_lit;
-    lzo_uint r1_m_len;
-
-    /* some stats */
-    unsigned long r1_r, m2_m, m3_m;
-#endif
-
-#if defined(LZO1X) || defined(LZO1Y) || defined(LZO1Z)
-    lzo_uint r1_lit;
-    lzo_uint r1_m_len;
-
-    /* some stats */
-    unsigned long m1a_m, m1b_m, m2_m, m3_m, m4_m;
-    unsigned long lit1_r, lit2_r, lit3_r;
-#endif
-
-#if defined(LZO2A)
-    /* some stats */
-    unsigned long m1, m2, m3, m4;
-#endif
-}
-LZO_COMPRESS_T;
-
-
-#if (LZO_CC_BORLANDC && LZO_ARCH_I086) && (__BORLANDC__ < 0x0450)
-   /* work around a Borland C 3.1 bug */
-#  define getbyte(c)  ((c).ip < (c).in_end ? (c).ip +=1, (c).ip[-1] : (-1))
-#elif (LZO_OS_TOS && (LZO_CC_PUREC || LZO_CC_TURBOC))
-   /* work around a code generation bug in Turbo C / Pure C (Atari ST) */
-#  define getbyte(c)  ((c).ip < (c).in_end ? (int) (unsigned) *((c).ip)++ : (-1))
-#else
-#  define getbyte(c)  ((c).ip < (c).in_end ? *((c).ip)++ : (-1))
-#endif
-
-#include "lzo_swd.ch"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static int
-init_match ( LZO_COMPRESS_T *c, lzo_swd_p s,
-             const lzo_bytep dict, lzo_uint dict_len,
-             lzo_uint32 flags )
-{
-    int r;
-
-    assert(!c->init);
-    c->init = 1;
-
-    s->c = c;
-
-    c->last_m_len = c->last_m_off = 0;
-
-    c->textsize = c->codesize = c->printcount = 0;
-    c->lit_bytes = c->match_bytes = c->rep_bytes = 0;
-    c->lazy = 0;
-
-    r = swd_init(s,dict,dict_len);
-    if (r != LZO_E_OK)
-    {
-        swd_exit(s);
-        return r;
-    }
-
-    s->use_best_off = (flags & 1) ? 1 : 0;
-    return LZO_E_OK;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static int
-find_match ( LZO_COMPRESS_T *c, lzo_swd_p s,
-             lzo_uint this_len, lzo_uint skip )
-{
-    assert(c->init);
-
-    if (skip > 0)
-    {
-        assert(this_len >= skip);
-        swd_accept(s, this_len - skip);
-        c->textsize += this_len - skip + 1;
-    }
-    else
-    {
-        assert(this_len <= 1);
-        c->textsize += this_len - skip;
-    }
-
-    s->m_len = SWD_THRESHOLD;
-    s->m_off = 0;
-#ifdef SWD_BEST_OFF
-    if (s->use_best_off)
-        lzo_memset(s->best_pos,0,sizeof(s->best_pos));
-#endif
-    swd_findbest(s);
-    c->m_len = s->m_len;
-    c->m_off = s->m_off;
-
-    swd_getbyte(s);
-
-    if (s->b_char < 0)
-    {
-        c->look = 0;
-        c->m_len = 0;
-        swd_exit(s);
-    }
-    else
-    {
-        c->look = s->look + 1;
-    }
-    c->bp = c->ip - c->look;
-
-#if 0
-    /* brute force match search */
-    if (c->m_len > SWD_THRESHOLD && c->m_len + 1 <= c->look)
-    {
-        const lzo_bytep ip = c->bp;
-        const lzo_bytep m  = c->bp - c->m_off;
-        const lzo_bytep in = c->in;
-
-        if (ip - in > s->swd_n)
-            in = ip - s->swd_n;
-        for (;;)
-        {
-            while (*in != *ip)
-                in++;
-            if (in == ip)
-                break;
-            if (in != m)
-                if (lzo_memcmp(in,ip,c->m_len+1) == 0)
-                    printf("%p %p %p %5d\n",in,ip,m,c->m_len);
-            in++;
-        }
-    }
-#endif
-
-    if (c->cb && c->cb->nprogress && c->textsize > c->printcount)
-    {
-        (*c->cb->nprogress)(c->cb, c->textsize, c->codesize, 0);
-        c->printcount += 1024;
-    }
-
-    return LZO_E_OK;
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo_ptr.c b/lzo/src/lzo_ptr.c
deleted file mode 100644
index 46e6e353..00000000
--- a/lzo/src/lzo_ptr.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* lzo_ptr.c -- low-level pointer constructs
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo_conf.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(lzo_uintptr_t)
-__lzo_ptr_linear(const lzo_voidp ptr)
-{
-    lzo_uintptr_t p;
-
-#if (LZO_ARCH_I086)
-    p = (((lzo_uintptr_t)(ACC_PTR_FP_SEG(ptr))) << (16 - ACC_MM_AHSHIFT)) + (ACC_PTR_FP_OFF(ptr));
-#elif (LZO_MM_PVP)
-    p = (lzo_uintptr_t) (ptr);
-    p = (p << 3) | (p >> 61);
-#else
-    p = (lzo_uintptr_t) PTR_LINEAR(ptr);
-#endif
-
-    return p;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_PUBLIC(unsigned)
-__lzo_align_gap(const lzo_voidp ptr, lzo_uint size)
-{
-#if defined(__LZO_UINTPTR_T_IS_POINTER)
-    size_t n = (size_t) ptr;
-    n = (((n + size - 1) / size) * size) - n;
-#else
-    lzo_uintptr_t p, n;
-    p = __lzo_ptr_linear(ptr);
-    n = (((p + size - 1) / size) * size) - p;
-#endif
-
-    assert(size > 0);
-    assert((long)n >= 0);
-    assert(n <= size);
-    return (unsigned)n;
-}
-
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/lzo_ptr.h b/lzo/src/lzo_ptr.h
deleted file mode 100644
index 6aa1fc84..00000000
--- a/lzo/src/lzo_ptr.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/* lzo_ptr.h -- low-level pointer constructs
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_PTR_H
-#define __LZO_PTR_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-// Integral types
-************************************************************************/
-
-#if !defined(lzo_uintptr_t)
-#  if (__LZO_MMODEL_HUGE)
-#    define lzo_uintptr_t   unsigned long
-#  else
-#    define lzo_uintptr_t   acc_uintptr_t
-#    ifdef __ACC_INTPTR_T_IS_POINTER
-#      define __LZO_UINTPTR_T_IS_POINTER 1
-#    endif
-#  endif
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Always use the safe (=integral) version for pointer-comparisons.
- * The compiler should optimize away the additional casts anyway.
- *
- * Note that this only works if the representation and ordering
- * of the pointer and the integral is the same (at bit level).
- *
- * Most 16-bit compilers have their own view about pointers -
- * fortunately they don't care about comparing pointers
- * that are pointing to Nirvana.
- */
-
-#if (LZO_ARCH_I086)
-#define PTR(a)              ((lzo_bytep) (a))
-/* only need the low bits of the pointer -> offset is ok */
-#define PTR_ALIGNED_4(a)    ((ACC_PTR_FP_OFF(a) & 3) == 0)
-#define PTR_ALIGNED2_4(a,b) (((ACC_PTR_FP_OFF(a) | ACC_PTR_FP_OFF(b)) & 3) == 0)
-#elif (LZO_MM_PVP)
-#define PTR(a)              ((lzo_bytep) (a))
-#define PTR_ALIGNED_8(a)    ((((lzo_uintptr_t)(a)) >> 61) == 0)
-#define PTR_ALIGNED2_8(a,b) ((((lzo_uintptr_t)(a)|(lzo_uintptr_t)(b)) >> 61) == 0)
-#else
-#define PTR(a)              ((lzo_uintptr_t) (a))
-#define PTR_LINEAR(a)       PTR(a)
-#define PTR_ALIGNED_4(a)    ((PTR_LINEAR(a) & 3) == 0)
-#define PTR_ALIGNED_8(a)    ((PTR_LINEAR(a) & 7) == 0)
-#define PTR_ALIGNED2_4(a,b) (((PTR_LINEAR(a) | PTR_LINEAR(b)) & 3) == 0)
-#define PTR_ALIGNED2_8(a,b) (((PTR_LINEAR(a) | PTR_LINEAR(b)) & 7) == 0)
-#endif
-
-#define PTR_LT(a,b)         (PTR(a) < PTR(b))
-#define PTR_GE(a,b)         (PTR(a) >= PTR(b))
-#define PTR_DIFF(a,b)       (PTR(a) - PTR(b))
-#define pd(a,b)             ((lzo_uint) ((a)-(b)))
-
-
-LZO_EXTERN(lzo_uintptr_t)
-__lzo_ptr_linear(const lzo_voidp ptr);
-
-
-typedef union
-{
-    char            a_char;
-    unsigned char   a_uchar;
-    short           a_short;
-    unsigned short  a_ushort;
-    int             a_int;
-    unsigned int    a_uint;
-    long            a_long;
-    unsigned long   a_ulong;
-    lzo_int         a_lzo_int;
-    lzo_uint        a_lzo_uint;
-    lzo_int32       a_lzo_int32;
-    lzo_uint32      a_lzo_uint32;
-#if defined(LZO_UINT64_MAX)
-    lzo_int64       a_lzo_int64;
-    lzo_uint64      a_lzo_uint64;
-#endif
-    ptrdiff_t       a_ptrdiff_t;
-    lzo_uintptr_t   a_lzo_uintptr_t;
-    lzo_voidp       a_lzo_voidp;
-    void *          a_void_p;
-    lzo_bytep       a_lzo_bytep;
-    lzo_bytepp      a_lzo_bytepp;
-    lzo_uintp       a_lzo_uintp;
-    lzo_uint *      a_lzo_uint_p;
-    lzo_uint32p     a_lzo_uint32p;
-    lzo_uint32 *    a_lzo_uint32_p;
-    unsigned char * a_uchar_p;
-    char *          a_char_p;
-}
-lzo_full_align_t;
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo_str.c b/lzo/src/lzo_str.c
deleted file mode 100644
index faeb5b54..00000000
--- a/lzo/src/lzo_str.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* lzo_str.c -- string functions for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo_conf.h"
-
-#undef lzo_memcmp
-#undef lzo_memcpy
-#undef lzo_memmove
-#undef lzo_memset
-
-
-/***********************************************************************
-// slow but portable <string.h> stuff, only used in assertions
-************************************************************************/
-
-#if !(__LZO_MMODEL_HUGE)
-#  undef ACC_HAVE_MM_HUGE_PTR
-#endif
-#define acc_hsize_t             lzo_uint
-#define acc_hvoid_p             lzo_voidp
-#define acc_hbyte_p             lzo_bytep
-#define ACCLIB_PUBLIC(r,f)      LZO_PUBLIC(r) f
-#ifndef __ACCLIB_FUNCNAME
-#define __ACCLIB_FUNCNAME(f)    f
-#endif
-#define acc_hmemcmp             __ACCLIB_FUNCNAME(lzo_memcmp)
-#define acc_hmemcpy             __ACCLIB_FUNCNAME(lzo_memcpy)
-#define acc_hmemmove            __ACCLIB_FUNCNAME(lzo_memmove)
-#define acc_hmemset             __ACCLIB_FUNCNAME(lzo_memset)
-#define ACC_WANT_ACCLIB_HMEMCPY 1
-#include "miniacc.h"
-#undef ACCLIB_PUBLIC
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/lzo_swd.ch b/lzo/src/lzo_swd.ch
deleted file mode 100644
index a8d8b396..00000000
--- a/lzo/src/lzo_swd.ch
+++ /dev/null
@@ -1,736 +0,0 @@
-/* lzo_swd.ch -- sliding window dictionary
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#if (LZO_UINT_MAX < LZO_0xffffffffL)
-#  error "LZO_UINT_MAX"
-#endif
-#if defined(LZO_DEBUG)
-#  include <stdio.h>
-#endif
-#if defined(__LZO_CHECKER)
-#  include <stdlib.h>
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* unsigned type for dictionary access - don't waste memory here */
-#if (0UL + SWD_N + SWD_F + SWD_F < 0UL + USHRT_MAX)
-   typedef unsigned short   swd_uint;
-#  define SWD_UINT_MAX      USHRT_MAX
-#elif (0UL + SWD_N + SWD_F + SWD_F < 0UL + UINT_MAX)
-   typedef unsigned         swd_uint;
-#  define SWD_UINT_MAX      UINT_MAX
-#else
-   typedef lzo_uint         swd_uint;
-#  define SWD_UINT_MAX      LZO_UINT_MAX
-#endif
-#define swd_uintp           swd_uint __LZO_MMODEL *
-#define SWD_UINT(x)         ((swd_uint)(x))
-
-
-#ifndef SWD_HSIZE
-#  define SWD_HSIZE         16384
-#endif
-#ifndef SWD_MAX_CHAIN
-#  define SWD_MAX_CHAIN     2048
-#endif
-
-#if !defined(HEAD3)
-#if 1
-#  define HEAD3(b,p) \
-    ((DMUL(0x9f5f,(((((lzo_xint)b[p]<<5)^b[p+1])<<5)^b[p+2]))>>5) & (SWD_HSIZE-1))
-#else
-#  define HEAD3(b,p) \
-    ((DMUL(0x9f5f,(((((lzo_xint)b[p+2]<<5)^b[p+1])<<5)^b[p]))>>5) & (SWD_HSIZE-1))
-#endif
-#endif
-
-#if !(SWD_NO_HEAD2) && (SWD_THRESHOLD == 1) && !defined(HEAD2)
-#  if 1 && defined(LZO_UNALIGNED_OK_2)
-#    define HEAD2(b,p)      UA_GET16((b)+(p))
-#  else
-#    define HEAD2(b,p)      (b[p] ^ ((unsigned)b[p+1]<<8))
-#  endif
-#  define NIL2              SWD_UINT_MAX
-#endif
-#ifndef IF_HEAD2
-#define IF_HEAD2(s)         /*empty*/
-#endif
-
-
-typedef struct
-{
-/* public - "built-in" */
-    lzo_uint swd_n;
-    lzo_uint swd_f;
-    lzo_uint swd_threshold;
-
-/* public - configuration */
-    lzo_uint max_chain;
-    lzo_uint nice_length;
-    lzo_bool use_best_off;
-    lzo_uint lazy_insert;
-
-/* public - output */
-    lzo_uint m_len;
-    lzo_uint m_off;
-    lzo_uint look;
-    int b_char;
-#if defined(SWD_BEST_OFF)
-    lzo_uint best_off[ SWD_BEST_OFF ];
-#endif
-
-/* semi public */
-    LZO_COMPRESS_T *c;
-    lzo_uint m_pos;
-#if defined(SWD_BEST_OFF)
-    lzo_uint best_pos[ SWD_BEST_OFF ];
-#endif
-
-/* private */
-    const lzo_bytep dict;
-    const lzo_bytep dict_end;
-    lzo_uint dict_len;
-
-/* private */
-    lzo_uint ip;                /* input pointer (lookahead) */
-    lzo_uint bp;                /* buffer pointer */
-    lzo_uint rp;                /* remove pointer */
-    lzo_uint b_size;
-
-    lzo_bytep b_wrap;
-
-    lzo_uint node_count;
-    lzo_uint first_rp;
-
-#if defined(__LZO_MMODEL_HUGE)
-#  define A(type, n)    ((((n) * sizeof(type)) + 3UL) &~ 3UL)
-
-#  define O_b(s)        (0L)
-#  define O_head3(s)    (O_b(s) + A(char, 0UL + SWD_N + SWD_F + SWD_F))
-#  define O_succ3(s)    (O_head3(s) + A(swd_uint, 0UL + SWD_HSIZE))
-#  define O_best3(s)    (O_succ3(s) + A(swd_uint, 0UL + SWD_N + SWD_F))
-#  define O_llen3(s)    (O_best3(s) + A(swd_uint, 0UL + SWD_N + SWD_F))
-# ifdef HEAD2
-#  define O_head2(s)    (O_llen3(s) + A(swd_uint, 0UL + SWD_HSIZE))
-#  define O_END(s)      (O_head2(s) + A(swd_uint, 0UL + 65536L))
-# else
-#  define O_END(s)      (O_llen3(s) + A(swd_uint, 0UL + SWD_HSIZE))
-# endif
-
-#  define S_DEF(s,type,off)  ((type) ((lzo_bytep)s + 0L + sizeof(*s) + off))
-#  define s_b(s)        S_DEF(s, lzo_bytep, O_b(s))
-#  define s_head3(s)    S_DEF(s, swd_uintp, O_head3(s))
-#  define s_succ3(s)    S_DEF(s, swd_uintp, O_succ3(s))
-#  define s_best3(s)    S_DEF(s, swd_uintp, O_best3(s))
-#  define s_llen3(s)    S_DEF(s, swd_uintp, O_llen3(s))
-# ifdef HEAD2
-#  define s_head2(s)    S_DEF(s, swd_uintp, O_head2(s))
-# endif
-
-#elif defined(__LZO_CHECKER)
-    /* malloc arrays of the exact size to detect any overrun */
-    unsigned char *b;
-    swd_uint *head3;
-    swd_uint *succ3;
-    swd_uint *best3;
-    swd_uint *llen3;
-# ifdef HEAD2
-    swd_uint *head2;
-# endif
-
-#else
-    unsigned char b [ SWD_N + SWD_F + SWD_F ];
-    swd_uint head3 [ SWD_HSIZE ];
-    swd_uint succ3 [ SWD_N + SWD_F ];
-    swd_uint best3 [ SWD_N + SWD_F ];
-    swd_uint llen3 [ SWD_HSIZE ];
-# ifdef HEAD2
-    swd_uint head2 [ 65536L ];
-# endif
-#endif
-}
-lzo_swd_t;
-#define lzo_swd_p   lzo_swd_t __LZO_MMODEL *
-
-
-#if defined(__LZO_MMODEL_HUGE)
-#define SIZEOF_LZO_SWD_T    O_END(0)
-#else
-#define s_b(s)      s->b
-#define s_head3(s)  s->head3
-#define s_succ3(s)  s->succ3
-#define s_best3(s)  s->best3
-#define s_llen3(s)  s->llen3
-#ifdef HEAD2
-#define s_head2(s)  s->head2
-#endif
-#define SIZEOF_LZO_SWD_T    (sizeof(lzo_swd_t))
-#endif
-
-
-/* Access macro for head3.
- * head3[key] may be uninitialized if the list is emtpy,
- * but then its value will never be used.
- */
-#if defined(__LZO_CHECKER)
-#  define s_get_head3(s,key) \
-        ((s_llen3(s)[key] == 0) ? SWD_UINT_MAX : s_head3(s)[key])
-#else
-#  define s_get_head3(s,key)    s_head3(s)[key]
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static
-void swd_initdict(lzo_swd_p s, const lzo_bytep dict, lzo_uint dict_len)
-{
-    s->dict = s->dict_end = NULL;
-    s->dict_len = 0;
-
-    if (!dict || dict_len == 0)
-        return;
-    if (dict_len > s->swd_n)
-    {
-        dict += dict_len - s->swd_n;
-        dict_len = s->swd_n;
-    }
-
-    s->dict = dict;
-    s->dict_len = dict_len;
-    s->dict_end = dict + dict_len;
-    lzo_memcpy(s_b(s),dict,dict_len);
-    s->ip = dict_len;
-}
-
-
-static
-void swd_insertdict(lzo_swd_p s, lzo_uint node, lzo_uint len)
-{
-    lzo_uint key;
-
-    s->node_count = s->swd_n - len;
-    s->first_rp = node;
-
-    if (len) do
-    {
-        key = HEAD3(s_b(s),node);
-        s_succ3(s)[node] = s_get_head3(s,key);
-        s_head3(s)[key] = SWD_UINT(node);
-        s_best3(s)[node] = SWD_UINT(s->swd_f + 1);
-        s_llen3(s)[key]++;
-        assert(s_llen3(s)[key] <= s->swd_n);
-
-#ifdef HEAD2
-        IF_HEAD2(s) {
-            key = HEAD2(s_b(s),node);
-            s_head2(s)[key] = SWD_UINT(node);
-        }
-#endif
-
-        node++;
-    }
-    while (--len != 0);
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static
-int swd_init(lzo_swd_p s, const lzo_bytep dict, lzo_uint dict_len)
-{
-#if defined(__LZO_CHECKER)
-    s->b = (lzo_bytep) malloc(SWD_N + SWD_F + SWD_F);
-    s->head3 = (swd_uintp) malloc(sizeof(swd_uint) * SWD_HSIZE);
-    s->succ3 = (swd_uintp) malloc(sizeof(swd_uint) * (SWD_N + SWD_F));
-    s->best3 = (swd_uintp) malloc(sizeof(swd_uint) * (SWD_N + SWD_F));
-    s->llen3 = (swd_uintp) malloc(sizeof(swd_uint) * SWD_HSIZE);
-#ifdef HEAD2
-    IF_HEAD2(s) {
-        s->head2 = (swd_uintp) malloc(sizeof(swd_uint) * 65536L);
-    }
-#endif
-#endif
-
-    s->m_len = 0;
-    s->m_off = 0;
-#if defined(SWD_BEST_OFF)
-    {
-        unsigned i;
-        for (i = 0; i < SWD_BEST_OFF; i++)
-            s->best_off[i] = s->best_pos[i] = 0;
-    }
-#endif
-
-    s->swd_n = SWD_N;
-    s->swd_f = SWD_F;
-    s->swd_threshold = SWD_THRESHOLD;
-
-    /* defaults */
-    s->max_chain = SWD_MAX_CHAIN;
-    s->nice_length = s->swd_f;
-    s->use_best_off = 0;
-    s->lazy_insert = 0;
-
-    s->b_size = s->swd_n + s->swd_f;
-#if 0
-    if (2 * s->swd_f >= s->swd_n || s->b_size + s->swd_f >= SWD_UINT_MAX)
-        return LZO_E_ERROR;
-#else
-    LZO_COMPILE_TIME_ASSERT(!(0ul + 2 * SWD_F >= SWD_N))
-    LZO_COMPILE_TIME_ASSERT(!(0ul + SWD_N + SWD_F + SWD_F >= SWD_UINT_MAX))
-#endif
-    s->b_wrap = s_b(s) + s->b_size;
-    s->node_count = s->swd_n;
-
-    lzo_memset(s_llen3(s), 0, (lzo_uint)sizeof(s_llen3(s)[0]) * (lzo_uint)SWD_HSIZE);
-#ifdef HEAD2
-    IF_HEAD2(s) {
-#if 1
-        lzo_memset(s_head2(s), 0xff, (lzo_uint)sizeof(s_head2(s)[0]) * 65536L);
-        assert(s_head2(s)[0] == NIL2);
-#else
-        lzo_uint32 i;
-        for (i = 0; i < 65536L; i++)
-            s_head2(s)[i] = NIL2;
-#endif
-    }
-#endif
-
-    s->ip = 0;
-    swd_initdict(s,dict,dict_len);
-    s->bp = s->ip;
-    s->first_rp = s->ip;
-
-    assert(s->ip + s->swd_f <= s->b_size);
-#if 1
-    s->look = (lzo_uint) (s->c->in_end - s->c->ip);
-    if (s->look > 0)
-    {
-        if (s->look > s->swd_f)
-            s->look = s->swd_f;
-        lzo_memcpy(&s_b(s)[s->ip],s->c->ip,s->look);
-        s->c->ip += s->look;
-        s->ip += s->look;
-    }
-#else
-    s->look = 0;
-    while (s->look < s->swd_f)
-    {
-        int c;
-        if ((c = getbyte(*(s->c))) < 0)
-            break;
-        s_b(s)[s->ip] = LZO_BYTE(c);
-        s->ip++;
-        s->look++;
-    }
-#endif
-    if (s->ip == s->b_size)
-        s->ip = 0;
-
-    if (s->look >= 2 && s->dict_len > 0)
-        swd_insertdict(s,0,s->dict_len);
-
-    s->rp = s->first_rp;
-    if (s->rp >= s->node_count)
-        s->rp -= s->node_count;
-    else
-        s->rp += s->b_size - s->node_count;
-
-#if 1 || defined(__LZO_CHECKER)
-    /* initialize memory for the first few HEAD3 (if s->ip is not far
-     * enough ahead to do this job for us). The value doesn't matter. */
-    if (s->look < 3) {
-        lzo_bytep p = &s_b(s)[s->bp+s->look];
-        p[0] = p[1] = p[2] = 0;
-    }
-#endif
-
-    return LZO_E_OK;
-}
-
-
-static
-void swd_exit(lzo_swd_p s)
-{
-#if defined(__LZO_CHECKER)
-    /* free in reverse order of allocations */
-#ifdef HEAD2
-    free(s->head2); s->head2 = NULL;
-#endif
-    free(s->llen3); s->llen3 = NULL;
-    free(s->best3); s->best3 = NULL;
-    free(s->succ3); s->succ3 = NULL;
-    free(s->head3); s->head3 = NULL;
-    free(s->b); s->b = NULL;
-#else
-    LZO_UNUSED(s);
-#endif
-}
-
-
-#define swd_pos2off(s,pos) \
-    (s->bp > (pos) ? s->bp - (pos) : s->b_size - ((pos) - s->bp))
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static __lzo_inline
-void swd_getbyte(lzo_swd_p s)
-{
-    int c;
-
-    if ((c = getbyte(*(s->c))) < 0)
-    {
-        if (s->look > 0)
-            --s->look;
-#if defined(__LZO_CHECKER)
-        /* initialize memory - value doesn't matter */
-        s_b(s)[s->ip] = 0;
-        if (s->ip < s->swd_f)
-            s->b_wrap[s->ip] = 0;
-#endif
-    }
-    else
-    {
-        s_b(s)[s->ip] = LZO_BYTE(c);
-        if (s->ip < s->swd_f)
-            s->b_wrap[s->ip] = LZO_BYTE(c);
-    }
-    if (++s->ip == s->b_size)
-        s->ip = 0;
-    if (++s->bp == s->b_size)
-        s->bp = 0;
-    if (++s->rp == s->b_size)
-        s->rp = 0;
-}
-
-
-/***********************************************************************
-// remove node from lists
-************************************************************************/
-
-static __lzo_inline
-void swd_remove_node(lzo_swd_p s, lzo_uint node)
-{
-    if (s->node_count == 0)
-    {
-        lzo_uint key;
-
-#ifdef LZO_DEBUG
-        if (s->first_rp != LZO_UINT_MAX)
-        {
-            if (node != s->first_rp)
-                printf("Remove %5ld: %5ld %5ld %5ld %5ld  %6ld %6ld\n",
-                        (long)node, (long)s->rp, (long)s->ip, (long)s->bp,
-                        (long)s->first_rp, (long)(s->ip - node),
-                        (long)(s->ip - s->bp));
-            assert(node == s->first_rp);
-            s->first_rp = LZO_UINT_MAX;
-        }
-#endif
-
-        key = HEAD3(s_b(s),node);
-        assert(s_llen3(s)[key] > 0);
-        --s_llen3(s)[key];
-
-#ifdef HEAD2
-        IF_HEAD2(s) {
-            key = HEAD2(s_b(s),node);
-            assert(s_head2(s)[key] != NIL2);
-            if ((lzo_uint) s_head2(s)[key] == node)
-                s_head2(s)[key] = NIL2;
-        }
-#endif
-    }
-    else
-        --s->node_count;
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static
-void swd_accept(lzo_swd_p s, lzo_uint n)
-{
-    assert(n <= s->look);
-
-    if (n) do
-    {
-        lzo_uint key;
-
-        swd_remove_node(s,s->rp);
-
-        /* add bp into HEAD3 */
-        key = HEAD3(s_b(s),s->bp);
-        s_succ3(s)[s->bp] = s_get_head3(s,key);
-        s_head3(s)[key] = SWD_UINT(s->bp);
-        s_best3(s)[s->bp] = SWD_UINT(s->swd_f + 1);
-        s_llen3(s)[key]++;
-        assert(s_llen3(s)[key] <= s->swd_n);
-
-#ifdef HEAD2
-        /* add bp into HEAD2 */
-        IF_HEAD2(s) {
-            key = HEAD2(s_b(s),s->bp);
-            s_head2(s)[key] = SWD_UINT(s->bp);
-        }
-#endif
-
-        swd_getbyte(s);
-    } while (--n != 0);
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static
-void swd_search(lzo_swd_p s, lzo_uint node, lzo_uint cnt)
-{
-    const lzo_bytep p1;
-    const lzo_bytep p2;
-    const lzo_bytep px;
-    lzo_uint m_len = s->m_len;
-    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;
-    unsigned char scan_end1;
-
-    assert(s->m_len > 0);
-
-    scan_end1 = bp[m_len - 1];
-    for ( ; cnt-- > 0; node = s_succ3(s)[node])
-    {
-        p1 = bp;
-        p2 = b + node;
-        px = bx;
-
-        assert(m_len < s->look);
-
-        if (
-#if 1
-            p2[m_len - 1] == scan_end1 &&
-            p2[m_len] == p1[m_len] &&
-#endif
-            p2[0] == p1[0] &&
-            p2[1] == p1[1])
-        {
-            lzo_uint i;
-            assert(lzo_memcmp(bp,&b[node],3) == 0);
-
-#if 0 && defined(LZO_UNALIGNED_OK_4)
-            p1 += 3; p2 += 3;
-            while (p1 + 4 <= px && UA_GET32(p1) == UA_GET32(p2))
-                p1 += 4, p2 += 4;
-            while (p1 < px && *p1 == *p2)
-                p1 += 1, p2 += 1;
-#else
-            p1 += 2; p2 += 2;
-            do {} while (++p1 < px && *p1 == *++p2);
-#endif
-            i = pd(p1, bp);
-
-#ifdef LZO_DEBUG
-            if (lzo_memcmp(bp,&b[node],i) != 0)
-                printf("%5ld %5ld %5ld %02x/%02x %02x/%02x\n",
-                        (long)s->bp, (long) node, (long) i,
-                        bp[0], bp[1], b[node], b[node+1]);
-#endif
-            assert(lzo_memcmp(bp,&b[node],i) == 0);
-
-#if defined(SWD_BEST_OFF)
-            if (i < SWD_BEST_OFF)
-            {
-                if (s->best_pos[i] == 0)
-                    s->best_pos[i] = node + 1;
-            }
-#endif
-            if (i > m_len)
-            {
-                s->m_len = m_len = i;
-                s->m_pos = node;
-                if (m_len == s->look)
-                    return;
-                if (m_len >= s->nice_length)
-                    return;
-                if (m_len > (lzo_uint) s_best3(s)[node])
-                    return;
-                scan_end1 = bp[m_len - 1];
-            }
-        }
-    }
-}
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#ifdef HEAD2
-
-static
-lzo_bool swd_search2(lzo_swd_p s)
-{
-    lzo_uint key;
-
-    assert(s->look >= 2);
-    assert(s->m_len > 0);
-
-    key = s_head2(s)[ HEAD2(s_b(s),s->bp) ];
-    if (key == NIL2)
-        return 0;
-#ifdef LZO_DEBUG
-    if (lzo_memcmp(&s_b(s)[s->bp],&s_b(s)[key],2) != 0)
-        printf("%5ld %5ld %02x/%02x %02x/%02x\n", (long)s->bp, (long)key,
-                s_b(s)[s->bp], s_b(s)[s->bp+1], s_b(s)[key], s_b(s)[key+1]);
-#endif
-    assert(lzo_memcmp(&s_b(s)[s->bp],&s_b(s)[key],2) == 0);
-#if defined(SWD_BEST_OFF)
-    if (s->best_pos[2] == 0)
-        s->best_pos[2] = key + 1;
-#endif
-
-    if (s->m_len < 2)
-    {
-        s->m_len = 2;
-        s->m_pos = key;
-    }
-    return 1;
-}
-
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-static
-void swd_findbest(lzo_swd_p s)
-{
-    lzo_uint key;
-    lzo_uint cnt, node;
-    lzo_uint len;
-
-    assert(s->m_len > 0);
-
-    /* get current head, add bp into HEAD3 */
-    key = HEAD3(s_b(s),s->bp);
-    node = s_succ3(s)[s->bp] = s_get_head3(s,key);
-    cnt = s_llen3(s)[key]++;
-    assert(s_llen3(s)[key] <= s->swd_n + s->swd_f);
-    if (cnt > s->max_chain && s->max_chain > 0)
-        cnt = s->max_chain;
-    s_head3(s)[key] = SWD_UINT(s->bp);
-
-    s->b_char = s_b(s)[s->bp];
-    len = s->m_len;
-    if (s->m_len >= s->look)
-    {
-        if (s->look == 0)
-            s->b_char = -1;
-        s->m_off = 0;
-        s_best3(s)[s->bp] = SWD_UINT(s->swd_f + 1);
-    }
-    else
-    {
-#if defined(HEAD2)
-        if (swd_search2(s) && s->look >= 3)
-            swd_search(s,node,cnt);
-#else
-        if (s->look >= 3)
-            swd_search(s,node,cnt);
-#endif
-        if (s->m_len > len)
-            s->m_off = swd_pos2off(s,s->m_pos);
-        s_best3(s)[s->bp] = SWD_UINT(s->m_len);
-
-#if defined(SWD_BEST_OFF)
-        if (s->use_best_off)
-        {
-            unsigned i;
-            for (i = 2; i < SWD_BEST_OFF; i++)
-                if (s->best_pos[i] > 0)
-                    s->best_off[i] = swd_pos2off(s,s->best_pos[i]-1);
-                else
-                    s->best_off[i] = 0;
-        }
-#endif
-    }
-
-    swd_remove_node(s,s->rp);
-
-#ifdef HEAD2
-    /* add bp into HEAD2 */
-    IF_HEAD2(s) {
-        key = HEAD2(s_b(s),s->bp);
-        s_head2(s)[key] = SWD_UINT(s->bp);
-    }
-#endif
-}
-
-
-#undef HEAD3
-#undef HEAD2
-#undef IF_HEAD2
-#undef s_get_head3
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/src/lzo_util.c b/lzo/src/lzo_util.c
deleted file mode 100644
index 1e4a9e33..00000000
--- a/lzo/src/lzo_util.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* lzo_util.c -- utilities for the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo_conf.h"
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* If you use the LZO library in a product, I would appreciate that you
- * keep this copyright string in the executable of your product.
-.*/
-
-static const char __lzo_copyright[] =
-#if !defined(__LZO_IN_MINLZO)
-    /* save space as some people want a really small decompressor */
-    LZO_VERSION_STRING;
-#else
-    "\r\n\n"
-    "LZO data compression library.\n"
-    "$Copyright: LZO Copyright (C) 1996-2011 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"
-    "$Info: " LZO_INFO_STRING " $\n";
-#endif
-
-
-LZO_PUBLIC(const lzo_bytep)
-lzo_copyright(void)
-{
-#if (LZO_OS_DOS16 && LZO_CC_TURBOC)
-    return (lzo_voidp) __lzo_copyright;
-#else
-    return (const lzo_bytep) __lzo_copyright;
-#endif
-}
-
-LZO_PUBLIC(unsigned)
-lzo_version(void)
-{
-    return LZO_VERSION;
-}
-
-LZO_PUBLIC(const char *)
-lzo_version_string(void)
-{
-    return LZO_VERSION_STRING;
-}
-
-LZO_PUBLIC(const char *)
-lzo_version_date(void)
-{
-    return LZO_VERSION_DATE;
-}
-
-LZO_PUBLIC(const lzo_charp)
-_lzo_version_string(void)
-{
-    return LZO_VERSION_STRING;
-}
-
-LZO_PUBLIC(const lzo_charp)
-_lzo_version_date(void)
-{
-    return LZO_VERSION_DATE;
-}
-
-
-/***********************************************************************
-// adler32 checksum
-// adapted from free code by Mark Adler <madler@alumni.caltech.edu>
-// see http://www.zlib.org/
-************************************************************************/
-
-#define LZO_BASE 65521u /* largest prime smaller than 65536 */
-#define LZO_NMAX 5552
-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-
-#define LZO_DO1(buf,i)  s1 += buf[i]; s2 += s1
-#define LZO_DO2(buf,i)  LZO_DO1(buf,i); LZO_DO1(buf,i+1);
-#define LZO_DO4(buf,i)  LZO_DO2(buf,i); LZO_DO2(buf,i+2);
-#define LZO_DO8(buf,i)  LZO_DO4(buf,i); LZO_DO4(buf,i+4);
-#define LZO_DO16(buf,i) LZO_DO8(buf,i); LZO_DO8(buf,i+8);
-
-LZO_PUBLIC(lzo_uint32)
-lzo_adler32(lzo_uint32 adler, const lzo_bytep buf, lzo_uint len)
-{
-    lzo_uint32 s1 = adler & 0xffff;
-    lzo_uint32 s2 = (adler >> 16) & 0xffff;
-    unsigned k;
-
-    if (buf == NULL)
-        return 1;
-
-    while (len > 0)
-    {
-        k = len < LZO_NMAX ? (unsigned) len : LZO_NMAX;
-        len -= k;
-        if (k >= 16) do
-        {
-            LZO_DO16(buf,0);
-            buf += 16;
-            k -= 16;
-        } while (k >= 16);
-        if (k != 0) do
-        {
-            s1 += *buf++;
-            s2 += s1;
-        } while (--k > 0);
-        s1 %= LZO_BASE;
-        s2 %= LZO_BASE;
-    }
-    return (s2 << 16) | s1;
-}
-
-#undef LZO_DO1
-#undef LZO_DO2
-#undef LZO_DO4
-#undef LZO_DO8
-#undef LZO_DO16
-
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/miniacc.h b/lzo/src/miniacc.h
deleted file mode 100644
index 0487a004..00000000
--- a/lzo/src/miniacc.h
+++ /dev/null
@@ -1,6922 +0,0 @@
-/* ACC --- Automatic Compiler Configuration
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#ifndef __ACC_H_INCLUDED
-#define __ACC_H_INCLUDED 1
-#define ACC_VERSION     20110125L
-#if defined(__CYGWIN32__) && !defined(__CYGWIN__)
-#  define __CYGWIN__ __CYGWIN32__
-#endif
-#if defined(__IBMCPP__) && !defined(__IBMC__)
-#  define __IBMC__ __IBMCPP__
-#endif
-#if defined(__ICL) && defined(_WIN32) && !defined(__INTEL_COMPILER)
-#  define __INTEL_COMPILER __ICL
-#endif
-#if 1 && defined(__INTERIX) && defined(__GNUC__) && !defined(_ALL_SOURCE)
-#  define _ALL_SOURCE 1
-#endif
-#if defined(__mips__) && defined(__R5900__)
-#  if !defined(__LONG_MAX__)
-#    define __LONG_MAX__ 9223372036854775807L
-#  endif
-#endif
-#if defined(__INTEL_COMPILER) && defined(__linux__)
-#  pragma warning(disable: 193)
-#endif
-#if defined(__KEIL__) && defined(__C166__)
-#  pragma warning disable = 322
-#elif 0 && defined(__C251__)
-#  pragma warning disable = 322
-#endif
-#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__MWERKS__)
-#  if (_MSC_VER >= 1300)
-#    pragma warning(disable: 4668)
-#  endif
-#endif
-#if defined(__POCC__) && defined(_WIN32)
-#  if (__POCC__ >= 400)
-#    pragma warn(disable: 2216)
-#  endif
-#endif
-#if 0 && defined(__WATCOMC__)
-#  if (__WATCOMC__ >= 1050) && (__WATCOMC__ < 1060)
-#    pragma warning 203 9
-#  endif
-#endif
-#if defined(__BORLANDC__) && defined(__MSDOS__) && !defined(__FLAT__)
-#  pragma option -h
-#endif
-#if (ACC_CFG_NO_CONFIG_HEADER)
-#elif defined(ACC_CFG_CONFIG_HEADER)
-#  include ACC_CFG_CONFIG_HEADER
-#else
-#endif
-#if (ACC_CFG_NO_LIMITS_H)
-#elif (ACC_LIBC_NAKED) || (ACC_BROKEN_LIMITS_H)
-#ifndef __ACC_FALLBACK_LIMITS_H_INCLUDED
-#define __ACC_FALLBACK_LIMITS_H_INCLUDED 1
-#undef CHAR_BIT
-#define CHAR_BIT        8
-#ifndef MB_LEN_MAX
-#define MB_LEN_MAX      1
-#endif
-#ifndef __SCHAR_MAX__
-#define __SCHAR_MAX__   127
-#endif
-#ifndef __SHRT_MAX__
-#define __SHRT_MAX__    32767
-#endif
-#ifndef __INT_MAX__
-#define __INT_MAX__     2147483647
-#endif
-#ifndef __LONG_MAX__
-#if defined(__alpha__) || defined(_LP64) || defined(__MIPS_PSX2__)
-#define __LONG_MAX__    9223372036854775807L
-#else
-#define __LONG_MAX__    2147483647L
-#endif
-#endif
-#undef SCHAR_MIN
-#undef SCHAR_MAX
-#undef UCHAR_MAX
-#define SCHAR_MIN       (-1 - SCHAR_MAX)
-#define SCHAR_MAX       (__SCHAR_MAX__)
-#define UCHAR_MAX       (SCHAR_MAX * 2 + 1)
-#undef SHRT_MIN
-#undef SHRT_MAX
-#undef USHRT_MAX
-#define SHRT_MIN        (-1 - SHRT_MAX)
-#define SHRT_MAX        (__SHRT_MAX__)
-#if ((__INT_MAX__) == (__SHRT_MAX__))
-#define USHRT_MAX       (SHRT_MAX * 2U + 1U)
-#else
-#define USHRT_MAX       (SHRT_MAX * 2 + 1)
-#endif
-#undef INT_MIN
-#undef INT_MAX
-#undef UINT_MAX
-#define INT_MIN         (-1 - INT_MAX)
-#define INT_MAX         (__INT_MAX__)
-#define UINT_MAX        (INT_MAX * 2U + 1U)
-#undef LONG_MIN
-#undef LONG_MAX
-#undef ULONG_MAX
-#define LONG_MIN        (-1L - LONG_MAX)
-#define LONG_MAX        ((__LONG_MAX__) + 0L)
-#define ULONG_MAX       (LONG_MAX * 2UL + 1UL)
-#undef CHAR_MIN
-#undef CHAR_MAX
-#if defined(__CHAR_UNSIGNED__) || defined(_CHAR_UNSIGNED)
-#define CHAR_MIN        0
-#define CHAR_MAX        UCHAR_MAX
-#else
-#define CHAR_MIN        SCHAR_MIN
-#define CHAR_MAX        SCHAR_MAX
-#endif
-#endif
-#else
-#  include <limits.h>
-#endif
-#if 0
-#define ACC_0xffffL             0xfffful
-#define ACC_0xffffffffL         0xfffffffful
-#else
-#define ACC_0xffffL             65535ul
-#define ACC_0xffffffffL         4294967295ul
-#endif
-#if (ACC_0xffffL == ACC_0xffffffffL)
-#  error "your preprocessor is broken 1"
-#endif
-#if (16ul * 16384ul != 262144ul)
-#  error "your preprocessor is broken 2"
-#endif
-#if 0
-#if (32767 >= 4294967295ul)
-#  error "your preprocessor is broken 3"
-#endif
-#if (65535u >= 4294967295ul)
-#  error "your preprocessor is broken 4"
-#endif
-#endif
-#if (UINT_MAX == ACC_0xffffL)
-#if defined(__ZTC__) && defined(__I86__) && !defined(__OS2__)
-#  if !defined(MSDOS)
-#    define MSDOS 1
-#  endif
-#  if !defined(_MSDOS)
-#    define _MSDOS 1
-#  endif
-#elif 0 && defined(__VERSION) && defined(MB_LEN_MAX)
-#  if (__VERSION == 520) && (MB_LEN_MAX == 1)
-#    if !defined(__AZTEC_C__)
-#      define __AZTEC_C__ __VERSION
-#    endif
-#    if !defined(__DOS__)
-#      define __DOS__ 1
-#    endif
-#  endif
-#endif
-#endif
-#if defined(_MSC_VER) && defined(M_I86HM) && (UINT_MAX == ACC_0xffffL)
-#  define ptrdiff_t long
-#  define _PTRDIFF_T_DEFINED 1
-#endif
-#if (UINT_MAX == ACC_0xffffL)
-#  undef __ACC_RENAME_A
-#  undef __ACC_RENAME_B
-#  if defined(__AZTEC_C__) && defined(__DOS__)
-#    define __ACC_RENAME_A 1
-#  elif defined(_MSC_VER) && defined(MSDOS)
-#    if (_MSC_VER < 600)
-#      define __ACC_RENAME_A 1
-#    elif (_MSC_VER < 700)
-#      define __ACC_RENAME_B 1
-#    endif
-#  elif defined(__TSC__) && defined(__OS2__)
-#    define __ACC_RENAME_A 1
-#  elif defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0410)
-#    define __ACC_RENAME_A 1
-#  elif defined(__PACIFIC__) && defined(DOS)
-#    if !defined(__far)
-#      define __far far
-#    endif
-#    if !defined(__near)
-#      define __near near
-#    endif
-#  endif
-#  if defined(__ACC_RENAME_A)
-#    if !defined(__cdecl)
-#      define __cdecl cdecl
-#    endif
-#    if !defined(__far)
-#      define __far far
-#    endif
-#    if !defined(__huge)
-#      define __huge huge
-#    endif
-#    if !defined(__near)
-#      define __near near
-#    endif
-#    if !defined(__pascal)
-#      define __pascal pascal
-#    endif
-#    if !defined(__huge)
-#      define __huge huge
-#    endif
-#  elif defined(__ACC_RENAME_B)
-#    if !defined(__cdecl)
-#      define __cdecl _cdecl
-#    endif
-#    if !defined(__far)
-#      define __far _far
-#    endif
-#    if !defined(__huge)
-#      define __huge _huge
-#    endif
-#    if !defined(__near)
-#      define __near _near
-#    endif
-#    if !defined(__pascal)
-#      define __pascal _pascal
-#    endif
-#  elif (defined(__PUREC__) || defined(__TURBOC__)) && defined(__TOS__)
-#    if !defined(__cdecl)
-#      define __cdecl cdecl
-#    endif
-#    if !defined(__pascal)
-#      define __pascal pascal
-#    endif
-#  endif
-#  undef __ACC_RENAME_A
-#  undef __ACC_RENAME_B
-#endif
-#if (UINT_MAX == ACC_0xffffL)
-#if defined(__AZTEC_C__) && defined(__DOS__)
-#  define ACC_BROKEN_CDECL_ALT_SYNTAX 1
-#elif defined(_MSC_VER) && defined(MSDOS)
-#  if (_MSC_VER < 600)
-#    define ACC_BROKEN_INTEGRAL_CONSTANTS 1
-#  endif
-#  if (_MSC_VER < 700)
-#    define ACC_BROKEN_INTEGRAL_PROMOTION 1
-#    define ACC_BROKEN_SIZEOF 1
-#  endif
-#elif defined(__PACIFIC__) && defined(DOS)
-#  define ACC_BROKEN_INTEGRAL_CONSTANTS 1
-#elif defined(__TURBOC__) && defined(__MSDOS__)
-#  if (__TURBOC__ < 0x0150)
-#    define ACC_BROKEN_CDECL_ALT_SYNTAX 1
-#    define ACC_BROKEN_INTEGRAL_CONSTANTS 1
-#    define ACC_BROKEN_INTEGRAL_PROMOTION 1
-#  endif
-#  if (__TURBOC__ < 0x0200)
-#    define ACC_BROKEN_SIZEOF 1
-#  endif
-#  if (__TURBOC__ < 0x0400) && defined(__cplusplus)
-#    define ACC_BROKEN_CDECL_ALT_SYNTAX 1
-#  endif
-#elif (defined(__PUREC__) || defined(__TURBOC__)) && defined(__TOS__)
-#  define ACC_BROKEN_CDECL_ALT_SYNTAX 1
-#  define ACC_BROKEN_SIZEOF 1
-#endif
-#endif
-#if defined(__WATCOMC__) && (__WATCOMC__ < 900)
-#  define ACC_BROKEN_INTEGRAL_CONSTANTS 1
-#endif
-#if defined(_CRAY) && defined(_CRAY1)
-#  define ACC_BROKEN_SIGNED_RIGHT_SHIFT 1
-#endif
-#define ACC_PP_STRINGIZE(x)             #x
-#define ACC_PP_MACRO_EXPAND(x)          ACC_PP_STRINGIZE(x)
-#define ACC_PP_CONCAT2(a,b)             a ## b
-#define ACC_PP_CONCAT3(a,b,c)           a ## b ## c
-#define ACC_PP_CONCAT4(a,b,c,d)         a ## b ## c ## d
-#define ACC_PP_CONCAT5(a,b,c,d,e)       a ## b ## c ## d ## e
-#define ACC_PP_ECONCAT2(a,b)            ACC_PP_CONCAT2(a,b)
-#define ACC_PP_ECONCAT3(a,b,c)          ACC_PP_CONCAT3(a,b,c)
-#define ACC_PP_ECONCAT4(a,b,c,d)        ACC_PP_CONCAT4(a,b,c,d)
-#define ACC_PP_ECONCAT5(a,b,c,d,e)      ACC_PP_CONCAT5(a,b,c,d,e)
-#if 1
-#define ACC_CPP_STRINGIZE(x)            #x
-#define ACC_CPP_MACRO_EXPAND(x)         ACC_CPP_STRINGIZE(x)
-#define ACC_CPP_CONCAT2(a,b)            a ## b
-#define ACC_CPP_CONCAT3(a,b,c)          a ## b ## c
-#define ACC_CPP_CONCAT4(a,b,c,d)        a ## b ## c ## d
-#define ACC_CPP_CONCAT5(a,b,c,d,e)      a ## b ## c ## d ## e
-#define ACC_CPP_ECONCAT2(a,b)           ACC_CPP_CONCAT2(a,b)
-#define ACC_CPP_ECONCAT3(a,b,c)         ACC_CPP_CONCAT3(a,b,c)
-#define ACC_CPP_ECONCAT4(a,b,c,d)       ACC_CPP_CONCAT4(a,b,c,d)
-#define ACC_CPP_ECONCAT5(a,b,c,d,e)     ACC_CPP_CONCAT5(a,b,c,d,e)
-#endif
-#define __ACC_MASK_GEN(o,b)     (((((o) << ((b)-1)) - (o)) << 1) + (o))
-#if 1 && defined(__cplusplus)
-#  if !defined(__STDC_CONSTANT_MACROS)
-#    define __STDC_CONSTANT_MACROS 1
-#  endif
-#  if !defined(__STDC_LIMIT_MACROS)
-#    define __STDC_LIMIT_MACROS 1
-#  endif
-#endif
-#if defined(__cplusplus)
-#  define ACC_EXTERN_C extern "C"
-#else
-#  define ACC_EXTERN_C extern
-#endif
-#if !defined(__ACC_OS_OVERRIDE)
-#if (ACC_OS_FREESTANDING)
-#  define ACC_INFO_OS           "freestanding"
-#elif (ACC_OS_EMBEDDED)
-#  define ACC_INFO_OS           "embedded"
-#elif 1 && defined(__IAR_SYSTEMS_ICC__)
-#  define ACC_OS_EMBEDDED       1
-#  define ACC_INFO_OS           "embedded"
-#elif defined(__CYGWIN__) && defined(__GNUC__)
-#  define ACC_OS_CYGWIN         1
-#  define ACC_INFO_OS           "cygwin"
-#elif defined(__EMX__) && defined(__GNUC__)
-#  define ACC_OS_EMX            1
-#  define ACC_INFO_OS           "emx"
-#elif defined(__BEOS__)
-#  define ACC_OS_BEOS           1
-#  define ACC_INFO_OS           "beos"
-#elif defined(__Lynx__)
-#  define ACC_OS_LYNXOS         1
-#  define ACC_INFO_OS           "lynxos"
-#elif defined(__OS400__)
-#  define ACC_OS_OS400          1
-#  define ACC_INFO_OS           "os400"
-#elif defined(__QNX__)
-#  define ACC_OS_QNX            1
-#  define ACC_INFO_OS           "qnx"
-#elif defined(__BORLANDC__) && defined(__DPMI32__) && (__BORLANDC__ >= 0x0460)
-#  define ACC_OS_DOS32          1
-#  define ACC_INFO_OS           "dos32"
-#elif defined(__BORLANDC__) && defined(__DPMI16__)
-#  define ACC_OS_DOS16          1
-#  define ACC_INFO_OS           "dos16"
-#elif defined(__ZTC__) && defined(DOS386)
-#  define ACC_OS_DOS32          1
-#  define ACC_INFO_OS           "dos32"
-#elif defined(__OS2__) || defined(__OS2V2__)
-#  if (UINT_MAX == ACC_0xffffL)
-#    define ACC_OS_OS216        1
-#    define ACC_INFO_OS         "os216"
-#  elif (UINT_MAX == ACC_0xffffffffL)
-#    define ACC_OS_OS2          1
-#    define ACC_INFO_OS         "os2"
-#  else
-#    error "check your limits.h header"
-#  endif
-#elif defined(__WIN64__) || defined(_WIN64) || defined(WIN64)
-#  define ACC_OS_WIN64          1
-#  define ACC_INFO_OS           "win64"
-#elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(__WINDOWS_386__)
-#  define ACC_OS_WIN32          1
-#  define ACC_INFO_OS           "win32"
-#elif defined(__MWERKS__) && defined(__INTEL__)
-#  define ACC_OS_WIN32          1
-#  define ACC_INFO_OS           "win32"
-#elif defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows)
-#  if (UINT_MAX == ACC_0xffffL)
-#    define ACC_OS_WIN16        1
-#    define ACC_INFO_OS         "win16"
-#  elif (UINT_MAX == ACC_0xffffffffL)
-#    define ACC_OS_WIN32        1
-#    define ACC_INFO_OS         "win32"
-#  else
-#    error "check your limits.h header"
-#  endif
-#elif defined(__DOS__) || defined(__MSDOS__) || defined(_MSDOS) || defined(MSDOS) || (defined(__PACIFIC__) && defined(DOS))
-#  if (UINT_MAX == ACC_0xffffL)
-#    define ACC_OS_DOS16        1
-#    define ACC_INFO_OS         "dos16"
-#  elif (UINT_MAX == ACC_0xffffffffL)
-#    define ACC_OS_DOS32        1
-#    define ACC_INFO_OS         "dos32"
-#  else
-#    error "check your limits.h header"
-#  endif
-#elif defined(__WATCOMC__)
-#  if defined(__NT__) && (UINT_MAX == ACC_0xffffL)
-#    define ACC_OS_DOS16        1
-#    define ACC_INFO_OS         "dos16"
-#  elif defined(__NT__) && (__WATCOMC__ < 1100)
-#    define ACC_OS_WIN32        1
-#    define ACC_INFO_OS         "win32"
-#  elif defined(__linux__) || defined(__LINUX__)
-#    define ACC_OS_POSIX        1
-#    define ACC_INFO_OS         "posix"
-#  else
-#    error "please specify a target using the -bt compiler option"
-#  endif
-#elif defined(__palmos__)
-#  define ACC_OS_PALMOS         1
-#  define ACC_INFO_OS           "palmos"
-#elif defined(__TOS__) || defined(__atarist__)
-#  define ACC_OS_TOS            1
-#  define ACC_INFO_OS           "tos"
-#elif defined(macintosh) && !defined(__ppc__)
-#  define ACC_OS_MACCLASSIC     1
-#  define ACC_INFO_OS           "macclassic"
-#elif defined(__VMS)
-#  define ACC_OS_VMS            1
-#  define ACC_INFO_OS           "vms"
-#elif ((defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__))
-#  define ACC_OS_CONSOLE        1
-#  define ACC_OS_CONSOLE_PS2    1
-#  define ACC_INFO_OS           "console"
-#  define ACC_INFO_OS_CONSOLE   "ps2"
-#elif (defined(__mips__) && defined(__psp__))
-#  define ACC_OS_CONSOLE        1
-#  define ACC_OS_CONSOLE_PSP    1
-#  define ACC_INFO_OS           "console"
-#  define ACC_INFO_OS_CONSOLE   "psp"
-#else
-#  define ACC_OS_POSIX          1
-#  define ACC_INFO_OS           "posix"
-#endif
-#if (ACC_OS_POSIX)
-#  if defined(_AIX) || defined(__AIX__) || defined(__aix__)
-#    define ACC_OS_POSIX_AIX        1
-#    define ACC_INFO_OS_POSIX       "aix"
-#  elif defined(__FreeBSD__)
-#    define ACC_OS_POSIX_FREEBSD    1
-#    define ACC_INFO_OS_POSIX       "freebsd"
-#  elif defined(__hpux__) || defined(__hpux)
-#    define ACC_OS_POSIX_HPUX       1
-#    define ACC_INFO_OS_POSIX       "hpux"
-#  elif defined(__INTERIX)
-#    define ACC_OS_POSIX_INTERIX    1
-#    define ACC_INFO_OS_POSIX       "interix"
-#  elif defined(__IRIX__) || defined(__irix__)
-#    define ACC_OS_POSIX_IRIX       1
-#    define ACC_INFO_OS_POSIX       "irix"
-#  elif defined(__linux__) || defined(__linux) || defined(__LINUX__)
-#    define ACC_OS_POSIX_LINUX      1
-#    define ACC_INFO_OS_POSIX       "linux"
-#  elif defined(__APPLE__) || defined(__MACOS__)
-#    define ACC_OS_POSIX_MACOSX     1
-#    define ACC_INFO_OS_POSIX       "macosx"
-#  elif defined(__minix__) || defined(__minix)
-#    define ACC_OS_POSIX_MINIX      1
-#    define ACC_INFO_OS_POSIX       "minix"
-#  elif defined(__NetBSD__)
-#    define ACC_OS_POSIX_NETBSD     1
-#    define ACC_INFO_OS_POSIX       "netbsd"
-#  elif defined(__OpenBSD__)
-#    define ACC_OS_POSIX_OPENBSD    1
-#    define ACC_INFO_OS_POSIX       "openbsd"
-#  elif defined(__osf__)
-#    define ACC_OS_POSIX_OSF        1
-#    define ACC_INFO_OS_POSIX       "osf"
-#  elif defined(__solaris__) || defined(__sun)
-#    if defined(__SVR4) || defined(__svr4__)
-#      define ACC_OS_POSIX_SOLARIS  1
-#      define ACC_INFO_OS_POSIX     "solaris"
-#    else
-#      define ACC_OS_POSIX_SUNOS    1
-#      define ACC_INFO_OS_POSIX     "sunos"
-#    endif
-#  elif defined(__ultrix__) || defined(__ultrix)
-#    define ACC_OS_POSIX_ULTRIX     1
-#    define ACC_INFO_OS_POSIX       "ultrix"
-#  elif defined(_UNICOS)
-#    define ACC_OS_POSIX_UNICOS     1
-#    define ACC_INFO_OS_POSIX       "unicos"
-#  else
-#    define ACC_OS_POSIX_UNKNOWN    1
-#    define ACC_INFO_OS_POSIX       "unknown"
-#  endif
-#endif
-#endif
-#if (ACC_OS_DOS16 || ACC_OS_OS216 || ACC_OS_WIN16)
-#  if (UINT_MAX != ACC_0xffffL)
-#    error "this should not happen"
-#  endif
-#  if (ULONG_MAX != ACC_0xffffffffL)
-#    error "this should not happen"
-#  endif
-#endif
-#if (ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_WIN32 || ACC_OS_WIN64)
-#  if (UINT_MAX != ACC_0xffffffffL)
-#    error "this should not happen"
-#  endif
-#  if (ULONG_MAX != ACC_0xffffffffL)
-#    error "this should not happen"
-#  endif
-#endif
-#if defined(CIL) && defined(_GNUCC) && defined(__GNUC__)
-#  define ACC_CC_CILLY          1
-#  define ACC_INFO_CC           "Cilly"
-#  if defined(__CILLY__)
-#    define ACC_INFO_CCVER      ACC_PP_MACRO_EXPAND(__CILLY__)
-#  else
-#    define ACC_INFO_CCVER      "unknown"
-#  endif
-#elif 0 && defined(SDCC) && defined(__VERSION__) && !defined(__GNUC__)
-#  define ACC_CC_SDCC           1
-#  define ACC_INFO_CC           "sdcc"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(SDCC)
-#elif defined(__PATHSCALE__) && defined(__PATHCC_PATCHLEVEL__)
-#  define ACC_CC_PATHSCALE      (__PATHCC__ * 0x10000L + __PATHCC_MINOR__ * 0x100 + __PATHCC_PATCHLEVEL__)
-#  define ACC_INFO_CC           "Pathscale C"
-#  define ACC_INFO_CCVER        __PATHSCALE__
-#elif defined(__INTEL_COMPILER)
-#  define ACC_CC_INTELC         1
-#  define ACC_INFO_CC           "Intel C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(__INTEL_COMPILER)
-#  if defined(_WIN32) || defined(_WIN64)
-#    define ACC_CC_SYNTAX_MSC 1
-#  else
-#    define ACC_CC_SYNTAX_GNUC 1
-#  endif
-#elif defined(__POCC__) && defined(_WIN32)
-#  define ACC_CC_PELLESC        1
-#  define ACC_INFO_CC           "Pelles C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(__POCC__)
-#elif defined(__clang__) && defined(__llvm__) && defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__)
-#  if defined(__GNUC_PATCHLEVEL__)
-#    define ACC_CC_CLANG_GNUC   (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100 + __GNUC_PATCHLEVEL__)
-#  else
-#    define ACC_CC_CLANG_GNUC   (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100)
-#  endif
-#  if defined(__clang_major__) && defined(__clang_minor__) && defined(__clang_patchlevel__)
-#    define ACC_CC_CLANG_CLANG  (__clang_major__ * 0x10000L + __clang_minor__ * 0x100 + __clang_patchlevel__)
-#  else
-#    define ACC_CC_CLANG_CLANG  0x010000L
-#  endif
-#  define ACC_CC_CLANG          ACC_CC_CLANG_GNUC
-#  define ACC_INFO_CC           "clang"
-#  define ACC_INFO_CCVER        __VERSION__
-#elif defined(__llvm__) && defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__)
-#  if defined(__GNUC_PATCHLEVEL__)
-#    define ACC_CC_LLVM_GNUC    (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100 + __GNUC_PATCHLEVEL__)
-#  else
-#    define ACC_CC_LLVM_GNUC    (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100)
-#  endif
-#  define ACC_CC_LLVM           ACC_CC_LLVM_GNUC
-#  define ACC_INFO_CC           "llvm-gcc"
-#  define ACC_INFO_CCVER        __VERSION__
-#elif defined(__GNUC__) && defined(__VERSION__)
-#  if defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__)
-#    define ACC_CC_GNUC         (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100 + __GNUC_PATCHLEVEL__)
-#  elif defined(__GNUC_MINOR__)
-#    define ACC_CC_GNUC         (__GNUC__ * 0x10000L + __GNUC_MINOR__ * 0x100)
-#  else
-#    define ACC_CC_GNUC         (__GNUC__ * 0x10000L)
-#  endif
-#  define ACC_INFO_CC           "gcc"
-#  define ACC_INFO_CCVER        __VERSION__
-#elif defined(__ACK__) && defined(_ACK)
-#  define ACC_CC_ACK            1
-#  define ACC_INFO_CC           "Amsterdam Compiler Kit C"
-#  define ACC_INFO_CCVER        "unknown"
-#elif defined(__AZTEC_C__)
-#  define ACC_CC_AZTECC         1
-#  define ACC_INFO_CC           "Aztec C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(__AZTEC_C__)
-#elif defined(__CODEGEARC__)
-#  define ACC_CC_CODEGEARC      1
-#  define ACC_INFO_CC           "CodeGear C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(__CODEGEARC__)
-#elif defined(__BORLANDC__)
-#  define ACC_CC_BORLANDC       1
-#  define ACC_INFO_CC           "Borland C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(__BORLANDC__)
-#elif defined(_CRAYC) && defined(_RELEASE)
-#  define ACC_CC_CRAYC          1
-#  define ACC_INFO_CC           "Cray C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(_RELEASE)
-#elif defined(__DMC__) && defined(__SC__)
-#  define ACC_CC_DMC            1
-#  define ACC_INFO_CC           "Digital Mars C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(__DMC__)
-#elif defined(__DECC)
-#  define ACC_CC_DECC           1
-#  define ACC_INFO_CC           "DEC C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(__DECC)
-#elif defined(__HIGHC__)
-#  define ACC_CC_HIGHC          1
-#  define ACC_INFO_CC           "MetaWare High C"
-#  define ACC_INFO_CCVER        "unknown"
-#elif defined(__IAR_SYSTEMS_ICC__)
-#  define ACC_CC_IARC           1
-#  define ACC_INFO_CC           "IAR C"
-#  if defined(__VER__)
-#    define ACC_INFO_CCVER      ACC_PP_MACRO_EXPAND(__VER__)
-#  else
-#    define ACC_INFO_CCVER      "unknown"
-#  endif
-#elif defined(__IBMC__)
-#  define ACC_CC_IBMC           1
-#  define ACC_INFO_CC           "IBM C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(__IBMC__)
-#elif defined(__KEIL__) && defined(__C166__)
-#  define ACC_CC_KEILC          1
-#  define ACC_INFO_CC           "Keil C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(__C166__)
-#elif defined(__LCC__) && defined(_WIN32) && defined(__LCCOPTIMLEVEL)
-#  define ACC_CC_LCCWIN32       1
-#  define ACC_INFO_CC           "lcc-win32"
-#  define ACC_INFO_CCVER        "unknown"
-#elif defined(__LCC__)
-#  define ACC_CC_LCC            1
-#  define ACC_INFO_CC           "lcc"
-#  if defined(__LCC_VERSION__)
-#    define ACC_INFO_CCVER      ACC_PP_MACRO_EXPAND(__LCC_VERSION__)
-#  else
-#    define ACC_INFO_CCVER      "unknown"
-#  endif
-#elif defined(_MSC_VER)
-#  define ACC_CC_MSC            1
-#  define ACC_INFO_CC           "Microsoft C"
-#  if defined(_MSC_FULL_VER)
-#    define ACC_INFO_CCVER      ACC_PP_MACRO_EXPAND(_MSC_VER) "." ACC_PP_MACRO_EXPAND(_MSC_FULL_VER)
-#  else
-#    define ACC_INFO_CCVER      ACC_PP_MACRO_EXPAND(_MSC_VER)
-#  endif
-#elif defined(__MWERKS__)
-#  define ACC_CC_MWERKS         1
-#  define ACC_INFO_CC           "Metrowerks C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(__MWERKS__)
-#elif (defined(__NDPC__) || defined(__NDPX__)) && defined(__i386)
-#  define ACC_CC_NDPC           1
-#  define ACC_INFO_CC           "Microway NDP C"
-#  define ACC_INFO_CCVER        "unknown"
-#elif defined(__PACIFIC__)
-#  define ACC_CC_PACIFICC       1
-#  define ACC_INFO_CC           "Pacific C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(__PACIFIC__)
-#elif defined(__PGI) && (defined(__linux__) || defined(__WIN32__))
-#  define ACC_CC_PGI            1
-#  define ACC_INFO_CC           "Portland Group PGI C"
-#  define ACC_INFO_CCVER        "unknown"
-#elif defined(__PUREC__) && defined(__TOS__)
-#  define ACC_CC_PUREC          1
-#  define ACC_INFO_CC           "Pure C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(__PUREC__)
-#elif defined(__SC__) && defined(__ZTC__)
-#  define ACC_CC_SYMANTECC      1
-#  define ACC_INFO_CC           "Symantec C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(__SC__)
-#elif defined(__SUNPRO_C)
-#  define ACC_INFO_CC           "SunPro C"
-#  if ((__SUNPRO_C)+0 > 0)
-#    define ACC_CC_SUNPROC      __SUNPRO_C
-#    define ACC_INFO_CCVER      ACC_PP_MACRO_EXPAND(__SUNPRO_C)
-#  else
-#    define ACC_CC_SUNPROC      1
-#    define ACC_INFO_CCVER      "unknown"
-#  endif
-#elif defined(__SUNPRO_CC)
-#  define ACC_INFO_CC           "SunPro C"
-#  if ((__SUNPRO_CC)+0 > 0)
-#    define ACC_CC_SUNPROC      __SUNPRO_CC
-#    define ACC_INFO_CCVER      ACC_PP_MACRO_EXPAND(__SUNPRO_CC)
-#  else
-#    define ACC_CC_SUNPROC      1
-#    define ACC_INFO_CCVER      "unknown"
-#  endif
-#elif defined(__TINYC__)
-#  define ACC_CC_TINYC          1
-#  define ACC_INFO_CC           "Tiny C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(__TINYC__)
-#elif defined(__TSC__)
-#  define ACC_CC_TOPSPEEDC      1
-#  define ACC_INFO_CC           "TopSpeed C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(__TSC__)
-#elif defined(__WATCOMC__)
-#  define ACC_CC_WATCOMC        1
-#  define ACC_INFO_CC           "Watcom C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(__WATCOMC__)
-#elif defined(__TURBOC__)
-#  define ACC_CC_TURBOC         1
-#  define ACC_INFO_CC           "Turbo C"
-#  define ACC_INFO_CCVER        ACC_PP_MACRO_EXPAND(__TURBOC__)
-#elif defined(__ZTC__)
-#  define ACC_CC_ZORTECHC       1
-#  define ACC_INFO_CC           "Zortech C"
-#  if (__ZTC__ == 0x310)
-#    define ACC_INFO_CCVER      "0x310"
-#  else
-#    define ACC_INFO_CCVER      ACC_PP_MACRO_EXPAND(__ZTC__)
-#  endif
-#else
-#  define ACC_CC_UNKNOWN        1
-#  define ACC_INFO_CC           "unknown"
-#  define ACC_INFO_CCVER        "unknown"
-#endif
-#if 0 && (ACC_CC_MSC && (_MSC_VER >= 1200)) && !defined(_MSC_FULL_VER)
-#  error "ACC_CC_MSC: _MSC_FULL_VER is not defined"
-#endif
-#if !defined(__ACC_ARCH_OVERRIDE) && !(ACC_ARCH_GENERIC) && defined(_CRAY)
-#  if (UINT_MAX > ACC_0xffffffffL) && defined(_CRAY)
-#    if defined(_CRAYMPP) || defined(_CRAYT3D) || defined(_CRAYT3E)
-#      define ACC_ARCH_CRAY_MPP     1
-#    elif defined(_CRAY1)
-#      define ACC_ARCH_CRAY_PVP     1
-#    endif
-#  endif
-#endif
-#if !defined(__ACC_ARCH_OVERRIDE)
-#if (ACC_ARCH_GENERIC)
-#  define ACC_INFO_ARCH             "generic"
-#elif (ACC_OS_DOS16 || ACC_OS_OS216 || ACC_OS_WIN16)
-#  define ACC_ARCH_I086             1
-#  define ACC_ARCH_IA16             1
-#  define ACC_INFO_ARCH             "i086"
-#elif defined(__alpha__) || defined(__alpha) || defined(_M_ALPHA)
-#  define ACC_ARCH_ALPHA            1
-#  define ACC_INFO_ARCH             "alpha"
-#elif (ACC_ARCH_CRAY_MPP) && (defined(_CRAYT3D) || defined(_CRAYT3E))
-#  define ACC_ARCH_ALPHA            1
-#  define ACC_INFO_ARCH             "alpha"
-#elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64)
-#  define ACC_ARCH_AMD64            1
-#  define ACC_INFO_ARCH             "amd64"
-#elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB))
-#  define ACC_ARCH_ARM              1
-#  define ACC_ARCH_ARM_THUMB        1
-#  define ACC_INFO_ARCH             "arm_thumb"
-#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCARM__)
-#  define ACC_ARCH_ARM              1
-#  if defined(__CPU_MODE__) && ((__CPU_MODE__)+0 == 1)
-#    define ACC_ARCH_ARM_THUMB      1
-#    define ACC_INFO_ARCH           "arm_thumb"
-#  elif defined(__CPU_MODE__) && ((__CPU_MODE__)+0 == 2)
-#    define ACC_INFO_ARCH           "arm"
-#  else
-#    define ACC_INFO_ARCH           "arm"
-#  endif
-#elif defined(__arm__) || defined(_M_ARM)
-#  define ACC_ARCH_ARM              1
-#  define ACC_INFO_ARCH             "arm"
-#elif (UINT_MAX <= ACC_0xffffL) && defined(__AVR__)
-#  define ACC_ARCH_AVR              1
-#  define ACC_INFO_ARCH             "avr"
-#elif defined(__avr32__) || defined(__AVR32__)
-#  define ACC_ARCH_AVR32            1
-#  define ACC_INFO_ARCH             "avr32"
-#elif defined(__bfin__)
-#  define ACC_ARCH_BLACKFIN         1
-#  define ACC_INFO_ARCH             "blackfin"
-#elif (UINT_MAX == ACC_0xffffL) && defined(__C166__)
-#  define ACC_ARCH_C166             1
-#  define ACC_INFO_ARCH             "c166"
-#elif defined(__cris__)
-#  define ACC_ARCH_CRIS             1
-#  define ACC_INFO_ARCH             "cris"
-#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCEZ80__)
-#  define ACC_ARCH_EZ80             1
-#  define ACC_INFO_ARCH             "ez80"
-#elif defined(__H8300__) || defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__)
-#  define ACC_ARCH_H8300            1
-#  define ACC_INFO_ARCH             "h8300"
-#elif defined(__hppa__) || defined(__hppa)
-#  define ACC_ARCH_HPPA             1
-#  define ACC_INFO_ARCH             "hppa"
-#elif defined(__386__) || defined(__i386__) || defined(__i386) || defined(_M_IX86) || defined(_M_I386)
-#  define ACC_ARCH_I386             1
-#  define ACC_ARCH_IA32             1
-#  define ACC_INFO_ARCH             "i386"
-#elif (ACC_CC_ZORTECHC && defined(__I86__))
-#  define ACC_ARCH_I386             1
-#  define ACC_ARCH_IA32             1
-#  define ACC_INFO_ARCH             "i386"
-#elif (ACC_OS_DOS32 && ACC_CC_HIGHC) && defined(_I386)
-#  define ACC_ARCH_I386             1
-#  define ACC_ARCH_IA32             1
-#  define ACC_INFO_ARCH             "i386"
-#elif defined(__ia64__) || defined(__ia64) || defined(_M_IA64)
-#  define ACC_ARCH_IA64             1
-#  define ACC_INFO_ARCH             "ia64"
-#elif (UINT_MAX == ACC_0xffffL) && defined(__m32c__)
-#  define ACC_ARCH_M16C             1
-#  define ACC_INFO_ARCH             "m16c"
-#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCM16C__)
-#  define ACC_ARCH_M16C             1
-#  define ACC_INFO_ARCH             "m16c"
-#elif defined(__m32r__)
-#  define ACC_ARCH_M32R             1
-#  define ACC_INFO_ARCH             "m32r"
-#elif (ACC_OS_TOS) || defined(__m68k__) || defined(__m68000__) || defined(__mc68000__) || defined(__mc68020__) || defined(_M_M68K)
-#  define ACC_ARCH_M68K             1
-#  define ACC_INFO_ARCH             "m68k"
-#elif (UINT_MAX == ACC_0xffffL) && defined(__C251__)
-#  define ACC_ARCH_MCS251           1
-#  define ACC_INFO_ARCH             "mcs251"
-#elif (UINT_MAX == ACC_0xffffL) && defined(__C51__)
-#  define ACC_ARCH_MCS51            1
-#  define ACC_INFO_ARCH             "mcs51"
-#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICC8051__)
-#  define ACC_ARCH_MCS51            1
-#  define ACC_INFO_ARCH             "mcs51"
-#elif defined(__mips__) || defined(__mips) || defined(_MIPS_ARCH) || defined(_M_MRX000)
-#  define ACC_ARCH_MIPS             1
-#  define ACC_INFO_ARCH             "mips"
-#elif (UINT_MAX == ACC_0xffffL) && defined(__MSP430__)
-#  define ACC_ARCH_MSP430           1
-#  define ACC_INFO_ARCH             "msp430"
-#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICC430__)
-#  define ACC_ARCH_MSP430           1
-#  define ACC_INFO_ARCH             "msp430"
-#elif defined(__powerpc__) || defined(__powerpc) || defined(__ppc__) || defined(__PPC__) || defined(_M_PPC) || defined(_ARCH_PPC) || defined(_ARCH_PWR)
-#  define ACC_ARCH_POWERPC          1
-#  define ACC_INFO_ARCH             "powerpc"
-#elif defined(__s390__) || defined(__s390) || defined(__s390x__) || defined(__s390x)
-#  define ACC_ARCH_S390             1
-#  define ACC_INFO_ARCH             "s390"
-#elif defined(__sh__) || defined(_M_SH)
-#  define ACC_ARCH_SH               1
-#  define ACC_INFO_ARCH             "sh"
-#elif defined(__sparc__) || defined(__sparc) || defined(__sparcv8)
-#  define ACC_ARCH_SPARC            1
-#  define ACC_INFO_ARCH             "sparc"
-#elif defined(__SPU__)
-#  define ACC_ARCH_SPU              1
-#  define ACC_INFO_ARCH             "spu"
-#elif (UINT_MAX == ACC_0xffffL) && defined(__z80)
-#  define ACC_ARCH_Z80              1
-#  define ACC_INFO_ARCH             "z80"
-#elif (ACC_ARCH_CRAY_PVP)
-#  if defined(_CRAYSV1)
-#    define ACC_ARCH_CRAY_SV1       1
-#    define ACC_INFO_ARCH           "cray_sv1"
-#  elif (_ADDR64)
-#    define ACC_ARCH_CRAY_T90       1
-#    define ACC_INFO_ARCH           "cray_t90"
-#  elif (_ADDR32)
-#    define ACC_ARCH_CRAY_YMP       1
-#    define ACC_INFO_ARCH           "cray_ymp"
-#  else
-#    define ACC_ARCH_CRAY_XMP       1
-#    define ACC_INFO_ARCH           "cray_xmp"
-#  endif
-#else
-#  define ACC_ARCH_UNKNOWN          1
-#  define ACC_INFO_ARCH             "unknown"
-#endif
-#endif
-#if 1 && (ACC_ARCH_UNKNOWN) && (ACC_OS_DOS32 || ACC_OS_OS2)
-#  error "FIXME - missing define for CPU architecture"
-#endif
-#if 1 && (ACC_ARCH_UNKNOWN) && (ACC_OS_WIN32)
-#  error "FIXME - missing WIN32 define for CPU architecture"
-#endif
-#if 1 && (ACC_ARCH_UNKNOWN) && (ACC_OS_WIN64)
-#  error "FIXME - missing WIN64 define for CPU architecture"
-#endif
-#if (ACC_OS_OS216 || ACC_OS_WIN16)
-#  define ACC_ARCH_I086PM           1
-#  define ACC_ARCH_IA16PM           1
-#elif 1 && (ACC_OS_DOS16 && defined(BLX286))
-#  define ACC_ARCH_I086PM           1
-#  define ACC_ARCH_IA16PM           1
-#elif 1 && (ACC_OS_DOS16 && defined(DOSX286))
-#  define ACC_ARCH_I086PM           1
-#  define ACC_ARCH_IA16PM           1
-#elif 1 && (ACC_OS_DOS16 && ACC_CC_BORLANDC && defined(__DPMI16__))
-#  define ACC_ARCH_I086PM           1
-#  define ACC_ARCH_IA16PM           1
-#endif
-#if (ACC_ARCH_ARM_THUMB) && !(ACC_ARCH_ARM)
-#  error "this should not happen"
-#endif
-#if (ACC_ARCH_I086PM) && !(ACC_ARCH_I086)
-#  error "this should not happen"
-#endif
-#if (ACC_ARCH_I086)
-#  if (UINT_MAX != ACC_0xffffL)
-#    error "this should not happen"
-#  endif
-#  if (ULONG_MAX != ACC_0xffffffffL)
-#    error "this should not happen"
-#  endif
-#endif
-#if (ACC_ARCH_I386)
-#  if (UINT_MAX != ACC_0xffffL) && defined(__i386_int16__)
-#    error "this should not happen"
-#  endif
-#  if (UINT_MAX != ACC_0xffffffffL) && !defined(__i386_int16__)
-#    error "this should not happen"
-#  endif
-#  if (ULONG_MAX != ACC_0xffffffffL)
-#    error "this should not happen"
-#  endif
-#endif
-#if !defined(__ACC_MM_OVERRIDE)
-#if (ACC_ARCH_I086)
-#if (UINT_MAX != ACC_0xffffL)
-#  error "this should not happen"
-#endif
-#if defined(__TINY__) || defined(M_I86TM) || defined(_M_I86TM)
-#  define ACC_MM_TINY           1
-#elif defined(__HUGE__) || defined(_HUGE_) || defined(M_I86HM) || defined(_M_I86HM)
-#  define ACC_MM_HUGE           1
-#elif defined(__SMALL__) || defined(M_I86SM) || defined(_M_I86SM) || defined(SMALL_MODEL)
-#  define ACC_MM_SMALL          1
-#elif defined(__MEDIUM__) || defined(M_I86MM) || defined(_M_I86MM)
-#  define ACC_MM_MEDIUM         1
-#elif defined(__COMPACT__) || defined(M_I86CM) || defined(_M_I86CM)
-#  define ACC_MM_COMPACT        1
-#elif defined(__LARGE__) || defined(M_I86LM) || defined(_M_I86LM) || defined(LARGE_MODEL)
-#  define ACC_MM_LARGE          1
-#elif (ACC_CC_AZTECC)
-#  if defined(_LARGE_CODE) && defined(_LARGE_DATA)
-#    define ACC_MM_LARGE        1
-#  elif defined(_LARGE_CODE)
-#    define ACC_MM_MEDIUM       1
-#  elif defined(_LARGE_DATA)
-#    define ACC_MM_COMPACT      1
-#  else
-#    define ACC_MM_SMALL        1
-#  endif
-#elif (ACC_CC_ZORTECHC && defined(__VCM__))
-#  define ACC_MM_LARGE          1
-#else
-#  error "unknown memory model"
-#endif
-#if (ACC_OS_DOS16 || ACC_OS_OS216 || ACC_OS_WIN16)
-#define ACC_HAVE_MM_HUGE_PTR        1
-#define ACC_HAVE_MM_HUGE_ARRAY      1
-#if (ACC_MM_TINY)
-#  undef ACC_HAVE_MM_HUGE_ARRAY
-#endif
-#if (ACC_CC_AZTECC || ACC_CC_PACIFICC || ACC_CC_ZORTECHC)
-#  undef ACC_HAVE_MM_HUGE_PTR
-#  undef ACC_HAVE_MM_HUGE_ARRAY
-#elif (ACC_CC_DMC || ACC_CC_SYMANTECC)
-#  undef ACC_HAVE_MM_HUGE_ARRAY
-#elif (ACC_CC_MSC && defined(_QC))
-#  undef ACC_HAVE_MM_HUGE_ARRAY
-#  if (_MSC_VER < 600)
-#    undef ACC_HAVE_MM_HUGE_PTR
-#  endif
-#elif (ACC_CC_TURBOC && (__TURBOC__ < 0x0295))
-#  undef ACC_HAVE_MM_HUGE_ARRAY
-#endif
-#if (ACC_ARCH_I086PM) && !(ACC_HAVE_MM_HUGE_PTR)
-#  if (ACC_OS_DOS16)
-#    error "this should not happen"
-#  elif (ACC_CC_ZORTECHC)
-#  else
-#    error "this should not happen"
-#  endif
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0200))
-   extern void __near __cdecl _AHSHIFT(void);
-#  define ACC_MM_AHSHIFT      ((unsigned) _AHSHIFT)
-#elif (ACC_CC_DMC || ACC_CC_SYMANTECC || ACC_CC_ZORTECHC)
-   extern void __near __cdecl _AHSHIFT(void);
-#  define ACC_MM_AHSHIFT      ((unsigned) _AHSHIFT)
-#elif (ACC_CC_MSC || ACC_CC_TOPSPEEDC)
-   extern void __near __cdecl _AHSHIFT(void);
-#  define ACC_MM_AHSHIFT      ((unsigned) _AHSHIFT)
-#elif (ACC_CC_TURBOC && (__TURBOC__ >= 0x0295))
-   extern void __near __cdecl _AHSHIFT(void);
-#  define ACC_MM_AHSHIFT      ((unsigned) _AHSHIFT)
-#elif ((ACC_CC_AZTECC || ACC_CC_PACIFICC || ACC_CC_TURBOC) && ACC_OS_DOS16)
-#  define ACC_MM_AHSHIFT      12
-#elif (ACC_CC_WATCOMC)
-   extern unsigned char _HShift;
-#  define ACC_MM_AHSHIFT      ((unsigned) _HShift)
-#else
-#  error "FIXME - implement ACC_MM_AHSHIFT"
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
-#elif (ACC_ARCH_C166)
-#if !defined(__MODEL__)
-#  error "FIXME - C166 __MODEL__"
-#elif ((__MODEL__) == 0)
-#  define ACC_MM_SMALL          1
-#elif ((__MODEL__) == 1)
-#  define ACC_MM_SMALL          1
-#elif ((__MODEL__) == 2)
-#  define ACC_MM_LARGE          1
-#elif ((__MODEL__) == 3)
-#  define ACC_MM_TINY           1
-#elif ((__MODEL__) == 4)
-#  define ACC_MM_XTINY          1
-#elif ((__MODEL__) == 5)
-#  define ACC_MM_XSMALL         1
-#else
-#  error "FIXME - C166 __MODEL__"
-#endif
-#elif (ACC_ARCH_MCS251)
-#if !defined(__MODEL__)
-#  error "FIXME - MCS251 __MODEL__"
-#elif ((__MODEL__) == 0)
-#  define ACC_MM_SMALL          1
-#elif ((__MODEL__) == 2)
-#  define ACC_MM_LARGE          1
-#elif ((__MODEL__) == 3)
-#  define ACC_MM_TINY           1
-#elif ((__MODEL__) == 4)
-#  define ACC_MM_XTINY          1
-#elif ((__MODEL__) == 5)
-#  define ACC_MM_XSMALL         1
-#else
-#  error "FIXME - MCS251 __MODEL__"
-#endif
-#elif (ACC_ARCH_MCS51)
-#if !defined(__MODEL__)
-#  error "FIXME - MCS51 __MODEL__"
-#elif ((__MODEL__) == 1)
-#  define ACC_MM_SMALL          1
-#elif ((__MODEL__) == 2)
-#  define ACC_MM_LARGE          1
-#elif ((__MODEL__) == 3)
-#  define ACC_MM_TINY           1
-#elif ((__MODEL__) == 4)
-#  define ACC_MM_XTINY          1
-#elif ((__MODEL__) == 5)
-#  define ACC_MM_XSMALL         1
-#else
-#  error "FIXME - MCS51 __MODEL__"
-#endif
-#elif (ACC_ARCH_CRAY_PVP)
-#  define ACC_MM_PVP            1
-#else
-#  define ACC_MM_FLAT           1
-#endif
-#if (ACC_MM_COMPACT)
-#  define ACC_INFO_MM           "compact"
-#elif (ACC_MM_FLAT)
-#  define ACC_INFO_MM           "flat"
-#elif (ACC_MM_HUGE)
-#  define ACC_INFO_MM           "huge"
-#elif (ACC_MM_LARGE)
-#  define ACC_INFO_MM           "large"
-#elif (ACC_MM_MEDIUM)
-#  define ACC_INFO_MM           "medium"
-#elif (ACC_MM_PVP)
-#  define ACC_INFO_MM           "pvp"
-#elif (ACC_MM_SMALL)
-#  define ACC_INFO_MM           "small"
-#elif (ACC_MM_TINY)
-#  define ACC_INFO_MM           "tiny"
-#else
-#  error "unknown memory model"
-#endif
-#endif
-#if defined(SIZEOF_SHORT)
-#  define ACC_SIZEOF_SHORT          (SIZEOF_SHORT)
-#endif
-#if defined(SIZEOF_INT)
-#  define ACC_SIZEOF_INT            (SIZEOF_INT)
-#endif
-#if defined(SIZEOF_LONG)
-#  define ACC_SIZEOF_LONG           (SIZEOF_LONG)
-#endif
-#if defined(SIZEOF_LONG_LONG)
-#  define ACC_SIZEOF_LONG_LONG      (SIZEOF_LONG_LONG)
-#endif
-#if defined(SIZEOF___INT16)
-#  define ACC_SIZEOF___INT16        (SIZEOF___INT16)
-#endif
-#if defined(SIZEOF___INT32)
-#  define ACC_SIZEOF___INT32        (SIZEOF___INT32)
-#endif
-#if defined(SIZEOF___INT64)
-#  define ACC_SIZEOF___INT64        (SIZEOF___INT64)
-#endif
-#if defined(SIZEOF_VOID_P)
-#  define ACC_SIZEOF_VOID_P         (SIZEOF_VOID_P)
-#endif
-#if defined(SIZEOF_SIZE_T)
-#  define ACC_SIZEOF_SIZE_T         (SIZEOF_SIZE_T)
-#endif
-#if defined(SIZEOF_PTRDIFF_T)
-#  define ACC_SIZEOF_PTRDIFF_T      (SIZEOF_PTRDIFF_T)
-#endif
-#define __ACC_LSR(x,b)    (((x)+0ul) >> (b))
-#if !defined(ACC_SIZEOF_SHORT)
-#  if (ACC_ARCH_CRAY_PVP)
-#    define ACC_SIZEOF_SHORT        8
-#  elif (USHRT_MAX == ACC_0xffffL)
-#    define ACC_SIZEOF_SHORT        2
-#  elif (__ACC_LSR(USHRT_MAX,7) == 1)
-#    define ACC_SIZEOF_SHORT        1
-#  elif (__ACC_LSR(USHRT_MAX,15) == 1)
-#    define ACC_SIZEOF_SHORT        2
-#  elif (__ACC_LSR(USHRT_MAX,31) == 1)
-#    define ACC_SIZEOF_SHORT        4
-#  elif (__ACC_LSR(USHRT_MAX,63) == 1)
-#    define ACC_SIZEOF_SHORT        8
-#  elif (__ACC_LSR(USHRT_MAX,127) == 1)
-#    define ACC_SIZEOF_SHORT        16
-#  else
-#    error "ACC_SIZEOF_SHORT"
-#  endif
-#endif
-#if !defined(ACC_SIZEOF_INT)
-#  if (ACC_ARCH_CRAY_PVP)
-#    define ACC_SIZEOF_INT          8
-#  elif (UINT_MAX == ACC_0xffffL)
-#    define ACC_SIZEOF_INT          2
-#  elif (UINT_MAX == ACC_0xffffffffL)
-#    define ACC_SIZEOF_INT          4
-#  elif (__ACC_LSR(UINT_MAX,7) == 1)
-#    define ACC_SIZEOF_INT          1
-#  elif (__ACC_LSR(UINT_MAX,15) == 1)
-#    define ACC_SIZEOF_INT          2
-#  elif (__ACC_LSR(UINT_MAX,31) == 1)
-#    define ACC_SIZEOF_INT          4
-#  elif (__ACC_LSR(UINT_MAX,63) == 1)
-#    define ACC_SIZEOF_INT          8
-#  elif (__ACC_LSR(UINT_MAX,127) == 1)
-#    define ACC_SIZEOF_INT          16
-#  else
-#    error "ACC_SIZEOF_INT"
-#  endif
-#endif
-#if !defined(ACC_SIZEOF_LONG)
-#  if (ULONG_MAX == ACC_0xffffffffL)
-#    define ACC_SIZEOF_LONG         4
-#  elif (__ACC_LSR(ULONG_MAX,7) == 1)
-#    define ACC_SIZEOF_LONG         1
-#  elif (__ACC_LSR(ULONG_MAX,15) == 1)
-#    define ACC_SIZEOF_LONG         2
-#  elif (__ACC_LSR(ULONG_MAX,31) == 1)
-#    define ACC_SIZEOF_LONG         4
-#  elif (__ACC_LSR(ULONG_MAX,63) == 1)
-#    define ACC_SIZEOF_LONG         8
-#  elif (__ACC_LSR(ULONG_MAX,127) == 1)
-#    define ACC_SIZEOF_LONG         16
-#  else
-#    error "ACC_SIZEOF_LONG"
-#  endif
-#endif
-#if !defined(ACC_SIZEOF_LONG_LONG) && !defined(ACC_SIZEOF___INT64)
-#if (ACC_SIZEOF_LONG > 0 && ACC_SIZEOF_LONG < 8)
-#  if defined(__LONG_MAX__) && defined(__LONG_LONG_MAX__)
-#    if (ACC_CC_GNUC >= 0x030300ul)
-#      if ((__LONG_MAX__)+0 == (__LONG_LONG_MAX__)+0)
-#        define ACC_SIZEOF_LONG_LONG      ACC_SIZEOF_LONG
-#      elif (__ACC_LSR(__LONG_LONG_MAX__,30) == 1)
-#        define ACC_SIZEOF_LONG_LONG      4
-#      endif
-#    endif
-#  endif
-#endif
-#endif
-#if !defined(ACC_SIZEOF_LONG_LONG) && !defined(ACC_SIZEOF___INT64)
-#if (ACC_SIZEOF_LONG > 0 && ACC_SIZEOF_LONG < 8)
-#if (ACC_ARCH_I086 && ACC_CC_DMC)
-#elif (ACC_CC_CILLY) && defined(__GNUC__)
-#  define ACC_SIZEOF_LONG_LONG      8
-#elif (ACC_CC_CLANG || ACC_CC_GNUC || ACC_CC_LLVM || ACC_CC_PATHSCALE)
-#  define ACC_SIZEOF_LONG_LONG      8
-#elif ((ACC_OS_WIN32 || ACC_OS_WIN64 || defined(_WIN32)) && ACC_CC_MSC && (_MSC_VER >= 1400))
-#  define ACC_SIZEOF_LONG_LONG      8
-#elif (ACC_OS_WIN64 || defined(_WIN64))
-#  define ACC_SIZEOF___INT64        8
-#elif (ACC_ARCH_I386 && (ACC_CC_DMC))
-#  define ACC_SIZEOF_LONG_LONG      8
-#elif (ACC_ARCH_I386 && (ACC_CC_SYMANTECC && (__SC__ >= 0x700)))
-#  define ACC_SIZEOF_LONG_LONG      8
-#elif (ACC_ARCH_I386 && (ACC_CC_INTELC && defined(__linux__)))
-#  define ACC_SIZEOF_LONG_LONG      8
-#elif (ACC_ARCH_I386 && (ACC_CC_MWERKS || ACC_CC_PELLESC || ACC_CC_PGI || ACC_CC_SUNPROC))
-#  define ACC_SIZEOF_LONG_LONG      8
-#elif (ACC_ARCH_I386 && (ACC_CC_INTELC || ACC_CC_MSC))
-#  define ACC_SIZEOF___INT64        8
-#elif ((ACC_OS_WIN32 || defined(_WIN32)) && (ACC_CC_MSC))
-#  define ACC_SIZEOF___INT64        8
-#elif (ACC_ARCH_I386 && (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0520)))
-#  define ACC_SIZEOF___INT64        8
-#elif (ACC_ARCH_I386 && (ACC_CC_WATCOMC && (__WATCOMC__ >= 1100)))
-#  define ACC_SIZEOF___INT64        8
-#elif (ACC_CC_WATCOMC && defined(_INTEGRAL_MAX_BITS) && (_INTEGRAL_MAX_BITS == 64))
-#  define ACC_SIZEOF___INT64        8
-#elif (ACC_OS_OS400 || defined(__OS400__)) && defined(__LLP64_IFC__)
-#  define ACC_SIZEOF_LONG_LONG      8
-#elif (defined(__vms) || defined(__VMS)) && (__INITIAL_POINTER_SIZE+0 == 64)
-#  define ACC_SIZEOF_LONG_LONG      8
-#elif (ACC_CC_SDCC) && (ACC_SIZEOF_INT == 2)
-#elif 1 && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
-#  define ACC_SIZEOF_LONG_LONG      8
-#endif
-#endif
-#endif
-#if defined(__cplusplus) && (ACC_CC_GNUC)
-#  if (ACC_CC_GNUC < 0x020800ul)
-#    undef ACC_SIZEOF_LONG_LONG
-#  endif
-#endif
-#if (ACC_CFG_NO_LONG_LONG) || defined(__NO_LONG_LONG)
-#  undef ACC_SIZEOF_LONG_LONG
-#endif
-#if !defined(ACC_SIZEOF_VOID_P)
-#if (ACC_ARCH_I086)
-#  define __ACC_WORDSIZE            2
-#  if (ACC_MM_TINY || ACC_MM_SMALL || ACC_MM_MEDIUM)
-#    define ACC_SIZEOF_VOID_P       2
-#  elif (ACC_MM_COMPACT || ACC_MM_LARGE || ACC_MM_HUGE)
-#    define ACC_SIZEOF_VOID_P       4
-#  else
-#    error "ACC_MM"
-#  endif
-#elif (ACC_ARCH_AVR || ACC_ARCH_Z80)
-#  define __ACC_WORDSIZE            1
-#  define ACC_SIZEOF_VOID_P         2
-#elif (ACC_ARCH_C166 || ACC_ARCH_MCS51 || ACC_ARCH_MCS251 || ACC_ARCH_MSP430)
-#  define ACC_SIZEOF_VOID_P         2
-#elif (ACC_ARCH_H8300)
-#  if defined(__NORMAL_MODE__)
-#    define __ACC_WORDSIZE          4
-#    define ACC_SIZEOF_VOID_P       2
-#  elif defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__)
-#    define __ACC_WORDSIZE          4
-#    define ACC_SIZEOF_VOID_P       4
-#  else
-#    define __ACC_WORDSIZE          2
-#    define ACC_SIZEOF_VOID_P       2
-#  endif
-#  if (ACC_CC_GNUC && (ACC_CC_GNUC < 0x040000ul)) && (ACC_SIZEOF_INT == 4)
-#    define ACC_SIZEOF_SIZE_T       ACC_SIZEOF_INT
-#    define ACC_SIZEOF_PTRDIFF_T    ACC_SIZEOF_INT
-#  endif
-#elif (ACC_ARCH_M16C)
-#  define __ACC_WORDSIZE            2
-#  if defined(__m32c_cpu__) || defined(__m32cm_cpu__)
-#    define ACC_SIZEOF_VOID_P       4
-#  else
-#    define ACC_SIZEOF_VOID_P       2
-#  endif
-#elif (ACC_SIZEOF_LONG == 8) && ((defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__))
-#  define __ACC_WORDSIZE            8
-#  define ACC_SIZEOF_VOID_P         4
-#elif defined(__LLP64__) || defined(__LLP64) || defined(_LLP64) || defined(_WIN64)
-#  define __ACC_WORDSIZE            8
-#  define ACC_SIZEOF_VOID_P         8
-#elif (ACC_OS_OS400 || defined(__OS400__)) && defined(__LLP64_IFC__)
-#  define ACC_SIZEOF_VOID_P         ACC_SIZEOF_LONG
-#  define ACC_SIZEOF_SIZE_T         ACC_SIZEOF_LONG
-#  define ACC_SIZEOF_PTRDIFF_T      ACC_SIZEOF_LONG
-#elif (ACC_OS_OS400 || defined(__OS400__))
-#  define __ACC_WORDSIZE            ACC_SIZEOF_LONG
-#  define ACC_SIZEOF_VOID_P         16
-#  define ACC_SIZEOF_SIZE_T         ACC_SIZEOF_LONG
-#  define ACC_SIZEOF_PTRDIFF_T      ACC_SIZEOF_LONG
-#elif (defined(__vms) || defined(__VMS)) && (__INITIAL_POINTER_SIZE+0 == 64)
-#  define ACC_SIZEOF_VOID_P         8
-#  define ACC_SIZEOF_SIZE_T         ACC_SIZEOF_LONG
-#  define ACC_SIZEOF_PTRDIFF_T      ACC_SIZEOF_LONG
-#elif (ACC_ARCH_SPU)
-# if 0
-#  define __ACC_WORDSIZE            16
-# endif
-#  define ACC_SIZEOF_VOID_P         4
-#else
-#  define ACC_SIZEOF_VOID_P         ACC_SIZEOF_LONG
-#endif
-#endif
-#if !defined(ACC_WORDSIZE)
-#  if defined(__ACC_WORDSIZE)
-#    define ACC_WORDSIZE            __ACC_WORDSIZE
-#  else
-#    define ACC_WORDSIZE            ACC_SIZEOF_VOID_P
-#  endif
-#endif
-#if !defined(ACC_SIZEOF_SIZE_T)
-#if (ACC_ARCH_I086 || ACC_ARCH_M16C)
-#  define ACC_SIZEOF_SIZE_T         2
-#else
-#  define ACC_SIZEOF_SIZE_T         ACC_SIZEOF_VOID_P
-#endif
-#endif
-#if !defined(ACC_SIZEOF_PTRDIFF_T)
-#if (ACC_ARCH_I086)
-#  if (ACC_MM_TINY || ACC_MM_SMALL || ACC_MM_MEDIUM || ACC_MM_HUGE)
-#    define ACC_SIZEOF_PTRDIFF_T    ACC_SIZEOF_VOID_P
-#  elif (ACC_MM_COMPACT || ACC_MM_LARGE)
-#    if (ACC_CC_BORLANDC || ACC_CC_TURBOC)
-#      define ACC_SIZEOF_PTRDIFF_T  4
-#    else
-#      define ACC_SIZEOF_PTRDIFF_T  2
-#    endif
-#  else
-#    error "ACC_MM"
-#  endif
-#else
-#  define ACC_SIZEOF_PTRDIFF_T      ACC_SIZEOF_SIZE_T
-#endif
-#endif
-#if (ACC_ABI_NEUTRAL_ENDIAN)
-#  undef ACC_ABI_BIG_ENDIAN
-#  undef ACC_ABI_LITTLE_ENDIAN
-#elif !(ACC_ABI_BIG_ENDIAN) && !(ACC_ABI_LITTLE_ENDIAN)
-#if (ACC_ARCH_ALPHA) && (ACC_ARCH_CRAY_MPP)
-#  define ACC_ABI_BIG_ENDIAN        1
-#elif (ACC_ARCH_IA64) && (ACC_OS_POSIX_LINUX || ACC_OS_WIN64)
-#  define ACC_ABI_LITTLE_ENDIAN     1
-#elif (ACC_ARCH_ALPHA || ACC_ARCH_AMD64 || ACC_ARCH_BLACKFIN || ACC_ARCH_CRIS || ACC_ARCH_I086 || ACC_ARCH_I386 || ACC_ARCH_MSP430)
-#  define ACC_ABI_LITTLE_ENDIAN     1
-#elif (ACC_ARCH_AVR32 || ACC_ARCH_M68K || ACC_ARCH_S390)
-#  define ACC_ABI_BIG_ENDIAN        1
-#elif 1 && defined(__IAR_SYSTEMS_ICC__) && defined(__LITTLE_ENDIAN__)
-#  if (__LITTLE_ENDIAN__ == 1)
-#    define ACC_ABI_LITTLE_ENDIAN   1
-#  else
-#    define ACC_ABI_BIG_ENDIAN      1
-#  endif
-#elif 1 && defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
-#  define ACC_ABI_BIG_ENDIAN        1
-#elif 1 && defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)
-#  define ACC_ABI_LITTLE_ENDIAN     1
-#elif 1 && (ACC_ARCH_ARM) && defined(__ARMEB__) && !defined(__ARMEL__)
-#  define ACC_ABI_BIG_ENDIAN        1
-#elif 1 && (ACC_ARCH_ARM) && defined(__ARMEL__) && !defined(__ARMEB__)
-#  define ACC_ABI_LITTLE_ENDIAN     1
-#elif 1 && (ACC_ARCH_MIPS) && defined(__MIPSEB__) && !defined(__MIPSEL__)
-#  define ACC_ABI_BIG_ENDIAN        1
-#elif 1 && (ACC_ARCH_MIPS) && defined(__MIPSEL__) && !defined(__MIPSEB__)
-#  define ACC_ABI_LITTLE_ENDIAN     1
-#endif
-#endif
-#if (ACC_ABI_BIG_ENDIAN) && (ACC_ABI_LITTLE_ENDIAN)
-#  error "this should not happen"
-#endif
-#if (ACC_ABI_BIG_ENDIAN)
-#  define ACC_INFO_ABI_ENDIAN       "be"
-#elif (ACC_ABI_LITTLE_ENDIAN)
-#  define ACC_INFO_ABI_ENDIAN       "le"
-#elif (ACC_ABI_NEUTRAL_ENDIAN)
-#  define ACC_INFO_ABI_ENDIAN       "neutral"
-#endif
-#if (ACC_SIZEOF_INT == 1 && ACC_SIZEOF_LONG == 2 && ACC_SIZEOF_VOID_P == 2)
-#  define ACC_ABI_I8LP16         1
-#  define ACC_INFO_ABI_PM       "i8lp16"
-#elif (ACC_SIZEOF_INT == 2 && ACC_SIZEOF_LONG == 2 && ACC_SIZEOF_VOID_P == 2)
-#  define ACC_ABI_ILP16         1
-#  define ACC_INFO_ABI_PM       "ilp16"
-#elif (ACC_SIZEOF_INT == 4 && ACC_SIZEOF_LONG == 4 && ACC_SIZEOF_VOID_P == 4)
-#  define ACC_ABI_ILP32         1
-#  define ACC_INFO_ABI_PM       "ilp32"
-#elif (ACC_SIZEOF_INT == 4 && ACC_SIZEOF_LONG == 4 && ACC_SIZEOF_VOID_P == 8 && ACC_SIZEOF_SIZE_T == 8)
-#  define ACC_ABI_LLP64         1
-#  define ACC_INFO_ABI_PM       "llp64"
-#elif (ACC_SIZEOF_INT == 4 && ACC_SIZEOF_LONG == 8 && ACC_SIZEOF_VOID_P == 8)
-#  define ACC_ABI_LP64          1
-#  define ACC_INFO_ABI_PM       "lp64"
-#elif (ACC_SIZEOF_INT == 8 && ACC_SIZEOF_LONG == 8 && ACC_SIZEOF_VOID_P == 8)
-#  define ACC_ABI_ILP64         1
-#  define ACC_INFO_ABI_PM       "ilp64"
-#elif (ACC_SIZEOF_INT == 4 && ACC_SIZEOF_LONG == 8 && ACC_SIZEOF_VOID_P == 4)
-#  define ACC_ABI_IP32L64       1
-#  define ACC_INFO_ABI_PM       "ip32l64"
-#endif
-#if !defined(__ACC_LIBC_OVERRIDE)
-#if (ACC_LIBC_NAKED)
-#  define ACC_INFO_LIBC         "naked"
-#elif (ACC_LIBC_FREESTANDING)
-#  define ACC_INFO_LIBC         "freestanding"
-#elif (ACC_LIBC_MOSTLY_FREESTANDING)
-#  define ACC_INFO_LIBC         "mfreestanding"
-#elif (ACC_LIBC_ISOC90)
-#  define ACC_INFO_LIBC         "isoc90"
-#elif (ACC_LIBC_ISOC99)
-#  define ACC_INFO_LIBC         "isoc99"
-#elif defined(__dietlibc__)
-#  define ACC_LIBC_DIETLIBC     1
-#  define ACC_INFO_LIBC         "dietlibc"
-#elif defined(_NEWLIB_VERSION)
-#  define ACC_LIBC_NEWLIB       1
-#  define ACC_INFO_LIBC         "newlib"
-#elif defined(__UCLIBC__) && defined(__UCLIBC_MAJOR__) && defined(__UCLIBC_MINOR__)
-#  if defined(__UCLIBC_SUBLEVEL__)
-#    define ACC_LIBC_UCLIBC     (__UCLIBC_MAJOR__ * 0x10000L + __UCLIBC_MINOR__ * 0x100 + __UCLIBC_SUBLEVEL__)
-#  else
-#    define ACC_LIBC_UCLIBC     0x00090bL
-#  endif
-#  define ACC_INFO_LIBC         "uclibc"
-#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-#  define ACC_LIBC_GLIBC        (__GLIBC__ * 0x10000L + __GLIBC_MINOR__ * 0x100)
-#  define ACC_INFO_LIBC         "glibc"
-#elif (ACC_CC_MWERKS) && defined(__MSL__)
-#  define ACC_LIBC_MSL          __MSL__
-#  define ACC_INFO_LIBC         "msl"
-#elif 1 && defined(__IAR_SYSTEMS_ICC__)
-#  define ACC_LIBC_ISOC90       1
-#  define ACC_INFO_LIBC         "isoc90"
-#else
-#  define ACC_LIBC_DEFAULT      1
-#  define ACC_INFO_LIBC         "default"
-#endif
-#endif
-#if !defined(__acc_gnuc_extension__)
-#if (ACC_CC_GNUC >= 0x020800ul)
-#  define __acc_gnuc_extension__    __extension__
-#elif (ACC_CC_CLANG || ACC_CC_LLVM || ACC_CC_PATHSCALE)
-#  define __acc_gnuc_extension__    __extension__
-#else
-#  define __acc_gnuc_extension__    /*empty*/
-#endif
-#endif
-#if !defined(__acc_ua_volatile)
-#  define __acc_ua_volatile     volatile
-#endif
-#if !defined(__acc_alignof)
-#if (ACC_CC_CILLY || ACC_CC_CLANG || ACC_CC_GNUC || ACC_CC_LLVM || ACC_CC_PATHSCALE || ACC_CC_PGI)
-#  define __acc_alignof(e)      __alignof__(e)
-#elif (ACC_CC_INTELC && (__INTEL_COMPILER >= 700))
-#  define __acc_alignof(e)      __alignof__(e)
-#elif (ACC_CC_MSC && (_MSC_VER >= 1300))
-#  define __acc_alignof(e)      __alignof(e)
-#elif (ACC_CC_SUNPROC && (ACC_CC_SUNPROC >= 0x5100))
-#  define __acc_alignof(e)      __alignof__(e)
-#endif
-#endif
-#if defined(__acc_alignof)
-#  define __acc_HAVE_alignof 1
-#endif
-#if !defined(__acc_constructor)
-#if (ACC_CC_GNUC >= 0x030400ul)
-#  define __acc_constructor     __attribute__((__constructor__,__used__))
-#elif (ACC_CC_GNUC >= 0x020700ul)
-#  define __acc_constructor     __attribute__((__constructor__))
-#elif (ACC_CC_CLANG || ACC_CC_LLVM || ACC_CC_PATHSCALE)
-#  define __acc_constructor     __attribute__((__constructor__))
-#endif
-#endif
-#if defined(__acc_constructor)
-#  define __acc_HAVE_constructor 1
-#endif
-#if !defined(__acc_destructor)
-#if (ACC_CC_GNUC >= 0x030400ul)
-#  define __acc_destructor      __attribute__((__destructor__,__used__))
-#elif (ACC_CC_GNUC >= 0x020700ul)
-#  define __acc_destructor      __attribute__((__destructor__))
-#elif (ACC_CC_CLANG || ACC_CC_LLVM || ACC_CC_PATHSCALE)
-#  define __acc_destructor      __attribute__((__destructor__))
-#endif
-#endif
-#if defined(__acc_destructor)
-#  define __acc_HAVE_destructor 1
-#endif
-#if (__acc_HAVE_destructor) && !(__acc_HAVE_constructor)
-#  error "this should not happen"
-#endif
-#if !defined(__acc_inline)
-#if (ACC_CC_TURBOC && (__TURBOC__ <= 0x0295))
-#elif defined(__cplusplus)
-#  define __acc_inline          inline
-#elif (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0550))
-#  define __acc_inline          __inline
-#elif (ACC_CC_CILLY || ACC_CC_CLANG || ACC_CC_GNUC || ACC_CC_LLVM || ACC_CC_PATHSCALE || ACC_CC_PGI)
-#  define __acc_inline          __inline__
-#elif (ACC_CC_DMC)
-#  define __acc_inline          __inline
-#elif (ACC_CC_INTELC)
-#  define __acc_inline          __inline
-#elif (ACC_CC_MWERKS && (__MWERKS__ >= 0x2405))
-#  define __acc_inline          __inline
-#elif (ACC_CC_MSC && (_MSC_VER >= 900))
-#  define __acc_inline          __inline
-#elif (ACC_CC_SUNPROC && (ACC_CC_SUNPROC >= 0x5100))
-#  define __acc_inline          __inline__
-#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
-#  define __acc_inline          inline
-#endif
-#endif
-#if defined(__acc_inline)
-#  define __acc_HAVE_inline 1
-#else
-#  define __acc_inline          /*empty*/
-#endif
-#if !defined(__acc_forceinline)
-#if (ACC_CC_GNUC >= 0x030200ul)
-#  define __acc_forceinline     __inline__ __attribute__((__always_inline__))
-#elif (ACC_CC_INTELC && (__INTEL_COMPILER >= 450) && ACC_CC_SYNTAX_MSC)
-#  define __acc_forceinline     __forceinline
-#elif (ACC_CC_INTELC && (__INTEL_COMPILER >= 800) && ACC_CC_SYNTAX_GNUC)
-#  define __acc_forceinline     __inline__ __attribute__((__always_inline__))
-#elif (ACC_CC_CLANG || ACC_CC_LLVM || ACC_CC_PATHSCALE)
-#  define __acc_forceinline     __inline__ __attribute__((__always_inline__))
-#elif (ACC_CC_MSC && (_MSC_VER >= 1200))
-#  define __acc_forceinline     __forceinline
-#elif (ACC_CC_SUNPROC && (ACC_CC_SUNPROC >= 0x5100))
-#  define __acc_forceinline     __inline__ __attribute__((__always_inline__))
-#endif
-#endif
-#if defined(__acc_forceinline)
-#  define __acc_HAVE_forceinline 1
-#else
-#  define __acc_forceinline     /*empty*/
-#endif
-#if !defined(__acc_noinline)
-#if 1 && (ACC_ARCH_I386) && (ACC_CC_GNUC >= 0x040000ul) && (ACC_CC_GNUC < 0x040003ul)
-#  define __acc_noinline        __attribute__((__noinline__,__used__))
-#elif (ACC_CC_GNUC >= 0x030200ul)
-#  define __acc_noinline        __attribute__((__noinline__))
-#elif (ACC_CC_INTELC && (__INTEL_COMPILER >= 600) && ACC_CC_SYNTAX_MSC)
-#  define __acc_noinline        __declspec(noinline)
-#elif (ACC_CC_INTELC && (__INTEL_COMPILER >= 800) && ACC_CC_SYNTAX_GNUC)
-#  define __acc_noinline        __attribute__((__noinline__))
-#elif (ACC_CC_CLANG || ACC_CC_LLVM || ACC_CC_PATHSCALE)
-#  define __acc_noinline        __attribute__((__noinline__))
-#elif (ACC_CC_MSC && (_MSC_VER >= 1300))
-#  define __acc_noinline        __declspec(noinline)
-#elif (ACC_CC_MWERKS && (__MWERKS__ >= 0x3200) && (ACC_OS_WIN32 || ACC_OS_WIN64))
-#  if defined(__cplusplus)
-#  else
-#    define __acc_noinline      __declspec(noinline)
-#  endif
-#elif (ACC_CC_SUNPROC && (ACC_CC_SUNPROC >= 0x5100))
-#  define __acc_noinline        __attribute__((__noinline__))
-#endif
-#endif
-#if defined(__acc_noinline)
-#  define __acc_HAVE_noinline 1
-#else
-#  define __acc_noinline        /*empty*/
-#endif
-#if (__acc_HAVE_forceinline || __acc_HAVE_noinline) && !(__acc_HAVE_inline)
-#  error "this should not happen"
-#endif
-#if !defined(__acc_noreturn)
-#if (ACC_CC_GNUC >= 0x020700ul)
-#  define __acc_noreturn        __attribute__((__noreturn__))
-#elif (ACC_CC_INTELC && (__INTEL_COMPILER >= 450) && ACC_CC_SYNTAX_MSC)
-#  define __acc_noreturn        __declspec(noreturn)
-#elif (ACC_CC_INTELC && (__INTEL_COMPILER >= 600) && ACC_CC_SYNTAX_GNUC)
-#  define __acc_noreturn        __attribute__((__noreturn__))
-#elif (ACC_CC_CLANG || ACC_CC_LLVM || ACC_CC_PATHSCALE)
-#  define __acc_noreturn        __attribute__((__noreturn__))
-#elif (ACC_CC_MSC && (_MSC_VER >= 1200))
-#  define __acc_noreturn        __declspec(noreturn)
-#endif
-#endif
-#if defined(__acc_noreturn)
-#  define __acc_HAVE_noreturn 1
-#else
-#  define __acc_noreturn        /*empty*/
-#endif
-#if !defined(__acc_nothrow)
-#if (ACC_CC_GNUC >= 0x030300ul)
-#  define __acc_nothrow         __attribute__((__nothrow__))
-#elif (ACC_CC_INTELC && (__INTEL_COMPILER >= 450) && ACC_CC_SYNTAX_MSC) && defined(__cplusplus)
-#  define __acc_nothrow         __declspec(nothrow)
-#elif (ACC_CC_INTELC && (__INTEL_COMPILER >= 900) && ACC_CC_SYNTAX_GNUC)
-#  define __acc_nothrow         __attribute__((__nothrow__))
-#elif (ACC_CC_CLANG || ACC_CC_LLVM || ACC_CC_PATHSCALE)
-#  define __acc_nothrow         __attribute__((__nothrow__))
-#elif (ACC_CC_MSC && (_MSC_VER >= 1200)) && defined(__cplusplus)
-#  define __acc_nothrow         __declspec(nothrow)
-#endif
-#endif
-#if defined(__acc_nothrow)
-#  define __acc_HAVE_nothrow 1
-#else
-#  define __acc_nothrow         /*empty*/
-#endif
-#if !defined(__acc_restrict)
-#if (ACC_CC_GNUC >= 0x030400ul)
-#  define __acc_restrict        __restrict__
-#elif (ACC_CC_INTELC && (__INTEL_COMPILER >= 600) && ACC_CC_SYNTAX_GNUC)
-#  define __acc_restrict        __restrict__
-#elif (ACC_CC_CLANG || ACC_CC_LLVM)
-#  define __acc_restrict        __restrict__
-#elif (ACC_CC_MSC && (_MSC_VER >= 1400))
-#  define __acc_restrict        __restrict
-#endif
-#endif
-#if defined(__acc_restrict)
-#  define __acc_HAVE_restrict 1
-#else
-#  define __acc_restrict        /*empty*/
-#endif
-#if !defined(__acc_likely) && !defined(__acc_unlikely)
-#if (ACC_CC_GNUC >= 0x030200ul)
-#  define __acc_likely(e)       (__builtin_expect(!!(e),1))
-#  define __acc_unlikely(e)     (__builtin_expect(!!(e),0))
-#elif (ACC_CC_INTELC && (__INTEL_COMPILER >= 800))
-#  define __acc_likely(e)       (__builtin_expect(!!(e),1))
-#  define __acc_unlikely(e)     (__builtin_expect(!!(e),0))
-#elif (ACC_CC_CLANG || ACC_CC_LLVM || ACC_CC_PATHSCALE)
-#  define __acc_likely(e)       (__builtin_expect(!!(e),1))
-#  define __acc_unlikely(e)     (__builtin_expect(!!(e),0))
-#endif
-#endif
-#if defined(__acc_likely)
-#  define __acc_HAVE_likely 1
-#else
-#  define __acc_likely(e)       (e)
-#endif
-#if defined(__acc_unlikely)
-#  define __acc_HAVE_unlikely 1
-#else
-#  define __acc_unlikely(e)     (e)
-#endif
-#if !defined(ACC_UNUSED)
-#  if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0600))
-#    define ACC_UNUSED(var)         ((void) &var)
-#  elif (ACC_CC_BORLANDC || ACC_CC_HIGHC || ACC_CC_NDPC || ACC_CC_PELLESC || ACC_CC_TURBOC)
-#    define ACC_UNUSED(var)         if (&var) ; else
-#  elif (ACC_CC_CLANG || ACC_CC_GNUC || ACC_CC_LLVM || ACC_CC_PATHSCALE)
-#    define ACC_UNUSED(var)         ((void) var)
-#  elif (ACC_CC_MSC && (_MSC_VER < 900))
-#    define ACC_UNUSED(var)         if (&var) ; else
-#  elif (ACC_CC_KEILC)
-#    define ACC_UNUSED(var)         {extern int __acc_unused[1-2*!(sizeof(var)>0)];}
-#  elif (ACC_CC_PACIFICC)
-#    define ACC_UNUSED(var)         ((void) sizeof(var))
-#  elif (ACC_CC_WATCOMC) && defined(__cplusplus)
-#    define ACC_UNUSED(var)         ((void) var)
-#  else
-#    define ACC_UNUSED(var)         ((void) &var)
-#  endif
-#endif
-#if !defined(ACC_UNUSED_FUNC)
-#  if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0600))
-#    define ACC_UNUSED_FUNC(func)   ((void) func)
-#  elif (ACC_CC_BORLANDC || ACC_CC_NDPC || ACC_CC_TURBOC)
-#    define ACC_UNUSED_FUNC(func)   if (func) ; else
-#  elif (ACC_CC_CLANG || ACC_CC_LLVM)
-#    define ACC_UNUSED_FUNC(func)   ((void) &func)
-#  elif (ACC_CC_MSC && (_MSC_VER < 900))
-#    define ACC_UNUSED_FUNC(func)   if (func) ; else
-#  elif (ACC_CC_MSC)
-#    define ACC_UNUSED_FUNC(func)   ((void) &func)
-#  elif (ACC_CC_KEILC || ACC_CC_PELLESC)
-#    define ACC_UNUSED_FUNC(func)   {extern int __acc_unused[1-2*!(sizeof((int)func)>0)];}
-#  else
-#    define ACC_UNUSED_FUNC(func)   ((void) func)
-#  endif
-#endif
-#if !defined(ACC_UNUSED_LABEL)
-#  if (ACC_CC_WATCOMC) && defined(__cplusplus)
-#    define ACC_UNUSED_LABEL(l)     switch(0) case 1:goto l
-#  elif (ACC_CC_CLANG || ACC_CC_INTELC || ACC_CC_WATCOMC)
-#    define ACC_UNUSED_LABEL(l)     if (0) goto l
-#  else
-#    define ACC_UNUSED_LABEL(l)     switch(0) case 1:goto l
-#  endif
-#endif
-#if !defined(ACC_DEFINE_UNINITIALIZED_VAR)
-#  if 0
-#    define ACC_DEFINE_UNINITIALIZED_VAR(type,var,init)  type var
-#  elif 0 && (ACC_CC_GNUC)
-#    define ACC_DEFINE_UNINITIALIZED_VAR(type,var,init)  type var = var
-#  else
-#    define ACC_DEFINE_UNINITIALIZED_VAR(type,var,init)  type var = init
-#  endif
-#endif
-#if !defined(ACC_UNCONST_CAST)
-#  if 0 && defined(__cplusplus)
-#    define ACC_UNCONST_CAST(t,e)   (const_cast<t> (e))
-#  elif (ACC_CC_CLANG || ACC_CC_GNUC || ACC_CC_LLVM || ACC_CC_PATHSCALE)
-#    define ACC_UNCONST_CAST(t,e)   ((t) ((void *) ((char *) ((acc_uintptr_t) ((const void *) (e))))))
-#  else
-#    define ACC_UNCONST_CAST(t,e)   ((t) ((void *) ((char *) ((const void *) (e)))))
-#  endif
-#endif
-#if !defined(ACC_COMPILE_TIME_ASSERT_HEADER)
-#  if (ACC_CC_AZTECC || ACC_CC_ZORTECHC)
-#    define ACC_COMPILE_TIME_ASSERT_HEADER(e)  extern int __acc_cta[1-!(e)];
-#  elif (ACC_CC_DMC || ACC_CC_SYMANTECC)
-#    define ACC_COMPILE_TIME_ASSERT_HEADER(e)  extern int __acc_cta[1u-2*!(e)];
-#  elif (ACC_CC_TURBOC && (__TURBOC__ == 0x0295))
-#    define ACC_COMPILE_TIME_ASSERT_HEADER(e)  extern int __acc_cta[1-!(e)];
-#  else
-#    define ACC_COMPILE_TIME_ASSERT_HEADER(e)  extern int __acc_cta[1-2*!(e)];
-#  endif
-#endif
-#if !defined(ACC_COMPILE_TIME_ASSERT)
-#  if (ACC_CC_AZTECC)
-#    define ACC_COMPILE_TIME_ASSERT(e)  {typedef int __acc_cta_t[1-!(e)];}
-#  elif (ACC_CC_DMC || ACC_CC_PACIFICC || ACC_CC_SYMANTECC || ACC_CC_ZORTECHC)
-#    define ACC_COMPILE_TIME_ASSERT(e)  switch(0) case 1:case !(e):break;
-#  elif (ACC_CC_MSC && (_MSC_VER < 900))
-#    define ACC_COMPILE_TIME_ASSERT(e)  switch(0) case 1:case !(e):break;
-#  elif (ACC_CC_TURBOC && (__TURBOC__ == 0x0295))
-#    define ACC_COMPILE_TIME_ASSERT(e)  switch(0) case 1:case !(e):break;
-#  else
-#    define ACC_COMPILE_TIME_ASSERT(e)  {typedef int __acc_cta_t[1-2*!(e)];}
-#  endif
-#endif
-#if (ACC_ARCH_I086 || ACC_ARCH_I386) && (ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
-#  if (ACC_CC_GNUC || ACC_CC_HIGHC || ACC_CC_NDPC || ACC_CC_PACIFICC)
-#  elif (ACC_CC_DMC || ACC_CC_SYMANTECC || ACC_CC_ZORTECHC)
-#    define __acc_cdecl                 __cdecl
-#    define __acc_cdecl_atexit          /*empty*/
-#    define __acc_cdecl_main            __cdecl
-#    if (ACC_OS_OS2 && (ACC_CC_DMC || ACC_CC_SYMANTECC))
-#      define __acc_cdecl_qsort         __pascal
-#    elif (ACC_OS_OS2 && (ACC_CC_ZORTECHC))
-#      define __acc_cdecl_qsort         _stdcall
-#    else
-#      define __acc_cdecl_qsort         __cdecl
-#    endif
-#  elif (ACC_CC_WATCOMC)
-#    define __acc_cdecl                 __cdecl
-#  else
-#    define __acc_cdecl                 __cdecl
-#    define __acc_cdecl_atexit          __cdecl
-#    define __acc_cdecl_main            __cdecl
-#    define __acc_cdecl_qsort           __cdecl
-#  endif
-#  if (ACC_CC_GNUC || ACC_CC_HIGHC || ACC_CC_NDPC || ACC_CC_PACIFICC || ACC_CC_WATCOMC)
-#  elif (ACC_OS_OS2 && (ACC_CC_DMC || ACC_CC_SYMANTECC))
-#    define __acc_cdecl_sighandler      __pascal
-#  elif (ACC_OS_OS2 && (ACC_CC_ZORTECHC))
-#    define __acc_cdecl_sighandler      _stdcall
-#  elif (ACC_CC_MSC && (_MSC_VER >= 1400)) && defined(_M_CEE_PURE)
-#    define __acc_cdecl_sighandler      __clrcall
-#  elif (ACC_CC_MSC && (_MSC_VER >= 600 && _MSC_VER < 700))
-#    if defined(_DLL)
-#      define __acc_cdecl_sighandler    _far _cdecl _loadds
-#    elif defined(_MT)
-#      define __acc_cdecl_sighandler    _far _cdecl
-#    else
-#      define __acc_cdecl_sighandler    _cdecl
-#    endif
-#  else
-#    define __acc_cdecl_sighandler      __cdecl
-#  endif
-#elif (ACC_ARCH_I386) && (ACC_CC_WATCOMC)
-#  define __acc_cdecl                   __cdecl
-#elif (ACC_ARCH_M68K && ACC_OS_TOS && (ACC_CC_PUREC || ACC_CC_TURBOC))
-#  define __acc_cdecl                   cdecl
-#endif
-#if !defined(__acc_cdecl)
-#  define __acc_cdecl                   /*empty*/
-#endif
-#if !defined(__acc_cdecl_atexit)
-#  define __acc_cdecl_atexit            /*empty*/
-#endif
-#if !defined(__acc_cdecl_main)
-#  define __acc_cdecl_main              /*empty*/
-#endif
-#if !defined(__acc_cdecl_qsort)
-#  define __acc_cdecl_qsort             /*empty*/
-#endif
-#if !defined(__acc_cdecl_sighandler)
-#  define __acc_cdecl_sighandler        /*empty*/
-#endif
-#if !defined(__acc_cdecl_va)
-#  define __acc_cdecl_va                __acc_cdecl
-#endif
-#if !(ACC_CFG_NO_WINDOWS_H)
-#if (ACC_OS_CYGWIN || (ACC_OS_EMX && defined(__RSXNT__)) || ACC_OS_WIN32 || ACC_OS_WIN64)
-#  if (ACC_CC_WATCOMC && (__WATCOMC__ < 1000))
-#  elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__PW32__)
-#  elif ((ACC_OS_CYGWIN || defined(__MINGW32__)) && (ACC_CC_GNUC && (ACC_CC_GNUC < 0x025f00ul)))
-#  else
-#    define ACC_HAVE_WINDOWS_H 1
-#  endif
-#endif
-#endif
-#if (ACC_ARCH_ALPHA)
-#  define ACC_OPT_AVOID_UINT_INDEX  1
-#  define ACC_OPT_AVOID_SHORT       1
-#  define ACC_OPT_AVOID_USHORT      1
-#elif (ACC_ARCH_AMD64)
-#  define ACC_OPT_AVOID_INT_INDEX   1
-#  define ACC_OPT_AVOID_UINT_INDEX  1
-#  define ACC_OPT_UNALIGNED16       1
-#  define ACC_OPT_UNALIGNED32       1
-#  define ACC_OPT_UNALIGNED64       1
-#elif (ACC_ARCH_ARM && ACC_ARCH_ARM_THUMB)
-#elif (ACC_ARCH_ARM)
-#  define ACC_OPT_AVOID_SHORT       1
-#  define ACC_OPT_AVOID_USHORT      1
-#elif (ACC_ARCH_CRIS)
-#  define ACC_OPT_UNALIGNED16       1
-#  define ACC_OPT_UNALIGNED32       1
-#elif (ACC_ARCH_I386)
-#  define ACC_OPT_UNALIGNED16       1
-#  define ACC_OPT_UNALIGNED32       1
-#elif (ACC_ARCH_IA64)
-#  define ACC_OPT_AVOID_INT_INDEX   1
-#  define ACC_OPT_AVOID_UINT_INDEX  1
-#  define ACC_OPT_PREFER_POSTINC    1
-#elif (ACC_ARCH_M68K)
-#  define ACC_OPT_PREFER_POSTINC    1
-#  define ACC_OPT_PREFER_PREDEC     1
-#  if defined(__mc68020__) && !defined(__mcoldfire__)
-#    define ACC_OPT_UNALIGNED16     1
-#    define ACC_OPT_UNALIGNED32     1
-#  endif
-#elif (ACC_ARCH_MIPS)
-#  define ACC_OPT_AVOID_UINT_INDEX  1
-#elif (ACC_ARCH_POWERPC)
-#  define ACC_OPT_PREFER_PREINC     1
-#  define ACC_OPT_PREFER_PREDEC     1
-#  if (ACC_ABI_BIG_ENDIAN)
-#    define ACC_OPT_UNALIGNED16     1
-#    define ACC_OPT_UNALIGNED32     1
-#  endif
-#elif (ACC_ARCH_S390)
-#  define ACC_OPT_UNALIGNED16       1
-#  define ACC_OPT_UNALIGNED32       1
-#  if (ACC_SIZEOF_SIZE_T == 8)
-#    define ACC_OPT_UNALIGNED64     1
-#  endif
-#elif (ACC_ARCH_SH)
-#  define ACC_OPT_PREFER_POSTINC    1
-#  define ACC_OPT_PREFER_PREDEC     1
-#endif
-#ifndef ACC_CFG_NO_INLINE_ASM
-#if (ACC_CC_LLVM)
-#  define ACC_CFG_NO_INLINE_ASM 1
-#endif
-#endif
-#ifndef ACC_CFG_NO_UNALIGNED
-#if (ACC_ABI_NEUTRAL_ENDIAN) || (ACC_ARCH_GENERIC)
-#  define ACC_CFG_NO_UNALIGNED 1
-#endif
-#endif
-#if (ACC_CFG_NO_UNALIGNED)
-#  undef ACC_OPT_UNALIGNED16
-#  undef ACC_OPT_UNALIGNED32
-#  undef ACC_OPT_UNALIGNED64
-#endif
-#if (ACC_CFG_NO_INLINE_ASM)
-#elif (ACC_ARCH_I386 && (ACC_OS_DOS32 || ACC_OS_WIN32) && (ACC_CC_DMC || ACC_CC_INTELC || ACC_CC_MSC || ACC_CC_PELLESC))
-#  define ACC_ASM_SYNTAX_MSC 1
-#elif (ACC_OS_WIN64 && (ACC_CC_DMC || ACC_CC_INTELC || ACC_CC_MSC || ACC_CC_PELLESC))
-#elif (ACC_ARCH_I386 && ACC_CC_GNUC && (ACC_CC_GNUC == 0x011f00ul))
-#elif (ACC_ARCH_I386 && (ACC_CC_CLANG || ACC_CC_GNUC || ACC_CC_INTELC || ACC_CC_PATHSCALE))
-#  define ACC_ASM_SYNTAX_GNUC 1
-#elif (ACC_ARCH_AMD64 && (ACC_CC_CLANG || ACC_CC_GNUC || ACC_CC_INTELC || ACC_CC_PATHSCALE))
-#  define ACC_ASM_SYNTAX_GNUC 1
-#endif
-#if (ACC_ASM_SYNTAX_GNUC)
-#if (ACC_ARCH_I386 && ACC_CC_GNUC && (ACC_CC_GNUC < 0x020000ul))
-#  define __ACC_ASM_CLOBBER         "ax"
-#elif (ACC_CC_INTELC)
-#  define __ACC_ASM_CLOBBER         "memory"
-#else
-#  define __ACC_ASM_CLOBBER         "cc", "memory"
-#endif
-#endif
-#if defined(__ACC_INFOSTR_MM)
-#elif (ACC_MM_FLAT) && (defined(__ACC_INFOSTR_PM) || defined(ACC_INFO_ABI_PM))
-#  define __ACC_INFOSTR_MM          ""
-#elif defined(ACC_INFO_MM)
-#  define __ACC_INFOSTR_MM          "." ACC_INFO_MM
-#else
-#  define __ACC_INFOSTR_MM          ""
-#endif
-#if defined(__ACC_INFOSTR_PM)
-#elif defined(ACC_INFO_ABI_PM)
-#  define __ACC_INFOSTR_PM          "." ACC_INFO_ABI_PM
-#else
-#  define __ACC_INFOSTR_PM          ""
-#endif
-#if defined(__ACC_INFOSTR_ENDIAN)
-#elif defined(ACC_INFO_ABI_ENDIAN)
-#  define __ACC_INFOSTR_ENDIAN      "." ACC_INFO_ABI_ENDIAN
-#else
-#  define __ACC_INFOSTR_ENDIAN      ""
-#endif
-#if defined(__ACC_INFOSTR_OSNAME)
-#elif defined(ACC_INFO_OS_CONSOLE)
-#  define __ACC_INFOSTR_OSNAME      ACC_INFO_OS "." ACC_INFO_OS_CONSOLE
-#elif defined(ACC_INFO_OS_POSIX)
-#  define __ACC_INFOSTR_OSNAME      ACC_INFO_OS "." ACC_INFO_OS_POSIX
-#else
-#  define __ACC_INFOSTR_OSNAME      ACC_INFO_OS
-#endif
-#if defined(__ACC_INFOSTR_LIBC)
-#elif defined(ACC_INFO_LIBC)
-#  define __ACC_INFOSTR_LIBC        "." ACC_INFO_LIBC
-#else
-#  define __ACC_INFOSTR_LIBC        ""
-#endif
-#if defined(__ACC_INFOSTR_CCVER)
-#elif defined(ACC_INFO_CCVER)
-#  define __ACC_INFOSTR_CCVER       " " ACC_INFO_CCVER
-#else
-#  define __ACC_INFOSTR_CCVER       ""
-#endif
-#define ACC_INFO_STRING \
-    ACC_INFO_ARCH __ACC_INFOSTR_MM __ACC_INFOSTR_PM __ACC_INFOSTR_ENDIAN \
-    " " __ACC_INFOSTR_OSNAME __ACC_INFOSTR_LIBC " " ACC_INFO_CC __ACC_INFOSTR_CCVER
-#if (ACC_CFG_NO_CONFIG_HEADER)
-#elif defined(ACC_CFG_CONFIG_HEADER)
-#else
-#if !(ACC_CFG_AUTO_NO_HEADERS)
-#if (ACC_LIBC_NAKED)
-#elif (ACC_LIBC_FREESTANDING)
-#  define HAVE_LIMITS_H 1
-#  define HAVE_STDARG_H 1
-#  define HAVE_STDDEF_H 1
-#elif (ACC_LIBC_MOSTLY_FREESTANDING)
-#  define HAVE_LIMITS_H 1
-#  define HAVE_SETJMP_H 1
-#  define HAVE_STDARG_H 1
-#  define HAVE_STDDEF_H 1
-#  define HAVE_STDIO_H 1
-#  define HAVE_STRING_H 1
-#else
-#define STDC_HEADERS 1
-#define HAVE_ASSERT_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_DIRENT_H 1
-#define HAVE_ERRNO_H 1
-#define HAVE_FCNTL_H 1
-#define HAVE_FLOAT_H 1
-#define HAVE_LIMITS_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_SETJMP_H 1
-#define HAVE_SIGNAL_H 1
-#define HAVE_STDARG_H 1
-#define HAVE_STDDEF_H 1
-#define HAVE_STDIO_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_TIME_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_UTIME_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TIME_H 1
-#define HAVE_SYS_TYPES_H 1
-#if (ACC_OS_POSIX)
-#  if (ACC_OS_POSIX_AIX)
-#    define HAVE_SYS_RESOURCE_H 1
-#  elif (ACC_OS_POSIX_FREEBSD || ACC_OS_POSIX_MACOSX || ACC_OS_POSIX_NETBSD || ACC_OS_POSIX_OPENBSD)
-#    define HAVE_STRINGS_H 1
-#    undef HAVE_MALLOC_H
-#  elif (ACC_OS_POSIX_HPUX || ACC_OS_POSIX_INTERIX)
-#    define HAVE_ALLOCA_H 1
-#  elif (ACC_OS_POSIX_MACOSX && ACC_LIBC_MSL)
-#    undef HAVE_SYS_TIME_H
-#    undef HAVE_SYS_TYPES_H
-#  elif (ACC_OS_POSIX_SOLARIS || ACC_OS_POSIX_SUNOS)
-#    define HAVE_ALLOCA_H 1
-#  endif
-#  if (ACC_LIBC_DIETLIBC || ACC_LIBC_GLIBC || ACC_LIBC_UCLIBC)
-#    define HAVE_STRINGS_H 1
-#    define HAVE_SYS_MMAN_H 1
-#    define HAVE_SYS_RESOURCE_H 1
-#    define HAVE_SYS_WAIT_H 1
-#  endif
-#  if (ACC_LIBC_NEWLIB)
-#    undef HAVE_STRINGS_H
-#  endif
-#elif (ACC_OS_CYGWIN)
-#  define HAVE_IO_H 1
-#elif (ACC_OS_EMX)
-#  define HAVE_ALLOCA_H 1
-#  define HAVE_IO_H 1
-#elif (ACC_ARCH_M68K && ACC_OS_TOS && ACC_CC_GNUC)
-#  if !defined(__MINT__)
-#    undef HAVE_MALLOC_H
-#  endif
-#elif (ACC_ARCH_M68K && ACC_OS_TOS && (ACC_CC_PUREC || ACC_CC_TURBOC))
-#  undef HAVE_DIRENT_H
-#  undef HAVE_FCNTL_H
-#  undef HAVE_MALLOC_H
-#  undef HAVE_MEMORY_H
-#  undef HAVE_UNISTD_H
-#  undef HAVE_UTIME_H
-#  undef HAVE_SYS_STAT_H
-#  undef HAVE_SYS_TIME_H
-#  undef HAVE_SYS_TYPES_H
-#endif
-#if (ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
-#define HAVE_CONIO_H 1
-#define HAVE_DIRECT_H 1
-#define HAVE_DOS_H 1
-#define HAVE_IO_H 1
-#define HAVE_SHARE_H 1
-#if (ACC_CC_AZTECC)
-#  undef HAVE_CONIO_H
-#  undef HAVE_DIRECT_H
-#  undef HAVE_DIRENT_H
-#  undef HAVE_MALLOC_H
-#  undef HAVE_SHARE_H
-#  undef HAVE_UNISTD_H
-#  undef HAVE_UTIME_H
-#  undef HAVE_SYS_STAT_H
-#  undef HAVE_SYS_TIME_H
-#  undef HAVE_SYS_TYPES_H
-#elif (ACC_CC_BORLANDC)
-#  undef HAVE_UNISTD_H
-#  undef HAVE_SYS_TIME_H
-#  if (ACC_OS_WIN32 || ACC_OS_WIN64)
-#    undef HAVE_DIRENT_H
-#  endif
-#  if (__BORLANDC__ < 0x0400)
-#    undef HAVE_DIRENT_H
-#    undef HAVE_UTIME_H
-#  endif
-#elif (ACC_CC_DMC)
-#  undef HAVE_DIRENT_H
-#  undef HAVE_UNISTD_H
-#  define HAVE_SYS_DIRENT_H 1
-#elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
-#elif (ACC_OS_DOS32 && ACC_CC_HIGHC)
-#  define HAVE_ALLOCA_H 1
-#  undef HAVE_DIRENT_H
-#  undef HAVE_UNISTD_H
-#elif (ACC_CC_IBMC && ACC_OS_OS2)
-#  undef HAVE_DOS_H
-#  undef HAVE_DIRENT_H
-#  undef HAVE_UNISTD_H
-#  undef HAVE_UTIME_H
-#  undef HAVE_SYS_TIME_H
-#  define HAVE_SYS_UTIME_H 1
-#elif (ACC_CC_INTELC || ACC_CC_MSC)
-#  undef HAVE_DIRENT_H
-#  undef HAVE_UNISTD_H
-#  undef HAVE_UTIME_H
-#  undef HAVE_SYS_TIME_H
-#  define HAVE_SYS_UTIME_H 1
-#elif (ACC_CC_LCCWIN32)
-#  undef HAVE_DIRENT_H
-#  undef HAVE_DOS_H
-#  undef HAVE_UNISTD_H
-#  undef HAVE_SYS_TIME_H
-#elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__MINGW32__)
-#  undef HAVE_UTIME_H
-#  define HAVE_SYS_UTIME_H 1
-#elif (ACC_OS_WIN32 && ACC_LIBC_MSL)
-#  define HAVE_ALLOCA_H 1
-#  undef HAVE_DOS_H
-#  undef HAVE_SHARE_H
-#  undef HAVE_SYS_TIME_H
-#elif (ACC_CC_NDPC)
-#  undef HAVE_DIRENT_H
-#  undef HAVE_DOS_H
-#  undef HAVE_UNISTD_H
-#  undef HAVE_UTIME_H
-#  undef HAVE_SYS_TIME_H
-#elif (ACC_CC_PACIFICC)
-#  undef HAVE_DIRECT_H
-#  undef HAVE_DIRENT_H
-#  undef HAVE_FCNTL_H
-#  undef HAVE_IO_H
-#  undef HAVE_MALLOC_H
-#  undef HAVE_MEMORY_H
-#  undef HAVE_SHARE_H
-#  undef HAVE_UNISTD_H
-#  undef HAVE_UTIME_H
-#  undef HAVE_SYS_STAT_H
-#  undef HAVE_SYS_TIME_H
-#  undef HAVE_SYS_TYPES_H
-#elif (ACC_OS_WIN32 && ACC_CC_PELLESC)
-#  undef HAVE_DIRENT_H
-#  undef HAVE_DOS_H
-#  undef HAVE_MALLOC_H
-#  undef HAVE_SHARE_H
-#  undef HAVE_UNISTD_H
-#  undef HAVE_UTIME_H
-#  undef HAVE_SYS_TIME_H
-#  if (__POCC__ < 280)
-#  else
-#    define HAVE_SYS_UTIME_H 1
-#  endif
-#elif (ACC_OS_WIN32 && ACC_CC_PGI) && defined(__MINGW32__)
-#  undef HAVE_UTIME_H
-#  define HAVE_SYS_UTIME_H 1
-#elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__PW32__)
-#elif (ACC_CC_SYMANTECC)
-#  undef HAVE_DIRENT_H
-#  undef HAVE_UNISTD_H
-#  if (__SC__ < 0x700)
-#    undef HAVE_UTIME_H
-#    undef HAVE_SYS_TIME_H
-#  endif
-#elif (ACC_CC_TOPSPEEDC)
-#  undef HAVE_DIRENT_H
-#  undef HAVE_UNISTD_H
-#  undef HAVE_UTIME_H
-#  undef HAVE_SYS_STAT_H
-#  undef HAVE_SYS_TIME_H
-#  undef HAVE_SYS_TYPES_H
-#elif (ACC_CC_TURBOC)
-#  undef HAVE_UNISTD_H
-#  undef HAVE_SYS_TIME_H
-#  undef HAVE_SYS_TYPES_H
-#  if (ACC_OS_WIN32 || ACC_OS_WIN64)
-#    undef HAVE_DIRENT_H
-#  endif
-#  if (__TURBOC__ < 0x0200)
-#    undef HAVE_SIGNAL_H
-#  endif
-#  if (__TURBOC__ < 0x0400)
-#    undef HAVE_DIRECT_H
-#    undef HAVE_DIRENT_H
-#    undef HAVE_MALLOC_H
-#    undef HAVE_MEMORY_H
-#    undef HAVE_UTIME_H
-#  endif
-#elif (ACC_CC_WATCOMC)
-#  undef HAVE_DIRENT_H
-#  undef HAVE_UTIME_H
-#  undef HAVE_SYS_TIME_H
-#  define HAVE_SYS_UTIME_H 1
-#  if (__WATCOMC__ < 950)
-#    undef HAVE_UNISTD_H
-#  endif
-#elif (ACC_CC_ZORTECHC)
-#  undef HAVE_DIRENT_H
-#  undef HAVE_MEMORY_H
-#  undef HAVE_UNISTD_H
-#  undef HAVE_UTIME_H
-#  undef HAVE_SYS_TIME_H
-#endif
-#endif
-#if (ACC_OS_CONSOLE)
-#  undef HAVE_DIRENT_H
-#endif
-#if (ACC_OS_EMBEDDED)
-#  undef HAVE_DIRENT_H
-#endif
-#if (ACC_LIBC_ISOC90 || ACC_LIBC_ISOC99)
-#  undef HAVE_DIRENT_H
-#  undef HAVE_FCNTL_H
-#  undef HAVE_MALLOC_H
-#  undef HAVE_UNISTD_H
-#  undef HAVE_UTIME_H
-#  undef HAVE_SYS_STAT_H
-#  undef HAVE_SYS_TIME_H
-#  undef HAVE_SYS_TYPES_H
-#endif
-#if (ACC_LIBC_GLIBC >= 0x020100ul)
-#  define HAVE_STDINT_H 1
-#elif (ACC_LIBC_DIETLIBC)
-#  undef HAVE_STDINT_H
-#elif (ACC_LIBC_UCLIBC)
-#  define HAVE_STDINT_H 1
-#elif (ACC_CC_BORLANDC) && (__BORLANDC__ >= 0x560)
-#  undef HAVE_STDINT_H
-#elif (ACC_CC_DMC) && (__DMC__ >= 0x825)
-#  define HAVE_STDINT_H 1
-#endif
-#if (HAVE_SYS_TIME_H && HAVE_TIME_H)
-#  define TIME_WITH_SYS_TIME 1
-#endif
-#endif
-#endif
-#if !(ACC_CFG_AUTO_NO_FUNCTIONS)
-#if (ACC_LIBC_NAKED)
-#elif (ACC_LIBC_FREESTANDING)
-#elif (ACC_LIBC_MOSTLY_FREESTANDING)
-#  define HAVE_LONGJMP 1
-#  define HAVE_MEMCMP 1
-#  define HAVE_MEMCPY 1
-#  define HAVE_MEMMOVE 1
-#  define HAVE_MEMSET 1
-#  define HAVE_SETJMP 1
-#else
-#define HAVE_ACCESS 1
-#define HAVE_ALLOCA 1
-#define HAVE_ATEXIT 1
-#define HAVE_ATOI 1
-#define HAVE_ATOL 1
-#define HAVE_CHMOD 1
-#define HAVE_CHOWN 1
-#define HAVE_CTIME 1
-#define HAVE_DIFFTIME 1
-#define HAVE_FILENO 1
-#define HAVE_FSTAT 1
-#define HAVE_GETENV 1
-#define HAVE_GETTIMEOFDAY 1
-#define HAVE_GMTIME 1
-#define HAVE_ISATTY 1
-#define HAVE_LOCALTIME 1
-#define HAVE_LONGJMP 1
-#define HAVE_LSTAT 1
-#define HAVE_MEMCMP 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMSET 1
-#define HAVE_MKDIR 1
-#define HAVE_MKTIME 1
-#define HAVE_QSORT 1
-#define HAVE_RAISE 1
-#define HAVE_RMDIR 1
-#define HAVE_SETJMP 1
-#define HAVE_SIGNAL 1
-#define HAVE_SNPRINTF 1
-#define HAVE_STAT 1
-#define HAVE_STRCHR 1
-#define HAVE_STRDUP 1
-#define HAVE_STRERROR 1
-#define HAVE_STRFTIME 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-#define HAVE_TIME 1
-#define HAVE_UMASK 1
-#define HAVE_UTIME 1
-#define HAVE_VSNPRINTF 1
-#if (ACC_OS_BEOS || ACC_OS_CYGWIN || ACC_OS_POSIX || ACC_OS_QNX || ACC_OS_VMS)
-#  define HAVE_STRCASECMP 1
-#  define HAVE_STRNCASECMP 1
-#elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__PW32__)
-#  define HAVE_STRCASECMP 1
-#  define HAVE_STRNCASECMP 1
-#else
-#  define HAVE_STRICMP 1
-#  define HAVE_STRNICMP 1
-#endif
-#if (ACC_OS_POSIX)
-#  if (ACC_OS_POSIX_AIX)
-#    define HAVE_GETRUSAGE 1
-#  elif (ACC_OS_POSIX_MACOSX && ACC_LIBC_MSL)
-#    undef HAVE_CHOWN
-#    undef HAVE_LSTAT
-#  elif (ACC_OS_POSIX_UNICOS)
-#    undef HAVE_ALLOCA
-#    undef HAVE_SNPRINTF
-#    undef HAVE_VSNPRINTF
-#  endif
-#  if (ACC_CC_TINYC)
-#    undef HAVE_ALLOCA
-#  endif
-#  if (ACC_LIBC_DIETLIBC || ACC_LIBC_GLIBC || ACC_LIBC_UCLIBC)
-#    define HAVE_GETRUSAGE 1
-#    define HAVE_GETPAGESIZE 1
-#    define HAVE_MMAP 1
-#    define HAVE_MPROTECT 1
-#    define HAVE_MUNMAP 1
-#  endif
-#elif (ACC_OS_CYGWIN)
-#  if (ACC_CC_GNUC < 0x025a00ul)
-#    undef HAVE_GETTIMEOFDAY
-#    undef HAVE_LSTAT
-#  endif
-#  if (ACC_CC_GNUC < 0x025f00ul)
-#    undef HAVE_SNPRINTF
-#    undef HAVE_VSNPRINTF
-#  endif
-#elif (ACC_OS_EMX)
-#  undef HAVE_CHOWN
-#  undef HAVE_LSTAT
-#elif (ACC_ARCH_M68K && ACC_OS_TOS && ACC_CC_GNUC)
-#  if !defined(__MINT__)
-#    undef HAVE_SNPRINTF
-#    undef HAVE_VSNPRINTF
-#  endif
-#elif (ACC_ARCH_M68K && ACC_OS_TOS && (ACC_CC_PUREC || ACC_CC_TURBOC))
-#  undef HAVE_ALLOCA
-#  undef HAVE_ACCESS
-#  undef HAVE_CHMOD
-#  undef HAVE_CHOWN
-#  undef HAVE_FSTAT
-#  undef HAVE_GETTIMEOFDAY
-#  undef HAVE_LSTAT
-#  undef HAVE_SNPRINTF
-#  undef HAVE_UMASK
-#  undef HAVE_UTIME
-#  undef HAVE_VSNPRINTF
-#endif
-#if (ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
-#undef HAVE_CHOWN
-#undef HAVE_GETTIMEOFDAY
-#undef HAVE_LSTAT
-#undef HAVE_UMASK
-#if (ACC_CC_AZTECC)
-#  undef HAVE_ALLOCA
-#  undef HAVE_DIFFTIME
-#  undef HAVE_FSTAT
-#  undef HAVE_STRDUP
-#  undef HAVE_SNPRINTF
-#  undef HAVE_UTIME
-#  undef HAVE_VSNPRINTF
-#elif (ACC_CC_BORLANDC)
-#  if (__BORLANDC__ < 0x0400)
-#    undef HAVE_ALLOCA
-#    undef HAVE_UTIME
-#  endif
-#  if ((__BORLANDC__ < 0x0410) && ACC_OS_WIN16)
-#    undef HAVE_ALLOCA
-#  endif
-#  if (__BORLANDC__ < 0x0550)
-#    undef HAVE_SNPRINTF
-#    undef HAVE_VSNPRINTF
-#  endif
-#elif (ACC_CC_DMC)
-#  if (ACC_OS_WIN16)
-#    undef HAVE_ALLOCA
-#  endif
-#  define snprintf _snprintf
-#  define vsnprintf _vsnprintf
-#elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
-#  undef HAVE_SNPRINTF
-#  undef HAVE_VSNPRINTF
-#elif (ACC_OS_DOS32 && ACC_CC_HIGHC)
-#  undef HAVE_SNPRINTF
-#  undef HAVE_VSNPRINTF
-#elif (ACC_CC_IBMC)
-#  undef HAVE_SNPRINTF
-#  undef HAVE_VSNPRINTF
-#elif (ACC_CC_INTELC)
-#  ifndef snprintf
-#  define snprintf _snprintf
-#  endif
-#  ifndef vsnprintf
-#  define vsnprintf _vsnprintf
-#  endif
-#elif (ACC_CC_LCCWIN32)
-#  define utime _utime
-#elif (ACC_CC_MSC)
-#  if (_MSC_VER < 600)
-#    undef HAVE_STRFTIME
-#  endif
-#  if (_MSC_VER < 700)
-#    undef HAVE_SNPRINTF
-#    undef HAVE_VSNPRINTF
-#  elif (_MSC_VER < 1500)
-#    ifndef snprintf
-#    define snprintf _snprintf
-#    endif
-#    ifndef vsnprintf
-#    define vsnprintf _vsnprintf
-#    endif
-#  else
-#    ifndef snprintf
-#    define snprintf _snprintf
-#    endif
-#  endif
-#  if ((_MSC_VER < 800) && ACC_OS_WIN16)
-#    undef HAVE_ALLOCA
-#  endif
-#  if (ACC_ARCH_I086) && defined(__cplusplus)
-#    undef HAVE_LONGJMP
-#    undef HAVE_SETJMP
-#  endif
-#elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__MINGW32__)
-#  if (ACC_CC_GNUC < 0x025f00ul)
-#    undef HAVE_SNPRINTF
-#    undef HAVE_VSNPRINTF
-#  else
-#    define snprintf _snprintf
-#    define vsnprintf _vsnprintf
-#  endif
-#elif (ACC_OS_WIN32 && ACC_LIBC_MSL)
-#  if (__MSL__ < 0x8000ul)
-#    undef HAVE_CHMOD
-#  endif
-#elif (ACC_CC_NDPC)
-#  undef HAVE_ALLOCA
-#  undef HAVE_SNPRINTF
-#  undef HAVE_STRNICMP
-#  undef HAVE_UTIME
-#  undef HAVE_VSNPRINTF
-#  if defined(__cplusplus)
-#    undef HAVE_STAT
-#  endif
-#elif (ACC_CC_PACIFICC)
-#  undef HAVE_ACCESS
-#  undef HAVE_ALLOCA
-#  undef HAVE_CHMOD
-#  undef HAVE_DIFFTIME
-#  undef HAVE_FSTAT
-#  undef HAVE_MKTIME
-#  undef HAVE_RAISE
-#  undef HAVE_SNPRINTF
-#  undef HAVE_STRFTIME
-#  undef HAVE_UTIME
-#  undef HAVE_VSNPRINTF
-#elif (ACC_OS_WIN32 && ACC_CC_PELLESC)
-#  if (__POCC__ < 280)
-#    define alloca _alloca
-#    undef HAVE_UTIME
-#  endif
-#elif (ACC_OS_WIN32 && ACC_CC_PGI) && defined(__MINGW32__)
-#  define snprintf _snprintf
-#  define vsnprintf _vsnprintf
-#elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__PW32__)
-#  undef HAVE_SNPRINTF
-#  undef HAVE_VSNPRINTF
-#elif (ACC_CC_SYMANTECC)
-#  if (ACC_OS_WIN16 && (ACC_MM_MEDIUM || ACC_MM_LARGE || ACC_MM_HUGE))
-#    undef HAVE_ALLOCA
-#  endif
-#  if (__SC__ < 0x600)
-#    undef HAVE_SNPRINTF
-#    undef HAVE_VSNPRINTF
-#  else
-#    define snprintf _snprintf
-#    define vsnprintf _vsnprintf
-#  endif
-#  if (__SC__ < 0x700)
-#    undef HAVE_DIFFTIME
-#    undef HAVE_UTIME
-#  endif
-#elif (ACC_CC_TOPSPEEDC)
-#  undef HAVE_SNPRINTF
-#  undef HAVE_VSNPRINTF
-#elif (ACC_CC_TURBOC)
-#  undef HAVE_ALLOCA
-#  undef HAVE_SNPRINTF
-#  undef HAVE_VSNPRINTF
-#  if (__TURBOC__ < 0x0200)
-#    undef HAVE_RAISE
-#    undef HAVE_SIGNAL
-#  endif
-#  if (__TURBOC__ < 0x0295)
-#    undef HAVE_MKTIME
-#    undef HAVE_STRFTIME
-#  endif
-#  if (__TURBOC__ < 0x0400)
-#    undef HAVE_UTIME
-#  endif
-#elif (ACC_CC_WATCOMC)
-#  if (__WATCOMC__ < 1100)
-#    undef HAVE_SNPRINTF
-#    undef HAVE_VSNPRINTF
-#  elif (__WATCOMC__ < 1200)
-#    define snprintf _snprintf
-#    define vsnprintf _vsnprintf
-#  endif
-#elif (ACC_CC_ZORTECHC)
-#  if (ACC_OS_WIN16 && (ACC_MM_MEDIUM || ACC_MM_LARGE || ACC_MM_HUGE))
-#    undef HAVE_ALLOCA
-#  endif
-#  undef HAVE_DIFFTIME
-#  undef HAVE_SNPRINTF
-#  undef HAVE_UTIME
-#  undef HAVE_VSNPRINTF
-#endif
-#endif
-#if (ACC_OS_CONSOLE)
-#  undef HAVE_ACCESS
-#  undef HAVE_CHMOD
-#  undef HAVE_CHOWN
-#  undef HAVE_GETTIMEOFDAY
-#  undef HAVE_LSTAT
-#  undef HAVE_TIME
-#  undef HAVE_UMASK
-#  undef HAVE_UTIME
-#endif
-#if (ACC_LIBC_ISOC90 || ACC_LIBC_ISOC99)
-#  undef HAVE_ACCESS
-#  undef HAVE_CHMOD
-#  undef HAVE_CHOWN
-#  undef HAVE_FSTAT
-#  undef HAVE_GETTIMEOFDAY
-#  undef HAVE_LSTAT
-#  undef HAVE_STAT
-#  undef HAVE_UMASK
-#  undef HAVE_UTIME
-# if 1
-#  undef HAVE_ALLOCA
-#  undef HAVE_ISATTY
-#  undef HAVE_MKDIR
-#  undef HAVE_RMDIR
-#  undef HAVE_STRDUP
-#  undef HAVE_STRICMP
-#  undef HAVE_STRNICMP
-# endif
-#endif
-#endif
-#endif
-#if !(ACC_CFG_AUTO_NO_SIZES)
-#if !defined(SIZEOF_SHORT) && defined(ACC_SIZEOF_SHORT)
-#  define SIZEOF_SHORT          ACC_SIZEOF_SHORT
-#endif
-#if !defined(SIZEOF_INT) && defined(ACC_SIZEOF_INT)
-#  define SIZEOF_INT            ACC_SIZEOF_INT
-#endif
-#if !defined(SIZEOF_LONG) && defined(ACC_SIZEOF_LONG)
-#  define SIZEOF_LONG           ACC_SIZEOF_LONG
-#endif
-#if !defined(SIZEOF_LONG_LONG) && defined(ACC_SIZEOF_LONG_LONG)
-#  define SIZEOF_LONG_LONG      ACC_SIZEOF_LONG_LONG
-#endif
-#if !defined(SIZEOF___INT32) && defined(ACC_SIZEOF___INT32)
-#  define SIZEOF___INT32        ACC_SIZEOF___INT32
-#endif
-#if !defined(SIZEOF___INT64) && defined(ACC_SIZEOF___INT64)
-#  define SIZEOF___INT64        ACC_SIZEOF___INT64
-#endif
-#if !defined(SIZEOF_VOID_P) && defined(ACC_SIZEOF_VOID_P)
-#  define SIZEOF_VOID_P         ACC_SIZEOF_VOID_P
-#endif
-#if !defined(SIZEOF_SIZE_T) && defined(ACC_SIZEOF_SIZE_T)
-#  define SIZEOF_SIZE_T         ACC_SIZEOF_SIZE_T
-#endif
-#if !defined(SIZEOF_PTRDIFF_T) && defined(ACC_SIZEOF_PTRDIFF_T)
-#  define SIZEOF_PTRDIFF_T      ACC_SIZEOF_PTRDIFF_T
-#endif
-#endif
-#if (HAVE_SIGNAL) && !defined(RETSIGTYPE)
-#  define RETSIGTYPE void
-#endif
-#endif
-#if (ACC_CFG_NO_ACC_TYPE_H)
-#else
-#if (ACC_SIZEOF_LONG_LONG+0 > 0)
-__acc_gnuc_extension__ typedef long long acc_llong_t;
-__acc_gnuc_extension__ typedef unsigned long long acc_ullong_t;
-#endif
-#if (!(ACC_SIZEOF_SHORT+0 > 0 && ACC_SIZEOF_INT+0 > 0 && ACC_SIZEOF_LONG+0 > 0))
-#  error "missing defines for sizes"
-#endif
-#if (!(ACC_SIZEOF_PTRDIFF_T+0 > 0 && ACC_SIZEOF_SIZE_T+0 > 0 && ACC_SIZEOF_VOID_P+0 > 0))
-#  error "missing defines for sizes"
-#endif
-#if !defined(acc_int16e_t)
-#if (ACC_SIZEOF_LONG == 2)
-#  define acc_int16e_t          long
-#  define acc_uint16e_t         unsigned long
-#elif (ACC_SIZEOF_INT == 2)
-#  define acc_int16e_t          int
-#  define acc_uint16e_t         unsigned int
-#elif (ACC_SIZEOF_SHORT == 2)
-#  define acc_int16e_t          short int
-#  define acc_uint16e_t         unsigned short int
-#elif 1 && !(ACC_CFG_TYPE_NO_MODE_HI) && (ACC_CC_CLANG || (ACC_CC_GNUC >= 0x025f00ul) || ACC_CC_LLVM)
-   typedef int __acc_int16e_hi_t __attribute__((__mode__(__HI__)));
-   typedef unsigned int __acc_uint16e_hi_t __attribute__((__mode__(__HI__)));
-#  define acc_int16e_t          __acc_int16e_hi_t
-#  define acc_uint16e_t         __acc_uint16e_hi_t
-#elif (ACC_SIZEOF___INT16 == 2)
-#  define acc_int16e_t          __int16
-#  define acc_uint16e_t         unsigned __int16
-#else
-#endif
-#endif
-#if defined(acc_int16e_t)
-#  define ACC_SIZEOF_ACC_INT16E_T   2
-#endif
-#if !defined(acc_int32e_t)
-#if (ACC_SIZEOF_LONG == 4)
-#  define acc_int32e_t          long int
-#  define acc_uint32e_t         unsigned long int
-#elif (ACC_SIZEOF_INT == 4)
-#  define acc_int32e_t          int
-#  define acc_uint32e_t         unsigned int
-#elif (ACC_SIZEOF_SHORT == 4)
-#  define acc_int32e_t          short int
-#  define acc_uint32e_t         unsigned short int
-#elif (ACC_SIZEOF_LONG_LONG == 4)
-#  define acc_int32e_t          acc_llong_t
-#  define acc_uint32e_t         acc_ullong_t
-#elif 1 && !(ACC_CFG_TYPE_NO_MODE_SI) && (ACC_CC_CLANG || (ACC_CC_GNUC >= 0x025f00ul) || ACC_CC_LLVM) && (__INT_MAX__+0 > 2147483647L)
-   typedef int __acc_int32e_si_t __attribute__((__mode__(__SI__)));
-   typedef unsigned int __acc_uint32e_si_t __attribute__((__mode__(__SI__)));
-#  define acc_int32e_t          __acc_int32e_si_t
-#  define acc_uint32e_t         __acc_uint32e_si_t
-#elif 1 && !(ACC_CFG_TYPE_NO_MODE_SI) && (ACC_CC_GNUC >= 0x025f00ul) && defined(__AVR__) && (__LONG_MAX__+0 == 32767L)
-   typedef int __acc_int32e_si_t __attribute__((__mode__(__SI__)));
-   typedef unsigned int __acc_uint32e_si_t __attribute__((__mode__(__SI__)));
-#  define acc_int32e_t          __acc_int32e_si_t
-#  define acc_uint32e_t         __acc_uint32e_si_t
-#  define ACC_INT32_C(c)        c##LL
-#  define ACC_UINT32_C(c)       c##ULL
-#elif (ACC_SIZEOF___INT32 == 4)
-#  define acc_int32e_t          __int32
-#  define acc_uint32e_t         unsigned __int32
-#else
-#endif
-#endif
-#if defined(acc_int32e_t)
-#  define ACC_SIZEOF_ACC_INT32E_T   4
-#endif
-#if !defined(acc_int64e_t)
-#if (ACC_SIZEOF___INT64 == 8)
-#  if (ACC_CC_BORLANDC) && !(ACC_CFG_TYPE_PREFER___INT64)
-#    define ACC_CFG_TYPE_PREFER___INT64 1
-#  endif
-#endif
-#if (ACC_SIZEOF_INT == 8) && (ACC_SIZEOF_INT < ACC_SIZEOF_LONG)
-#  define acc_int64e_t          int
-#  define acc_uint64e_t         unsigned int
-#  define ACC_SIZEOF_ACC_INT64E_T   ACC_SIZEOF_INT
-#elif (ACC_SIZEOF_LONG == 8)
-#  define acc_int64e_t          long int
-#  define acc_uint64e_t         unsigned long int
-#  define ACC_SIZEOF_ACC_INT64E_T   ACC_SIZEOF_LONG
-#elif (ACC_SIZEOF_LONG_LONG == 8) && !(ACC_CFG_TYPE_PREFER___INT64)
-#  define acc_int64e_t          acc_llong_t
-#  define acc_uint64e_t         acc_ullong_t
-#  if (ACC_CC_BORLANDC)
-#    define ACC_INT64_C(c)      ((c) + 0ll)
-#    define ACC_UINT64_C(c)     ((c) + 0ull)
-#  else
-#    define ACC_INT64_C(c)      c##LL
-#    define ACC_UINT64_C(c)     c##ULL
-#  endif
-#  define ACC_SIZEOF_ACC_INT64E_T   ACC_SIZEOF_LONG_LONG
-#elif (ACC_SIZEOF___INT64 == 8)
-#  define acc_int64e_t          __int64
-#  define acc_uint64e_t         unsigned __int64
-#  if (ACC_CC_BORLANDC)
-#    define ACC_INT64_C(c)      ((c) + 0i64)
-#    define ACC_UINT64_C(c)     ((c) + 0ui64)
-#  else
-#    define ACC_INT64_C(c)      c##i64
-#    define ACC_UINT64_C(c)     c##ui64
-#  endif
-#  define ACC_SIZEOF_ACC_INT64E_T   ACC_SIZEOF___INT64
-#else
-#endif
-#endif
-#if !defined(acc_int32l_t)
-#if defined(acc_int32e_t)
-#  define acc_int32l_t          acc_int32e_t
-#  define acc_uint32l_t         acc_uint32e_t
-#  define ACC_SIZEOF_ACC_INT32L_T   ACC_SIZEOF_ACC_INT32E_T
-#elif (ACC_SIZEOF_INT >= 4) && (ACC_SIZEOF_INT < ACC_SIZEOF_LONG)
-#  define acc_int32l_t          int
-#  define acc_uint32l_t         unsigned int
-#  define ACC_SIZEOF_ACC_INT32L_T   ACC_SIZEOF_INT
-#elif (ACC_SIZEOF_LONG >= 4)
-#  define acc_int32l_t          long int
-#  define acc_uint32l_t         unsigned long int
-#  define ACC_SIZEOF_ACC_INT32L_T   ACC_SIZEOF_LONG
-#else
-#  error "acc_int32l_t"
-#endif
-#endif
-#if !defined(acc_int64l_t)
-#if defined(acc_int64e_t)
-#  define acc_int64l_t          acc_int64e_t
-#  define acc_uint64l_t         acc_uint64e_t
-#  define ACC_SIZEOF_ACC_INT64L_T   ACC_SIZEOF_ACC_INT64E_T
-#else
-#endif
-#endif
-#if !defined(acc_int32f_t)
-#if (ACC_SIZEOF_SIZE_T >= 8)
-#  define acc_int32f_t          acc_int64l_t
-#  define acc_uint32f_t         acc_uint64l_t
-#  define ACC_SIZEOF_ACC_INT32F_T   ACC_SIZEOF_ACC_INT64L_T
-#else
-#  define acc_int32f_t          acc_int32l_t
-#  define acc_uint32f_t         acc_uint32l_t
-#  define ACC_SIZEOF_ACC_INT32F_T   ACC_SIZEOF_ACC_INT32L_T
-#endif
-#endif
-#if !defined(acc_intptr_t)
-#if 1 && (ACC_OS_OS400 && (ACC_SIZEOF_VOID_P == 16))
-#  define __ACC_INTPTR_T_IS_POINTER 1
-   typedef char*                acc_intptr_t;
-   typedef char*                acc_uintptr_t;
-#  define acc_intptr_t          acc_intptr_t
-#  define acc_uintptr_t         acc_uintptr_t
-#  define ACC_SIZEOF_ACC_INTPTR_T   ACC_SIZEOF_VOID_P
-#elif (ACC_CC_MSC && (_MSC_VER >= 1300) && (ACC_SIZEOF_VOID_P == 4) && (ACC_SIZEOF_INT == 4))
-   typedef __w64 int            acc_intptr_t;
-   typedef __w64 unsigned int   acc_uintptr_t;
-#  define acc_intptr_t          acc_intptr_t
-#  define acc_uintptr_t         acc_uintptr_t
-#  define ACC_SIZEOF_ACC_INTPTR_T   ACC_SIZEOF_INT
-#elif (ACC_SIZEOF_SHORT == ACC_SIZEOF_VOID_P) && (ACC_SIZEOF_INT > ACC_SIZEOF_VOID_P)
-#  define acc_intptr_t          short
-#  define acc_uintptr_t         unsigned short
-#  define ACC_SIZEOF_ACC_INTPTR_T   ACC_SIZEOF_SHORT
-#elif (ACC_SIZEOF_INT >= ACC_SIZEOF_VOID_P) && (ACC_SIZEOF_INT < ACC_SIZEOF_LONG)
-#  define acc_intptr_t          int
-#  define acc_uintptr_t         unsigned int
-#  define ACC_SIZEOF_ACC_INTPTR_T   ACC_SIZEOF_INT
-#elif (ACC_SIZEOF_LONG >= ACC_SIZEOF_VOID_P)
-#  define acc_intptr_t          long
-#  define acc_uintptr_t         unsigned long
-#  define ACC_SIZEOF_ACC_INTPTR_T   ACC_SIZEOF_LONG
-#elif (ACC_SIZEOF_ACC_INT64L_T >= ACC_SIZEOF_VOID_P)
-#  define acc_intptr_t          acc_int64l_t
-#  define acc_uintptr_t         acc_uint64l_t
-#  define ACC_SIZEOF_ACC_INTPTR_T   ACC_SIZEOF_ACC_INT64L_T
-#else
-#  error "acc_intptr_t"
-#endif
-#endif
-#if !defined(acc_word_t)
-#if defined(ACC_WORDSIZE) && (ACC_WORDSIZE > 0)
-#if (ACC_WORDSIZE == ACC_SIZEOF_ACC_INTPTR_T) && !defined(__ACC_INTPTR_T_IS_POINTER)
-#  define acc_word_t            acc_uintptr_t
-#  define acc_sword_t           acc_intptr_t
-#  define ACC_SIZEOF_ACC_WORD_T ACC_SIZEOF_ACC_INTPTR_T
-#elif (ACC_WORDSIZE == ACC_SIZEOF_LONG)
-#  define acc_word_t            unsigned long
-#  define acc_sword_t           long
-#  define ACC_SIZEOF_ACC_WORD_T ACC_SIZEOF_LONG
-#elif (ACC_WORDSIZE == ACC_SIZEOF_INT)
-#  define acc_word_t            unsigned int
-#  define acc_sword_t           int
-#  define ACC_SIZEOF_ACC_WORD_T ACC_SIZEOF_INT
-#elif (ACC_WORDSIZE == ACC_SIZEOF_SHORT)
-#  define acc_word_t            unsigned short
-#  define acc_sword_t           short
-#  define ACC_SIZEOF_ACC_WORD_T ACC_SIZEOF_SHORT
-#elif (ACC_WORDSIZE == 1)
-#  define acc_word_t            unsigned char
-#  define acc_sword_t           signed char
-#  define ACC_SIZEOF_ACC_WORD_T 1
-#elif (ACC_WORDSIZE == ACC_SIZEOF_ACC_INT64L_T)
-#  define acc_word_t            acc_uint64l_t
-#  define acc_sword_t           acc_int64l_t
-#  define ACC_SIZEOF_ACC_WORD_T ACC_SIZEOF_ACC_INT64L_T
-#elif (ACC_ARCH_SPU) && (ACC_CC_GNUC)
-#if 0
-   typedef unsigned acc_word_t  __attribute__((__mode__(__V16QI__)));
-   typedef int      acc_sword_t __attribute__((__mode__(__V16QI__)));
-#  define acc_word_t            acc_word_t
-#  define acc_sword_t           acc_sword_t
-#  define ACC_SIZEOF_ACC_WORD_T 16
-#endif
-#else
-#  error "acc_word_t"
-#endif
-#endif
-#endif
-#if !defined(ACC_INT16_C)
-#  if (ACC_BROKEN_INTEGRAL_CONSTANTS) && (ACC_SIZEOF_INT >= 2)
-#    define ACC_INT16_C(c)      ((c) + 0)
-#    define ACC_UINT16_C(c)     ((c) + 0U)
-#  elif (ACC_BROKEN_INTEGRAL_CONSTANTS) && (ACC_SIZEOF_LONG >= 2)
-#    define ACC_INT16_C(c)      ((c) + 0L)
-#    define ACC_UINT16_C(c)     ((c) + 0UL)
-#  elif (ACC_SIZEOF_INT >= 2)
-#    define ACC_INT16_C(c)      c
-#    define ACC_UINT16_C(c)     c##U
-#  elif (ACC_SIZEOF_LONG >= 2)
-#    define ACC_INT16_C(c)      c##L
-#    define ACC_UINT16_C(c)     c##UL
-#  else
-#    error "ACC_INT16_C"
-#  endif
-#endif
-#if !defined(ACC_INT32_C)
-#  if (ACC_BROKEN_INTEGRAL_CONSTANTS) && (ACC_SIZEOF_INT >= 4)
-#    define ACC_INT32_C(c)      ((c) + 0)
-#    define ACC_UINT32_C(c)     ((c) + 0U)
-#  elif (ACC_BROKEN_INTEGRAL_CONSTANTS) && (ACC_SIZEOF_LONG >= 4)
-#    define ACC_INT32_C(c)      ((c) + 0L)
-#    define ACC_UINT32_C(c)     ((c) + 0UL)
-#  elif (ACC_SIZEOF_INT >= 4)
-#    define ACC_INT32_C(c)      c
-#    define ACC_UINT32_C(c)     c##U
-#  elif (ACC_SIZEOF_LONG >= 4)
-#    define ACC_INT32_C(c)      c##L
-#    define ACC_UINT32_C(c)     c##UL
-#  elif (ACC_SIZEOF_LONG_LONG >= 4)
-#    define ACC_INT32_C(c)      c##LL
-#    define ACC_UINT32_C(c)     c##ULL
-#  else
-#    error "ACC_INT32_C"
-#  endif
-#endif
-#if !defined(ACC_INT64_C) && defined(acc_int64l_t)
-#  if (ACC_BROKEN_INTEGRAL_CONSTANTS) && (ACC_SIZEOF_INT >= 8)
-#    define ACC_INT64_C(c)      ((c) + 0)
-#    define ACC_UINT64_C(c)     ((c) + 0U)
-#  elif (ACC_BROKEN_INTEGRAL_CONSTANTS) && (ACC_SIZEOF_LONG >= 8)
-#    define ACC_INT64_C(c)      ((c) + 0L)
-#    define ACC_UINT64_C(c)     ((c) + 0UL)
-#  elif (ACC_SIZEOF_INT >= 8)
-#    define ACC_INT64_C(c)      c
-#    define ACC_UINT64_C(c)     c##U
-#  elif (ACC_SIZEOF_LONG >= 8)
-#    define ACC_INT64_C(c)      c##L
-#    define ACC_UINT64_C(c)     c##UL
-#  else
-#    error "ACC_INT64_C"
-#  endif
-#endif
-#if !defined(SIZEOF_ACC_INT16E_T) && defined(ACC_SIZEOF_ACC_INT16E_T)
-#  define SIZEOF_ACC_INT16E_T   ACC_SIZEOF_ACC_INT16E_T
-#endif
-#if !defined(SIZEOF_ACC_INT32E_T) && defined(ACC_SIZEOF_ACC_INT32E_T)
-#  define SIZEOF_ACC_INT32E_T   ACC_SIZEOF_ACC_INT32E_T
-#endif
-#if !defined(SIZEOF_ACC_INT64E_T) && defined(ACC_SIZEOF_ACC_INT64E_T)
-#  define SIZEOF_ACC_INT64E_T   ACC_SIZEOF_ACC_INT64E_T
-#endif
-#if !defined(SIZEOF_ACC_INT32L_T) && defined(ACC_SIZEOF_ACC_INT32L_T)
-#  define SIZEOF_ACC_INT32L_T   ACC_SIZEOF_ACC_INT32L_T
-#endif
-#if !defined(SIZEOF_ACC_INT64L_T) && defined(ACC_SIZEOF_ACC_INT64L_T)
-#  define SIZEOF_ACC_INT64L_T   ACC_SIZEOF_ACC_INT64L_T
-#endif
-#if !defined(SIZEOF_ACC_INT32F_T) && defined(ACC_SIZEOF_ACC_INT32F_T)
-#  define SIZEOF_ACC_INT32F_T   ACC_SIZEOF_ACC_INT32F_T
-#endif
-#if !defined(SIZEOF_ACC_INTPTR_T) && defined(ACC_SIZEOF_ACC_INTPTR_T)
-#  define SIZEOF_ACC_INTPTR_T   ACC_SIZEOF_ACC_INTPTR_T
-#endif
-#if !defined(SIZEOF_ACC_WORD_T) && defined(ACC_SIZEOF_ACC_WORD_T)
-#  define SIZEOF_ACC_WORD_T     ACC_SIZEOF_ACC_WORD_T
-#endif
-#if 1 && !defined(acc_signo_t) && defined(__linux__) && defined(__dietlibc__) && (ACC_SIZEOF_INT != 4)
-#  define acc_signo_t           acc_int32e_t
-#endif
-#if !defined(acc_signo_t)
-#  define acc_signo_t           int
-#endif
-#if defined(__cplusplus)
-extern "C" {
-#endif
-#if (ACC_BROKEN_CDECL_ALT_SYNTAX)
-typedef void __acc_cdecl_sighandler (*acc_sighandler_t)(acc_signo_t);
-#elif defined(RETSIGTYPE)
-typedef RETSIGTYPE (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
-#else
-typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
-#endif
-#if defined(__cplusplus)
-}
-#endif
-#  if (ACC_CFG_NO_ACC_UA_H)
-#  else
-#if (ACC_CC_GNUC && (ACC_CC_GNUC < 0x020700ul))
-#elif (ACC_CC_GNUC && (ACC_CC_GNUC < 0x020800ul)) && defined(__cplusplus)
-#elif (ACC_CC_INTELC) && defined(_WIN32)
-#elif (ACC_CC_INTELC && (__INTEL_COMPILER < 700))
-#elif (ACC_CC_LLVM)
-#elif (ACC_CC_GNUC || ACC_CC_INTELC || ACC_CC_PATHSCALE)
-#if !defined(__acc_ua16_t) && (ACC_OPT_UNALIGNED16) && defined(acc_int16e_t)
-   typedef struct { __acc_ua_volatile acc_uint16e_t v __attribute__((__packed__)); } __acc_ua16_t;
-#  define __acc_ua16_t __acc_ua16_t
-#endif
-#if !defined(__acc_ua32_t) && (ACC_OPT_UNALIGNED32) && defined(acc_int32e_t)
-   typedef struct { __acc_ua_volatile acc_uint32e_t v __attribute__((__packed__)); } __acc_ua32_t;
-#  define __acc_ua32_t __acc_ua32_t
-#endif
-#if !defined(__acc_ua64_t) && (ACC_OPT_UNALIGNED64) && defined(acc_int64l_t)
-   typedef struct { __acc_ua_volatile acc_uint64l_t v __attribute__((__packed__)); } __acc_ua64_t;
-#  define __acc_ua64_t __acc_ua64_t
-#endif
-#endif
-#if (ACC_OPT_UNALIGNED16) && defined(acc_int16e_t)
-#define ACC_UA_GET16(p)         (* (__acc_ua_volatile const acc_uint16e_t*) (__acc_ua_volatile const void*) (p))
-#define ACC_UA_SET16(p,v)       ((* (__acc_ua_volatile acc_uint16e_t*) (__acc_ua_volatile void*) (p)) = (acc_uint16e_t) (v))
-#if (ACC_ABI_BIG_ENDIAN)
-#  define ACC_UA_GET_BE16(p)    ACC_UA_GET16(p)
-#  define ACC_UA_SET_BE16(p,v)  ACC_UA_SET16(p,v)
-#elif (ACC_ABI_LITTLE_ENDIAN)
-#  define ACC_UA_GET_LE16(p)    ACC_UA_GET16(p)
-#  define ACC_UA_SET_LE16(p,v)  ACC_UA_SET16(p,v)
-#endif
-#if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
-#if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
-#if !defined(ACC_UA_GET_LE16)
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp);
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
-    __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp;
-    unsigned long v;
-    __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
-    return v;
-}
-#define ACC_UA_GET_LE16(p)      __ACC_UA_GET_LE16(p)
-#endif
-#if !defined(ACC_UA_SET_LE16)
-extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v);
-extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
-    __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp;
-    __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
-}
-#define ACC_UA_SET_LE16(p,v)    __ACC_UA_SET_LE16(p,v)
-#endif
-#endif
-#endif
-#if !defined(ACC_UA_COPY16)
-#  define ACC_UA_COPY16(d,s)    ACC_UA_SET16(d, ACC_UA_GET16(s))
-#endif
-#endif
-#if (ACC_OPT_UNALIGNED32) && defined(acc_int32e_t)
-#define ACC_UA_GET32(p)         (* (__acc_ua_volatile const acc_uint32e_t*) (__acc_ua_volatile const void*) (p))
-#define ACC_UA_SET32(p,v)       ((* (__acc_ua_volatile acc_uint32e_t*) (__acc_ua_volatile void*) (p)) = (acc_uint32e_t) (v))
-#if (ACC_ABI_BIG_ENDIAN)
-#  define ACC_UA_GET_BE32(p)    ACC_UA_GET32(p)
-#  define ACC_UA_SET_BE32(p,v)  ACC_UA_SET32(p,v)
-#elif (ACC_ABI_LITTLE_ENDIAN)
-#  define ACC_UA_GET_LE32(p)    ACC_UA_GET32(p)
-#  define ACC_UA_SET_LE32(p,v)  ACC_UA_SET32(p,v)
-#endif
-#if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
-#if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
-#if !defined(ACC_UA_GET_LE32)
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp);
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
-    __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp;
-    unsigned long v;
-    __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
-    return v;
-}
-#define ACC_UA_GET_LE32(p)      __ACC_UA_GET_LE32(p)
-#endif
-#if !defined(ACC_UA_SET_LE32)
-extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v);
-extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
-    __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp;
-    __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
-}
-#define ACC_UA_SET_LE32(p,v)    __ACC_UA_SET_LE32(p,v)
-#endif
-#endif
-#endif
-#if !defined(ACC_UA_COPY32)
-#  define ACC_UA_COPY32(d,s)    ACC_UA_SET32(d, ACC_UA_GET32(s))
-#endif
-#endif
-#if (ACC_OPT_UNALIGNED64) && defined(acc_int64l_t)
-#define ACC_UA_GET64(p)         (* (__acc_ua_volatile const acc_uint64l_t*) (__acc_ua_volatile const void*) (p))
-#define ACC_UA_SET64(p,v)       ((* (__acc_ua_volatile acc_uint64l_t*) (__acc_ua_volatile void*) (p)) = (acc_uint64l_t) (v))
-#if (ACC_ABI_BIG_ENDIAN)
-#  define ACC_UA_GET_BE64(p)    ACC_UA_GET64(p)
-#  define ACC_UA_SET_BE64(p,v)  ACC_UA_SET64(p,v)
-#elif (ACC_ABI_LITTLE_ENDIAN)
-#  define ACC_UA_GET_LE64(p)    ACC_UA_GET64(p)
-#  define ACC_UA_SET_LE64(p,v)  ACC_UA_SET64(p,v)
-#endif
-#if !defined(ACC_UA_COPY64)
-#  define ACC_UA_COPY64(d,s)    ACC_UA_SET64(d, ACC_UA_GET64(s))
-#endif
-#endif
-#  endif
-#endif
-#endif
-#if defined(ACC_WANT_ACC_TYPE_H)
-#  undef ACC_WANT_ACC_TYPE_H
-#  if defined(ACC_CFG_NO_ACC_TYPE_H)
-#    error "ACC_WANT_ACC_TYPE_H with ACC_CFG_NO_ACC_TYPE_H"
-#  endif
-#if (ACC_SIZEOF_LONG_LONG+0 > 0)
-__acc_gnuc_extension__ typedef long long acc_llong_t;
-__acc_gnuc_extension__ typedef unsigned long long acc_ullong_t;
-#endif
-#if (!(ACC_SIZEOF_SHORT+0 > 0 && ACC_SIZEOF_INT+0 > 0 && ACC_SIZEOF_LONG+0 > 0))
-#  error "missing defines for sizes"
-#endif
-#if (!(ACC_SIZEOF_PTRDIFF_T+0 > 0 && ACC_SIZEOF_SIZE_T+0 > 0 && ACC_SIZEOF_VOID_P+0 > 0))
-#  error "missing defines for sizes"
-#endif
-#if !defined(acc_int16e_t)
-#if (ACC_SIZEOF_LONG == 2)
-#  define acc_int16e_t          long
-#  define acc_uint16e_t         unsigned long
-#elif (ACC_SIZEOF_INT == 2)
-#  define acc_int16e_t          int
-#  define acc_uint16e_t         unsigned int
-#elif (ACC_SIZEOF_SHORT == 2)
-#  define acc_int16e_t          short int
-#  define acc_uint16e_t         unsigned short int
-#elif 1 && !(ACC_CFG_TYPE_NO_MODE_HI) && (ACC_CC_CLANG || (ACC_CC_GNUC >= 0x025f00ul) || ACC_CC_LLVM)
-   typedef int __acc_int16e_hi_t __attribute__((__mode__(__HI__)));
-   typedef unsigned int __acc_uint16e_hi_t __attribute__((__mode__(__HI__)));
-#  define acc_int16e_t          __acc_int16e_hi_t
-#  define acc_uint16e_t         __acc_uint16e_hi_t
-#elif (ACC_SIZEOF___INT16 == 2)
-#  define acc_int16e_t          __int16
-#  define acc_uint16e_t         unsigned __int16
-#else
-#endif
-#endif
-#if defined(acc_int16e_t)
-#  define ACC_SIZEOF_ACC_INT16E_T   2
-#endif
-#if !defined(acc_int32e_t)
-#if (ACC_SIZEOF_LONG == 4)
-#  define acc_int32e_t          long int
-#  define acc_uint32e_t         unsigned long int
-#elif (ACC_SIZEOF_INT == 4)
-#  define acc_int32e_t          int
-#  define acc_uint32e_t         unsigned int
-#elif (ACC_SIZEOF_SHORT == 4)
-#  define acc_int32e_t          short int
-#  define acc_uint32e_t         unsigned short int
-#elif (ACC_SIZEOF_LONG_LONG == 4)
-#  define acc_int32e_t          acc_llong_t
-#  define acc_uint32e_t         acc_ullong_t
-#elif 1 && !(ACC_CFG_TYPE_NO_MODE_SI) && (ACC_CC_CLANG || (ACC_CC_GNUC >= 0x025f00ul) || ACC_CC_LLVM) && (__INT_MAX__+0 > 2147483647L)
-   typedef int __acc_int32e_si_t __attribute__((__mode__(__SI__)));
-   typedef unsigned int __acc_uint32e_si_t __attribute__((__mode__(__SI__)));
-#  define acc_int32e_t          __acc_int32e_si_t
-#  define acc_uint32e_t         __acc_uint32e_si_t
-#elif 1 && !(ACC_CFG_TYPE_NO_MODE_SI) && (ACC_CC_GNUC >= 0x025f00ul) && defined(__AVR__) && (__LONG_MAX__+0 == 32767L)
-   typedef int __acc_int32e_si_t __attribute__((__mode__(__SI__)));
-   typedef unsigned int __acc_uint32e_si_t __attribute__((__mode__(__SI__)));
-#  define acc_int32e_t          __acc_int32e_si_t
-#  define acc_uint32e_t         __acc_uint32e_si_t
-#  define ACC_INT32_C(c)        c##LL
-#  define ACC_UINT32_C(c)       c##ULL
-#elif (ACC_SIZEOF___INT32 == 4)
-#  define acc_int32e_t          __int32
-#  define acc_uint32e_t         unsigned __int32
-#else
-#endif
-#endif
-#if defined(acc_int32e_t)
-#  define ACC_SIZEOF_ACC_INT32E_T   4
-#endif
-#if !defined(acc_int64e_t)
-#if (ACC_SIZEOF___INT64 == 8)
-#  if (ACC_CC_BORLANDC) && !(ACC_CFG_TYPE_PREFER___INT64)
-#    define ACC_CFG_TYPE_PREFER___INT64 1
-#  endif
-#endif
-#if (ACC_SIZEOF_INT == 8) && (ACC_SIZEOF_INT < ACC_SIZEOF_LONG)
-#  define acc_int64e_t          int
-#  define acc_uint64e_t         unsigned int
-#  define ACC_SIZEOF_ACC_INT64E_T   ACC_SIZEOF_INT
-#elif (ACC_SIZEOF_LONG == 8)
-#  define acc_int64e_t          long int
-#  define acc_uint64e_t         unsigned long int
-#  define ACC_SIZEOF_ACC_INT64E_T   ACC_SIZEOF_LONG
-#elif (ACC_SIZEOF_LONG_LONG == 8) && !(ACC_CFG_TYPE_PREFER___INT64)
-#  define acc_int64e_t          acc_llong_t
-#  define acc_uint64e_t         acc_ullong_t
-#  if (ACC_CC_BORLANDC)
-#    define ACC_INT64_C(c)      ((c) + 0ll)
-#    define ACC_UINT64_C(c)     ((c) + 0ull)
-#  else
-#    define ACC_INT64_C(c)      c##LL
-#    define ACC_UINT64_C(c)     c##ULL
-#  endif
-#  define ACC_SIZEOF_ACC_INT64E_T   ACC_SIZEOF_LONG_LONG
-#elif (ACC_SIZEOF___INT64 == 8)
-#  define acc_int64e_t          __int64
-#  define acc_uint64e_t         unsigned __int64
-#  if (ACC_CC_BORLANDC)
-#    define ACC_INT64_C(c)      ((c) + 0i64)
-#    define ACC_UINT64_C(c)     ((c) + 0ui64)
-#  else
-#    define ACC_INT64_C(c)      c##i64
-#    define ACC_UINT64_C(c)     c##ui64
-#  endif
-#  define ACC_SIZEOF_ACC_INT64E_T   ACC_SIZEOF___INT64
-#else
-#endif
-#endif
-#if !defined(acc_int32l_t)
-#if defined(acc_int32e_t)
-#  define acc_int32l_t          acc_int32e_t
-#  define acc_uint32l_t         acc_uint32e_t
-#  define ACC_SIZEOF_ACC_INT32L_T   ACC_SIZEOF_ACC_INT32E_T
-#elif (ACC_SIZEOF_INT >= 4) && (ACC_SIZEOF_INT < ACC_SIZEOF_LONG)
-#  define acc_int32l_t          int
-#  define acc_uint32l_t         unsigned int
-#  define ACC_SIZEOF_ACC_INT32L_T   ACC_SIZEOF_INT
-#elif (ACC_SIZEOF_LONG >= 4)
-#  define acc_int32l_t          long int
-#  define acc_uint32l_t         unsigned long int
-#  define ACC_SIZEOF_ACC_INT32L_T   ACC_SIZEOF_LONG
-#else
-#  error "acc_int32l_t"
-#endif
-#endif
-#if !defined(acc_int64l_t)
-#if defined(acc_int64e_t)
-#  define acc_int64l_t          acc_int64e_t
-#  define acc_uint64l_t         acc_uint64e_t
-#  define ACC_SIZEOF_ACC_INT64L_T   ACC_SIZEOF_ACC_INT64E_T
-#else
-#endif
-#endif
-#if !defined(acc_int32f_t)
-#if (ACC_SIZEOF_SIZE_T >= 8)
-#  define acc_int32f_t          acc_int64l_t
-#  define acc_uint32f_t         acc_uint64l_t
-#  define ACC_SIZEOF_ACC_INT32F_T   ACC_SIZEOF_ACC_INT64L_T
-#else
-#  define acc_int32f_t          acc_int32l_t
-#  define acc_uint32f_t         acc_uint32l_t
-#  define ACC_SIZEOF_ACC_INT32F_T   ACC_SIZEOF_ACC_INT32L_T
-#endif
-#endif
-#if !defined(acc_intptr_t)
-#if 1 && (ACC_OS_OS400 && (ACC_SIZEOF_VOID_P == 16))
-#  define __ACC_INTPTR_T_IS_POINTER 1
-   typedef char*                acc_intptr_t;
-   typedef char*                acc_uintptr_t;
-#  define acc_intptr_t          acc_intptr_t
-#  define acc_uintptr_t         acc_uintptr_t
-#  define ACC_SIZEOF_ACC_INTPTR_T   ACC_SIZEOF_VOID_P
-#elif (ACC_CC_MSC && (_MSC_VER >= 1300) && (ACC_SIZEOF_VOID_P == 4) && (ACC_SIZEOF_INT == 4))
-   typedef __w64 int            acc_intptr_t;
-   typedef __w64 unsigned int   acc_uintptr_t;
-#  define acc_intptr_t          acc_intptr_t
-#  define acc_uintptr_t         acc_uintptr_t
-#  define ACC_SIZEOF_ACC_INTPTR_T   ACC_SIZEOF_INT
-#elif (ACC_SIZEOF_SHORT == ACC_SIZEOF_VOID_P) && (ACC_SIZEOF_INT > ACC_SIZEOF_VOID_P)
-#  define acc_intptr_t          short
-#  define acc_uintptr_t         unsigned short
-#  define ACC_SIZEOF_ACC_INTPTR_T   ACC_SIZEOF_SHORT
-#elif (ACC_SIZEOF_INT >= ACC_SIZEOF_VOID_P) && (ACC_SIZEOF_INT < ACC_SIZEOF_LONG)
-#  define acc_intptr_t          int
-#  define acc_uintptr_t         unsigned int
-#  define ACC_SIZEOF_ACC_INTPTR_T   ACC_SIZEOF_INT
-#elif (ACC_SIZEOF_LONG >= ACC_SIZEOF_VOID_P)
-#  define acc_intptr_t          long
-#  define acc_uintptr_t         unsigned long
-#  define ACC_SIZEOF_ACC_INTPTR_T   ACC_SIZEOF_LONG
-#elif (ACC_SIZEOF_ACC_INT64L_T >= ACC_SIZEOF_VOID_P)
-#  define acc_intptr_t          acc_int64l_t
-#  define acc_uintptr_t         acc_uint64l_t
-#  define ACC_SIZEOF_ACC_INTPTR_T   ACC_SIZEOF_ACC_INT64L_T
-#else
-#  error "acc_intptr_t"
-#endif
-#endif
-#if !defined(acc_word_t)
-#if defined(ACC_WORDSIZE) && (ACC_WORDSIZE > 0)
-#if (ACC_WORDSIZE == ACC_SIZEOF_ACC_INTPTR_T) && !defined(__ACC_INTPTR_T_IS_POINTER)
-#  define acc_word_t            acc_uintptr_t
-#  define acc_sword_t           acc_intptr_t
-#  define ACC_SIZEOF_ACC_WORD_T ACC_SIZEOF_ACC_INTPTR_T
-#elif (ACC_WORDSIZE == ACC_SIZEOF_LONG)
-#  define acc_word_t            unsigned long
-#  define acc_sword_t           long
-#  define ACC_SIZEOF_ACC_WORD_T ACC_SIZEOF_LONG
-#elif (ACC_WORDSIZE == ACC_SIZEOF_INT)
-#  define acc_word_t            unsigned int
-#  define acc_sword_t           int
-#  define ACC_SIZEOF_ACC_WORD_T ACC_SIZEOF_INT
-#elif (ACC_WORDSIZE == ACC_SIZEOF_SHORT)
-#  define acc_word_t            unsigned short
-#  define acc_sword_t           short
-#  define ACC_SIZEOF_ACC_WORD_T ACC_SIZEOF_SHORT
-#elif (ACC_WORDSIZE == 1)
-#  define acc_word_t            unsigned char
-#  define acc_sword_t           signed char
-#  define ACC_SIZEOF_ACC_WORD_T 1
-#elif (ACC_WORDSIZE == ACC_SIZEOF_ACC_INT64L_T)
-#  define acc_word_t            acc_uint64l_t
-#  define acc_sword_t           acc_int64l_t
-#  define ACC_SIZEOF_ACC_WORD_T ACC_SIZEOF_ACC_INT64L_T
-#elif (ACC_ARCH_SPU) && (ACC_CC_GNUC)
-#if 0
-   typedef unsigned acc_word_t  __attribute__((__mode__(__V16QI__)));
-   typedef int      acc_sword_t __attribute__((__mode__(__V16QI__)));
-#  define acc_word_t            acc_word_t
-#  define acc_sword_t           acc_sword_t
-#  define ACC_SIZEOF_ACC_WORD_T 16
-#endif
-#else
-#  error "acc_word_t"
-#endif
-#endif
-#endif
-#if !defined(ACC_INT16_C)
-#  if (ACC_BROKEN_INTEGRAL_CONSTANTS) && (ACC_SIZEOF_INT >= 2)
-#    define ACC_INT16_C(c)      ((c) + 0)
-#    define ACC_UINT16_C(c)     ((c) + 0U)
-#  elif (ACC_BROKEN_INTEGRAL_CONSTANTS) && (ACC_SIZEOF_LONG >= 2)
-#    define ACC_INT16_C(c)      ((c) + 0L)
-#    define ACC_UINT16_C(c)     ((c) + 0UL)
-#  elif (ACC_SIZEOF_INT >= 2)
-#    define ACC_INT16_C(c)      c
-#    define ACC_UINT16_C(c)     c##U
-#  elif (ACC_SIZEOF_LONG >= 2)
-#    define ACC_INT16_C(c)      c##L
-#    define ACC_UINT16_C(c)     c##UL
-#  else
-#    error "ACC_INT16_C"
-#  endif
-#endif
-#if !defined(ACC_INT32_C)
-#  if (ACC_BROKEN_INTEGRAL_CONSTANTS) && (ACC_SIZEOF_INT >= 4)
-#    define ACC_INT32_C(c)      ((c) + 0)
-#    define ACC_UINT32_C(c)     ((c) + 0U)
-#  elif (ACC_BROKEN_INTEGRAL_CONSTANTS) && (ACC_SIZEOF_LONG >= 4)
-#    define ACC_INT32_C(c)      ((c) + 0L)
-#    define ACC_UINT32_C(c)     ((c) + 0UL)
-#  elif (ACC_SIZEOF_INT >= 4)
-#    define ACC_INT32_C(c)      c
-#    define ACC_UINT32_C(c)     c##U
-#  elif (ACC_SIZEOF_LONG >= 4)
-#    define ACC_INT32_C(c)      c##L
-#    define ACC_UINT32_C(c)     c##UL
-#  elif (ACC_SIZEOF_LONG_LONG >= 4)
-#    define ACC_INT32_C(c)      c##LL
-#    define ACC_UINT32_C(c)     c##ULL
-#  else
-#    error "ACC_INT32_C"
-#  endif
-#endif
-#if !defined(ACC_INT64_C) && defined(acc_int64l_t)
-#  if (ACC_BROKEN_INTEGRAL_CONSTANTS) && (ACC_SIZEOF_INT >= 8)
-#    define ACC_INT64_C(c)      ((c) + 0)
-#    define ACC_UINT64_C(c)     ((c) + 0U)
-#  elif (ACC_BROKEN_INTEGRAL_CONSTANTS) && (ACC_SIZEOF_LONG >= 8)
-#    define ACC_INT64_C(c)      ((c) + 0L)
-#    define ACC_UINT64_C(c)     ((c) + 0UL)
-#  elif (ACC_SIZEOF_INT >= 8)
-#    define ACC_INT64_C(c)      c
-#    define ACC_UINT64_C(c)     c##U
-#  elif (ACC_SIZEOF_LONG >= 8)
-#    define ACC_INT64_C(c)      c##L
-#    define ACC_UINT64_C(c)     c##UL
-#  else
-#    error "ACC_INT64_C"
-#  endif
-#endif
-#if !defined(SIZEOF_ACC_INT16E_T) && defined(ACC_SIZEOF_ACC_INT16E_T)
-#  define SIZEOF_ACC_INT16E_T   ACC_SIZEOF_ACC_INT16E_T
-#endif
-#if !defined(SIZEOF_ACC_INT32E_T) && defined(ACC_SIZEOF_ACC_INT32E_T)
-#  define SIZEOF_ACC_INT32E_T   ACC_SIZEOF_ACC_INT32E_T
-#endif
-#if !defined(SIZEOF_ACC_INT64E_T) && defined(ACC_SIZEOF_ACC_INT64E_T)
-#  define SIZEOF_ACC_INT64E_T   ACC_SIZEOF_ACC_INT64E_T
-#endif
-#if !defined(SIZEOF_ACC_INT32L_T) && defined(ACC_SIZEOF_ACC_INT32L_T)
-#  define SIZEOF_ACC_INT32L_T   ACC_SIZEOF_ACC_INT32L_T
-#endif
-#if !defined(SIZEOF_ACC_INT64L_T) && defined(ACC_SIZEOF_ACC_INT64L_T)
-#  define SIZEOF_ACC_INT64L_T   ACC_SIZEOF_ACC_INT64L_T
-#endif
-#if !defined(SIZEOF_ACC_INT32F_T) && defined(ACC_SIZEOF_ACC_INT32F_T)
-#  define SIZEOF_ACC_INT32F_T   ACC_SIZEOF_ACC_INT32F_T
-#endif
-#if !defined(SIZEOF_ACC_INTPTR_T) && defined(ACC_SIZEOF_ACC_INTPTR_T)
-#  define SIZEOF_ACC_INTPTR_T   ACC_SIZEOF_ACC_INTPTR_T
-#endif
-#if !defined(SIZEOF_ACC_WORD_T) && defined(ACC_SIZEOF_ACC_WORD_T)
-#  define SIZEOF_ACC_WORD_T     ACC_SIZEOF_ACC_WORD_T
-#endif
-#if 1 && !defined(acc_signo_t) && defined(__linux__) && defined(__dietlibc__) && (ACC_SIZEOF_INT != 4)
-#  define acc_signo_t           acc_int32e_t
-#endif
-#if !defined(acc_signo_t)
-#  define acc_signo_t           int
-#endif
-#if defined(__cplusplus)
-extern "C" {
-#endif
-#if (ACC_BROKEN_CDECL_ALT_SYNTAX)
-typedef void __acc_cdecl_sighandler (*acc_sighandler_t)(acc_signo_t);
-#elif defined(RETSIGTYPE)
-typedef RETSIGTYPE (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
-#else
-typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
-#endif
-#if defined(__cplusplus)
-}
-#endif
-#  if !defined(ACC_CFG_NO_ACC_UA_H)
-#if (ACC_CC_GNUC && (ACC_CC_GNUC < 0x020700ul))
-#elif (ACC_CC_GNUC && (ACC_CC_GNUC < 0x020800ul)) && defined(__cplusplus)
-#elif (ACC_CC_INTELC) && defined(_WIN32)
-#elif (ACC_CC_INTELC && (__INTEL_COMPILER < 700))
-#elif (ACC_CC_LLVM)
-#elif (ACC_CC_GNUC || ACC_CC_INTELC || ACC_CC_PATHSCALE)
-#if !defined(__acc_ua16_t) && (ACC_OPT_UNALIGNED16) && defined(acc_int16e_t)
-   typedef struct { __acc_ua_volatile acc_uint16e_t v __attribute__((__packed__)); } __acc_ua16_t;
-#  define __acc_ua16_t __acc_ua16_t
-#endif
-#if !defined(__acc_ua32_t) && (ACC_OPT_UNALIGNED32) && defined(acc_int32e_t)
-   typedef struct { __acc_ua_volatile acc_uint32e_t v __attribute__((__packed__)); } __acc_ua32_t;
-#  define __acc_ua32_t __acc_ua32_t
-#endif
-#if !defined(__acc_ua64_t) && (ACC_OPT_UNALIGNED64) && defined(acc_int64l_t)
-   typedef struct { __acc_ua_volatile acc_uint64l_t v __attribute__((__packed__)); } __acc_ua64_t;
-#  define __acc_ua64_t __acc_ua64_t
-#endif
-#endif
-#if (ACC_OPT_UNALIGNED16) && defined(acc_int16e_t)
-#define ACC_UA_GET16(p)         (* (__acc_ua_volatile const acc_uint16e_t*) (__acc_ua_volatile const void*) (p))
-#define ACC_UA_SET16(p,v)       ((* (__acc_ua_volatile acc_uint16e_t*) (__acc_ua_volatile void*) (p)) = (acc_uint16e_t) (v))
-#if (ACC_ABI_BIG_ENDIAN)
-#  define ACC_UA_GET_BE16(p)    ACC_UA_GET16(p)
-#  define ACC_UA_SET_BE16(p,v)  ACC_UA_SET16(p,v)
-#elif (ACC_ABI_LITTLE_ENDIAN)
-#  define ACC_UA_GET_LE16(p)    ACC_UA_GET16(p)
-#  define ACC_UA_SET_LE16(p,v)  ACC_UA_SET16(p,v)
-#endif
-#if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
-#if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
-#if !defined(ACC_UA_GET_LE16)
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp);
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
-    __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp;
-    unsigned long v;
-    __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
-    return v;
-}
-#define ACC_UA_GET_LE16(p)      __ACC_UA_GET_LE16(p)
-#endif
-#if !defined(ACC_UA_SET_LE16)
-extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v);
-extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
-    __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp;
-    __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
-}
-#define ACC_UA_SET_LE16(p,v)    __ACC_UA_SET_LE16(p,v)
-#endif
-#endif
-#endif
-#if !defined(ACC_UA_COPY16)
-#  define ACC_UA_COPY16(d,s)    ACC_UA_SET16(d, ACC_UA_GET16(s))
-#endif
-#endif
-#if (ACC_OPT_UNALIGNED32) && defined(acc_int32e_t)
-#define ACC_UA_GET32(p)         (* (__acc_ua_volatile const acc_uint32e_t*) (__acc_ua_volatile const void*) (p))
-#define ACC_UA_SET32(p,v)       ((* (__acc_ua_volatile acc_uint32e_t*) (__acc_ua_volatile void*) (p)) = (acc_uint32e_t) (v))
-#if (ACC_ABI_BIG_ENDIAN)
-#  define ACC_UA_GET_BE32(p)    ACC_UA_GET32(p)
-#  define ACC_UA_SET_BE32(p,v)  ACC_UA_SET32(p,v)
-#elif (ACC_ABI_LITTLE_ENDIAN)
-#  define ACC_UA_GET_LE32(p)    ACC_UA_GET32(p)
-#  define ACC_UA_SET_LE32(p,v)  ACC_UA_SET32(p,v)
-#endif
-#if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
-#if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
-#if !defined(ACC_UA_GET_LE32)
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp);
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
-    __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp;
-    unsigned long v;
-    __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
-    return v;
-}
-#define ACC_UA_GET_LE32(p)      __ACC_UA_GET_LE32(p)
-#endif
-#if !defined(ACC_UA_SET_LE32)
-extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v);
-extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
-    __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp;
-    __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
-}
-#define ACC_UA_SET_LE32(p,v)    __ACC_UA_SET_LE32(p,v)
-#endif
-#endif
-#endif
-#if !defined(ACC_UA_COPY32)
-#  define ACC_UA_COPY32(d,s)    ACC_UA_SET32(d, ACC_UA_GET32(s))
-#endif
-#endif
-#if (ACC_OPT_UNALIGNED64) && defined(acc_int64l_t)
-#define ACC_UA_GET64(p)         (* (__acc_ua_volatile const acc_uint64l_t*) (__acc_ua_volatile const void*) (p))
-#define ACC_UA_SET64(p,v)       ((* (__acc_ua_volatile acc_uint64l_t*) (__acc_ua_volatile void*) (p)) = (acc_uint64l_t) (v))
-#if (ACC_ABI_BIG_ENDIAN)
-#  define ACC_UA_GET_BE64(p)    ACC_UA_GET64(p)
-#  define ACC_UA_SET_BE64(p,v)  ACC_UA_SET64(p,v)
-#elif (ACC_ABI_LITTLE_ENDIAN)
-#  define ACC_UA_GET_LE64(p)    ACC_UA_GET64(p)
-#  define ACC_UA_SET_LE64(p,v)  ACC_UA_SET64(p,v)
-#endif
-#if !defined(ACC_UA_COPY64)
-#  define ACC_UA_COPY64(d,s)    ACC_UA_SET64(d, ACC_UA_GET64(s))
-#endif
-#endif
-#  endif
-#endif
-#if defined(ACC_WANT_ACC_INCD_H)
-#  undef ACC_WANT_ACC_INCD_H
-#ifndef __ACC_INCD_H_INCLUDED
-#define __ACC_INCD_H_INCLUDED 1
-#if (ACC_LIBC_NAKED)
-#ifndef __ACC_FALLBACK_STDDEF_H_INCLUDED
-#define __ACC_FALLBACK_STDDEF_H_INCLUDED 1
-#if defined(__PTRDIFF_TYPE__)
-typedef __PTRDIFF_TYPE__ acc_fallback_ptrdiff_t;
-#elif defined(__MIPS_PSX2__)
-typedef int acc_fallback_ptrdiff_t;
-#else
-typedef long acc_fallback_ptrdiff_t;
-#endif
-#if defined(__SIZE_TYPE__)
-typedef __SIZE_TYPE__ acc_fallback_size_t;
-#elif defined(__MIPS_PSX2__)
-typedef unsigned int acc_fallback_size_t;
-#else
-typedef unsigned long acc_fallback_size_t;
-#endif
-#if !defined(ptrdiff_t)
-typedef acc_fallback_ptrdiff_t ptrdiff_t;
-#ifndef _PTRDIFF_T_DEFINED
-#define _PTRDIFF_T_DEFINED 1
-#endif
-#endif
-#if !defined(size_t)
-typedef acc_fallback_size_t size_t;
-#ifndef _SIZE_T_DEFINED
-#define _SIZE_T_DEFINED 1
-#endif
-#endif
-#if !defined(__cplusplus) && !defined(wchar_t)
-typedef unsigned short wchar_t;
-#ifndef _WCHAR_T_DEFINED
-#define _WCHAR_T_DEFINED 1
-#endif
-#endif
-#ifndef NULL
-#if defined(__cplusplus) && defined(__GNUC__) && (__GNUC__ >= 4)
-#define NULL    __null
-#elif defined(__cplusplus)
-#define NULL    0
-#else
-#define NULL    ((void*)0)
-#endif
-#endif
-#ifndef offsetof
-#define offsetof(s,m)   ((size_t)((ptrdiff_t)&(((s*)0)->m)))
-#endif
-#endif
-#elif (ACC_LIBC_FREESTANDING)
-# if HAVE_STDDEF_H
-#  include <stddef.h>
-# endif
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#elif (ACC_LIBC_MOSTLY_FREESTANDING)
-# if HAVE_STDIO_H
-#  include <stdio.h>
-# endif
-# if HAVE_STDDEF_H
-#  include <stddef.h>
-# endif
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#else
-#include <stdio.h>
-#if (HAVE_TIME_H) && defined(__MSL__) && defined(__cplusplus)
-# include <time.h>
-#endif
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#endif
-#endif
-#endif
-#if defined(ACC_WANT_ACC_INCE_H)
-#  undef ACC_WANT_ACC_INCE_H
-#ifndef __ACC_INCE_H_INCLUDED
-#define __ACC_INCE_H_INCLUDED 1
-#if (ACC_LIBC_NAKED)
-#elif (ACC_LIBC_FREESTANDING)
-#elif (ACC_LIBC_MOSTLY_FREESTANDING)
-#  if (HAVE_SETJMP_H)
-#    include <setjmp.h>
-#  endif
-#else
-#if (HAVE_STDARG_H)
-#  include <stdarg.h>
-#endif
-#if (HAVE_CTYPE_H)
-#  include <ctype.h>
-#endif
-#if (HAVE_ERRNO_H)
-#  include <errno.h>
-#endif
-#if (HAVE_MALLOC_H)
-#  include <malloc.h>
-#endif
-#if (HAVE_ALLOCA_H)
-#  include <alloca.h>
-#endif
-#if (HAVE_FCNTL_H)
-#  include <fcntl.h>
-#endif
-#if (HAVE_DIRENT_H)
-#  include <dirent.h>
-#endif
-#if (HAVE_SETJMP_H)
-#  include <setjmp.h>
-#endif
-#if (HAVE_SIGNAL_H)
-#  include <signal.h>
-#endif
-#if (TIME_WITH_SYS_TIME)
-#  include <sys/time.h>
-#  include <time.h>
-#elif (HAVE_TIME_H)
-#  include <time.h>
-#endif
-#if (HAVE_UTIME_H)
-#  include <utime.h>
-#elif (HAVE_SYS_UTIME_H)
-#  include <sys/utime.h>
-#endif
-#if (HAVE_IO_H)
-#  include <io.h>
-#endif
-#if (HAVE_DOS_H)
-#  include <dos.h>
-#endif
-#if (HAVE_DIRECT_H)
-#  include <direct.h>
-#endif
-#if (HAVE_SHARE_H)
-#  include <share.h>
-#endif
-#if (ACC_CC_NDPC)
-#  include <os.h>
-#endif
-#if defined(__TOS__) && (defined(__PUREC__) || defined(__TURBOC__))
-#  include <ext.h>
-#endif
-#endif
-#endif
-#endif
-#if defined(ACC_WANT_ACC_INCI_H)
-#  undef ACC_WANT_ACC_INCI_H
-#ifndef __ACC_INCI_H_INCLUDED
-#define __ACC_INCI_H_INCLUDED 1
-#if (ACC_LIBC_NAKED)
-#elif (ACC_LIBC_FREESTANDING)
-#elif (ACC_LIBC_MOSTLY_FREESTANDING)
-#else
-#if (ACC_OS_TOS && (ACC_CC_PUREC || ACC_CC_TURBOC))
-#  include <tos.h>
-#elif (ACC_HAVE_WINDOWS_H)
-#  if 1 && !defined(WIN32_LEAN_AND_MEAN)
-#    define WIN32_LEAN_AND_MEAN 1
-#  endif
-#  if 1 && !defined(_WIN32_WINNT)
-#    define _WIN32_WINNT 0x0400
-#  endif
-#  include <windows.h>
-#  if (ACC_CC_BORLANDC || ACC_CC_TURBOC)
-#    include <dir.h>
-#  endif
-#elif (ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_WIN16)
-#  if (ACC_CC_AZTECC)
-#    include <model.h>
-#    include <stat.h>
-#  elif (ACC_CC_BORLANDC || ACC_CC_TURBOC)
-#    include <alloc.h>
-#    include <dir.h>
-#  elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
-#    include <sys/exceptn.h>
-#  elif (ACC_CC_PACIFICC)
-#    include <unixio.h>
-#    include <stat.h>
-#    include <sys.h>
-#  elif (ACC_CC_WATCOMC)
-#    include <i86.h>
-#  endif
-#elif (ACC_OS_OS216)
-#  if (ACC_CC_WATCOMC)
-#    include <i86.h>
-#  endif
-#endif
-#if (HAVE_SYS_MMAN_H)
-#  include <sys/mman.h>
-#endif
-#if (HAVE_SYS_RESOURCE_H)
-#  include <sys/resource.h>
-#endif
-#if (ACC_OS_DOS16 || ACC_OS_OS216 || ACC_OS_WIN16)
-#  if defined(FP_OFF)
-#    define ACC_PTR_FP_OFF(x)   FP_OFF(x)
-#  elif defined(_FP_OFF)
-#    define ACC_PTR_FP_OFF(x)   _FP_OFF(x)
-#  else
-#    define ACC_PTR_FP_OFF(x)   (((const unsigned __far*)&(x))[0])
-#  endif
-#  if defined(FP_SEG)
-#    define ACC_PTR_FP_SEG(x)   FP_SEG(x)
-#  elif defined(_FP_SEG)
-#    define ACC_PTR_FP_SEG(x)   _FP_SEG(x)
-#  else
-#    define ACC_PTR_FP_SEG(x)   (((const unsigned __far*)&(x))[1])
-#  endif
-#  if defined(MK_FP)
-#    define ACC_PTR_MK_FP(s,o)  MK_FP(s,o)
-#  elif defined(_MK_FP)
-#    define ACC_PTR_MK_FP(s,o)  _MK_FP(s,o)
-#  else
-#    define ACC_PTR_MK_FP(s,o)  ((void __far*)(((unsigned long)(s)<<16)+(unsigned)(o)))
-#  endif
-#  if 0
-#    undef ACC_PTR_FP_OFF
-#    undef ACC_PTR_FP_SEG
-#    undef ACC_PTR_MK_FP
-#    define ACC_PTR_FP_OFF(x)   (((const unsigned __far*)&(x))[0])
-#    define ACC_PTR_FP_SEG(x)   (((const unsigned __far*)&(x))[1])
-#    define ACC_PTR_MK_FP(s,o)  ((void __far*)(((unsigned long)(s)<<16)+(unsigned)(o)))
-#  endif
-#endif
-#endif
-#endif
-#endif
-#if defined(ACC_WANT_ACC_LIB_H)
-#  undef ACC_WANT_ACC_LIB_H
-#ifndef __ACC_LIB_H_INCLUDED
-#define __ACC_LIB_H_INCLUDED 1
-#if !defined(__ACCLIB_FUNCNAME)
-#  define __ACCLIB_FUNCNAME(f)  f
-#endif
-#if !defined(ACCLIB_EXTERN)
-#  define ACCLIB_EXTERN(r,f)                extern r __ACCLIB_FUNCNAME(f)
-#endif
-#if !defined(ACCLIB_EXTERN_NOINLINE)
-#  if defined(__acc_noinline)
-#    define ACCLIB_EXTERN_NOINLINE(r,f)     extern __acc_noinline r __ACCLIB_FUNCNAME(f)
-#  else
-#    define ACCLIB_EXTERN_NOINLINE(r,f)     extern r __ACCLIB_FUNCNAME(f)
-#  endif
-#endif
-#if !defined(__ACCLIB_CONST_CAST_RETURN)
-#if 1 && (ACC_CC_CLANG || ACC_CC_GNUC || ACC_CC_LLVM || ACC_CC_PATHSCALE)
-#  define __ACCLIB_CONST_CAST_RETURN(type,var) return (type) (acc_uintptr_t) (var);
-#elif (ACC_CC_CLANG || ACC_CC_GNUC || ACC_CC_LLVM || ACC_CC_PATHSCALE)
-#  define __ACCLIB_CONST_CAST_RETURN(type,var) \
-        { union { type a; const type b; } u; u.b = (var); return u.a; }
-#else
-#  define __ACCLIB_CONST_CAST_RETURN(type,var) return (type) (var);
-#endif
-#endif
-#if (ACC_OS_WIN64)
-#  define acclib_handle_t       acc_int64l_t
-#  define acclib_uhandle_t      acc_uint64l_t
-#elif (ACC_ARCH_I386 && ACC_CC_MSC && (_MSC_VER >= 1300))
-   typedef __w64 long           acclib_handle_t;
-   typedef __w64 unsigned long  acclib_uhandle_t;
-#  define acclib_handle_t       acclib_handle_t
-#  define acclib_uhandle_t      acclib_uhandle_t
-#else
-#  define acclib_handle_t       long
-#  define acclib_uhandle_t      unsigned long
-#endif
-#if 0
-ACCLIB_EXTERN(int, acc_ascii_digit)   (int);
-ACCLIB_EXTERN(int, acc_ascii_islower) (int);
-ACCLIB_EXTERN(int, acc_ascii_isupper) (int);
-ACCLIB_EXTERN(int, acc_ascii_tolower) (int);
-ACCLIB_EXTERN(int, acc_ascii_toupper) (int);
-ACCLIB_EXTERN(int, acc_ascii_utolower) (int);
-ACCLIB_EXTERN(int, acc_ascii_utoupper) (int);
-#endif
-#define acc_ascii_isdigit(c)    (((unsigned)(c) - 48) < 10)
-#define acc_ascii_islower(c)    (((unsigned)(c) - 97) < 26)
-#define acc_ascii_isupper(c)    (((unsigned)(c) - 65) < 26)
-#define acc_ascii_tolower(c)    ((int)(c) + (acc_ascii_isupper(c) << 5))
-#define acc_ascii_toupper(c)    ((int)(c) - (acc_ascii_islower(c) << 5))
-#define acc_ascii_utolower(c)   acc_ascii_tolower((unsigned char)(c))
-#define acc_ascii_utoupper(c)   acc_ascii_toupper((unsigned char)(c))
-#ifndef acc_hsize_t
-#if (ACC_HAVE_MM_HUGE_PTR)
-#  define acc_hsize_t   unsigned long
-#  define acc_hvoid_p   void __huge *
-#  define acc_hchar_p   char __huge *
-#  define acc_hchar_pp  char __huge * __huge *
-#  define acc_hbyte_p   unsigned char __huge *
-#else
-#  define acc_hsize_t   size_t
-#  define acc_hvoid_p   void *
-#  define acc_hchar_p   char *
-#  define acc_hchar_pp  char **
-#  define acc_hbyte_p   unsigned char *
-#endif
-#endif
-ACCLIB_EXTERN(acc_hvoid_p, acc_halloc) (acc_hsize_t);
-ACCLIB_EXTERN(void, acc_hfree) (acc_hvoid_p);
-#if (ACC_OS_DOS16 || ACC_OS_OS216)
-ACCLIB_EXTERN(void __far*, acc_dos_alloc) (unsigned long);
-ACCLIB_EXTERN(int, acc_dos_free) (void __far*);
-#endif
-ACCLIB_EXTERN(int, acc_hmemcmp) (const acc_hvoid_p, const acc_hvoid_p, acc_hsize_t);
-ACCLIB_EXTERN(acc_hvoid_p, acc_hmemcpy) (acc_hvoid_p, const acc_hvoid_p, acc_hsize_t);
-ACCLIB_EXTERN(acc_hvoid_p, acc_hmemmove) (acc_hvoid_p, const acc_hvoid_p, acc_hsize_t);
-ACCLIB_EXTERN(acc_hvoid_p, acc_hmemset) (acc_hvoid_p, int, acc_hsize_t);
-ACCLIB_EXTERN(acc_hsize_t, acc_hstrlen) (const acc_hchar_p);
-ACCLIB_EXTERN(int, acc_hstrcmp) (const acc_hchar_p, const acc_hchar_p);
-ACCLIB_EXTERN(int, acc_hstrncmp)(const acc_hchar_p, const acc_hchar_p, acc_hsize_t);
-ACCLIB_EXTERN(int, acc_ascii_hstricmp) (const acc_hchar_p, const acc_hchar_p);
-ACCLIB_EXTERN(int, acc_ascii_hstrnicmp)(const acc_hchar_p, const acc_hchar_p, acc_hsize_t);
-ACCLIB_EXTERN(int, acc_ascii_hmemicmp) (const acc_hvoid_p, const acc_hvoid_p, acc_hsize_t);
-ACCLIB_EXTERN(acc_hchar_p, acc_hstrstr) (const acc_hchar_p, const acc_hchar_p);
-ACCLIB_EXTERN(acc_hchar_p, acc_ascii_hstristr) (const acc_hchar_p, const acc_hchar_p);
-ACCLIB_EXTERN(acc_hvoid_p, acc_hmemmem) (const acc_hvoid_p, acc_hsize_t, const acc_hvoid_p, acc_hsize_t);
-ACCLIB_EXTERN(acc_hvoid_p, acc_ascii_hmemimem) (const acc_hvoid_p, acc_hsize_t, const acc_hvoid_p, acc_hsize_t);
-ACCLIB_EXTERN(acc_hchar_p, acc_hstrcpy) (acc_hchar_p, const acc_hchar_p);
-ACCLIB_EXTERN(acc_hchar_p, acc_hstrcat) (acc_hchar_p, const acc_hchar_p);
-ACCLIB_EXTERN(acc_hsize_t, acc_hstrlcpy) (acc_hchar_p, const acc_hchar_p, acc_hsize_t);
-ACCLIB_EXTERN(acc_hsize_t, acc_hstrlcat) (acc_hchar_p, const acc_hchar_p, acc_hsize_t);
-ACCLIB_EXTERN(int, acc_hstrscpy) (acc_hchar_p, const acc_hchar_p, acc_hsize_t);
-ACCLIB_EXTERN(int, acc_hstrscat) (acc_hchar_p, const acc_hchar_p, acc_hsize_t);
-ACCLIB_EXTERN(acc_hchar_p, acc_hstrccpy) (acc_hchar_p, const acc_hchar_p, int);
-ACCLIB_EXTERN(acc_hvoid_p, acc_hmemccpy) (acc_hvoid_p, const acc_hvoid_p, int, acc_hsize_t);
-ACCLIB_EXTERN(acc_hchar_p, acc_hstrchr)  (const acc_hchar_p, int);
-ACCLIB_EXTERN(acc_hchar_p, acc_hstrrchr) (const acc_hchar_p, int);
-ACCLIB_EXTERN(acc_hchar_p, acc_ascii_hstrichr) (const acc_hchar_p, int);
-ACCLIB_EXTERN(acc_hchar_p, acc_ascii_hstrrichr) (const acc_hchar_p, int);
-ACCLIB_EXTERN(acc_hvoid_p, acc_hmemchr)  (const acc_hvoid_p, int, acc_hsize_t);
-ACCLIB_EXTERN(acc_hvoid_p, acc_hmemrchr) (const acc_hvoid_p, int, acc_hsize_t);
-ACCLIB_EXTERN(acc_hvoid_p, acc_ascii_hmemichr) (const acc_hvoid_p, int, acc_hsize_t);
-ACCLIB_EXTERN(acc_hvoid_p, acc_ascii_hmemrichr) (const acc_hvoid_p, int, acc_hsize_t);
-ACCLIB_EXTERN(acc_hsize_t, acc_hstrspn)  (const acc_hchar_p, const acc_hchar_p);
-ACCLIB_EXTERN(acc_hsize_t, acc_hstrrspn) (const acc_hchar_p, const acc_hchar_p);
-ACCLIB_EXTERN(acc_hsize_t, acc_hstrcspn)  (const acc_hchar_p, const acc_hchar_p);
-ACCLIB_EXTERN(acc_hsize_t, acc_hstrrcspn) (const acc_hchar_p, const acc_hchar_p);
-ACCLIB_EXTERN(acc_hchar_p, acc_hstrpbrk)  (const acc_hchar_p, const acc_hchar_p);
-ACCLIB_EXTERN(acc_hchar_p, acc_hstrrpbrk) (const acc_hchar_p, const acc_hchar_p);
-ACCLIB_EXTERN(acc_hchar_p, acc_hstrsep)  (acc_hchar_pp, const acc_hchar_p);
-ACCLIB_EXTERN(acc_hchar_p, acc_hstrrsep) (acc_hchar_pp, const acc_hchar_p);
-ACCLIB_EXTERN(acc_hchar_p, acc_ascii_hstrlwr) (acc_hchar_p);
-ACCLIB_EXTERN(acc_hchar_p, acc_ascii_hstrupr) (acc_hchar_p);
-ACCLIB_EXTERN(acc_hvoid_p, acc_ascii_hmemlwr) (acc_hvoid_p, acc_hsize_t);
-ACCLIB_EXTERN(acc_hvoid_p, acc_ascii_hmemupr) (acc_hvoid_p, acc_hsize_t);
-ACCLIB_EXTERN(acc_hsize_t, acc_hfread) (void *, acc_hvoid_p, acc_hsize_t);
-ACCLIB_EXTERN(acc_hsize_t, acc_hfwrite) (void *, const acc_hvoid_p, acc_hsize_t);
-#if (ACC_HAVE_MM_HUGE_PTR)
-ACCLIB_EXTERN(long, acc_hread) (int, acc_hvoid_p, long);
-ACCLIB_EXTERN(long, acc_hwrite) (int, const acc_hvoid_p, long);
-#endif
-ACCLIB_EXTERN(long, acc_safe_hread) (int, acc_hvoid_p, long);
-ACCLIB_EXTERN(long, acc_safe_hwrite) (int, const acc_hvoid_p, long);
-ACCLIB_EXTERN(unsigned, acc_ua_get_be16) (const acc_hvoid_p);
-ACCLIB_EXTERN(acc_uint32l_t, acc_ua_get_be24) (const acc_hvoid_p);
-ACCLIB_EXTERN(acc_uint32l_t, acc_ua_get_be32) (const acc_hvoid_p);
-ACCLIB_EXTERN(void, acc_ua_set_be16) (acc_hvoid_p, unsigned);
-ACCLIB_EXTERN(void, acc_ua_set_be24) (acc_hvoid_p, acc_uint32l_t);
-ACCLIB_EXTERN(void, acc_ua_set_be32) (acc_hvoid_p, acc_uint32l_t);
-ACCLIB_EXTERN(unsigned, acc_ua_get_le16) (const acc_hvoid_p);
-ACCLIB_EXTERN(acc_uint32l_t, acc_ua_get_le24) (const acc_hvoid_p);
-ACCLIB_EXTERN(acc_uint32l_t, acc_ua_get_le32) (const acc_hvoid_p);
-ACCLIB_EXTERN(void, acc_ua_set_le16) (acc_hvoid_p, unsigned);
-ACCLIB_EXTERN(void, acc_ua_set_le24) (acc_hvoid_p, acc_uint32l_t);
-ACCLIB_EXTERN(void, acc_ua_set_le32) (acc_hvoid_p, acc_uint32l_t);
-#if defined(acc_int64l_t)
-ACCLIB_EXTERN(acc_uint64l_t, acc_ua_get_be64) (const acc_hvoid_p);
-ACCLIB_EXTERN(void, acc_ua_set_be64) (acc_hvoid_p, acc_uint64l_t);
-ACCLIB_EXTERN(acc_uint64l_t, acc_ua_get_le64) (const acc_hvoid_p);
-ACCLIB_EXTERN(void, acc_ua_set_le64) (acc_hvoid_p, acc_uint64l_t);
-#endif
-ACCLIB_EXTERN_NOINLINE(short, acc_vget_short) (short, int);
-ACCLIB_EXTERN_NOINLINE(int, acc_vget_int) (int, int);
-ACCLIB_EXTERN_NOINLINE(long, acc_vget_long) (long, int);
-#if defined(acc_int64l_t)
-ACCLIB_EXTERN_NOINLINE(acc_int64l_t, acc_vget_acc_int64l_t) (acc_int64l_t, int);
-#endif
-ACCLIB_EXTERN_NOINLINE(acc_hsize_t, acc_vget_acc_hsize_t) (acc_hsize_t, int);
-#if !(ACC_CFG_NO_FLOAT)
-ACCLIB_EXTERN_NOINLINE(float, acc_vget_float) (float, int);
-#endif
-#if !(ACC_CFG_NO_DOUBLE)
-ACCLIB_EXTERN_NOINLINE(double, acc_vget_double) (double, int);
-#endif
-ACCLIB_EXTERN_NOINLINE(acc_hvoid_p, acc_vget_acc_hvoid_p) (acc_hvoid_p, int);
-ACCLIB_EXTERN_NOINLINE(const acc_hvoid_p, acc_vget_acc_hvoid_cp) (const acc_hvoid_p, int);
-#if !defined(ACC_FN_PATH_MAX)
-#if (ACC_OS_DOS16 || ACC_OS_WIN16)
-#  define ACC_FN_PATH_MAX   143
-#elif (ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN32 || ACC_OS_WIN64)
-#  define ACC_FN_PATH_MAX   259
-#elif (ACC_OS_TOS)
-#  define ACC_FN_PATH_MAX   259
-#endif
-#endif
-#if !defined(ACC_FN_PATH_MAX)
-#  define ACC_FN_PATH_MAX   1023
-#endif
-#if !defined(ACC_FN_NAME_MAX)
-#if (ACC_OS_DOS16 || ACC_OS_WIN16)
-#  define ACC_FN_NAME_MAX   12
-#elif (ACC_ARCH_M68K && ACC_OS_TOS && (ACC_CC_PUREC || ACC_CC_TURBOC))
-#  define ACC_FN_NAME_MAX   12
-#elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
-#elif (ACC_OS_DOS32)
-#  define ACC_FN_NAME_MAX   12
-#endif
-#endif
-#if !defined(ACC_FN_NAME_MAX)
-#  define ACC_FN_NAME_MAX   ACC_FN_PATH_MAX
-#endif
-#define ACC_FNMATCH_NOESCAPE        1
-#define ACC_FNMATCH_PATHNAME        2
-#define ACC_FNMATCH_PATHSTAR        4
-#define ACC_FNMATCH_PERIOD          8
-#define ACC_FNMATCH_ASCII_CASEFOLD  16
-ACCLIB_EXTERN(int, acc_fnmatch) (const acc_hchar_p, const acc_hchar_p, int);
-#undef __ACCLIB_USE_OPENDIR
-#if (HAVE_DIRENT_H || ACC_CC_WATCOMC)
-#  define __ACCLIB_USE_OPENDIR 1
-#  if (ACC_OS_DOS32 && defined(__BORLANDC__))
-#  elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
-#  elif (ACC_OS_OS2 || ACC_OS_OS216)
-#  elif (ACC_ARCH_M68K && ACC_OS_TOS && ACC_CC_GNUC)
-#  elif (ACC_OS_WIN32 && !(ACC_HAVE_WINDOWS_H))
-#  elif (ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_TOS || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
-#    undef __ACCLIB_USE_OPENDIR
-#  endif
-#endif
-typedef struct
-{
-#if defined(__ACCLIB_USE_OPENDIR)
-    void* u_dirp;
-# if (ACC_CC_WATCOMC)
-    unsigned short f_time;
-    unsigned short f_date;
-    unsigned long f_size;
-# endif
-    char f_name[ACC_FN_NAME_MAX+1];
-#elif (ACC_OS_WIN32 || ACC_OS_WIN64)
-    acclib_handle_t u_handle;
-    unsigned f_attr;
-    unsigned f_size_low;
-    unsigned f_size_high;
-    char f_name[ACC_FN_NAME_MAX+1];
-#elif (ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_TOS || ACC_OS_WIN16)
-    char u_dta[21];
-    unsigned char f_attr;
-    unsigned short f_time;
-    unsigned short f_date;
-    unsigned short f_size_low;
-    unsigned short f_size_high;
-    char f_name[ACC_FN_NAME_MAX+1];
-    char u_dirp;
-#else
-    void* u_dirp;
-    char f_name[ACC_FN_NAME_MAX+1];
-#endif
-} acc_dir_t;
-#ifndef acc_dir_p
-#define acc_dir_p acc_dir_t *
-#endif
-ACCLIB_EXTERN(int, acc_opendir)  (acc_dir_p, const char*);
-ACCLIB_EXTERN(int, acc_readdir)  (acc_dir_p);
-ACCLIB_EXTERN(int, acc_closedir) (acc_dir_p);
-#if (ACC_CC_GNUC) && (defined(__CYGWIN__) || defined(__MINGW32__))
-#  define acc_alloca(x)     __builtin_alloca((x))
-#elif (ACC_CC_GNUC) && (ACC_OS_CONSOLE_PS2)
-#  define acc_alloca(x)     __builtin_alloca((x))
-#elif (ACC_CC_BORLANDC || ACC_CC_LCC) && defined(__linux__)
-#elif (HAVE_ALLOCA)
-#  define acc_alloca(x)     ((void *) (alloca((x))))
-#endif
-#if (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
-#  define acc_stackavail()  stackavail()
-#elif (ACC_ARCH_I086 && ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0410))
-#  define acc_stackavail()  stackavail()
-#elif (ACC_ARCH_I086 && ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0400))
-#  if (ACC_OS_WIN16) && (ACC_MM_TINY || ACC_MM_SMALL || ACC_MM_MEDIUM)
-#  else
-#    define acc_stackavail()  stackavail()
-#  endif
-#elif ((ACC_ARCH_I086 || ACC_ARCH_I386) && (ACC_CC_DMC || ACC_CC_SYMANTECC))
-#  define acc_stackavail()  stackavail()
-#elif ((ACC_ARCH_I086) && ACC_CC_MSC && (_MSC_VER >= 700))
-#  define acc_stackavail()  _stackavail()
-#elif ((ACC_ARCH_I086) && ACC_CC_MSC)
-#  define acc_stackavail()  stackavail()
-#elif ((ACC_ARCH_I086 || ACC_ARCH_I386) && ACC_CC_TURBOC && (__TURBOC__ >= 0x0450))
-#  define acc_stackavail()  stackavail()
-#elif (ACC_ARCH_I086 && ACC_CC_TURBOC && (__TURBOC__ >= 0x0400))
-   ACC_EXTERN_C size_t __cdecl stackavail(void);
-#  define acc_stackavail()  stackavail()
-#elif ((ACC_ARCH_I086 || ACC_ARCH_I386) && (ACC_CC_WATCOMC))
-#  define acc_stackavail()  stackavail()
-#elif (ACC_ARCH_I086 && ACC_CC_ZORTECHC)
-#  define acc_stackavail()  _chkstack()
-#endif
-ACCLIB_EXTERN(acclib_handle_t, acc_get_osfhandle) (int);
-ACCLIB_EXTERN(const char *, acc_getenv) (const char *);
-ACCLIB_EXTERN(int, acc_isatty) (int);
-ACCLIB_EXTERN(int, acc_mkdir) (const char*, unsigned);
-ACCLIB_EXTERN(int, acc_rmdir) (const char*);
-ACCLIB_EXTERN(int, acc_response) (int*, char***);
-ACCLIB_EXTERN(int, acc_set_binmode) (int, int);
-#if defined(acc_int32e_t)
-ACCLIB_EXTERN(acc_int32e_t, acc_muldiv32s) (acc_int32e_t, acc_int32e_t, acc_int32e_t);
-ACCLIB_EXTERN(acc_uint32e_t, acc_muldiv32u) (acc_uint32e_t, acc_uint32e_t, acc_uint32e_t);
-#endif
-ACCLIB_EXTERN(void, acc_wildargv) (int*, char***);
-ACCLIB_EXTERN_NOINLINE(void, acc_debug_break) (void);
-ACCLIB_EXTERN_NOINLINE(void, acc_debug_nop) (void);
-ACCLIB_EXTERN_NOINLINE(int, acc_debug_align_check_query) (void);
-ACCLIB_EXTERN_NOINLINE(int, acc_debug_align_check_enable) (int);
-ACCLIB_EXTERN_NOINLINE(unsigned, acc_debug_running_on_qemu) (void);
-ACCLIB_EXTERN_NOINLINE(unsigned, acc_debug_running_on_valgrind) (void);
-#if !defined(acc_int64l_t) || (ACC_CFG_NO_DOUBLE)
-#  undef __ACCLIB_PCLOCK_USE_RDTSC
-#  undef __ACCLIB_PCLOCK_USE_PERFCTR
-#  undef __ACCLIB_UCLOCK_USE_RDTSC
-#  undef __ACCLIB_UCLOCK_USE_PERFCTR
-#else
-typedef struct {
-    void* h;
-    int mode;
-    double tsc_to_seconds;
-    unsigned cpu_type, cpu_features, cpu_khz, cpu_nrctrs;
-    const char* cpu_name;
-} acc_perfctr_handle_t;
-typedef struct {
-    acc_uint64l_t tsc;
-#if (ACC_OS_POSIX_LINUX)
-    acc_uint64l_t pmc[18];
-#else
-    acc_uint64l_t pmc[1];
-#endif
-} acc_perfctr_clock_t;
-#ifndef acc_perfctr_handle_p
-#define acc_perfctr_handle_p acc_perfctr_handle_t *
-#endif
-#ifndef acc_perfctr_clock_p
-#define acc_perfctr_clock_p acc_perfctr_clock_t *
-#endif
-ACCLIB_EXTERN(int, acc_perfctr_open)  (acc_perfctr_handle_p);
-ACCLIB_EXTERN(int, acc_perfctr_close) (acc_perfctr_handle_p);
-ACCLIB_EXTERN(void, acc_perfctr_read) (acc_perfctr_handle_p, acc_perfctr_clock_p);
-#if !(ACC_CFG_NO_DOUBLE)
-ACCLIB_EXTERN(double, acc_perfctr_get_elapsed) (acc_perfctr_handle_p, const acc_perfctr_clock_p, const acc_perfctr_clock_p);
-ACCLIB_EXTERN(double, acc_perfctr_get_elapsed_tsc) (acc_perfctr_handle_p, acc_uint64l_t);
-#endif
-ACCLIB_EXTERN(int, acc_perfctr_flush_cpu_cache) (acc_perfctr_handle_p, unsigned);
-#endif
-#if defined(acc_int32e_t)
-ACCLIB_EXTERN(int, acc_tsc_read) (acc_uint32e_t*);
-#else
-#  undef __ACCLIB_PCLOCK_USE_RDTSC
-#  undef __ACCLIB_UCLOCK_USE_RDTSC
-#endif
-struct acc_pclock_handle_t;
-struct acc_pclock_t;
-typedef struct acc_pclock_handle_t acc_pclock_handle_t;
-typedef struct acc_pclock_t acc_pclock_t;
-#ifndef acc_pclock_handle_p
-#define acc_pclock_handle_p acc_pclock_handle_t *
-#endif
-#ifndef acc_pclock_p
-#define acc_pclock_p acc_pclock_t *
-#endif
-#define ACC_PCLOCK_REALTIME             0
-#define ACC_PCLOCK_MONOTONIC            1
-#define ACC_PCLOCK_PROCESS_CPUTIME_ID   2
-#define ACC_PCLOCK_THREAD_CPUTIME_ID    3
-struct acc_pclock_handle_t {
-    acclib_handle_t h;
-    int mode;
-    int read_error;
-    const char* name;
-    int (*gettime) (acc_pclock_handle_p, acc_pclock_p);
-#if defined(acc_int64l_t)
-    acc_uint64l_t ticks_base;
-#endif
-#if (__ACCLIB_PCLOCK_USE_PERFCTR)
-    acc_perfctr_handle_t pch;
-#endif
-};
-struct acc_pclock_t {
-#if defined(acc_int64l_t)
-    acc_int64l_t tv_sec;
-#else
-    acc_int32l_t tv_sec_high;
-    acc_uint32l_t tv_sec_low;
-#endif
-    acc_uint32l_t tv_nsec;
-};
-ACCLIB_EXTERN(int, acc_pclock_open)  (acc_pclock_handle_p, int);
-ACCLIB_EXTERN(int, acc_pclock_open_default) (acc_pclock_handle_p);
-ACCLIB_EXTERN(int, acc_pclock_close) (acc_pclock_handle_p);
-ACCLIB_EXTERN(void, acc_pclock_read) (acc_pclock_handle_p, acc_pclock_p);
-#if !(ACC_CFG_NO_DOUBLE)
-ACCLIB_EXTERN(double, acc_pclock_get_elapsed) (acc_pclock_handle_p, const acc_pclock_p, const acc_pclock_p);
-#endif
-ACCLIB_EXTERN(int, acc_pclock_flush_cpu_cache) (acc_pclock_handle_p, unsigned);
-#if !defined(acc_int64l_t) || (ACC_CFG_NO_DOUBLE)
-#  undef __ACCLIB_UCLOCK_USE_QPC
-#elif (ACC_OS_CYGWIN || ACC_OS_EMX || ACC_OS_WIN32 || ACC_OS_WIN64) && (ACC_HAVE_WINDOWS_H)
-#  define __ACCLIB_UCLOCK_USE_QPC 1
-#else
-#  undef __ACCLIB_UCLOCK_USE_QPC
-#endif
-typedef struct {
-    acclib_handle_t h;
-    int mode;
-    int read_error;
-    const char* name;
-#if (__ACCLIB_UCLOCK_USE_PERFCTR)
-    acc_perfctr_handle_t pch;
-#endif
-#if (__ACCLIB_UCLOCK_USE_QPC)
-    double qpf;
-#endif
-} acc_uclock_handle_t;
-typedef struct {
-    union {
-        acc_uint32l_t t32;
-#if !(ACC_OS_DOS16 || ACC_OS_WIN16)
-#  if !(ACC_CFG_NO_DOUBLE)
-        double td;
-#  endif
-#  if defined(acc_int64l_t)
-        acc_int64l_t t64;
-#  endif
-#endif
-    } ticks;
-#if (__ACCLIB_UCLOCK_USE_RDTSC)
-    acc_uint64l_t tsc;
-#endif
-#if (__ACCLIB_UCLOCK_USE_PERFCTR)
-    acc_perfctr_clock_t pcc;
-#endif
-#if (__ACCLIB_UCLOCK_USE_QPC)
-    acc_int64l_t qpc;
-#endif
-} acc_uclock_t;
-#ifndef acc_uclock_handle_p
-#define acc_uclock_handle_p acc_uclock_handle_t *
-#endif
-#ifndef acc_uclock_p
-#define acc_uclock_p acc_uclock_t *
-#endif
-ACCLIB_EXTERN(int, acc_uclock_open)  (acc_uclock_handle_p);
-ACCLIB_EXTERN(int, acc_uclock_close) (acc_uclock_handle_p);
-ACCLIB_EXTERN(void, acc_uclock_read) (acc_uclock_handle_p, acc_uclock_p);
-#if !(ACC_CFG_NO_DOUBLE)
-ACCLIB_EXTERN(double, acc_uclock_get_elapsed) (acc_uclock_handle_p, const acc_uclock_p, const acc_uclock_p);
-#endif
-ACCLIB_EXTERN(int, acc_uclock_flush_cpu_cache) (acc_uclock_handle_p, unsigned);
-struct acc_getopt_t;
-typedef struct acc_getopt_t acc_getopt_t;
-#ifndef acc_getopt_p
-#define acc_getopt_p acc_getopt_t *
-#endif
-struct acc_getopt_longopt_t;
-typedef struct acc_getopt_longopt_t acc_getopt_longopt_t;
-#ifndef acc_getopt_longopt_p
-#define acc_getopt_longopt_p acc_getopt_longopt_t *
-#endif
-struct acc_getopt_longopt_t {
-    const char* name;
-    int has_arg;
-    int* flag;
-    int val;
-};
-struct acc_getopt_t {
-    void *user;
-    const char *progname;
-    int bad_option;
-    char *optarg;
-    void (*opterr)(acc_getopt_p, const char*, void *);
-    int optind;
-    int optopt;
-    int errcount;
-    int argc; char** argv;
-    int eof; int shortpos;
-    int pending_rotate_first, pending_rotate_middle;
-};
-enum { ACC_GETOPT_NO_ARG, ACC_GETOPT_REQUIRED_ARG, ACC_GETOPT_OPTIONAL_ARG, ACC_GETOPT_EXACT_ARG = 0x10 };
-enum { ACC_GETOPT_PERMUTE, ACC_GETOPT_RETURN_IN_ORDER, ACC_GETOPT_REQUIRE_ORDER };
-ACCLIB_EXTERN(void, acc_getopt_init) (acc_getopt_p g,
-                                      int start_argc, int argc, char** argv);
-ACCLIB_EXTERN(int, acc_getopt) (acc_getopt_p g,
-                                const char* shortopts,
-                                const acc_getopt_longopt_p longopts,
-                                int* longind);
-typedef struct {
-    acc_uint32l_t seed;
-} acc_rand31_t;
-#ifndef acc_rand31_p
-#define acc_rand31_p acc_rand31_t *
-#endif
-ACCLIB_EXTERN(void, acc_srand31) (acc_rand31_p, acc_uint32l_t);
-ACCLIB_EXTERN(acc_uint32l_t, acc_rand31) (acc_rand31_p);
-#if defined(acc_int64l_t)
-typedef struct {
-    acc_uint64l_t seed;
-} acc_rand48_t;
-#ifndef acc_rand48_p
-#define acc_rand48_p acc_rand48_t *
-#endif
-ACCLIB_EXTERN(void, acc_srand48) (acc_rand48_p, acc_uint32l_t);
-ACCLIB_EXTERN(acc_uint32l_t, acc_rand48) (acc_rand48_p);
-ACCLIB_EXTERN(acc_uint32l_t, acc_rand48_r32) (acc_rand48_p);
-#endif
-#if defined(acc_int64l_t)
-typedef struct {
-    acc_uint64l_t seed;
-} acc_rand64_t;
-#ifndef acc_rand64_p
-#define acc_rand64_p acc_rand64_t *
-#endif
-ACCLIB_EXTERN(void, acc_srand64) (acc_rand64_p, acc_uint64l_t);
-ACCLIB_EXTERN(acc_uint32l_t, acc_rand64) (acc_rand64_p);
-ACCLIB_EXTERN(acc_uint32l_t, acc_rand64_r32) (acc_rand64_p);
-#endif
-typedef struct {
-    unsigned n;
-    acc_uint32l_t s[624];
-} acc_randmt_t;
-#ifndef acc_randmt_p
-#define acc_randmt_p acc_randmt_t *
-#endif
-ACCLIB_EXTERN(void, acc_srandmt) (acc_randmt_p, acc_uint32l_t);
-ACCLIB_EXTERN(acc_uint32l_t, acc_randmt) (acc_randmt_p);
-ACCLIB_EXTERN(acc_uint32l_t, acc_randmt_r32) (acc_randmt_p);
-#if defined(acc_int64l_t)
-typedef struct {
-    unsigned n;
-    acc_uint64l_t s[312];
-} acc_randmt64_t;
-#ifndef acc_randmt64_p
-#define acc_randmt64_p acc_randmt64_t *
-#endif
-ACCLIB_EXTERN(void, acc_srandmt64) (acc_randmt64_p, acc_uint64l_t);
-ACCLIB_EXTERN(acc_uint64l_t, acc_randmt64_r64) (acc_randmt64_p);
-#endif
-#define ACC_SPAWN_P_WAIT    0
-#define ACC_SPAWN_P_NOWAIT  1
-ACCLIB_EXTERN(int, acc_spawnv)  (int mode, const char* fn, const char* const * argv);
-ACCLIB_EXTERN(int, acc_spawnvp) (int mode, const char* fn, const char* const * argv);
-ACCLIB_EXTERN(int, acc_spawnve) (int mode, const char* fn, const char* const * argv, const char * const envp);
-#endif
-#endif
-#if defined(ACC_WANT_ACC_CXX_H)
-#  undef ACC_WANT_ACC_CXX_H
-#ifndef __ACC_CXX_H_INCLUDED
-#define __ACC_CXX_H_INCLUDED 1
-#if defined(__cplusplus)
-#if defined(ACC_CXX_NOTHROW)
-#elif (ACC_CC_GNUC && (ACC_CC_GNUC < 0x020800ul))
-#elif (ACC_CC_BORLANDC && (__BORLANDC__ < 0x0450))
-#elif (ACC_CC_HIGHC)
-#elif (ACC_CC_MSC && (_MSC_VER < 1100))
-#elif (ACC_CC_NDPC)
-#elif (ACC_CC_TURBOC)
-#elif (ACC_CC_WATCOMC && !defined(_CPPUNWIND))
-#elif (ACC_CC_ZORTECHC)
-#else
-#  define ACC_CXX_NOTHROW   throw()
-#endif
-#if !defined(ACC_CXX_NOTHROW)
-#  define ACC_CXX_NOTHROW   /*empty*/
-#endif
-#if defined(__ACC_CXX_DO_NEW)
-#elif (ACC_CC_NDPC || ACC_CC_PGI)
-#  define __ACC_CXX_DO_NEW          { return 0; }
-#elif ((ACC_CC_BORLANDC || ACC_CC_TURBOC) && ACC_ARCH_I086)
-#  define __ACC_CXX_DO_NEW          { return 0; }
-#else
-#  define __ACC_CXX_DO_NEW          ;
-#endif
-#if defined(__ACC_CXX_DO_DELETE)
-#elif (ACC_CC_BORLANDC || ACC_CC_TURBOC)
-#  define __ACC_CXX_DO_DELETE       { }
-#else
-#  define __ACC_CXX_DO_DELETE       ACC_CXX_NOTHROW { }
-#endif
-#if (ACC_CC_BORLANDC && (__BORLANDC__ < 0x0450))
-#elif (ACC_CC_MSC && ACC_MM_HUGE)
-#  define ACC_CXX_DISABLE_NEW_DELETE private:
-#elif (ACC_CC_MSC && (_MSC_VER < 1100))
-#elif (ACC_CC_NDPC)
-#elif (ACC_CC_SYMANTECC || ACC_CC_ZORTECHC)
-#elif (ACC_CC_TURBOC)
-#elif (ACC_CC_WATCOMC && (__WATCOMC__ < 1100))
-#else
-#  define __ACC_CXX_HAVE_ARRAY_NEW 1
-#endif
-#if (__ACC_CXX_HAVE_ARRAY_NEW)
-#  define __ACC_CXX_HAVE_PLACEMENT_NEW 1
-#endif
-#if (__ACC_CXX_HAVE_PLACEMENT_NEW)
-#  if (ACC_CC_GNUC >= 0x030000ul)
-#    define __ACC_CXX_HAVE_PLACEMENT_DELETE 1
-#  elif (ACC_CC_INTELC)
-#    define __ACC_CXX_HAVE_PLACEMENT_DELETE 1
-#  elif (ACC_CC_MSC && (_MSC_VER >= 1200))
-#    define __ACC_CXX_HAVE_PLACEMENT_DELETE 1
-#  elif (ACC_CC_CLANG || ACC_CC_LLVM || ACC_CC_PATHSCALE)
-#    define __ACC_CXX_HAVE_PLACEMENT_DELETE 1
-#  elif (ACC_CC_PGI)
-#    define __ACC_CXX_HAVE_PLACEMENT_DELETE 1
-#  endif
-#endif
-#if defined(ACC_CXX_DISABLE_NEW_DELETE)
-#elif defined(new) || defined(delete)
-#  define ACC_CXX_DISABLE_NEW_DELETE private:
-#elif (ACC_CC_GNUC && (ACC_CC_GNUC < 0x025b00ul))
-#  define ACC_CXX_DISABLE_NEW_DELETE private:
-#elif  (ACC_CC_HIGHC)
-#  define ACC_CXX_DISABLE_NEW_DELETE private:
-#elif !(__ACC_CXX_HAVE_ARRAY_NEW)
-#  define ACC_CXX_DISABLE_NEW_DELETE \
-        protected: static void operator delete(void*) __ACC_CXX_DO_DELETE \
-        protected: static void* operator new(size_t) __ACC_CXX_DO_NEW \
-        private:
-#else
-#  define ACC_CXX_DISABLE_NEW_DELETE \
-        protected: static void operator delete(void*) __ACC_CXX_DO_DELETE \
-                   static void operator delete[](void*) __ACC_CXX_DO_DELETE \
-        private:   static void* operator new(size_t)  __ACC_CXX_DO_NEW \
-                   static void* operator new[](size_t) __ACC_CXX_DO_NEW
-#endif
-#if defined(ACC_CXX_TRIGGER_FUNCTION)
-#else
-#  define ACC_CXX_TRIGGER_FUNCTION \
-        protected: virtual const void* acc_cxx_trigger_function() const; \
-        private:
-#endif
-#if defined(ACC_CXX_TRIGGER_FUNCTION_IMPL)
-#else
-#  define ACC_CXX_TRIGGER_FUNCTION_IMPL(klass) \
-        const void* klass::acc_cxx_trigger_function() const { return 0; }
-#endif
-#endif
-#endif
-#endif
-#if defined(ACC_WANT_ACC_CHK_CH)
-#  undef ACC_WANT_ACC_CHK_CH
-#if !defined(ACCCHK_ASSERT)
-#  define ACCCHK_ASSERT(expr)   ACC_COMPILE_TIME_ASSERT_HEADER(expr)
-#endif
-#if !defined(ACCCHK_ASSERT_SIGN_T)
-#  define ACCCHK_ASSERT_SIGN_T(type,relop) \
-        ACCCHK_ASSERT( (type) (-1)       relop  (type) 0 ) \
-        ACCCHK_ASSERT( (type) (~(type)0) relop  (type) 0 ) \
-        ACCCHK_ASSERT( (type) (~(type)0) ==     (type) (-1) )
-#endif
-#if !defined(ACCCHK_ASSERT_IS_SIGNED_T)
-#  define ACCCHK_ASSERT_IS_SIGNED_T(type)       ACCCHK_ASSERT_SIGN_T(type,<)
-#endif
-#if !defined(ACCCHK_ASSERT_IS_UNSIGNED_T)
-#  if (ACC_BROKEN_INTEGRAL_PROMOTION)
-#    define ACCCHK_ASSERT_IS_UNSIGNED_T(type) \
-        ACCCHK_ASSERT( (type) (-1) > (type) 0 )
-#  else
-#    define ACCCHK_ASSERT_IS_UNSIGNED_T(type)   ACCCHK_ASSERT_SIGN_T(type,>)
-#  endif
-#endif
-#if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0550) && (__BORLANDC__ < 0x0560))
-#  pragma option push -w-8055
-#elif (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0550))
-#  pragma option push -w-osh
-#endif
-#if (ACC_0xffffffffL - ACC_UINT32_C(4294967294) != 1)
-#  error "preprocessor error 1"
-#endif
-#if (ACC_0xffffffffL - ACC_UINT32_C(0xfffffffd) != 2)
-#  error "preprocessor error 2"
-#endif
-#define ACCCHK_VAL  1
-#define ACCCHK_TMP1 ACCCHK_VAL
-#undef ACCCHK_VAL
-#define ACCCHK_VAL  2
-#define ACCCHK_TMP2 ACCCHK_VAL
-#if (ACCCHK_TMP1 != 2)
-#  error "preprocessor error 3a"
-#endif
-#if (ACCCHK_TMP2 != 2)
-#  error "preprocessor error 3b"
-#endif
-#undef ACCCHK_VAL
-#if (ACCCHK_TMP2)
-#  error "preprocessor error 3c"
-#endif
-#if (ACCCHK_TMP2 + 0 != 0)
-#  error "preprocessor error 3d"
-#endif
-#undef ACCCHK_TMP1
-#undef ACCCHK_TMP2
-#if 0 || defined(ACCCHK_CFG_PEDANTIC)
-#  if (ACC_ARCH_MIPS) && defined(_MIPS_SZINT)
-    ACCCHK_ASSERT((_MIPS_SZINT) == 8 * sizeof(int))
-#  endif
-#  if (ACC_ARCH_MIPS) && defined(_MIPS_SZLONG)
-    ACCCHK_ASSERT((_MIPS_SZLONG) == 8 * sizeof(long))
-#  endif
-#  if (ACC_ARCH_MIPS) && defined(_MIPS_SZPTR)
-    ACCCHK_ASSERT((_MIPS_SZPTR) == 8 * sizeof(void *))
-#  endif
-#endif
-    ACCCHK_ASSERT(1 == 1)
-    ACCCHK_ASSERT(__ACC_MASK_GEN(1u,2) == 3)
-    ACCCHK_ASSERT(__ACC_MASK_GEN(1u,8) == 255)
-#if (SIZEOF_INT >= 2)
-    ACCCHK_ASSERT(__ACC_MASK_GEN(1,15) == 32767)
-    ACCCHK_ASSERT(__ACC_MASK_GEN(1u,16) == 0xffffU)
-#else
-    ACCCHK_ASSERT(__ACC_MASK_GEN(1ul,16) == 0xffffUL)
-#endif
-#if (SIZEOF_INT >= 4)
-    ACCCHK_ASSERT(__ACC_MASK_GEN(1,31) == 2147483647)
-    ACCCHK_ASSERT(__ACC_MASK_GEN(1u,32) == 0xffffffffU)
-#endif
-#if (SIZEOF_LONG >= 4)
-    ACCCHK_ASSERT(__ACC_MASK_GEN(1ul,32) == 0xffffffffUL)
-#endif
-#if (SIZEOF_LONG >= 8)
-    ACCCHK_ASSERT(__ACC_MASK_GEN(1ul,64) == 0xffffffffffffffffUL)
-#endif
-#if !(ACC_BROKEN_INTEGRAL_PROMOTION)
-    ACCCHK_ASSERT(__ACC_MASK_GEN(1u,SIZEOF_INT*8) == ~0u)
-    ACCCHK_ASSERT(__ACC_MASK_GEN(1ul,SIZEOF_LONG*8) == ~0ul)
-#endif
-#if !(ACC_BROKEN_SIGNED_RIGHT_SHIFT)
-    ACCCHK_ASSERT(((-1) >> 7) == -1)
-#endif
-    ACCCHK_ASSERT(((1)  >> 7) == 0)
-    ACCCHK_ASSERT((~0l  & ~0)  == ~0l)
-    ACCCHK_ASSERT((~0l  & ~0u) == ~0u)
-    ACCCHK_ASSERT((~0ul & ~0)  == ~0ul)
-    ACCCHK_ASSERT((~0ul & ~0u) == ~0u)
-#if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150)
-#elif (SIZEOF_INT == 2)
-    ACCCHK_ASSERT((~0l  & ~0u) == 0xffffU)
-    ACCCHK_ASSERT((~0ul & ~0u) == 0xffffU)
-#elif (SIZEOF_INT == 4)
-    ACCCHK_ASSERT((~0l  & ~0u) == 0xffffffffU)
-    ACCCHK_ASSERT((~0ul & ~0u) == 0xffffffffU)
-#endif
-    ACCCHK_ASSERT_IS_SIGNED_T(signed char)
-    ACCCHK_ASSERT_IS_UNSIGNED_T(unsigned char)
-    ACCCHK_ASSERT(sizeof(signed char) == sizeof(char))
-    ACCCHK_ASSERT(sizeof(unsigned char) == sizeof(char))
-    ACCCHK_ASSERT(sizeof(char) == 1)
-#if (ACC_CC_CILLY) && (!defined(__CILLY__) || (__CILLY__ < 0x010302L))
-#else
-    ACCCHK_ASSERT(sizeof(char) == sizeof((char)0))
-#endif
-#if defined(__cplusplus)
-    ACCCHK_ASSERT(sizeof('\0') == sizeof(char))
-#else
-#  if (ACC_CC_DMC)
-#  else
-    ACCCHK_ASSERT(sizeof('\0') == sizeof(int))
-#  endif
-#endif
-#if defined(__acc_alignof)
-    ACCCHK_ASSERT(__acc_alignof(char) == 1)
-    ACCCHK_ASSERT(__acc_alignof(signed char) == 1)
-    ACCCHK_ASSERT(__acc_alignof(unsigned char) == 1)
-#if defined(acc_int16e_t)
-    ACCCHK_ASSERT(__acc_alignof(acc_int16e_t) >= 1)
-    ACCCHK_ASSERT(__acc_alignof(acc_int16e_t) <= 2)
-#endif
-#if defined(acc_int32e_t)
-    ACCCHK_ASSERT(__acc_alignof(acc_int32e_t) >= 1)
-    ACCCHK_ASSERT(__acc_alignof(acc_int32e_t) <= 4)
-#endif
-#endif
-    ACCCHK_ASSERT_IS_SIGNED_T(short)
-    ACCCHK_ASSERT_IS_UNSIGNED_T(unsigned short)
-    ACCCHK_ASSERT(sizeof(short) == sizeof(unsigned short))
-#if !(ACC_ABI_I8LP16)
-    ACCCHK_ASSERT(sizeof(short) >= 2)
-#endif
-    ACCCHK_ASSERT(sizeof(short) >= sizeof(char))
-#if (ACC_CC_CILLY) && (!defined(__CILLY__) || (__CILLY__ < 0x010302L))
-#else
-    ACCCHK_ASSERT(sizeof(short) == sizeof((short)0))
-#endif
-#if (SIZEOF_SHORT > 0)
-    ACCCHK_ASSERT(sizeof(short) == SIZEOF_SHORT)
-#endif
-    ACCCHK_ASSERT_IS_SIGNED_T(int)
-    ACCCHK_ASSERT_IS_UNSIGNED_T(unsigned int)
-    ACCCHK_ASSERT(sizeof(int) == sizeof(unsigned int))
-#if !(ACC_ABI_I8LP16)
-    ACCCHK_ASSERT(sizeof(int) >= 2)
-#endif
-    ACCCHK_ASSERT(sizeof(int) >= sizeof(short))
-    ACCCHK_ASSERT(sizeof(int) == sizeof(0))
-    ACCCHK_ASSERT(sizeof(int) == sizeof((int)0))
-#if (SIZEOF_INT > 0)
-    ACCCHK_ASSERT(sizeof(int) == SIZEOF_INT)
-#endif
-    ACCCHK_ASSERT(sizeof(0) == sizeof(int))
-    ACCCHK_ASSERT_IS_SIGNED_T(long)
-    ACCCHK_ASSERT_IS_UNSIGNED_T(unsigned long)
-    ACCCHK_ASSERT(sizeof(long) == sizeof(unsigned long))
-#if !(ACC_ABI_I8LP16)
-    ACCCHK_ASSERT(sizeof(long) >= 4)
-#endif
-    ACCCHK_ASSERT(sizeof(long) >= sizeof(int))
-    ACCCHK_ASSERT(sizeof(long) == sizeof(0L))
-    ACCCHK_ASSERT(sizeof(long) == sizeof((long)0))
-#if (SIZEOF_LONG > 0)
-    ACCCHK_ASSERT(sizeof(long) == SIZEOF_LONG)
-#endif
-    ACCCHK_ASSERT(sizeof(0L) == sizeof(long))
-    ACCCHK_ASSERT_IS_UNSIGNED_T(size_t)
-    ACCCHK_ASSERT(sizeof(size_t) >= sizeof(int))
-    ACCCHK_ASSERT(sizeof(size_t) == sizeof(sizeof(0)))
-#if (SIZEOF_SIZE_T > 0)
-    ACCCHK_ASSERT(sizeof(size_t) == SIZEOF_SIZE_T)
-#endif
-    ACCCHK_ASSERT_IS_SIGNED_T(ptrdiff_t)
-    ACCCHK_ASSERT(sizeof(ptrdiff_t) >= sizeof(int))
-    ACCCHK_ASSERT(sizeof(ptrdiff_t) >= sizeof(size_t))
-#if !(ACC_BROKEN_SIZEOF)
-    ACCCHK_ASSERT(sizeof(ptrdiff_t) == sizeof((char*)0 - (char*)0))
-# if (ACC_HAVE_MM_HUGE_PTR)
-    ACCCHK_ASSERT(4 == sizeof((char __huge*)0 - (char __huge*)0))
-# endif
-#endif
-#if (SIZEOF_PTRDIFF_T > 0)
-    ACCCHK_ASSERT(sizeof(ptrdiff_t) == SIZEOF_PTRDIFF_T)
-#endif
-    ACCCHK_ASSERT(sizeof(void*) >= sizeof(char*))
-#if (SIZEOF_VOID_P > 0)
-    ACCCHK_ASSERT(sizeof(void*) == SIZEOF_VOID_P)
-    ACCCHK_ASSERT(sizeof(char*) == SIZEOF_VOID_P)
-#endif
-#if (ACC_HAVE_MM_HUGE_PTR)
-    ACCCHK_ASSERT(4 == sizeof(void __huge*))
-    ACCCHK_ASSERT(4 == sizeof(char __huge*))
-#endif
-#if (ACC_ABI_I8LP16)
-    ACCCHK_ASSERT((((1u  <<  7) + 1) >>  7) == 1)
-    ACCCHK_ASSERT((((1ul << 15) + 1) >> 15) == 1)
-#else
-    ACCCHK_ASSERT((((1u  << 15) + 1) >> 15) == 1)
-    ACCCHK_ASSERT((((1ul << 31) + 1) >> 31) == 1)
-#endif
-#if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150)
-#elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
-#else
-    ACCCHK_ASSERT((1   << (8*SIZEOF_INT-1)) < 0)
-#endif
-    ACCCHK_ASSERT((1u  << (8*SIZEOF_INT-1)) > 0)
-#if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
-#else
-    ACCCHK_ASSERT((1l  << (8*SIZEOF_LONG-1)) < 0)
-#endif
-    ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0)
-#if defined(acc_int16e_t)
-    ACCCHK_ASSERT(sizeof(acc_int16e_t) == 2)
-    ACCCHK_ASSERT(sizeof(acc_int16e_t) == SIZEOF_ACC_INT16E_T)
-    ACCCHK_ASSERT(sizeof(acc_uint16e_t) == 2)
-    ACCCHK_ASSERT(sizeof(acc_int16e_t) == sizeof(acc_uint16e_t))
-    ACCCHK_ASSERT_IS_SIGNED_T(acc_int16e_t)
-    ACCCHK_ASSERT_IS_UNSIGNED_T(acc_uint16e_t)
-#if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150)
-#else
-    ACCCHK_ASSERT(((acc_uint16e_t)(~(acc_uint16e_t)0ul) >> 15) == 1)
-#endif
-    ACCCHK_ASSERT( (acc_int16e_t) (1 + ~(acc_int16e_t)0) == 0)
-#if defined(ACCCHK_CFG_PEDANTIC)
-    ACCCHK_ASSERT( (acc_uint16e_t)(1 + ~(acc_uint16e_t)0) == 0)
-#endif
-#endif
-#if defined(acc_int32e_t)
-    ACCCHK_ASSERT(sizeof(acc_int32e_t) == 4)
-    ACCCHK_ASSERT(sizeof(acc_int32e_t) == SIZEOF_ACC_INT32E_T)
-    ACCCHK_ASSERT(sizeof(acc_uint32e_t) == 4)
-    ACCCHK_ASSERT(sizeof(acc_int32e_t) == sizeof(acc_uint32e_t))
-    ACCCHK_ASSERT_IS_SIGNED_T(acc_int32e_t)
-    ACCCHK_ASSERT(((( (acc_int32e_t)1 << 30) + 1) >> 30) == 1)
-    ACCCHK_ASSERT_IS_UNSIGNED_T(acc_uint32e_t)
-    ACCCHK_ASSERT(((( (acc_uint32e_t)1 << 31) + 1) >> 31) == 1)
-    ACCCHK_ASSERT(((acc_uint32e_t)(~(acc_uint32e_t)0ul) >> 31) == 1)
-    ACCCHK_ASSERT( (acc_int32e_t) (1 + ~(acc_int32e_t)0) == 0)
-#if defined(ACCCHK_CFG_PEDANTIC)
-    ACCCHK_ASSERT( (acc_uint32e_t)(1 + ~(acc_uint32e_t)0) == 0)
-#endif
-#endif
-#if defined(acc_int32e_t)
-    ACCCHK_ASSERT(sizeof(acc_int32l_t) >= sizeof(acc_int32e_t))
-#endif
-    ACCCHK_ASSERT(sizeof(acc_int32l_t) >= 4)
-    ACCCHK_ASSERT(sizeof(acc_int32l_t) == SIZEOF_ACC_INT32L_T)
-    ACCCHK_ASSERT(sizeof(acc_uint32l_t) >= 4)
-    ACCCHK_ASSERT(sizeof(acc_int32l_t) == sizeof(acc_uint32l_t))
-    ACCCHK_ASSERT_IS_SIGNED_T(acc_int32l_t)
-    ACCCHK_ASSERT(((( (acc_int32l_t)1 << 30) + 1) >> 30) == 1)
-    ACCCHK_ASSERT_IS_UNSIGNED_T(acc_uint32l_t)
-    ACCCHK_ASSERT(((( (acc_uint32l_t)1 << 31) + 1) >> 31) == 1)
-    ACCCHK_ASSERT(sizeof(acc_int32f_t) >= sizeof(int))
-#if defined(acc_int32e_t)
-    ACCCHK_ASSERT(sizeof(acc_int32f_t) >= sizeof(acc_int32e_t))
-#endif
-    ACCCHK_ASSERT(sizeof(acc_int32f_t) >= sizeof(acc_int32l_t))
-    ACCCHK_ASSERT(sizeof(acc_int32f_t) >= 4)
-    ACCCHK_ASSERT(sizeof(acc_int32f_t) >= sizeof(acc_int32l_t))
-    ACCCHK_ASSERT(sizeof(acc_int32f_t) == SIZEOF_ACC_INT32F_T)
-    ACCCHK_ASSERT(sizeof(acc_uint32f_t) >= 4)
-    ACCCHK_ASSERT(sizeof(acc_uint32f_t) >= sizeof(acc_uint32l_t))
-    ACCCHK_ASSERT(sizeof(acc_int32f_t) == sizeof(acc_uint32f_t))
-    ACCCHK_ASSERT_IS_SIGNED_T(acc_int32f_t)
-    ACCCHK_ASSERT(((( (acc_int32f_t)1 << 30) + 1) >> 30) == 1)
-    ACCCHK_ASSERT_IS_UNSIGNED_T(acc_uint32f_t)
-    ACCCHK_ASSERT(((( (acc_uint32f_t)1 << 31) + 1) >> 31) == 1)
-#if defined(acc_int64e_t)
-    ACCCHK_ASSERT(sizeof(acc_int64e_t) == 8)
-    ACCCHK_ASSERT(sizeof(acc_int64e_t) == SIZEOF_ACC_INT64E_T)
-    ACCCHK_ASSERT(sizeof(acc_uint64e_t) == 8)
-    ACCCHK_ASSERT(sizeof(acc_int64e_t) == sizeof(acc_uint64e_t))
-    ACCCHK_ASSERT_IS_SIGNED_T(acc_int64e_t)
-#if (ACC_CC_BORLANDC && (__BORLANDC__ < 0x0530))
-#else
-    ACCCHK_ASSERT_IS_UNSIGNED_T(acc_uint64e_t)
-#endif
-#endif
-#if defined(acc_int64l_t)
-#if defined(acc_int64e_t)
-    ACCCHK_ASSERT(sizeof(acc_int64l_t) >= sizeof(acc_int64e_t))
-#endif
-    ACCCHK_ASSERT(sizeof(acc_int64l_t) >= 8)
-    ACCCHK_ASSERT(sizeof(acc_int64l_t) == SIZEOF_ACC_INT64L_T)
-    ACCCHK_ASSERT(sizeof(acc_uint64l_t) >= 8)
-    ACCCHK_ASSERT(sizeof(acc_int64l_t) == sizeof(acc_uint64l_t))
-    ACCCHK_ASSERT_IS_SIGNED_T(acc_int64l_t)
-    ACCCHK_ASSERT(((( (acc_int64l_t)1 << 62) + 1) >> 62) == 1)
-    ACCCHK_ASSERT(((( ACC_INT64_C(1) << 62) + 1) >> 62) == 1)
-#if (ACC_CC_BORLANDC && (__BORLANDC__ < 0x0530))
-#else
-    ACCCHK_ASSERT_IS_UNSIGNED_T(acc_uint64l_t)
-    ACCCHK_ASSERT(ACC_UINT64_C(18446744073709551615)     > 0)
-#endif
-    ACCCHK_ASSERT(((( (acc_uint64l_t)1 << 63) + 1) >> 63) == 1)
-    ACCCHK_ASSERT(((( ACC_UINT64_C(1) << 63) + 1) >> 63) == 1)
-#if (ACC_CC_GNUC && (ACC_CC_GNUC < 0x020600ul))
-    ACCCHK_ASSERT(ACC_INT64_C(9223372036854775807)       > ACC_INT64_C(0))
-#else
-    ACCCHK_ASSERT(ACC_INT64_C(9223372036854775807)       > 0)
-#endif
-    ACCCHK_ASSERT(ACC_INT64_C(-9223372036854775807) - 1  < 0)
-    ACCCHK_ASSERT( ACC_INT64_C(9223372036854775807) % ACC_INT32_C(2147483629)  == 721)
-    ACCCHK_ASSERT( ACC_INT64_C(9223372036854775807) % ACC_INT32_C(2147483647)  == 1)
-    ACCCHK_ASSERT(ACC_UINT64_C(9223372036854775807) % ACC_UINT32_C(2147483629) == 721)
-    ACCCHK_ASSERT(ACC_UINT64_C(9223372036854775807) % ACC_UINT32_C(2147483647) == 1)
-#endif
-#if !defined(__ACC_INTPTR_T_IS_POINTER)
-    ACCCHK_ASSERT_IS_SIGNED_T(acc_intptr_t)
-    ACCCHK_ASSERT_IS_UNSIGNED_T(acc_uintptr_t)
-#endif
-    ACCCHK_ASSERT(sizeof(acc_intptr_t) >= sizeof(void *))
-    ACCCHK_ASSERT(sizeof(acc_intptr_t) == SIZEOF_ACC_INTPTR_T)
-    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(acc_uintptr_t))
-#if defined(acc_word_t)
-    ACCCHK_ASSERT(ACC_WORDSIZE == SIZEOF_ACC_WORD_T)
-    ACCCHK_ASSERT_IS_UNSIGNED_T(acc_word_t)
-    ACCCHK_ASSERT_IS_SIGNED_T(acc_sword_t)
-    ACCCHK_ASSERT(sizeof(acc_word_t) == SIZEOF_ACC_WORD_T)
-    ACCCHK_ASSERT(sizeof(acc_word_t) == sizeof(acc_sword_t))
-#endif
-#if defined(ACC_INT16_C)
-    ACCCHK_ASSERT(sizeof(ACC_INT16_C(0)) >= 2)
-    ACCCHK_ASSERT(sizeof(ACC_UINT16_C(0)) >= 2)
-    ACCCHK_ASSERT((ACC_UINT16_C(0xffff) >> 15) == 1)
-#endif
-#if defined(ACC_INT32_C)
-    ACCCHK_ASSERT(sizeof(ACC_INT32_C(0)) >= 4)
-    ACCCHK_ASSERT(sizeof(ACC_UINT32_C(0)) >= 4)
-    ACCCHK_ASSERT((ACC_UINT32_C(0xffffffff) >> 31) == 1)
-#endif
-#if defined(ACC_INT64_C)
-#if (ACC_CC_BORLANDC && (__BORLANDC__ < 0x0560))
-#else
-    ACCCHK_ASSERT(sizeof(ACC_INT64_C(0)) >= 8)
-    ACCCHK_ASSERT(sizeof(ACC_UINT64_C(0)) >= 8)
-#endif
-    ACCCHK_ASSERT((ACC_UINT64_C(0xffffffffffffffff) >> 63) == 1)
-    ACCCHK_ASSERT((ACC_UINT64_C(0xffffffffffffffff) & ~0)  == ACC_UINT64_C(0xffffffffffffffff))
-    ACCCHK_ASSERT((ACC_UINT64_C(0xffffffffffffffff) & ~0l) == ACC_UINT64_C(0xffffffffffffffff))
-#if (SIZEOF_INT == 4)
-# if (ACC_CC_GNUC && (ACC_CC_GNUC < 0x020000ul))
-# else
-    ACCCHK_ASSERT((ACC_UINT64_C(0xffffffffffffffff) & ~0u) == 0xffffffffu)
-# endif
-#endif
-#if (SIZEOF_LONG == 4)
-# if (ACC_CC_GNUC && (ACC_CC_GNUC < 0x020000ul))
-# else
-    ACCCHK_ASSERT((ACC_UINT64_C(0xffffffffffffffff) & ~0ul) == 0xfffffffful)
-# endif
-#endif
-#endif
-#if (ACC_MM_TINY || ACC_MM_SMALL || ACC_MM_MEDIUM)
-    ACCCHK_ASSERT(sizeof(void*) == 2)
-    ACCCHK_ASSERT(sizeof(ptrdiff_t) == 2)
-#elif (ACC_MM_COMPACT || ACC_MM_LARGE || ACC_MM_HUGE)
-    ACCCHK_ASSERT(sizeof(void*) == 4)
-#endif
-#if (ACC_MM_TINY || ACC_MM_SMALL || ACC_MM_COMPACT)
-    ACCCHK_ASSERT(sizeof(void (*)(void)) == 2)
-#elif (ACC_MM_MEDIUM || ACC_MM_LARGE || ACC_MM_HUGE)
-    ACCCHK_ASSERT(sizeof(void (*)(void)) == 4)
-#endif
-#if (ACC_ABI_ILP32)
-    ACCCHK_ASSERT(sizeof(int) == 4)
-    ACCCHK_ASSERT(sizeof(long) == 4)
-    ACCCHK_ASSERT(sizeof(void*) == 4)
-    ACCCHK_ASSERT(sizeof(ptrdiff_t) == sizeof(void*))
-    ACCCHK_ASSERT(sizeof(size_t) == sizeof(void*))
-    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
-#endif
-#if (ACC_ABI_ILP64)
-    ACCCHK_ASSERT(sizeof(int) == 8)
-    ACCCHK_ASSERT(sizeof(long) == 8)
-    ACCCHK_ASSERT(sizeof(void*) == 8)
-    ACCCHK_ASSERT(sizeof(ptrdiff_t) == sizeof(void*))
-    ACCCHK_ASSERT(sizeof(size_t) == sizeof(void*))
-    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
-#endif
-#if (ACC_ABI_IP32L64)
-    ACCCHK_ASSERT(sizeof(int) == 4)
-    ACCCHK_ASSERT(sizeof(long) == 8)
-    ACCCHK_ASSERT(sizeof(void*) == 4)
-    ACCCHK_ASSERT(sizeof(ptrdiff_t) == sizeof(void*))
-    ACCCHK_ASSERT(sizeof(size_t) == sizeof(void*))
-    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
-#endif
-#if (ACC_ABI_LLP64)
-    ACCCHK_ASSERT(sizeof(int) == 4)
-    ACCCHK_ASSERT(sizeof(long) == 4)
-    ACCCHK_ASSERT(sizeof(void*) == 8)
-    ACCCHK_ASSERT(sizeof(ptrdiff_t) == sizeof(void*))
-    ACCCHK_ASSERT(sizeof(size_t) == sizeof(void*))
-    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
-#endif
-#if (ACC_ABI_LP32)
-    ACCCHK_ASSERT(sizeof(int) == 2)
-    ACCCHK_ASSERT(sizeof(long) == 4)
-    ACCCHK_ASSERT(sizeof(void*) == 4)
-    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
-#endif
-#if (ACC_ABI_LP64)
-    ACCCHK_ASSERT(sizeof(int) == 4)
-    ACCCHK_ASSERT(sizeof(long) == 8)
-    ACCCHK_ASSERT(sizeof(void*) == 8)
-    ACCCHK_ASSERT(sizeof(ptrdiff_t) == sizeof(void*))
-    ACCCHK_ASSERT(sizeof(size_t) == sizeof(void*))
-    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
-#endif
-#if (ACC_ARCH_I086)
-    ACCCHK_ASSERT(sizeof(size_t) == 2)
-    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
-#elif (ACC_ARCH_I386 || ACC_ARCH_M68K)
-    ACCCHK_ASSERT(sizeof(size_t) == 4)
-    ACCCHK_ASSERT(sizeof(ptrdiff_t) == 4)
-    ACCCHK_ASSERT(sizeof(acc_intptr_t) == sizeof(void *))
-#endif
-#if (ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_WIN32)
-    ACCCHK_ASSERT(sizeof(size_t) == 4)
-    ACCCHK_ASSERT(sizeof(ptrdiff_t) == 4)
-    ACCCHK_ASSERT(sizeof(void (*)(void)) == 4)
-#elif (ACC_OS_WIN64)
-    ACCCHK_ASSERT(sizeof(size_t) == 8)
-    ACCCHK_ASSERT(sizeof(ptrdiff_t) == 8)
-    ACCCHK_ASSERT(sizeof(void (*)(void)) == 8)
-#endif
-#if (ACC_CC_NDPC)
-#elif (SIZEOF_INT > 1)
-    ACCCHK_ASSERT( (int) ((unsigned char) ((signed char) -1)) == 255)
-#endif
-#if (ACC_CC_KEILC)
-#elif (ACC_CC_NDPC)
-#elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC)
-#elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
-#elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1)
-    ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
-#endif
-#if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560))
-#  pragma option pop
-#endif
-#endif
-#if defined(ACC_WANT_ACCLIB_UA)
-#  undef ACC_WANT_ACCLIB_UA
-#define __ACCLIB_UA_CH_INCLUDED 1
-#if !defined(ACCLIB_PUBLIC)
-#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
-#endif
-ACCLIB_PUBLIC(unsigned, acc_ua_get_be16) (const acc_hvoid_p p)
-{
-#if defined(ACC_UA_GET_BE16)
-    return ACC_UA_GET_BE16(p);
-#else
-    const acc_hbyte_p b = (const acc_hbyte_p) p;
-    return ((unsigned)b[1]) | ((unsigned)b[0] << 8);
-#endif
-}
-ACCLIB_PUBLIC(acc_uint32l_t, acc_ua_get_be24) (const acc_hvoid_p p)
-{
-    const acc_hbyte_p b = (const acc_hbyte_p) p;
-    return ((acc_uint32l_t)b[2]) | ((acc_uint32l_t)b[1] << 8) | ((acc_uint32l_t)b[0] << 16);
-}
-ACCLIB_PUBLIC(acc_uint32l_t, acc_ua_get_be32) (const acc_hvoid_p p)
-{
-#if defined(ACC_UA_GET_BE32)
-    return ACC_UA_GET_BE32(p);
-#else
-    const acc_hbyte_p b = (const acc_hbyte_p) p;
-    return ((acc_uint32l_t)b[3]) | ((acc_uint32l_t)b[2] << 8) | ((acc_uint32l_t)b[1] << 16) | ((acc_uint32l_t)b[0] << 24);
-#endif
-}
-ACCLIB_PUBLIC(void, acc_ua_set_be16) (acc_hvoid_p p, unsigned v)
-{
-#if defined(ACC_UA_SET_BE16)
-    ACC_UA_SET_BE16(p, v);
-#else
-    acc_hbyte_p b = (acc_hbyte_p) p;
-    b[1] = (unsigned char) ((v >>  0) & 0xff);
-    b[0] = (unsigned char) ((v >>  8) & 0xff);
-#endif
-}
-ACCLIB_PUBLIC(void, acc_ua_set_be24) (acc_hvoid_p p, acc_uint32l_t v)
-{
-    acc_hbyte_p b = (acc_hbyte_p) p;
-    b[2] = (unsigned char) ((v >>  0) & 0xff);
-    b[1] = (unsigned char) ((v >>  8) & 0xff);
-    b[0] = (unsigned char) ((v >> 16) & 0xff);
-}
-ACCLIB_PUBLIC(void, acc_ua_set_be32) (acc_hvoid_p p, acc_uint32l_t v)
-{
-#if defined(ACC_UA_SET_BE32)
-    ACC_UA_SET_BE32(p, v);
-#else
-    acc_hbyte_p b = (acc_hbyte_p) p;
-    b[3] = (unsigned char) ((v >>  0) & 0xff);
-    b[2] = (unsigned char) ((v >>  8) & 0xff);
-    b[1] = (unsigned char) ((v >> 16) & 0xff);
-    b[0] = (unsigned char) ((v >> 24) & 0xff);
-#endif
-}
-ACCLIB_PUBLIC(unsigned, acc_ua_get_le16) (const acc_hvoid_p p)
-{
-#if defined(ACC_UA_GET_LE16)
-    return ACC_UA_GET_LE16(p);
-#else
-    const acc_hbyte_p b = (const acc_hbyte_p) p;
-    return ((unsigned)b[0]) | ((unsigned)b[1] << 8);
-#endif
-}
-ACCLIB_PUBLIC(acc_uint32l_t, acc_ua_get_le24) (const acc_hvoid_p p)
-{
-    const acc_hbyte_p b = (const acc_hbyte_p) p;
-    return ((acc_uint32l_t)b[0]) | ((acc_uint32l_t)b[1] << 8) | ((acc_uint32l_t)b[2] << 16);
-}
-ACCLIB_PUBLIC(acc_uint32l_t, acc_ua_get_le32) (const acc_hvoid_p p)
-{
-#if defined(ACC_UA_GET_LE32)
-    return ACC_UA_GET_LE32(p);
-#else
-    const acc_hbyte_p b = (const acc_hbyte_p) p;
-    return ((acc_uint32l_t)b[0]) | ((acc_uint32l_t)b[1] << 8) | ((acc_uint32l_t)b[2] << 16) | ((acc_uint32l_t)b[3] << 24);
-#endif
-}
-ACCLIB_PUBLIC(void, acc_ua_set_le16) (acc_hvoid_p p, unsigned v)
-{
-#if defined(ACC_UA_SET_LE16)
-    ACC_UA_SET_LE16(p, v);
-#else
-    acc_hbyte_p b = (acc_hbyte_p) p;
-    b[0] = (unsigned char) ((v >>  0) & 0xff);
-    b[1] = (unsigned char) ((v >>  8) & 0xff);
-#endif
-}
-ACCLIB_PUBLIC(void, acc_ua_set_le24) (acc_hvoid_p p, acc_uint32l_t v)
-{
-    acc_hbyte_p b = (acc_hbyte_p) p;
-    b[0] = (unsigned char) ((v >>  0) & 0xff);
-    b[1] = (unsigned char) ((v >>  8) & 0xff);
-    b[2] = (unsigned char) ((v >> 16) & 0xff);
-}
-ACCLIB_PUBLIC(void, acc_ua_set_le32) (acc_hvoid_p p, acc_uint32l_t v)
-{
-#if defined(ACC_UA_SET_LE32)
-    ACC_UA_SET_LE32(p, v);
-#else
-    acc_hbyte_p b = (acc_hbyte_p) p;
-    b[0] = (unsigned char) ((v >>  0) & 0xff);
-    b[1] = (unsigned char) ((v >>  8) & 0xff);
-    b[2] = (unsigned char) ((v >> 16) & 0xff);
-    b[3] = (unsigned char) ((v >> 24) & 0xff);
-#endif
-}
-#if defined(acc_int64l_t)
-ACCLIB_PUBLIC(acc_uint64l_t, acc_ua_get_be64) (const acc_hvoid_p p)
-{
-#if defined(ACC_UA_GET_BE64)
-    return ACC_UA_GET_BE64(p);
-#elif defined(ACC_UA_GET_BE32)
-    const acc_hbyte_p b = (const acc_hbyte_p) p;
-    acc_uint32e_t v0, v1;
-    v1 = ACC_UA_GET_BE32(b + 0);
-    v0 = ACC_UA_GET_BE32(b + 4);
-    return ((acc_uint64l_t)v0) | ((acc_uint64l_t)v1 << 32);
-#elif (ACC_SIZEOF_LONG >= 8) || (ACC_SIZEOF_SIZE_T >= 8)
-    const acc_hbyte_p b = (const acc_hbyte_p) p;
-    return ((acc_uint64l_t)b[7]) | ((acc_uint64l_t)b[6] << 8) | ((acc_uint64l_t)b[5] << 16) | ((acc_uint64l_t)b[4] << 24) | ((acc_uint64l_t)b[3] << 32) | ((acc_uint64l_t)b[2] << 40) | ((acc_uint64l_t)b[1] << 48) | ((acc_uint64l_t)b[0] << 56);
-#else
-    const acc_hbyte_p b = (const acc_hbyte_p) p;
-    acc_uint32l_t v0, v1;
-    v1 = ((acc_uint32l_t)b[3]) | ((acc_uint32l_t)b[2] << 8) | ((acc_uint32l_t)b[1] << 16) | ((acc_uint32l_t)b[0] << 24);
-    b += 4;
-    v0 = ((acc_uint32l_t)b[3]) | ((acc_uint32l_t)b[2] << 8) | ((acc_uint32l_t)b[1] << 16) | ((acc_uint32l_t)b[0] << 24);
-    return ((acc_uint64l_t)v0) | ((acc_uint64l_t)v1 << 32);
-#endif
-}
-ACCLIB_PUBLIC(void, acc_ua_set_be64) (acc_hvoid_p p, acc_uint64l_t v)
-{
-#if defined(ACC_UA_SET_BE64)
-    ACC_UA_SET_BE64(p, v);
-#elif defined(ACC_UA_SET_BE32)
-    acc_hbyte_p b = (acc_hbyte_p) p;
-    ACC_UA_SET_BE32(b + 4, (v >>  0));
-    ACC_UA_SET_BE32(b + 0, (v >> 32));
-#elif (ACC_SIZEOF_LONG >= 8) || (ACC_SIZEOF_SIZE_T >= 8)
-    acc_hbyte_p b = (acc_hbyte_p) p;
-    b[7] = (unsigned char) ((v >>  0) & 0xff);
-    b[6] = (unsigned char) ((v >>  8) & 0xff);
-    b[5] = (unsigned char) ((v >> 16) & 0xff);
-    b[4] = (unsigned char) ((v >> 24) & 0xff);
-    b[3] = (unsigned char) ((v >> 32) & 0xff);
-    b[2] = (unsigned char) ((v >> 40) & 0xff);
-    b[1] = (unsigned char) ((v >> 48) & 0xff);
-    b[0] = (unsigned char) ((v >> 56) & 0xff);
-#else
-    acc_hbyte_p b = (acc_hbyte_p) p;
-    acc_uint32l_t x;
-    x = (acc_uint32l_t) (v >>  0);
-    b[7] = (unsigned char) ((x >>  0) & 0xff);
-    b[6] = (unsigned char) ((x >>  8) & 0xff);
-    b[5] = (unsigned char) ((x >> 16) & 0xff);
-    b[4] = (unsigned char) ((x >> 24) & 0xff);
-    x = (acc_uint32l_t) (v >> 32);
-    b[3] = (unsigned char) ((x >>  0) & 0xff);
-    b[2] = (unsigned char) ((x >>  8) & 0xff);
-    b[1] = (unsigned char) ((x >> 16) & 0xff);
-    b[0] = (unsigned char) ((x >> 24) & 0xff);
-#endif
-}
-#endif
-#if defined(acc_int64l_t)
-ACCLIB_PUBLIC(acc_uint64l_t, acc_ua_get_le64) (const acc_hvoid_p p)
-{
-#if defined(ACC_UA_GET_LE64)
-    return ACC_UA_GET_LE64(p);
-#elif defined(ACC_UA_GET_LE32)
-    const acc_hbyte_p b = (const acc_hbyte_p) p;
-    acc_uint32e_t v0, v1;
-    v0 = ACC_UA_GET_LE32(b + 0);
-    v1 = ACC_UA_GET_LE32(b + 4);
-    return ((acc_uint64l_t)v0) | ((acc_uint64l_t)v1 << 32);
-#elif (ACC_SIZEOF_LONG >= 8) || (ACC_SIZEOF_SIZE_T >= 8)
-    const acc_hbyte_p b = (const acc_hbyte_p) p;
-    return ((acc_uint64l_t)b[0]) | ((acc_uint64l_t)b[1] << 8) | ((acc_uint64l_t)b[2] << 16) | ((acc_uint64l_t)b[3] << 24) | ((acc_uint64l_t)b[4] << 32) | ((acc_uint64l_t)b[5] << 40) | ((acc_uint64l_t)b[6] << 48) | ((acc_uint64l_t)b[7] << 56);
-#else
-    const acc_hbyte_p b = (const acc_hbyte_p) p;
-    acc_uint32l_t v0, v1;
-    v0 = ((acc_uint32l_t)b[0]) | ((acc_uint32l_t)b[1] << 8) | ((acc_uint32l_t)b[2] << 16) | ((acc_uint32l_t)b[3] << 24);
-    b += 4;
-    v1 = ((acc_uint32l_t)b[0]) | ((acc_uint32l_t)b[1] << 8) | ((acc_uint32l_t)b[2] << 16) | ((acc_uint32l_t)b[3] << 24);
-    return ((acc_uint64l_t)v0) | ((acc_uint64l_t)v1 << 32);
-#endif
-}
-ACCLIB_PUBLIC(void, acc_ua_set_le64) (acc_hvoid_p p, acc_uint64l_t v)
-{
-#if defined(ACC_UA_SET_LE64)
-    ACC_UA_SET_LE64(p, v);
-#elif defined(ACC_UA_SET_LE32)
-    acc_hbyte_p b = (acc_hbyte_p) p;
-    ACC_UA_SET_LE32(b + 0, (v >>  0));
-    ACC_UA_SET_LE32(b + 4, (v >> 32));
-#elif (ACC_SIZEOF_LONG >= 8) || (ACC_SIZEOF_SIZE_T >= 8)
-    acc_hbyte_p b = (acc_hbyte_p) p;
-    b[0] = (unsigned char) ((v >>  0) & 0xff);
-    b[1] = (unsigned char) ((v >>  8) & 0xff);
-    b[2] = (unsigned char) ((v >> 16) & 0xff);
-    b[3] = (unsigned char) ((v >> 24) & 0xff);
-    b[4] = (unsigned char) ((v >> 32) & 0xff);
-    b[5] = (unsigned char) ((v >> 40) & 0xff);
-    b[6] = (unsigned char) ((v >> 48) & 0xff);
-    b[7] = (unsigned char) ((v >> 56) & 0xff);
-#else
-    acc_hbyte_p b = (acc_hbyte_p) p;
-    acc_uint32l_t x;
-    x = (acc_uint32l_t) (v >>  0);
-    b[0] = (unsigned char) ((x >>  0) & 0xff);
-    b[1] = (unsigned char) ((x >>  8) & 0xff);
-    b[2] = (unsigned char) ((x >> 16) & 0xff);
-    b[3] = (unsigned char) ((x >> 24) & 0xff);
-    x = (acc_uint32l_t) (v >> 32);
-    b[4] = (unsigned char) ((x >>  0) & 0xff);
-    b[5] = (unsigned char) ((x >>  8) & 0xff);
-    b[6] = (unsigned char) ((x >> 16) & 0xff);
-    b[7] = (unsigned char) ((x >> 24) & 0xff);
-#endif
-}
-#endif
-#endif
-#if defined(ACC_WANT_ACCLIB_VGET)
-#  undef ACC_WANT_ACCLIB_VGET
-#define __ACCLIB_VGET_CH_INCLUDED 1
-#if !defined(ACCLIB_PUBLIC)
-#  define ACCLIB_PUBLIC(r,f)                r __ACCLIB_FUNCNAME(f)
-#endif
-#if !defined(ACCLIB_PUBLIC_NOINLINE)
-#  if !defined(__acc_noinline)
-#    define ACCLIB_PUBLIC_NOINLINE(r,f)     r __ACCLIB_FUNCNAME(f)
-#  elif (ACC_CC_CLANG || (ACC_CC_GNUC >= 0x030400ul) || ACC_CC_LLVM)
-#    define ACCLIB_PUBLIC_NOINLINE(r,f)     __acc_noinline __attribute__((__used__)) r __ACCLIB_FUNCNAME(f)
-#  else
-#    define ACCLIB_PUBLIC_NOINLINE(r,f)     __acc_noinline r __ACCLIB_FUNCNAME(f)
-#  endif
-#endif
-#if (ACC_CC_CLANG || (ACC_CC_GNUC >= 0x030400ul) || ACC_CC_LLVM)
-extern void* volatile __acc_vget_ptr;
-void* volatile __attribute__((__used__)) __acc_vget_ptr = (void *) 0;
-#else
-extern void* volatile __acc_vget_ptr;
-void* volatile __acc_vget_ptr = (void *) 0;
-#endif
-#ifndef __ACCLIB_VGET_BODY
-#define __ACCLIB_VGET_BODY(T) \
-    if __acc_unlikely(__acc_vget_ptr) { \
-        * (T *) __acc_vget_ptr = v; \
-        * (int *) __acc_vget_ptr = expr; \
-        v = * (T *) __acc_vget_ptr; \
-    } \
-    return v;
-#endif
-ACCLIB_PUBLIC_NOINLINE(short, acc_vget_short) (short v, int expr)
-{
-    __ACCLIB_VGET_BODY(short)
-}
-ACCLIB_PUBLIC_NOINLINE(int, acc_vget_int) (int v, int expr)
-{
-    __ACCLIB_VGET_BODY(int)
-}
-ACCLIB_PUBLIC_NOINLINE(long, acc_vget_long) (long v, int expr)
-{
-    __ACCLIB_VGET_BODY(long)
-}
-#if defined(acc_int64l_t)
-ACCLIB_PUBLIC_NOINLINE(acc_int64l_t, acc_vget_acc_int64l_t) (acc_int64l_t v, int expr)
-{
-    __ACCLIB_VGET_BODY(acc_int64l_t)
-}
-#endif
-ACCLIB_PUBLIC_NOINLINE(acc_hsize_t, acc_vget_acc_hsize_t) (acc_hsize_t v, int expr)
-{
-    __ACCLIB_VGET_BODY(acc_hsize_t)
-}
-#if !(ACC_CFG_NO_FLOAT)
-ACCLIB_PUBLIC_NOINLINE(float, acc_vget_float) (float v, int expr)
-{
-    __ACCLIB_VGET_BODY(float)
-}
-#endif
-#if !(ACC_CFG_NO_DOUBLE)
-ACCLIB_PUBLIC_NOINLINE(double, acc_vget_double) (double v, int expr)
-{
-    __ACCLIB_VGET_BODY(double)
-}
-#endif
-ACCLIB_PUBLIC_NOINLINE(acc_hvoid_p, acc_vget_acc_hvoid_p) (acc_hvoid_p v, int expr)
-{
-    __ACCLIB_VGET_BODY(acc_hvoid_p)
-}
-#if (ACC_ARCH_I086 && ACC_CC_TURBOC && (__TURBOC__ == 0x0295)) && !defined(__cplusplus)
-ACCLIB_PUBLIC_NOINLINE(acc_hvoid_p, acc_vget_acc_hvoid_cp) (const acc_hvoid_p vv, int expr)
-{
-    acc_hvoid_p v = (acc_hvoid_p) vv;
-    __ACCLIB_VGET_BODY(acc_hvoid_p)
-}
-#else
-ACCLIB_PUBLIC_NOINLINE(const acc_hvoid_p, acc_vget_acc_hvoid_cp) (const acc_hvoid_p v, int expr)
-{
-    __ACCLIB_VGET_BODY(const acc_hvoid_p)
-}
-#endif
-#endif
-#if defined(ACC_WANT_ACCLIB_HMEMCPY)
-#  undef ACC_WANT_ACCLIB_HMEMCPY
-#define __ACCLIB_HMEMCPY_CH_INCLUDED 1
-#if !defined(ACCLIB_PUBLIC)
-#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
-#endif
-ACCLIB_PUBLIC(int, acc_hmemcmp) (const acc_hvoid_p s1, const acc_hvoid_p s2, acc_hsize_t len)
-{
-#if (ACC_HAVE_MM_HUGE_PTR) || !(HAVE_MEMCMP)
-    const acc_hbyte_p p1 = (const acc_hbyte_p) s1;
-    const acc_hbyte_p p2 = (const acc_hbyte_p) s2;
-    if __acc_likely(len > 0) do
-    {
-        int d = *p1 - *p2;
-        if (d != 0)
-            return d;
-        p1++; p2++;
-    } while __acc_likely(--len > 0);
-    return 0;
-#else
-    return memcmp(s1, s2, len);
-#endif
-}
-ACCLIB_PUBLIC(acc_hvoid_p, acc_hmemcpy) (acc_hvoid_p dest, const acc_hvoid_p src, acc_hsize_t len)
-{
-#if (ACC_HAVE_MM_HUGE_PTR) || !(HAVE_MEMCPY)
-    acc_hbyte_p p1 = (acc_hbyte_p) dest;
-    const acc_hbyte_p p2 = (const acc_hbyte_p) src;
-    if (!(len > 0) || p1 == p2)
-        return dest;
-    do
-        *p1++ = *p2++;
-    while __acc_likely(--len > 0);
-    return dest;
-#else
-    return memcpy(dest, src, len);
-#endif
-}
-ACCLIB_PUBLIC(acc_hvoid_p, acc_hmemmove) (acc_hvoid_p dest, const acc_hvoid_p src, acc_hsize_t len)
-{
-#if (ACC_HAVE_MM_HUGE_PTR) || !(HAVE_MEMMOVE)
-    acc_hbyte_p p1 = (acc_hbyte_p) dest;
-    const acc_hbyte_p p2 = (const acc_hbyte_p) src;
-    if (!(len > 0) || p1 == p2)
-        return dest;
-    if (p1 < p2)
-    {
-        do
-            *p1++ = *p2++;
-        while __acc_likely(--len > 0);
-    }
-    else
-    {
-        p1 += len;
-        p2 += len;
-        do
-            *--p1 = *--p2;
-        while __acc_likely(--len > 0);
-    }
-    return dest;
-#else
-    return memmove(dest, src, len);
-#endif
-}
-ACCLIB_PUBLIC(acc_hvoid_p, acc_hmemset) (acc_hvoid_p s, int c, acc_hsize_t len)
-{
-#if (ACC_HAVE_MM_HUGE_PTR) || !(HAVE_MEMSET)
-    acc_hbyte_p p = (acc_hbyte_p) s;
-    if __acc_likely(len > 0) do
-        *p++ = (unsigned char) c;
-    while __acc_likely(--len > 0);
-    return s;
-#else
-    return memset(s, c, len);
-#endif
-}
-#endif
-#if defined(ACC_WANT_ACCLIB_RAND)
-#  undef ACC_WANT_ACCLIB_RAND
-#define __ACCLIB_RAND_CH_INCLUDED 1
-#if !defined(ACCLIB_PUBLIC)
-#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
-#endif
-ACCLIB_PUBLIC(void, acc_srand31) (acc_rand31_p r, acc_uint32l_t seed)
-{
-    r->seed = seed & ACC_UINT32_C(0xffffffff);
-}
-ACCLIB_PUBLIC(acc_uint32l_t, acc_rand31) (acc_rand31_p r)
-{
-    r->seed = r->seed * ACC_UINT32_C(1103515245) + 12345;
-    r->seed &= ACC_UINT32_C(0x7fffffff);
-    return r->seed;
-}
-#if defined(acc_int64l_t)
-ACCLIB_PUBLIC(void, acc_srand48) (acc_rand48_p r, acc_uint32l_t seed)
-{
-    r->seed = seed & ACC_UINT32_C(0xffffffff);
-    r->seed <<= 16; r->seed |= 0x330e;
-}
-ACCLIB_PUBLIC(acc_uint32l_t, acc_rand48) (acc_rand48_p r)
-{
-    r->seed = r->seed * ACC_UINT64_C(25214903917) + 11;
-    r->seed &= ACC_UINT64_C(0xffffffffffff);
-    return (acc_uint32l_t) (r->seed >> 17);
-}
-ACCLIB_PUBLIC(acc_uint32l_t, acc_rand48_r32) (acc_rand48_p r)
-{
-    r->seed = r->seed * ACC_UINT64_C(25214903917) + 11;
-    r->seed &= ACC_UINT64_C(0xffffffffffff);
-    return (acc_uint32l_t) (r->seed >> 16);
-}
-#endif
-#if defined(acc_int64l_t)
-ACCLIB_PUBLIC(void, acc_srand64) (acc_rand64_p r, acc_uint64l_t seed)
-{
-    r->seed = seed & ACC_UINT64_C(0xffffffffffffffff);
-}
-ACCLIB_PUBLIC(acc_uint32l_t, acc_rand64) (acc_rand64_p r)
-{
-    r->seed = r->seed * ACC_UINT64_C(6364136223846793005) + 1;
-#if (ACC_SIZEOF_ACC_INT64L_T > 8)
-    r->seed &= ACC_UINT64_C(0xffffffffffffffff);
-#endif
-    return (acc_uint32l_t) (r->seed >> 33);
-}
-ACCLIB_PUBLIC(acc_uint32l_t, acc_rand64_r32) (acc_rand64_p r)
-{
-    r->seed = r->seed * ACC_UINT64_C(6364136223846793005) + 1;
-#if (ACC_SIZEOF_ACC_INT64L_T > 8)
-    r->seed &= ACC_UINT64_C(0xffffffffffffffff);
-#endif
-    return (acc_uint32l_t) (r->seed >> 32);
-}
-#endif
-ACCLIB_PUBLIC(void, acc_srandmt) (acc_randmt_p r, acc_uint32l_t seed)
-{
-    unsigned i = 0;
-    do {
-        r->s[i++] = (seed &= ACC_UINT32_C(0xffffffff));
-        seed ^= seed >> 30;
-        seed = seed * ACC_UINT32_C(0x6c078965) + i;
-    } while (i != 624);
-    r->n = i;
-}
-ACCLIB_PUBLIC(acc_uint32l_t, acc_randmt) (acc_randmt_p r)
-{
-    return (__ACCLIB_FUNCNAME(acc_randmt_r32)(r)) >> 1;
-}
-ACCLIB_PUBLIC(acc_uint32l_t, acc_randmt_r32) (acc_randmt_p r)
-{
-    acc_uint32l_t v;
-    if __acc_unlikely(r->n == 624) {
-        unsigned i = 0, j;
-        r->n = 0;
-        do {
-            j = i - 623; if ((int) j < 0) j += 624;
-            v = (r->s[i] & ACC_UINT32_C(0x80000000)) ^ (r->s[j] & ACC_UINT32_C(0x7fffffff));
-            j = i - 227; if ((int) j < 0) j += 624;
-            r->s[i] = r->s[j] ^ (v >> 1);
-            if (v & 1) r->s[i] ^= ACC_UINT32_C(0x9908b0df);
-        } while (++i != 624);
-    }
-    v = r->s[r->n++];
-    v ^= v >> 11; v ^= (v & ACC_UINT32_C(0x013a58ad)) << 7;
-    v ^= (v & ACC_UINT32_C(0x0001df8c)) << 15; v ^= v >> 18;
-    return v;
-}
-#if defined(acc_int64l_t)
-ACCLIB_PUBLIC(void, acc_srandmt64) (acc_randmt64_p r, acc_uint64l_t seed)
-{
-    unsigned i = 0;
-    do {
-        r->s[i++] = (seed &= ACC_UINT64_C(0xffffffffffffffff));
-        seed ^= seed >> 62;
-        seed = seed * ACC_UINT64_C(0x5851f42d4c957f2d) + i;
-    } while (i != 312);
-    r->n = i;
-}
-#if 0
-ACCLIB_PUBLIC(acc_uint32l_t, acc_randmt64) (acc_randmt64_p r)
-{
-    acc_uint64l_t v;
-    v = (__ACCLIB_FUNCNAME(acc_randmt64_r64)(r)) >> 33;
-    return (acc_uint32l_t) v;
-}
-#endif
-ACCLIB_PUBLIC(acc_uint64l_t, acc_randmt64_r64) (acc_randmt64_p r)
-{
-    acc_uint64l_t v;
-    if __acc_unlikely(r->n == 312) {
-        unsigned i = 0, j;
-        r->n = 0;
-        do {
-            j = i - 311; if ((int) j < 0) j += 312;
-            v = (r->s[i] & ACC_UINT64_C(0xffffffff80000000)) ^ (r->s[j] & ACC_UINT64_C(0x7fffffff));
-            j = i - 156; if ((int) j < 0) j += 312;
-            r->s[i] = r->s[j] ^ (v >> 1);
-            if (v & 1) r->s[i] ^= ACC_UINT64_C(0xb5026f5aa96619e9);
-        } while (++i != 312);
-    }
-    v = r->s[r->n++];
-    v ^= (v & ACC_UINT64_C(0xaaaaaaaaa0000000)) >> 29;
-    v ^= (v & ACC_UINT64_C(0x38eb3ffff6d3)) << 17;
-    v ^= (v & ACC_UINT64_C(0x7ffbf77)) << 37;
-    return v ^ (v >> 43);
-}
-#endif
-#endif
-#if defined(ACC_WANT_ACCLIB_RDTSC)
-#  undef ACC_WANT_ACCLIB_RDTSC
-#define __ACCLIB_RDTSC_CH_INCLUDED 1
-#if !defined(ACCLIB_PUBLIC)
-#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
-#endif
-#if defined(acc_int32e_t)
-#if (ACC_OS_WIN32 && ACC_CC_PELLESC && (__POCC__ >= 290))
-#  pragma warn(push)
-#  pragma warn(disable:2007)
-#endif
-#if (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC)
-#if (ACC_ARCH_AMD64 && ACC_CC_PATHSCALE)
-#  define __ACCLIB_RDTSC_REGS   : : "c" (t) : "cc", "memory", "rax", "rdx"
-#elif (ACC_ARCH_AMD64 && ACC_CC_INTELC)
-#  define __ACCLIB_RDTSC_REGS   : : "r" (t) : "memory", "rax", "rdx"
-#elif (ACC_ARCH_AMD64)
-#  define __ACCLIB_RDTSC_REGS   : : "r" (t) : "cc", "memory", "rax", "rdx"
-#elif (ACC_ARCH_I386 && ACC_CC_GNUC && (ACC_CC_GNUC < 0x020000ul))
-#  define __ACCLIB_RDTSC_REGS   : : "r" (t) : "ax", "dx"
-#elif (ACC_ARCH_I386 && ACC_CC_INTELC)
-#  define __ACCLIB_RDTSC_REGS   : : "r" (t) : "memory", "eax", "edx"
-#elif (ACC_ARCH_I386 && ACC_CC_PATHSCALE)
-#  define __ACCLIB_RDTSC_REGS   : : "c" (t) : "memory", "eax", "edx"
-#else
-#  define __ACCLIB_RDTSC_REGS   : : "r" (t) : "cc", "memory", "eax", "edx"
-#endif
-#endif
-ACCLIB_PUBLIC(int, acc_tsc_read) (acc_uint32e_t* t)
-{
-#if (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC)
-    __asm__ __volatile__(
-        "clc \n" ".byte 0x0f,0x31\n"
-        "movl %%eax,(%0)\n" "movl %%edx,4(%0)\n"
-        __ACCLIB_RDTSC_REGS
-    );
-    return 0;
-#elif (ACC_ARCH_I386) && (ACC_ASM_SYNTAX_MSC)
-    ACC_UNUSED(t);
-    __asm {
-        mov ecx, t
-        clc
-#  if (ACC_CC_MSC && (_MSC_VER < 1200))
-        _emit 0x0f
-        _emit 0x31
-#  else
-        rdtsc
-#  endif
-        mov [ecx], eax
-        mov [ecx+4], edx
-    }
-    return 0;
-#else
-    t[0] = t[1] = 0; return -1;
-#endif
-}
-#if (ACC_OS_WIN32 && ACC_CC_PELLESC && (__POCC__ >= 290))
-#  pragma warn(pop)
-#endif
-#endif
-#endif
-#if defined(ACC_WANT_ACCLIB_DOSALLOC)
-#  undef ACC_WANT_ACCLIB_DOSALLOC
-#define __ACCLIB_DOSALLOC_CH_INCLUDED 1
-#if !defined(ACCLIB_PUBLIC)
-#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
-#endif
-#if (ACC_OS_OS216)
-ACC_EXTERN_C unsigned short __far __pascal DosAllocHuge(unsigned short, unsigned short, unsigned short __far *, unsigned short, unsigned short);
-ACC_EXTERN_C unsigned short __far __pascal DosFreeSeg(unsigned short);
-#endif
-#if (ACC_OS_DOS16 || ACC_OS_WIN16)
-#if !(ACC_CC_AZTECC)
-ACCLIB_PUBLIC(void __far*, acc_dos_alloc) (unsigned long size)
-{
-    void __far* p = 0;
-    union REGS ri, ro;
-    if ((long)size <= 0)
-        return p;
-    size = (size + 15) >> 4;
-    if (size > 0xffffu)
-        return p;
-    ri.x.ax = 0x4800;
-    ri.x.bx = (unsigned short) size;
-    int86(0x21, &ri, &ro);
-    if ((ro.x.cflag & 1) == 0)
-        p = (void __far*) ACC_PTR_MK_FP(ro.x.ax, 0);
-    return p;
-}
-ACCLIB_PUBLIC(int, acc_dos_free) (void __far* p)
-{
-    union REGS ri, ro;
-    struct SREGS rs;
-    if (!p)
-        return 0;
-    if (ACC_PTR_FP_OFF(p) != 0)
-        return -1;
-    segread(&rs);
-    ri.x.ax = 0x4900;
-    rs.es = ACC_PTR_FP_SEG(p);
-    int86x(0x21, &ri, &ro, &rs);
-    if (ro.x.cflag & 1)
-        return -1;
-    return 0;
-}
-#endif
-#endif
-#if (ACC_OS_OS216)
-ACCLIB_PUBLIC(void __far*, acc_dos_alloc) (unsigned long size)
-{
-    void __far* p = 0;
-    unsigned short sel = 0;
-    if ((long)size <= 0)
-        return p;
-    if (DosAllocHuge((unsigned short)(size >> 16), (unsigned short)size, &sel, 0, 0) == 0)
-        p = (void __far*) ACC_PTR_MK_FP(sel, 0);
-    return p;
-}
-ACCLIB_PUBLIC(int, acc_dos_free) (void __far* p)
-{
-    if (!p)
-        return 0;
-    if (ACC_PTR_FP_OFF(p) != 0)
-        return -1;
-    if (DosFreeSeg(ACC_PTR_FP_SEG(p)) != 0)
-        return -1;
-    return 0;
-}
-#endif
-#endif
-#if defined(ACC_WANT_ACCLIB_GETOPT)
-#  undef ACC_WANT_ACCLIB_GETOPT
-#define __ACCLIB_GETOPT_CH_INCLUDED 1
-#if !defined(ACCLIB_PUBLIC)
-#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
-#endif
-ACCLIB_PUBLIC(void, acc_getopt_init) (acc_getopt_p g,
-                                      int start_argc, int argc, char** argv)
-{
-    memset(g, 0, sizeof(*g));
-    g->optind = start_argc;
-    g->argc = argc; g->argv = argv;
-    g->optopt = -1;
-}
-static int __ACCLIB_FUNCNAME(acc_getopt_rotate) (char** p, int first, int middle, int last)
-{
-    int i = middle, n = middle - first;
-    if (first >= middle || middle >= last) return 0;
-    for (;;)
-    {
-        char* t = p[first]; p[first] = p[i]; p[i] = t;
-        if (++first == middle)
-        {
-            if (++i == last) break;
-            middle = i;
-        }
-        else if (++i == last)
-            i = middle;
-    }
-    return n;
-}
-static int __ACCLIB_FUNCNAME(acc_getopt_perror) (acc_getopt_p g, int ret, const char* f, ...)
-{
-    if (g->opterr)
-    {
-#if (HAVE_STDARG_H)
-        struct { va_list ap; } s;
-        va_start(s.ap, f);
-        g->opterr(g, f, &s);
-        va_end(s.ap);
-#else
-        g->opterr(g, f, NULL);
-#endif
-    }
-    ++g->errcount;
-    return ret;
-}
-ACCLIB_PUBLIC(int, acc_getopt) (acc_getopt_p g,
-                                const char* shortopts,
-                                const acc_getopt_longopt_p longopts,
-                                int* longind)
-{
-#define pe  __ACCLIB_FUNCNAME(acc_getopt_perror)
-    int ordering = ACC_GETOPT_PERMUTE;
-    int missing_arg_ret = g->bad_option;
-    char* a;
-    if (shortopts)
-    {
-        if (*shortopts == '-' || *shortopts == '+')
-            ordering = *shortopts++ == '-' ? ACC_GETOPT_RETURN_IN_ORDER : ACC_GETOPT_REQUIRE_ORDER;
-        if (*shortopts == ':')
-            missing_arg_ret = *shortopts++;
-    }
-    g->optarg = NULL;
-    if (g->optopt == -1)
-        g->optopt = g->bad_option;
-    if (longind)
-        *longind = -1;
-    if (g->eof)
-        return -1;
-    if (g->shortpos)
-        goto acc_label_next_shortopt;
-    g->optind -= __ACCLIB_FUNCNAME(acc_getopt_rotate)(g->argv, g->pending_rotate_first, g->pending_rotate_middle, g->optind);
-    g->pending_rotate_first = g->pending_rotate_middle = g->optind;
-    if (ordering == ACC_GETOPT_PERMUTE)
-    {
-        while (g->optind < g->argc && !(g->argv[g->optind][0] == '-' && g->argv[g->optind][1]))
-            ++g->optind;
-        g->pending_rotate_middle = g->optind;
-    }
-    if (g->optind >= g->argc)
-    {
-        g->optind = g->pending_rotate_first;
-        goto acc_label_eof;
-    }
-    a = g->argv[g->optind];
-    if (a[0] == '-' && a[1] == '-')
-    {
-        size_t l = 0;
-        const acc_getopt_longopt_p o;
-        const acc_getopt_longopt_p o1 = NULL;
-        const acc_getopt_longopt_p o2 = NULL;
-        int need_exact = 0;
-        ++g->optind;
-        if (!a[2])
-            goto acc_label_eof;
-        for (a += 2; a[l] && a[l] != '=' && a[l] != '#'; )
-            ++l;
-        for (o = longopts; l && o && o->name; ++o)
-        {
-            if (strncmp(a, o->name, l) != 0)
-                continue;
-            if (!o->name[l])
-                goto acc_label_found_o;
-            need_exact |= o->has_arg & ACC_GETOPT_EXACT_ARG;
-            if (o1) o2 = o;
-            else    o1 = o;
-        }
-        if (!o1 || need_exact)
-            return pe(g, g->bad_option, "unrecognized option '--%s'", a);
-        if (o2)
-            return pe(g, g->bad_option, "option '--%s' is ambiguous (could be '--%s' or '--%s')", a, o1->name, o2->name);
-        o = o1;
-    acc_label_found_o:
-        a += l;
-        switch (o->has_arg & 0x2f)
-        {
-        case ACC_GETOPT_OPTIONAL_ARG:
-            if (a[0])
-                g->optarg = a + 1;
-            break;
-        case ACC_GETOPT_REQUIRED_ARG:
-            if (a[0])
-                g->optarg = a + 1;
-            else if (g->optind < g->argc)
-                g->optarg = g->argv[g->optind++];
-            if (!g->optarg)
-                return pe(g, missing_arg_ret, "option '--%s' requires an argument", o->name);
-            break;
-        case ACC_GETOPT_REQUIRED_ARG | 0x20:
-            if (a[0] && a[1])
-                g->optarg = a + 1;
-            if (!g->optarg)
-                return pe(g, missing_arg_ret, "option '--%s=' requires an argument", o->name);
-            break;
-        default:
-            if (a[0])
-                return pe(g, g->bad_option, "option '--%s' doesn't allow an argument", o->name);
-            break;
-        }
-        if (longind)
-            *longind = (int) (o - longopts);
-        if (o->flag)
-        {
-            *o->flag = o->val;
-            return 0;
-        }
-        return o->val;
-    }
-    if (a[0] == '-' && a[1])
-    {
-        unsigned char c;
-        const char* s;
-    acc_label_next_shortopt:
-        a = g->argv[g->optind] + ++g->shortpos;
-        c = (unsigned char) *a++; s = NULL;
-        if (c != ':' && shortopts)
-            s = strchr(shortopts, c);
-        if (!s || s[1] != ':')
-        {
-            if (!a[0])
-                ++g->optind, g->shortpos = 0;
-            if (!s)
-            {
-                g->optopt = c;
-                return pe(g, g->bad_option, "invalid option '-%c'", c);
-            }
-        }
-        else
-        {
-            ++g->optind, g->shortpos = 0;
-            if (a[0])
-                g->optarg = a;
-            else if (s[2] != ':')
-            {
-                if (g->optind < g->argc)
-                    g->optarg = g->argv[g->optind++];
-                else
-                {
-                    g->optopt = c;
-                    return pe(g, missing_arg_ret, "option '-%c' requires an argument", c);
-                }
-            }
-        }
-        return c;
-    }
-    if (ordering == ACC_GETOPT_RETURN_IN_ORDER)
-    {
-        ++g->optind;
-        g->optarg = a;
-        return 1;
-    }
-acc_label_eof:
-    g->optind -= __ACCLIB_FUNCNAME(acc_getopt_rotate)(g->argv, g->pending_rotate_first, g->pending_rotate_middle, g->optind);
-    g->pending_rotate_first = g->pending_rotate_middle = g->optind;
-    g->eof = 1;
-    return -1;
-#undef pe
-}
-#endif
-#if defined(ACC_WANT_ACCLIB_HALLOC)
-#  undef ACC_WANT_ACCLIB_HALLOC
-#define __ACCLIB_HALLOC_CH_INCLUDED 1
-#if !defined(ACCLIB_PUBLIC)
-#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
-#endif
-#if (ACC_HAVE_MM_HUGE_PTR)
-#if 1 && (ACC_OS_DOS16 && defined(BLX286))
-#  define __ACCLIB_HALLOC_USE_DAH 1
-#elif 1 && (ACC_OS_DOS16 && defined(DOSX286))
-#  define __ACCLIB_HALLOC_USE_DAH 1
-#elif 1 && (ACC_OS_OS216)
-#  define __ACCLIB_HALLOC_USE_DAH 1
-#elif 1 && (ACC_OS_WIN16)
-#  define __ACCLIB_HALLOC_USE_GA 1
-#elif 1 && (ACC_OS_DOS16) && (ACC_CC_BORLANDC) && defined(__DPMI16__)
-#  define __ACCLIB_HALLOC_USE_GA 1
-#endif
-#endif
-#if (__ACCLIB_HALLOC_USE_DAH)
-#if 0 && (ACC_OS_OS216)
-#include <os2.h>
-#else
-ACC_EXTERN_C unsigned short __far __pascal DosAllocHuge(unsigned short, unsigned short, unsigned short __far *, unsigned short, unsigned short);
-ACC_EXTERN_C unsigned short __far __pascal DosFreeSeg(unsigned short);
-#endif
-#endif
-#if (__ACCLIB_HALLOC_USE_GA)
-#if 0
-#define STRICT 1
-#include <windows.h>
-#else
-ACC_EXTERN_C const void __near* __far __pascal GlobalAlloc(unsigned, unsigned long);
-ACC_EXTERN_C const void __near* __far __pascal GlobalFree(const void __near*);
-ACC_EXTERN_C unsigned long __far __pascal GlobalHandle(unsigned);
-ACC_EXTERN_C void __far* __far __pascal GlobalLock(const void __near*);
-ACC_EXTERN_C int __far __pascal GlobalUnlock(const void __near*);
-#endif
-#endif
-ACCLIB_PUBLIC(acc_hvoid_p, acc_halloc) (acc_hsize_t size)
-{
-    acc_hvoid_p p = 0;
-    if (!(size > 0))
-        return p;
-#if 0 && defined(__palmos__)
-    p = MemPtrNew(size);
-#elif !(ACC_HAVE_MM_HUGE_PTR)
-    if (size < (size_t) -1)
-        p = malloc((size_t) size);
-#else
-    if ((long)size <= 0)
-        return p;
-{
-#if (__ACCLIB_HALLOC_USE_DAH)
-    unsigned short sel = 0;
-    if (DosAllocHuge((unsigned short)(size >> 16), (unsigned short)size, &sel, 0, 0) == 0)
-        p = (acc_hvoid_p) ACC_PTR_MK_FP(sel, 0);
-#elif (__ACCLIB_HALLOC_USE_GA)
-    const void __near* h = GlobalAlloc(2, size);
-    if (h) {
-        p = GlobalLock(h);
-        if (p && ACC_PTR_FP_OFF(p) != 0) {
-            GlobalUnlock(h);
-            p = 0;
-        }
-        if (!p)
-            GlobalFree(h);
-    }
-#elif (ACC_CC_MSC && (_MSC_VER >= 700))
-    p = _halloc(size, 1);
-#elif (ACC_CC_MSC || ACC_CC_WATCOMC)
-    p = halloc(size, 1);
-#elif (ACC_CC_DMC || ACC_CC_SYMANTECC || ACC_CC_ZORTECHC)
-    p = farmalloc(size);
-#elif (ACC_CC_BORLANDC || ACC_CC_TURBOC)
-    p = farmalloc(size);
-#elif (ACC_CC_AZTECC)
-    p = lmalloc(size);
-#else
-    if (size < (size_t) -1)
-        p = malloc((size_t) size);
-#endif
-}
-#endif
-    return p;
-}
-ACCLIB_PUBLIC(void, acc_hfree) (acc_hvoid_p p)
-{
-    if (!p)
-        return;
-#if 0 && defined(__palmos__)
-    MemPtrFree(p);
-#elif !(ACC_HAVE_MM_HUGE_PTR)
-    free(p);
-#else
-#if (__ACCLIB_HALLOC_USE_DAH)
-    if (ACC_PTR_FP_OFF(p) == 0)
-        DosFreeSeg((unsigned short) ACC_PTR_FP_SEG(p));
-#elif (__ACCLIB_HALLOC_USE_GA)
-    if (ACC_PTR_FP_OFF(p) == 0) {
-        const void __near* h = (const void __near*) (unsigned) GlobalHandle(ACC_PTR_FP_SEG(p));
-        if (h) {
-            GlobalUnlock(h);
-            GlobalFree(h);
-        }
-    }
-#elif (ACC_CC_MSC && (_MSC_VER >= 700))
-    _hfree(p);
-#elif (ACC_CC_MSC || ACC_CC_WATCOMC)
-    hfree(p);
-#elif (ACC_CC_DMC || ACC_CC_SYMANTECC || ACC_CC_ZORTECHC)
-    farfree((void __far*) p);
-#elif (ACC_CC_BORLANDC || ACC_CC_TURBOC)
-    farfree((void __far*) p);
-#elif (ACC_CC_AZTECC)
-    lfree(p);
-#else
-    free(p);
-#endif
-#endif
-}
-#endif
-#if defined(ACC_WANT_ACCLIB_HFREAD)
-#  undef ACC_WANT_ACCLIB_HFREAD
-#define __ACCLIB_HFREAD_CH_INCLUDED 1
-#if !defined(ACCLIB_PUBLIC)
-#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
-#endif
-ACCLIB_PUBLIC(acc_hsize_t, acc_hfread) (void* vfp, acc_hvoid_p buf, acc_hsize_t size)
-{
-    FILE* fp = (FILE *) vfp;
-#if (ACC_HAVE_MM_HUGE_PTR)
-#if (ACC_MM_TINY || ACC_MM_SMALL || ACC_MM_MEDIUM)
-#define __ACCLIB_REQUIRE_HMEMCPY_CH 1
-    unsigned char tmp[512];
-    acc_hsize_t l = 0;
-    while (l < size)
-    {
-        size_t n = size - l > sizeof(tmp) ? sizeof(tmp) : (size_t) (size - l);
-        n = fread(tmp, 1, n, fp);
-        if (n == 0)
-            break;
-        __ACCLIB_FUNCNAME(acc_hmemcpy)((acc_hbyte_p)buf + l, tmp, (acc_hsize_t)n);
-        l += n;
-    }
-    return l;
-#elif (ACC_MM_COMPACT || ACC_MM_LARGE || ACC_MM_HUGE)
-    acc_hbyte_p b = (acc_hbyte_p) buf;
-    acc_hsize_t l = 0;
-    while (l < size)
-    {
-        size_t n;
-        n = ACC_PTR_FP_OFF(b); n = (n <= 1) ? 0x8000u : (0u - n);
-        if ((acc_hsize_t) n > size - l)
-            n = (size_t) (size - l);
-        n = fread((void __far*)b, 1, n, fp);
-        if (n == 0)
-            break;
-        b += n; l += n;
-    }
-    return l;
-#else
-#  error "unknown memory model"
-#endif
-#else
-    return fread(buf, 1, size, fp);
-#endif
-}
-ACCLIB_PUBLIC(acc_hsize_t, acc_hfwrite) (void* vfp, const acc_hvoid_p buf, acc_hsize_t size)
-{
-    FILE* fp = (FILE *) vfp;
-#if (ACC_HAVE_MM_HUGE_PTR)
-#if (ACC_MM_TINY || ACC_MM_SMALL || ACC_MM_MEDIUM)
-#define __ACCLIB_REQUIRE_HMEMCPY_CH 1
-    unsigned char tmp[512];
-    acc_hsize_t l = 0;
-    while (l < size)
-    {
-        size_t n = size - l > sizeof(tmp) ? sizeof(tmp) : (size_t) (size - l);
-        __ACCLIB_FUNCNAME(acc_hmemcpy)(tmp, (const acc_hbyte_p)buf + l, (acc_hsize_t)n);
-        n = fwrite(tmp, 1, n, fp);
-        if (n == 0)
-            break;
-        l += n;
-    }
-    return l;
-#elif (ACC_MM_COMPACT || ACC_MM_LARGE || ACC_MM_HUGE)
-    const acc_hbyte_p b = (const acc_hbyte_p) buf;
-    acc_hsize_t l = 0;
-    while (l < size)
-    {
-        size_t n;
-        n = ACC_PTR_FP_OFF(b); n = (n <= 1) ? 0x8000u : (0u - n);
-        if ((acc_hsize_t) n > size - l)
-            n = (size_t) (size - l);
-        n = fwrite((void __far*)b, 1, n, fp);
-        if (n == 0)
-            break;
-        b += n; l += n;
-    }
-    return l;
-#else
-#  error "unknown memory model"
-#endif
-#else
-    return fwrite(buf, 1, size, fp);
-#endif
-}
-#endif
-#if defined(ACC_WANT_ACCLIB_HSREAD)
-#  undef ACC_WANT_ACCLIB_HSREAD
-#define __ACCLIB_HSREAD_CH_INCLUDED 1
-#if !defined(ACCLIB_PUBLIC)
-#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
-#endif
-ACCLIB_PUBLIC(long, acc_safe_hread) (int fd, acc_hvoid_p buf, long size)
-{
-    acc_hbyte_p b = (acc_hbyte_p) buf;
-    long l = 0;
-    int saved_errno;
-    saved_errno = errno;
-    while (l < size)
-    {
-        long n = size - l;
-#if (ACC_HAVE_MM_HUGE_PTR)
-#  define __ACCLIB_REQUIRE_HREAD_CH 1
-        errno = 0; n = acc_hread(fd, b, n);
-#elif (ACC_OS_DOS32) && defined(__DJGPP__)
-        errno = 0; n = _read(fd, b, n);
-#else
-        errno = 0; n = read(fd, b, n);
-#endif
-        if (n == 0)
-            break;
-        if (n < 0) {
-#if defined(EAGAIN)
-            if (errno == (EAGAIN)) continue;
-#endif
-#if defined(EINTR)
-            if (errno == (EINTR)) continue;
-#endif
-            if (errno == 0) errno = 1;
-            return l;
-        }
-        b += n; l += n;
-    }
-    errno = saved_errno;
-    return l;
-}
-ACCLIB_PUBLIC(long, acc_safe_hwrite) (int fd, const acc_hvoid_p buf, long size)
-{
-    const acc_hbyte_p b = (const acc_hbyte_p) buf;
-    long l = 0;
-    int saved_errno;
-    saved_errno = errno;
-    while (l < size)
-    {
-        long n = size - l;
-#if (ACC_HAVE_MM_HUGE_PTR)
-#  define __ACCLIB_REQUIRE_HREAD_CH 1
-        errno = 0; n = acc_hwrite(fd, b, n);
-#elif (ACC_OS_DOS32) && defined(__DJGPP__)
-        errno = 0; n = _write(fd, b, n);
-#else
-        errno = 0; n = write(fd, b, n);
-#endif
-        if (n == 0)
-            break;
-        if (n < 0) {
-#if defined(EAGAIN)
-            if (errno == (EAGAIN)) continue;
-#endif
-#if defined(EINTR)
-            if (errno == (EINTR)) continue;
-#endif
-            if (errno == 0) errno = 1;
-            return l;
-        }
-        b += n; l += n;
-    }
-    errno = saved_errno;
-    return l;
-}
-#endif
-#if defined(ACC_WANT_ACCLIB_PCLOCK)
-#  undef ACC_WANT_ACCLIB_PCLOCK
-#define __ACCLIB_PCLOCK_CH_INCLUDED 1
-#if !defined(ACCLIB_PUBLIC)
-#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
-#endif
-#if 0 && (ACC_OS_POSIX_LINUX && ACC_ARCH_AMD64 && ACC_ASM_SYNTAX_GNUC)
-#ifndef acc_pclock_syscall_clock_gettime
-#define acc_pclock_syscall_clock_gettime acc_pclock_syscall_clock_gettime
-#endif
-static __acc_noinline long acc_pclock_syscall_clock_gettime(long clockid, struct timespec *ts)
-{
-    long r;
-    __asm__ __volatile__("syscall\n" : "=a" (r) : "0" (228), "D" (clockid), "S" (ts) : __ACC_ASM_CLOBBER);
-    return r;
-}
-#endif
-#if 0 && (ACC_OS_POSIX_LINUX && ACC_ARCH_I386 && ACC_ASM_SYNTAX_GNUC)
-#ifndef acc_pclock_syscall_clock_gettime
-#define acc_pclock_syscall_clock_gettime acc_pclock_syscall_clock_gettime
-#endif
-static __acc_noinline long acc_pclock_syscall_clock_gettime(long clockid, struct timespec *ts)
-{
-    long r;
-    __asm__ __volatile__("int $0x80\n" : "=a" (r) : "0" (265), "b" (clockid), "c" (ts) : __ACC_ASM_CLOBBER);
-    return r;
-}
-#endif
-#if 0 && defined(acc_pclock_syscall_clock_gettime)
-#ifndef acc_pclock_read_clock_gettime_r_syscall
-#define acc_pclock_read_clock_gettime_r_syscall acc_pclock_read_clock_gettime_r_syscall
-#endif
-static int acc_pclock_read_clock_gettime_r_syscall(acc_pclock_handle_p h, acc_pclock_p c)
-{
-     struct timespec ts;
-    if (acc_pclock_syscall_clock_gettime(0, &ts) != 0)
-        return -1;
-    c->tv_sec = ts.tv_sec;
-    c->tv_nsec = ts.tv_nsec;
-    ACC_UNUSED(h); return 0;
-}
-#endif
-#if (HAVE_GETTIMEOFDAY)
-#ifndef acc_pclock_read_gettimeofday
-#define acc_pclock_read_gettimeofday acc_pclock_read_gettimeofday
-#endif
-static int acc_pclock_read_gettimeofday(acc_pclock_handle_p h, acc_pclock_p c)
-{
-    struct timeval tv;
-    if (gettimeofday(&tv, 0) != 0)
-        return -1;
-#if defined(acc_int64l_t)
-    c->tv_sec = tv.tv_sec;
-#else
-    c->tv_sec_high = 0;
-    c->tv_sec_low = tv.tv_sec;
-#endif
-    c->tv_nsec = (acc_uint32l_t) (tv.tv_usec * 1000u);
-    ACC_UNUSED(h); return 0;
-}
-#endif
-#if defined(CLOCKS_PER_SEC)
-#ifndef acc_pclock_read_clock
-#define acc_pclock_read_clock acc_pclock_read_clock
-#endif
-static int acc_pclock_read_clock(acc_pclock_handle_p h, acc_pclock_p c)
-{
-    clock_t ticks;
-    double secs;
-#if defined(acc_int64l_t)
-    acc_uint64l_t nsecs;
-    ticks = clock();
-    secs = (double)ticks / (CLOCKS_PER_SEC);
-    nsecs = (acc_uint64l_t) (secs * 1000000000.0);
-    c->tv_sec = (acc_int64l_t) (nsecs / 1000000000ul);
-    c->tv_nsec = (acc_uint32l_t) (nsecs % 1000000000ul);
-#else
-    ticks = clock();
-    secs = (double)ticks / (CLOCKS_PER_SEC);
-    c->tv_sec_high = 0;
-    c->tv_sec_low = (acc_uint32l_t) (secs + 0.5);
-    c->tv_nsec = 0;
-#endif
-    ACC_UNUSED(h); return 0;
-}
-#endif
-#if 1 && defined(acc_pclock_syscall_clock_gettime)
-#ifndef acc_pclock_read_clock_gettime_m_syscall
-#define acc_pclock_read_clock_gettime_m_syscall acc_pclock_read_clock_gettime_m_syscall
-#endif
-static int acc_pclock_read_clock_gettime_m_syscall(acc_pclock_handle_p h, acc_pclock_p c)
-{
-     struct timespec ts;
-    if (acc_pclock_syscall_clock_gettime(1, &ts) != 0)
-        return -1;
-    c->tv_sec = ts.tv_sec;
-    c->tv_nsec = ts.tv_nsec;
-    ACC_UNUSED(h); return 0;
-}
-#endif
-#if (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__) && defined(UCLOCKS_PER_SEC)
-#ifndef acc_pclock_read_uclock
-#define acc_pclock_read_uclock acc_pclock_read_uclock
-#endif
-static int acc_pclock_read_uclock(acc_pclock_handle_p h, acc_pclock_p c)
-{
-    acc_uint64l_t ticks;
-    double secs;
-    acc_uint64l_t nsecs;
-    ticks = uclock();
-    secs = (double)ticks / (UCLOCKS_PER_SEC);
-    nsecs = (acc_uint64l_t) (secs * 1000000000.0);
-    c->tv_sec = nsecs / 1000000000ul;
-    c->tv_nsec = (acc_uint32l_t) (nsecs % 1000000000ul);
-    ACC_UNUSED(h); return 0;
-}
-#endif
-#if 0 && (HAVE_CLOCK_GETTIME) && defined(CLOCK_PROCESS_CPUTIME_ID) && defined(acc_int64l_t)
-#ifndef acc_pclock_read_clock_gettime_p_libc
-#define acc_pclock_read_clock_gettime_p_libc acc_pclock_read_clock_gettime_p_libc
-#endif
-static int acc_pclock_read_clock_gettime_p_libc(acc_pclock_handle_p h, acc_pclock_p c)
-{
-    struct timespec ts;
-    if (clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts) != 0)
-        return -1;
-    c->tv_sec = ts.tv_sec;
-    c->tv_nsec = ts.tv_nsec;
-    ACC_UNUSED(h); return 0;
-}
-#endif
-#if 1 && defined(acc_pclock_syscall_clock_gettime)
-#ifndef acc_pclock_read_clock_gettime_p_syscall
-#define acc_pclock_read_clock_gettime_p_syscall acc_pclock_read_clock_gettime_p_syscall
-#endif
-static int acc_pclock_read_clock_gettime_p_syscall(acc_pclock_handle_p h, acc_pclock_p c)
-{
-     struct timespec ts;
-    if (acc_pclock_syscall_clock_gettime(2, &ts) != 0)
-        return -1;
-    c->tv_sec = ts.tv_sec;
-    c->tv_nsec = ts.tv_nsec;
-    ACC_UNUSED(h); return 0;
-}
-#endif
-#if (ACC_OS_CYGWIN || ACC_OS_WIN32 || ACC_OS_WIN64) && (ACC_HAVE_WINDOWS_H) && defined(acc_int64l_t)
-#ifndef acc_pclock_read_getprocesstimes
-#define acc_pclock_read_getprocesstimes acc_pclock_read_getprocesstimes
-#endif
-static int acc_pclock_read_getprocesstimes(acc_pclock_handle_p h, acc_pclock_p c)
-{
-    FILETIME ct, et, kt, ut;
-    acc_uint64l_t ticks;
-    if (GetProcessTimes(GetCurrentProcess(), &ct, &et, &kt, &ut) == 0)
-        return -1;
-    ticks = ((acc_uint64l_t)ut.dwHighDateTime << 32) | ut.dwLowDateTime;
-    if __acc_unlikely(h->ticks_base == 0)
-        h->ticks_base = ticks;
-    else
-        ticks -= h->ticks_base;
-    c->tv_sec = (acc_int64l_t) (ticks / 10000000ul);
-    c->tv_nsec = (acc_uint32l_t)(ticks % 10000000ul) * 100u;
-    ACC_UNUSED(h); return 0;
-}
-#endif
-#if (HAVE_GETRUSAGE) && defined(RUSAGE_SELF)
-#ifndef acc_pclock_read_getrusage
-#define acc_pclock_read_getrusage acc_pclock_read_getrusage
-#endif
-static int acc_pclock_read_getrusage(acc_pclock_handle_p h, acc_pclock_p c)
-{
-    struct rusage ru;
-    if (getrusage(RUSAGE_SELF, &ru) != 0)
-        return -1;
-#if defined(acc_int64l_t)
-    c->tv_sec = ru.ru_utime.tv_sec;
-#else
-    c->tv_sec_high = 0;
-    c->tv_sec_low = ru.ru_utime.tv_sec;
-#endif
-    c->tv_nsec = (acc_uint32l_t) (ru.ru_utime.tv_usec * 1000u);
-    ACC_UNUSED(h); return 0;
-}
-#endif
-#if (__ACCLIB_PCLOCK_USE_PERFCTR)
-#ifndef acc_pclock_read_perfctr
-#define acc_pclock_read_perfctr acc_pclock_read_perfctr
-#endif
-static int acc_pclock_read_perfctr(acc_pclock_handle_p h, acc_pclock_p c)
-{
-    acc_perfctr_clock_t pcc;
-    double secs;
-    acc_uint64l_t nsecs;
-    __ACCLIB_FUNCNAME(acc_perfctr_read)(&h->pch, &pcc);
-    if __acc_unlikely(h->ticks_base == 0)
-        h->ticks_base = pcc.tsc;
-    else
-        pcc.tsc -= h->ticks_base;
-    secs = pcc.tsc * h->pch.tsc_to_seconds;
-    nsecs = (acc_uint64l_t) (secs * 1000000000.0);
-    c->tv_sec = nsecs / 1000000000ul;
-    c->tv_nsec = (acc_uint32l_t) (nsecs % 1000000000ul);
-    ACC_UNUSED(h); return 0;
-}
-#endif
-#if 0 && (HAVE_CLOCK_GETTIME) && defined(CLOCK_THREAD_CPUTIME_ID) && defined(acc_int64l_t)
-#ifndef acc_pclock_read_clock_gettime_t_libc
-#define acc_pclock_read_clock_gettime_t_libc acc_pclock_read_clock_gettime_t_libc
-#endif
-static int acc_pclock_read_clock_gettime_t_libc(acc_pclock_handle_p h, acc_pclock_p c)
-{
-    struct timespec ts;
-    if (clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts) != 0)
-        return -1;
-    c->tv_sec = ts.tv_sec;
-    c->tv_nsec = ts.tv_nsec;
-    ACC_UNUSED(h); return 0;
-}
-#endif
-#if 1 && defined(acc_pclock_syscall_clock_gettime)
-#ifndef acc_pclock_read_clock_gettime_t_syscall
-#define acc_pclock_read_clock_gettime_t_syscall acc_pclock_read_clock_gettime_t_syscall
-#endif
-static int acc_pclock_read_clock_gettime_t_syscall(acc_pclock_handle_p h, acc_pclock_p c)
-{
-     struct timespec ts;
-    if (acc_pclock_syscall_clock_gettime(3, &ts) != 0)
-        return -1;
-    c->tv_sec = ts.tv_sec;
-    c->tv_nsec = ts.tv_nsec;
-    ACC_UNUSED(h); return 0;
-}
-#endif
-#if (ACC_OS_CYGWIN || ACC_OS_WIN32 || ACC_OS_WIN64) && (ACC_HAVE_WINDOWS_H) && defined(acc_int64l_t)
-#ifndef acc_pclock_read_getthreadtimes
-#define acc_pclock_read_getthreadtimes acc_pclock_read_getthreadtimes
-#endif
-static int acc_pclock_read_getthreadtimes(acc_pclock_handle_p h, acc_pclock_p c)
-{
-    FILETIME ct, et, kt, ut;
-    acc_uint64l_t ticks;
-    if (GetThreadTimes(GetCurrentThread(), &ct, &et, &kt, &ut) == 0)
-        return -1;
-    ticks = ((acc_uint64l_t)ut.dwHighDateTime << 32) | ut.dwLowDateTime;
-    if __acc_unlikely(h->ticks_base == 0)
-        h->ticks_base = ticks;
-    else
-        ticks -= h->ticks_base;
-    c->tv_sec = (acc_int64l_t) (ticks / 10000000ul);
-    c->tv_nsec = (acc_uint32l_t)(ticks % 10000000ul) * 100;
-    ACC_UNUSED(h); return 0;
-}
-#endif
-ACCLIB_PUBLIC(int, acc_pclock_open) (acc_pclock_handle_p h, int mode)
-{
-    acc_pclock_t c;
-    int i;
-    h->h = (acclib_handle_t) 0;
-    h->mode = -1;
-    h->read_error = 2;
-    h->name = NULL;
-    h->gettime = 0;
-#if defined(acc_int64l_t)
-    h->ticks_base = 0;
-#endif
-    switch (mode)
-    {
-    case ACC_PCLOCK_REALTIME:
-#     if defined(acc_pclock_read_clock_gettime_r_syscall)
-        if (acc_pclock_read_clock_gettime_r_syscall(h, &c) == 0) {
-            h->gettime = acc_pclock_read_clock_gettime_r_syscall;
-            h->name = "CLOCK_REALTIME/syscall";
-            break;
-        }
-#     endif
-#     if defined(acc_pclock_read_gettimeofday)
-        if (acc_pclock_read_gettimeofday(h, &c) == 0) {
-            h->gettime = acc_pclock_read_gettimeofday;
-            h->name = "gettimeofday";
-            break;
-        }
-#     endif
-        break;
-    case ACC_PCLOCK_MONOTONIC:
-#     if defined(acc_pclock_read_clock_gettime_m_syscall)
-        if (acc_pclock_read_clock_gettime_m_syscall(h, &c) == 0) {
-            h->gettime = acc_pclock_read_clock_gettime_m_syscall;
-            h->name = "CLOCK_MONOTONIC/syscall";
-            break;
-        }
-#     endif
-#     if defined(acc_pclock_read_uclock)
-        if (acc_pclock_read_uclock(h, &c) == 0) {
-            h->gettime = acc_pclock_read_uclock;
-            h->name = "uclock";
-            break;
-        }
-#     endif
-#     if defined(acc_pclock_read_clock)
-        if (acc_pclock_read_clock(h, &c) == 0) {
-            h->gettime = acc_pclock_read_clock;
-            h->name = "clock";
-            break;
-        }
-#     endif
-        break;
-    case ACC_PCLOCK_PROCESS_CPUTIME_ID:
-#     if defined(acc_pclock_read_perfctr)
-        if (__ACCLIB_FUNCNAME(acc_perfctr_open)(&h->pch) == 0) {
-            h->gettime = acc_pclock_read_perfctr;
-            h->name = "perfctr";
-            break;
-        }
-#     endif
-#     if defined(acc_pclock_read_getprocesstimes)
-        if (acc_pclock_read_getprocesstimes(h, &c) == 0) {
-            h->gettime = acc_pclock_read_getprocesstimes;
-            h->name = "GetProcessTimes";
-            break;
-        }
-#     endif
-#     if defined(acc_pclock_read_clock_gettime_p_syscall)
-        if (acc_pclock_read_clock_gettime_p_syscall(h, &c) == 0) {
-            h->gettime = acc_pclock_read_clock_gettime_p_syscall;
-            h->name = "CLOCK_PROCESS_CPUTIME_ID/syscall";
-            break;
-        }
-#     endif
-#     if defined(acc_pclock_read_clock_gettime_p_libc)
-        if (acc_pclock_read_clock_gettime_p_libc(h, &c) == 0) {
-            h->gettime = acc_pclock_read_clock_gettime_p_libc;
-            h->name = "CLOCK_PROCESS_CPUTIME_ID/libc";
-            break;
-        }
-#     endif
-#     if defined(acc_pclock_read_getrusage)
-        if (acc_pclock_read_getrusage(h, &c) == 0) {
-            h->gettime = acc_pclock_read_getrusage;
-            h->name = "getrusage";
-            break;
-        }
-#     endif
-        break;
-    case ACC_PCLOCK_THREAD_CPUTIME_ID:
-#     if defined(acc_pclock_read_getthreadtimes)
-        if (acc_pclock_read_getthreadtimes(h, &c) == 0) {
-            h->gettime = acc_pclock_read_getthreadtimes;
-            h->name = "GetThreadTimes";
-        }
-#     endif
-#     if defined(acc_pclock_read_clock_gettime_t_syscall)
-        if (acc_pclock_read_clock_gettime_t_syscall(h, &c) == 0) {
-            h->gettime = acc_pclock_read_clock_gettime_t_syscall;
-            h->name = "CLOCK_THREAD_CPUTIME_ID/syscall";
-            break;
-        }
-#     endif
-#     if defined(acc_pclock_read_clock_gettime_t_libc)
-        if (acc_pclock_read_clock_gettime_t_libc(h, &c) == 0) {
-            h->gettime = acc_pclock_read_clock_gettime_t_libc;
-            h->name = "CLOCK_THREAD_CPUTIME_ID/libc";
-            break;
-        }
-#     endif
-        break;
-    }
-    if (!h->gettime)
-        return -1;
-    if (!h->h)
-        h->h = (acclib_handle_t) 1;
-    h->mode = mode;
-    h->read_error = 0;
-    if (!h->name)
-        h->name = "unknown";
-    for (i = 0; i < 10; i++) {
-        __ACCLIB_FUNCNAME(acc_pclock_read)(h, &c);
-    }
-    return 0;
-}
-ACCLIB_PUBLIC(int, acc_pclock_open_default) (acc_pclock_handle_p h)
-{
-    if (__ACCLIB_FUNCNAME(acc_pclock_open)(h, ACC_PCLOCK_PROCESS_CPUTIME_ID) == 0)
-        return 0;
-    if (__ACCLIB_FUNCNAME(acc_pclock_open)(h, ACC_PCLOCK_MONOTONIC) == 0)
-        return 0;
-    if (__ACCLIB_FUNCNAME(acc_pclock_open)(h, ACC_PCLOCK_REALTIME) == 0)
-        return 0;
-    if (__ACCLIB_FUNCNAME(acc_pclock_open)(h, ACC_PCLOCK_THREAD_CPUTIME_ID) == 0)
-        return 0;
-    return -1;
-}
-ACCLIB_PUBLIC(int, acc_pclock_close) (acc_pclock_handle_p h)
-{
-    h->h = (acclib_handle_t) 0;
-    h->mode = -1;
-    h->name = NULL;
-    h->gettime = 0;
-#if (__ACCLIB_PCLOCK_USE_PERFCTR)
-    __ACCLIB_FUNCNAME(acc_perfctr_close)(&h->pch);
-#endif
-    return 0;
-}
-ACCLIB_PUBLIC(void, acc_pclock_read) (acc_pclock_handle_p h, acc_pclock_p c)
-{
-    if (h->gettime) {
-        if (h->gettime(h, c) == 0)
-            return;
-    }
-    h->read_error = 1;
-#if defined(acc_int64l_t)
-    c->tv_sec = 0;
-#else
-    c->tv_sec_high = 0;
-    c->tv_sec_low = 0;
-#endif
-    c->tv_nsec = 0;
-}
-#if !(ACC_CFG_NO_DOUBLE)
-ACCLIB_PUBLIC(double, acc_pclock_get_elapsed) (acc_pclock_handle_p h, const acc_pclock_p start, const acc_pclock_p stop)
-{
-    double tstop, tstart;
-    if (!h->h) {
-        h->mode = -1;
-        return 0.0;
-    }
-#if defined(acc_int64l_t)
-    tstop  = stop->tv_sec  + stop->tv_nsec  / 1000000000.0;
-    tstart = start->tv_sec + start->tv_nsec / 1000000000.0;
-#else
-    tstop  = stop->tv_sec_low  + stop->tv_nsec  / 1000000000.0;
-    tstart = start->tv_sec_low + start->tv_nsec / 1000000000.0;
-#endif
-    return tstop - tstart;
-}
-#endif
-ACCLIB_PUBLIC(int, acc_pclock_flush_cpu_cache) (acc_pclock_handle_p h, unsigned flags)
-{
-    if (h->h) {
-#if (__ACCLIB_PCLOCK_USE_PERFCTR)
-        return __ACCLIB_FUNCNAME(acc_perfctr_flush_cpu_cache)(&h->pch, flags);
-#endif
-    }
-    ACC_UNUSED(h); ACC_UNUSED(flags);
-    return -1;
-}
-#if defined(__ACCLIB_PCLOCK_NEED_WARN_POP)
-#  if (ACC_CC_MSC && (_MSC_VER >= 1200))
-#    pragma warning(pop)
-#  else
-#    error "__ACCLIB_PCLOCK_NEED_WARN_POP"
-#  endif
-#  undef __ACCLIB_PCLOCK_NEED_WARN_POP
-#endif
-#endif
-#if defined(ACC_WANT_ACCLIB_UCLOCK)
-#  undef ACC_WANT_ACCLIB_UCLOCK
-#define __ACCLIB_UCLOCK_CH_INCLUDED 1
-#if !defined(ACCLIB_PUBLIC)
-#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
-#endif
-#if (ACC_OS_DOS16 || ACC_OS_WIN16)
-#elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
-#elif (ACC_OS_CYGWIN || ACC_OS_WIN32 || ACC_OS_WIN64) && (ACC_HAVE_WINDOWS_H)
-#  if ((ACC_CC_DMC && (__DMC__ < 0x838)) || ACC_CC_LCCWIN32)
-#    define __ACCLIB_UCLOCK_USE_CLOCK 1
-#  else
-#    define __ACCLIB_UCLOCK_USE_WINMM 1
-#    if (ACC_CC_MSC && (_MSC_VER >= 1200))
-#      pragma warning(push)
-#      define __ACCLIB_UCLOCK_NEED_WARN_POP 1
-#    endif
-#    if (ACC_CC_MSC && (_MSC_VER >= 900))
-#      pragma warning(disable: 4201)
-#    elif (ACC_CC_MWERKS)
-#      define LPUINT __ACC_MMSYSTEM_H_LPUINT
-#    endif
-#    if 1
-#      include <mmsystem.h>
-#    else
-#      if (ACC_CC_INTELC || ACC_CC_MSC || ACC_CC_PELLESC)
-         ACC_EXTERN_C __declspec(dllimport) unsigned long __stdcall timeGetTime(void);
-#      else
-         ACC_EXTERN_C unsigned long __stdcall timeGetTime(void);
-#      endif
-#    endif
-#    if (ACC_CC_DMC)
-#      pragma DMC includelib "winmm.lib"
-#    elif (ACC_CC_INTELC || ACC_CC_MSC || ACC_CC_PELLESC)
-#      pragma comment(lib, "winmm.lib")
-#    elif (ACC_CC_MWERKS && (__MWERKS__ >= 0x3000))
-#      pragma comment(lib, "winmm.lib")
-#    elif (ACC_CC_SYMANTECC)
-#      pragma SC includelib "winmm.lib"
-#    elif (ACC_CC_WATCOMC && (__WATCOMC__ >= 1050))
-#      pragma library("winmm.lib")
-#    endif
-#  endif
-#elif (ACC_OS_CYGWIN || ACC_OS_DOS32 || ACC_OS_EMX || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_TOS || ACC_OS_WIN32 || ACC_OS_WIN64)
-#  define __ACCLIB_UCLOCK_USE_CLOCK 1
-#elif (ACC_OS_CONSOLE) && defined(CLOCKS_PER_SEC)
-#  define __ACCLIB_UCLOCK_USE_CLOCK 1
-#elif (ACC_LIBC_ISOC90 || ACC_LIBC_ISOC99) && defined(CLOCKS_PER_SEC)
-#  define __ACCLIB_UCLOCK_USE_CLOCK 1
-#endif
-#if (__ACCLIB_UCLOCK_USE_CLOCK) && !defined(CLOCKS_PER_SEC)
-#  if defined(CLK_TCK)
-#    define CLOCKS_PER_SEC CLK_TCK
-#  else
-#    undef __ACCLIB_UCLOCK_USE_CLOCK
-#  endif
-#endif
-#if (__ACCLIB_UCLOCK_USE_GETRUSAGE)
-#  if !defined(RUSAGE_SELF)
-#    undef __ACCLIB_UCLOCK_USE_GETRUSAGE
-#  endif
-#endif
-ACCLIB_PUBLIC(int, acc_uclock_open) (acc_uclock_handle_p h)
-{
-    int i;
-#if (__ACCLIB_UCLOCK_USE_QPC)
-    LARGE_INTEGER li;
-#endif
-    h->h = (acclib_handle_t) 1;
-    h->mode = 0;
-    h->read_error = 0;
-    h->name = NULL;
-#if (__ACCLIB_UCLOCK_USE_PERFCTR)
-    h->pch.h = 0;
-    if (h->mode == 0 && __ACCLIB_FUNCNAME(acc_perfctr_open)(&h->pch) == 0)
-        h->mode = 2;
-#endif
-#if (__ACCLIB_UCLOCK_USE_QPC)
-    h->qpf = 0.0;
-    if (h->mode == 0 && QueryPerformanceFrequency(&li) != 0) {
-        double d = (double) li.QuadPart;
-        if (d > 0.0 && QueryPerformanceCounter(&li) != 0) {
-            h->mode = 3;
-            h->qpf = d;
-        }
-    }
-#endif
-    for (i = 0; i < 10; i++) {
-        acc_uclock_t c;
-        __ACCLIB_FUNCNAME(acc_uclock_read)(h, &c);
-    }
-    return 0;
-}
-ACCLIB_PUBLIC(int, acc_uclock_close) (acc_uclock_handle_p h)
-{
-    h->h = (acclib_handle_t) 0;
-    h->mode = -1;
-    h->name = NULL;
-#if (__ACCLIB_UCLOCK_USE_PERFCTR)
-    __ACCLIB_FUNCNAME(acc_perfctr_close)(&h->pch);
-#endif
-    return 0;
-}
-ACCLIB_PUBLIC(void, acc_uclock_read) (acc_uclock_handle_p h, acc_uclock_p c)
-{
-#if (__ACCLIB_UCLOCK_USE_RDTSC)
-    __ACCLIB_FUNCNAME(acc_tsc_read)((acc_uint32e_t*) (void*) &c->tsc);
-#endif
-#if (__ACCLIB_UCLOCK_USE_PERFCTR)
-    if (h->pch.h) {
-        __ACCLIB_FUNCNAME(acc_perfctr_read)(&h->pch, &c->pcc);
-        if (h->mode > 0 && h->mode <= 2)
-            return;
-    }
-#endif
-#if (__ACCLIB_UCLOCK_USE_QPC)
-    if (h->qpf > 0.0) {
-        LARGE_INTEGER li;
-        if (QueryPerformanceCounter(&li) != 0) {
-            c->qpc = (acc_int64l_t) li.QuadPart;
-            if (h->mode > 0 && h->mode <= 3)
-                return;
-        } else {
-            h->mode = 0; h->qpf = 0.0; c->qpc = 0;
-            h->read_error = 1;
-        }
-    }
-#endif
-    {
-#if (ACC_OS_DOS16 || ACC_OS_WIN16)
-# if (ACC_CC_AZTECC)
-    c->ticks.t32 = 0;
-# else
-    union REGS ri, ro;
-    ri.x.ax = 0x2c00; int86(0x21, &ri, &ro);
-    c->ticks.t32 = ro.h.ch*60UL*60UL*100UL + ro.h.cl*60UL*100UL + ro.h.dh*100UL + ro.h.dl;
-# endif
-#elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
-    c->ticks.t64 = uclock();
-#elif (__ACCLIB_UCLOCK_USE_CLOCK) && defined(acc_int64l_t)
-    c->ticks.t64 = clock();
-#elif (__ACCLIB_UCLOCK_USE_CLOCK)
-    c->ticks.t32 = clock();
-#elif (__ACCLIB_UCLOCK_USE_WINMM)
-    c->ticks.t32 = timeGetTime();
-#elif (__ACCLIB_UCLOCK_USE_GETRUSAGE)
-    struct rusage ru;
-    if (getrusage(RUSAGE_SELF, &ru) != 0) c->ticks.td = 0;
-    else c->ticks.td = ru.ru_utime.tv_sec + ru.ru_utime.tv_usec / 1000000.0;
-#elif (HAVE_GETTIMEOFDAY)
-    struct timeval tv;
-    if (gettimeofday(&tv, 0) != 0) c->ticks.td = 0;
-    else c->ticks.td = tv.tv_sec + tv.tv_usec / 1000000.0;
-#else
-    ACC_UNUSED(c);
-#endif
-    }
-    ACC_UNUSED(h);
-}
-ACCLIB_PUBLIC(double, acc_uclock_get_elapsed) (acc_uclock_handle_p h, const acc_uclock_p start, const acc_uclock_p stop)
-{
-    double d;
-    if (!h->h) {
-        h->mode = -1;
-        return 0.0;
-    }
-#if (__ACCLIB_UCLOCK_USE_RDTSC)
-    if (h->mode == 1) {
-        if (!h->name) h->name = "rdtsc";
-        d = (double) ((acc_int64l_t)stop->tsc - (acc_int64l_t)start->tsc);
-        return d / 1000000000.0;
-    }
-#endif
-#if (__ACCLIB_UCLOCK_USE_PERFCTR)
-    if (h->pch.h && h->mode == 2) {
-        if (!h->name) h->name = "perfctr";
-        return __ACCLIB_FUNCNAME(acc_perfctr_get_elapsed)(&h->pch, &start->pcc, &stop->pcc);
-    }
-#endif
-#if (__ACCLIB_UCLOCK_USE_QPC)
-    if (h->qpf > 0.0 && h->mode == 3) {
-        if (!h->name) h->name = "qpc";
-        if (start->qpc == 0 || stop->qpc == 0) return 0.0;
-        return (double) (stop->qpc - start->qpc) / h->qpf;
-    }
-#endif
-#if (ACC_OS_DOS16 || ACC_OS_WIN16)
-    h->mode = 11;
-    if (!h->name) h->name = "uclock";
-    d = (double) (stop->ticks.t32 - start->ticks.t32) / 100.0;
-    if (d < 0.0) d += 86400.0;
-#elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
-    h->mode = 12;
-    if (!h->name) h->name = "uclock";
-    d = (double) (stop->ticks.t64 - start->ticks.t64) / (UCLOCKS_PER_SEC);
-#elif (__ACCLIB_UCLOCK_USE_CLOCK) && defined(acc_int64l_t)
-    h->mode = 13;
-    if (!h->name) h->name = "clock";
-    {
-    acc_int64l_t t;
-    t = stop->ticks.t64 - start->ticks.t64;
-    if (t < 0)
-        t += sizeof(clock_t) == 4 ? ACC_INT64_C(0x100000000) : ACC_INT64_C(0);
-    d = (double) t / (CLOCKS_PER_SEC);
-    }
-#elif (__ACCLIB_UCLOCK_USE_CLOCK)
-    h->mode = 14;
-    if (!h->name) h->name = "clock";
-    d = (double) (stop->ticks.t32 - start->ticks.t32) / (CLOCKS_PER_SEC);
-#elif (__ACCLIB_UCLOCK_USE_WINMM)
-    h->mode = 15;
-    if (!h->name) h->name = "timeGetTime";
-    d = (double) (stop->ticks.t32 - start->ticks.t32) / 1000.0;
-#elif (__ACCLIB_UCLOCK_USE_GETRUSAGE)
-    h->mode = 16;
-    if (!h->name) h->name = "getrusage";
-    d = stop->ticks.td - start->ticks.td;
-#elif (HAVE_GETTIMEOFDAY)
-    h->mode = 17;
-    if (!h->name) h->name = "gettimeofday";
-    d = stop->ticks.td - start->ticks.td;
-#else
-    h->mode = 0;
-    d = 0.0;
-#endif
-    return d;
-}
-ACCLIB_PUBLIC(int, acc_uclock_flush_cpu_cache) (acc_uclock_handle_p h, unsigned flags)
-{
-    if (h->h) {
-#if (__ACCLIB_UCLOCK_USE_PERFCTR)
-        return __ACCLIB_FUNCNAME(acc_perfctr_flush_cpu_cache)(&h->pch, flags);
-#endif
-    }
-    ACC_UNUSED(h); ACC_UNUSED(flags);
-    return -1;
-}
-#if defined(__ACCLIB_UCLOCK_NEED_WARN_POP)
-#  if (ACC_CC_MSC && (_MSC_VER >= 1200))
-#    pragma warning(pop)
-#  else
-#    error "__ACCLIB_UCLOCK_NEED_WARN_POP"
-#  endif
-#  undef __ACCLIB_UCLOCK_NEED_WARN_POP
-#endif
-#endif
-#if defined(ACC_WANT_ACCLIB_MISC)
-#  undef ACC_WANT_ACCLIB_MISC
-#define __ACCLIB_MISC_CH_INCLUDED 1
-#if !defined(ACCLIB_PUBLIC)
-#  define ACCLIB_PUBLIC(r,f)                r __ACCLIB_FUNCNAME(f)
-#endif
-#if !defined(ACCLIB_PUBLIC_NOINLINE)
-#  if !defined(__acc_noinline)
-#    define ACCLIB_PUBLIC_NOINLINE(r,f)     r __ACCLIB_FUNCNAME(f)
-#  elif (ACC_CC_CLANG || (ACC_CC_GNUC >= 0x030400ul) || ACC_CC_LLVM)
-#    define ACCLIB_PUBLIC_NOINLINE(r,f)     __acc_noinline __attribute__((__used__)) r __ACCLIB_FUNCNAME(f)
-#  else
-#    define ACCLIB_PUBLIC_NOINLINE(r,f)     __acc_noinline r __ACCLIB_FUNCNAME(f)
-#  endif
-#endif
-#if (ACC_OS_WIN32 && ACC_CC_PELLESC && (__POCC__ >= 290))
-#  pragma warn(push)
-#  pragma warn(disable:2007)
-#endif
-ACCLIB_PUBLIC(const char *, acc_getenv) (const char *s)
-{
-#if (HAVE_GETENV)
-    return getenv(s);
-#else
-    ACC_UNUSED(s); return (const char *) 0;
-#endif
-}
-ACCLIB_PUBLIC(acclib_handle_t, acc_get_osfhandle) (int fd)
-{
-    if (fd < 0)
-        return -1;
-#if (ACC_OS_CYGWIN)
-    return get_osfhandle(fd);
-#elif (ACC_OS_EMX && defined(__RSXNT__))
-    return -1;
-#elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__PW32__)
-    return -1;
-#elif (ACC_OS_WIN32 || ACC_OS_WIN64)
-# if (ACC_CC_PELLESC && (__POCC__ < 280))
-    return -1;
-# elif (ACC_CC_WATCOMC && (__WATCOMC__ < 1000))
-    return -1;
-# elif (ACC_CC_WATCOMC && (__WATCOMC__ < 1100))
-    return _os_handle(fd);
-# else
-    return _get_osfhandle(fd);
-# endif
-#else
-    return fd;
-#endif
-}
-ACCLIB_PUBLIC(int, acc_set_binmode) (int fd, int binary)
-{
-#if (ACC_ARCH_M68K && ACC_OS_TOS && ACC_CC_GNUC) && defined(__MINT__)
-    FILE* fp; int old_binary;
-    if (fd == STDIN_FILENO) fp = stdin;
-    else if (fd == STDOUT_FILENO) fp = stdout;
-    else if (fd == STDERR_FILENO) fp = stderr;
-    else return -1;
-    old_binary = fp->__mode.__binary;
-    __set_binmode(fp, binary ? 1 : 0);
-    return old_binary ? 1 : 0;
-#elif (ACC_ARCH_M68K && ACC_OS_TOS)
-    ACC_UNUSED(fd); ACC_UNUSED(binary);
-    return -1;
-#elif (ACC_OS_DOS16 && (ACC_CC_AZTECC || ACC_CC_PACIFICC))
-    ACC_UNUSED(fd); ACC_UNUSED(binary);
-    return -1;
-#elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
-    int r; unsigned old_flags = __djgpp_hwint_flags;
-    ACC_COMPILE_TIME_ASSERT(O_BINARY > 0)
-    ACC_COMPILE_TIME_ASSERT(O_TEXT > 0)
-    if (fd < 0) return -1;
-    r = setmode(fd, binary ? O_BINARY : O_TEXT);
-    if ((old_flags & 1u) != (__djgpp_hwint_flags & 1u))
-        __djgpp_set_ctrl_c(!(old_flags & 1));
-    if (r == -1) return -1;
-    return (r & O_TEXT) ? 0 : 1;
-#elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__PW32__)
-    if (fd < 0) return -1;
-    ACC_UNUSED(binary);
-    return 1;
-#elif (ACC_OS_DOS32 && ACC_CC_HIGHC)
-    FILE* fp; int r;
-    if (fd == fileno(stdin)) fp = stdin;
-    else if (fd == fileno(stdout)) fp = stdout;
-    else if (fd == fileno(stderr)) fp = stderr;
-    else return -1;
-    r = _setmode(fp, binary ? _BINARY : _TEXT);
-    if (r == -1) return -1;
-    return (r & _BINARY) ? 1 : 0;
-#elif (ACC_OS_WIN32 && ACC_CC_MWERKS) && defined(__MSL__)
-    ACC_UNUSED(fd); ACC_UNUSED(binary);
-    return -1;
-#elif (ACC_OS_CYGWIN && (ACC_CC_GNUC < 0x025a00ul))
-    ACC_UNUSED(fd); ACC_UNUSED(binary);
-    return -1;
-#elif (ACC_OS_CYGWIN || ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_EMX || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
-    int r;
-#if !(ACC_CC_ZORTECHC)
-    ACC_COMPILE_TIME_ASSERT(O_BINARY > 0)
-#endif
-    ACC_COMPILE_TIME_ASSERT(O_TEXT > 0)
-    if (fd < 0) return -1;
-    r = setmode(fd, binary ? O_BINARY : O_TEXT);
-    if (r == -1) return -1;
-    return (r & O_TEXT) ? 0 : 1;
-#else
-    if (fd < 0) return -1;
-    ACC_UNUSED(binary);
-    return 1;
-#endif
-}
-ACCLIB_PUBLIC(int, acc_isatty) (int fd)
-{
-    if (fd < 0)
-        return 0;
-#if (ACC_OS_DOS16 && !(ACC_CC_AZTECC))
-    {
-        union REGS ri, ro;
-        ri.x.ax = 0x4400; ri.x.bx = fd;
-        int86(0x21, &ri, &ro);
-        if ((ro.x.cflag & 1) == 0)
-            if ((ro.x.ax & 0x83) != 0x83)
-                return 0;
-    }
-#elif (ACC_OS_DOS32 && ACC_CC_WATCOMC)
-    {
-        union REGS ri, ro;
-        ri.w.ax = 0x4400; ri.w.bx = (unsigned short) fd;
-        int386(0x21, &ri, &ro);
-        if ((ro.w.cflag & 1) == 0)
-            if ((ro.w.ax & 0x83) != 0x83)
-                return 0;
-    }
-#elif (ACC_HAVE_WINDOWS_H)
-    {
-        acclib_handle_t h = __ACCLIB_FUNCNAME(acc_get_osfhandle)(fd);
-        if ((HANDLE)h != INVALID_HANDLE_VALUE)
-        {
-            DWORD d = 0;
-            if (GetConsoleMode((HANDLE)h, &d) == 0)
-                return 0;
-        }
-    }
-#endif
-#if (HAVE_ISATTY)
-    return (isatty(fd)) ? 1 : 0;
-#else
-    return 0;
-#endif
-}
-ACCLIB_PUBLIC(int, acc_mkdir) (const char* name, unsigned mode)
-{
-#if !(HAVE_MKDIR)
-    ACC_UNUSED(name); ACC_UNUSED(mode);
-    return -1;
-#elif (ACC_ARCH_M68K && ACC_OS_TOS && (ACC_CC_PUREC || ACC_CC_TURBOC))
-    ACC_UNUSED(mode);
-    return Dcreate(name);
-#elif (ACC_OS_DOS32 && ACC_CC_GNUC) && defined(__DJGPP__)
-    return mkdir(name, mode);
-#elif (ACC_OS_WIN32 && ACC_CC_GNUC) && defined(__PW32__)
-    return mkdir(name, mode);
-#elif (ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
-    ACC_UNUSED(mode);
-# if (ACC_CC_HIGHC || ACC_CC_PACIFICC)
-    return mkdir((char*) name);
-# else
-    return mkdir(name);
-# endif
-#elif (ACC_CC_WATCOMC)
-    return mkdir(name, (mode_t) mode);
-#else
-    return mkdir(name, mode);
-#endif
-}
-ACCLIB_PUBLIC(int, acc_rmdir) (const char* name)
-{
-#if !(HAVE_RMDIR)
-    ACC_UNUSED(name);
-    return -1;
-#elif ((ACC_OS_DOS16 || ACC_OS_DOS32) && (ACC_CC_HIGHC || ACC_CC_PACIFICC))
-    return rmdir((char *) name);
-#else
-    return rmdir(name);
-#endif
-}
-#if defined(acc_int32e_t)
-ACCLIB_PUBLIC(acc_int32e_t, acc_muldiv32s) (acc_int32e_t a, acc_int32e_t b, acc_int32e_t x)
-{
-    acc_int32e_t r = 0;
-    if __acc_likely(x != 0)
-    {
-#if defined(acc_int64l_t)
-        r = (acc_int32e_t) (((acc_int64l_t) a * b) / x);
-#else
-        ACC_UNUSED(a); ACC_UNUSED(b);
-#endif
-    }
-    return r;
-}
-ACCLIB_PUBLIC(acc_uint32e_t, acc_muldiv32u) (acc_uint32e_t a, acc_uint32e_t b, acc_uint32e_t x)
-{
-    acc_uint32e_t r = 0;
-    if __acc_likely(x != 0)
-    {
-#if defined(acc_int64l_t)
-        r = (acc_uint32e_t) (((acc_uint64l_t) a * b) / x);
-#else
-        ACC_UNUSED(a); ACC_UNUSED(b);
-#endif
-    }
-    return r;
-}
-#endif
-#if 0
-ACCLIB_PUBLIC_NOINLINE(int, acc_syscall_clock_gettime) (int c)
-{
-}
-#endif
-#if (ACC_OS_WIN16)
-ACC_EXTERN_C void __far __pascal DebugBreak(void);
-#endif
-ACCLIB_PUBLIC_NOINLINE(void, acc_debug_break) (void)
-{
-#if (ACC_OS_WIN16)
-    DebugBreak();
-#elif (ACC_ARCH_I086)
-#elif (ACC_OS_WIN64) && (ACC_HAVE_WINDOWS_H)
-    DebugBreak();
-#elif (ACC_CFG_NO_INLINE_ASM) && (ACC_OS_WIN32) && (ACC_HAVE_WINDOWS_H)
-    DebugBreak();
-#elif (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC)
-    __asm__ __volatile__("int $3\n" : : : __ACC_ASM_CLOBBER);
-#elif (ACC_ARCH_I386) && (ACC_ASM_SYNTAX_MSC)
-    __asm { int 3 }
-#elif (ACC_OS_WIN32) && (ACC_HAVE_WINDOWS_H)
-    DebugBreak();
-#else
-    * (volatile unsigned long *) (volatile void *) (size_t) 0x1 = ~0ul;
-#endif
-}
-ACCLIB_PUBLIC_NOINLINE(void, acc_debug_nop) (void)
-{
-}
-ACCLIB_PUBLIC_NOINLINE(int, acc_debug_align_check_query) (void)
-{
-#if (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC)
-    size_t r;
-    __asm__ __volatile__("pushf\n pop %0\n" : "=a" (r) : : __ACC_ASM_CLOBBER);
-    return (int)(r >> 18) & 1;
-#elif (ACC_ARCH_I386) && (ACC_ASM_SYNTAX_MSC)
-    unsigned long r;
-    __asm {
-        pushf
-        pop eax
-        mov r,eax
-    }
-    return (int)(r >> 18) & 1;
-#else
-    return -1;
-#endif
-}
-ACCLIB_PUBLIC_NOINLINE(int, acc_debug_align_check_enable) (int v)
-{
-    int r;
-#if (ACC_ARCH_AMD64) && (ACC_ASM_SYNTAX_GNUC)
-    if (v) {
-        __asm__ __volatile__("pushf\n orl $262144,(%%rsp)\n popf\n" : : : __ACC_ASM_CLOBBER);
-    } else {
-        __asm__ __volatile__("pushf\n andl $-262145,(%%rsp)\n popf\n" : : : __ACC_ASM_CLOBBER);
-    }
-    r = 0;
-#elif (ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC)
-    if (v) {
-        __asm__ __volatile__("pushf\n orl $262144,(%%esp)\n popf\n" : : : __ACC_ASM_CLOBBER);
-    } else {
-        __asm__ __volatile__("pushf\n andl $-262145,(%%esp)\n popf\n" : : : __ACC_ASM_CLOBBER);
-    }
-    r = 0;
-#elif (ACC_ARCH_I386) && (ACC_ASM_SYNTAX_MSC)
-    if (v) { __asm {
-        pushf
-        or dword ptr [esp],262144
-        popf
-    }} else { __asm {
-        pushf
-        and dword ptr [esp],-262145
-        popf
-    }}
-    r = 0;
-#else
-    r = -1;
-#endif
-    ACC_UNUSED(v); return r;
-}
-ACCLIB_PUBLIC_NOINLINE(unsigned, acc_debug_running_on_qemu) (void)
-{
-    unsigned r = 0;
-#if (ACC_OS_POSIX_LINUX || ACC_OS_WIN32 || ACC_OS_WIN64)
-    const char* p;
-    p = __ACCLIB_FUNCNAME(acc_getenv)("ACC_ENV_RUNNING_ON_QEMU");
-    if (p) {
-        if (p[0] == 0) r = 0;
-        else if ((p[0] >= '0' && p[0] <= '9') && p[1] == 0) r = p[0] - '0';
-        else r = 1;
-    }
-#endif
-    return r;
-}
-ACCLIB_PUBLIC_NOINLINE(unsigned, acc_debug_running_on_valgrind) (void)
-{
-#if (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC)
-    volatile unsigned long args[5] = { 0x1001, 0, 0, 0, 0 };
-    unsigned long r = 0;
-    __asm__ __volatile__(".byte 0xc1,0xc0,0x1d,0xc1,0xc0,0x03,0xc1,0xc8,0x1b,0xc1,0xc8,0x05,0xc1,0xc0,0x0d,0xc1,0xc0,0x13\n" : "=d" (r) : "a" (&args[0]), "d" (r) : __ACC_ASM_CLOBBER);
-    return (unsigned) r;
-#else
-    return 0;
-#endif
-}
-#if (ACC_OS_WIN32 && ACC_CC_PELLESC && (__POCC__ >= 290))
-#  pragma warn(pop)
-#endif
-#endif
-#if defined(ACC_WANT_ACCLIB_WILDARGV)
-#  undef ACC_WANT_ACCLIB_WILDARGV
-#define __ACCLIB_WILDARGV_CH_INCLUDED 1
-#if !defined(ACCLIB_PUBLIC)
-#  define ACCLIB_PUBLIC(r,f)    r __ACCLIB_FUNCNAME(f)
-#endif
-#if (ACC_OS_DOS16 || ACC_OS216 || ACC_OS_WIN16)
-#if 0 && (ACC_CC_MSC)
-ACC_EXTERN_C int __acc_cdecl __setargv(void);
-ACC_EXTERN_C int __acc_cdecl _setargv(void);
-ACC_EXTERN_C int __acc_cdecl _setargv(void) { return __setargv(); }
-#endif
-#endif
-#if (ACC_OS_WIN32 || ACC_OS_WIN64)
-#if (ACC_CC_INTELC || ACC_CC_MSC)
-ACC_EXTERN_C int __acc_cdecl __setargv(void);
-ACC_EXTERN_C int __acc_cdecl _setargv(void);
-ACC_EXTERN_C int __acc_cdecl _setargv(void) { return __setargv(); }
-#endif
-#endif
-#if (ACC_OS_EMX)
-#define __ACCLIB_HAVE_ACC_WILDARGV 1
-ACCLIB_PUBLIC(void, acc_wildargv) (int* argc, char*** argv)
-{
-    if (argc && argv) {
-        _response(argc, argv);
-        _wildcard(argc, argv);
-    }
-}
-#endif
-#if (ACC_OS_CONSOLE_PSP) && defined(__PSPSDK_DEBUG__)
-#define __ACCLIB_HAVE_ACC_WILDARGV 1
-ACC_EXTERN_C int acc_psp_init_module(int*, char***, int);
-ACCLIB_PUBLIC(void, acc_wildargv) (int* argc, char*** argv)
-{
-    acc_psp_init_module(argc, argv, -1);
-}
-#endif
-#if !(__ACCLIB_HAVE_ACC_WILDARGV)
-#define __ACCLIB_HAVE_ACC_WILDARGV 1
-ACCLIB_PUBLIC(void, acc_wildargv) (int* argc, char*** argv)
-{
-#if 1 && (ACC_ARCH_I086PM)
-    if (ACC_MM_AHSHIFT != 3) { exit(1); }
-#elif 1 && (ACC_ARCH_M68K && ACC_OS_TOS && ACC_CC_GNUC) && defined(__MINT__)
-    __binmode(1);
-    if (isatty(1)) __set_binmode(stdout, 0);
-    if (isatty(2)) __set_binmode(stderr, 0);
-#endif
-    ACC_UNUSED(argc); ACC_UNUSED(argv);
-}
-#endif
-#endif
-
-/* vim:set ts=4 et: */
diff --git a/lzo/src/stats1a.h b/lzo/src/stats1a.h
deleted file mode 100644
index 577f50c8..00000000
--- a/lzo/src/stats1a.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* stats1a.h -- statistics for the the LZO1A algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the LZO package and is subject
-   to change.
- */
-
-
-#ifndef __LZO_STATS1A_H
-#define __LZO_STATS1A_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-/***********************************************************************
-// collect statistical information when compressing
-// used for finetuning, view with a debugger
-************************************************************************/
-
-#if (LZO_COLLECT_STATS)
-#  define LZO_STATS(expr)   expr
-#else
-#  define LZO_STATS(expr)   ((void) 0)
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-typedef struct {
-
-/* configuration */
-    unsigned rbits;
-    unsigned clevel;
-
-/* internal configuration */
-    unsigned dbits;
-    unsigned lbits;
-
-/* constants */
-    unsigned min_match_short;
-    unsigned max_match_short;
-    unsigned min_match_long;
-    unsigned max_match_long;
-    unsigned min_offset;
-    unsigned max_offset;
-    unsigned r0min;
-    unsigned r0fast;
-    unsigned r0max;
-
-/* counts */
-    long short_matches;
-    long long_matches;
-    long r1_matches;
-    long lit_runs;
-    long lit_runs_after_long_match;
-    long r0short_runs;
-    long r0fast_runs;
-    long r0long_runs;
-
-/* */
-    long lit_run[RSIZE];
-    long lit_run_after_long_match[RSIZE];
-    long short_match[MAX_MATCH_SHORT + 1];
-    long long_match[MAX_MATCH_LONG + 1];
-    long marker[256];
-
-/* these could prove useful for further optimizations */
-    long short_match_offset_osize[MAX_MATCH_SHORT + 1];
-    long short_match_offset_256[MAX_MATCH_SHORT + 1];
-    long short_match_offset_1024[MAX_MATCH_SHORT + 1];
-    long matches_out_of_range;
-    long matches_out_of_range_2;
-    long matches_out_of_range_4;
-    long match_out_of_range[MAX_MATCH_SHORT + 1];
-
-/* */
-    long in_len;
-    long out_len;
-}
-lzo1a_stats_t;
-
-extern lzo1a_stats_t *lzo1a_stats;
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/stats1b.h b/lzo/src/stats1b.h
deleted file mode 100644
index e3ced967..00000000
--- a/lzo/src/stats1b.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* stats1b.h -- statistics for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_STATS1B_H
-#define __LZO_STATS1B_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-// Collect statistical information when compressing.
-// Useful for finetuning the compression algorithm.
-// Examine the symbol 'lzo1b_stats' with a debugger.
-************************************************************************/
-
-#if (LZO_COLLECT_STATS)
-#  define LZO_STATS(expr)   expr
-#else
-#  define LZO_STATS(expr)   ((void) 0)
-#endif
-
-
-#if (LZO_COLLECT_STATS)
-
-typedef struct
-{
-/* algorithm configuration */
-    unsigned r_bits;
-    unsigned m3o_bits;
-    unsigned dd_bits;
-    unsigned clevel;
-
-/* internal configuration */
-    unsigned d_bits;
-    long min_lookahead;
-    long max_lookbehind;
-    const char *compress_id;
-
-/* counts */
-    long lit_runs;
-    long r0short_runs;
-    long r0fast_runs;
-    long r0long_runs;
-    long m1_matches;
-    long m2_matches;
-    long m3_matches;
-    long m4_matches;
-    long r1_matches;
-
-/* */
-    long lit_run[R0MIN];
-    long m2_match[M2_MAX_LEN + 1];
-    long m3_match[M3_MAX_LEN + 1];
-#if (M3O_BITS < 8)
-    long lit_runs_after_m3_match;
-    long lit_run_after_m3_match[LZO_SIZE(8-M3O_BITS)];
-#endif
-
-/* */
-    long matches;
-    long match_bytes;
-    long literals;
-    long literal_overhead;
-    long literal_bytes;
-    double literal_overhead_percent;
-
-/* */
-    long unused_dict_entries;
-    double unused_dict_entries_percent;
-
-/* */
-    long in_len;
-    long out_len;
-}
-lzo1b_stats_t;
-
-
-void _lzo1b_stats_init(lzo1b_stats_t *lzo_stats);
-void _lzo1b_stats_calc(lzo1b_stats_t *lzo_stats);
-
-extern lzo1b_stats_t * const lzo1b_stats;
-
-#define lzo_stats_t     lzo1b_stats_t
-#define lzo_stats       lzo1b_stats
-
-#endif
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/
diff --git a/lzo/src/stats1c.h b/lzo/src/stats1c.h
deleted file mode 100644
index 8a0d3a5d..00000000
--- a/lzo/src/stats1c.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* stats1c.h -- statistics for the the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library 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.
-
-   The LZO library 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 the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the library and is subject
-   to change.
- */
-
-
-#ifndef __LZO_STATS1C_H
-#define __LZO_STATS1C_H 1
-
-#define lzo1b_stats_t       lzo1c_stats_t
-#define lzo1b_stats         lzo1c_stats
-#define _lzo1b_stats_init   _lzo1c_stats_init
-#define _lzo1b_stats_calc   _lzo1c_stats_calc
-
-#include "stats1b.h"
-
-#endif /* already included */
-
-/*
-vi:ts=4:et
-*/