From 383cd5a4ae9c617d477c05aac82e86e48a0b9076 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 01:10:36 +0000 Subject: [PATCH 01/82] Initialize branch F-13 for distcc --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 78b331d58728a94f5c558fed6596aba908ff218f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:03:47 +0000 Subject: [PATCH 02/82] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 130de57..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: distcc -# $Id: Makefile,v 1.1 2008/03/07 21:44:16 kevin Exp $ -NAME := distcc -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From 887cfdcfe0d01d9ff70f3b9aa3648d369e948beb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:03:50 +0000 Subject: [PATCH 03/82] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 130de57..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: distcc -# $Id: Makefile,v 1.1 2008/03/07 21:44:16 kevin Exp $ -NAME := distcc -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 412449e235e4009ae97f9735f2de336c7f25e922 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 7 Oct 2010 14:23:10 -0500 Subject: [PATCH 04/82] 3.1 --- .gitignore | 1 + distcc.spec | 29 +++++++++++++++++++++-------- sources | 2 +- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 8ab1d9e..f42c19b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ distcc-2.18.3.tar.bz2 +/distcc-3.1.tar.bz2 diff --git a/distcc.spec b/distcc.spec index 4c64cea..b9d0270 100644 --- a/distcc.spec +++ b/distcc.spec @@ -1,15 +1,19 @@ +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +# eval to 2.3 if python isn't yet present, workaround for no python in fc4 minimal buildroot +%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")} + Name: distcc -Version: 2.18.3 -Release: 6%{?dist} +Version: 3.1 +Release: 1%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ -URL: http://distcc.samba.org/ -Source0: http://distcc.samba.org/ftp/distcc/distcc-%{version}.tar.bz2 +URL: http://distcc.org/ +Source0: http://distcc.googlecode.com/files/distcc-%{version}.tar.bz2 Source1: hosts.sample Source2: distccd.init -Patch0: distcc-2.18.3-avahi.patch +#Patch0: distcc-2.18.3-avahi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: popt-devel @@ -42,11 +46,11 @@ This package contains the compilation server needed to use %{name}. %prep %setup -q -%patch0 -p1 -b .avahi +#%patch0 -p1 -b .avahi %build -%configure --with-gnome --with-docdir=%{_datadir}/doc/%{name}-%{version} +%configure --with-gnome --with-docdir=%{_datadir}/doc/%{name}-%{version} --disable-Werror make %{?_smp_mflags} @@ -94,6 +98,8 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/doc/%{name}-%{version} %{_bindir}/distcc %{_bindir}/distccmon* +%{_bindir}/lsdistcc +%{_bindir}/pump %{_mandir}/man1/distcc.* %{_mandir}/man1/distccmon* %{_datadir}/%{name} @@ -107,11 +113,18 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING README %{_bindir}/distccd %{_sysconfdir}/init.d/* +%{_sysconfdir}/default/distcc +%{_sysconfdir}/distcc/*allow* %{_mandir}/man1/distccd* +%{_mandir}/man1/include_server* +%{_mandir}/man1/pump* %config(noreplace) %{_sysconfdir}/sysconfig/distccd - +%{python_sitearch}/include_server* %changelog +* Thu Oct 07 2010 Jon Ciesla - 3.1-1 +- New upstream, BZ 641032. + * Fri Jul 24 2009 Fedora Release Engineering - 2.18.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 04f36e9..600a277 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0d6b80a1efc3a3d816c4f4175f63eaa2 distcc-2.18.3.tar.bz2 +a1a9d3853df7133669fffec2a9aab9f3 distcc-3.1.tar.bz2 From 764d82fe2e298636bb0b1d5ed8df77a6b71deb60 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 7 Oct 2010 14:32:03 -0500 Subject: [PATCH 05/82] BR fix. --- distcc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index b9d0270..67e7b12 100644 --- a/distcc.spec +++ b/distcc.spec @@ -19,7 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: popt-devel BuildRequires: libgnomeui-devel BuildRequires: pango-devel -BuildRequires: python +BuildRequires: python-devel BuildRequires: desktop-file-utils BuildRequires: avahi-devel From efc3555fce1b66b36248752e71434c7bcb40b03f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 08:02:06 -0600 Subject: [PATCH 06/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 67e7b12..e4810c7 100644 --- a/distcc.spec +++ b/distcc.spec @@ -5,7 +5,7 @@ Name: distcc Version: 3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Oct 07 2010 Jon Ciesla - 3.1-1 - New upstream, BZ 641032. From bd2ea69def391c9d99db931f461fe13c7c63363a Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 10 Nov 2011 09:43:26 -0600 Subject: [PATCH 07/82] libpng 1.5. --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index e4810c7..2ebb712 100644 --- a/distcc.spec +++ b/distcc.spec @@ -5,7 +5,7 @@ Name: distcc Version: 3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Thu Nov 10 2011 Jon Ciesla - 3.1-3 +- Rebuild for libpng 1.5. + * Tue Feb 08 2011 Fedora Release Engineering - 3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From e764dcc1cccd0c50360c0fb60b2bf1b2d8b4fddc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 18:41:32 -0600 Subject: [PATCH 08/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 2ebb712..88108ae 100644 --- a/distcc.spec +++ b/distcc.spec @@ -5,7 +5,7 @@ Name: distcc Version: 3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu Nov 10 2011 Jon Ciesla - 3.1-3 - Rebuild for libpng 1.5. From 42aa622d62e1b825e5fb555d8e1b18d3751c63df Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 31 Jan 2012 10:24:02 -0600 Subject: [PATCH 09/82] systemd conversion. --- distcc.spec | 58 +++++++++++++++++++++++++++++++++++++++---------- distccd.service | 11 ++++++++++ 2 files changed, 58 insertions(+), 11 deletions(-) create mode 100644 distccd.service diff --git a/distcc.spec b/distcc.spec index 88108ae..576070e 100644 --- a/distcc.spec +++ b/distcc.spec @@ -5,14 +5,14 @@ Name: distcc Version: 3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ URL: http://distcc.org/ Source0: http://distcc.googlecode.com/files/distcc-%{version}.tar.bz2 Source1: hosts.sample -Source2: distccd.init +Source2: distccd.service #Patch0: distcc-2.18.3-avahi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -36,9 +36,12 @@ Summary: Server for distributed C/C++ compilation Group: Development/Tools License: GPLv2+ -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig - +#Requires(post): /sbin/chkconfig +#Requires(preun): /sbin/chkconfig +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +Requires(post): systemd-sysv %description server This package contains the compilation server needed to use %{name}. @@ -46,7 +49,7 @@ This package contains the compilation server needed to use %{name}. %prep %setup -q -#%patch0 -p1 -b .avahi +#%%patch0 -p1 -b .avahi %build @@ -70,7 +73,11 @@ install -Dm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/hosts install -Dm 0644 contrib/redhat/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/distccd # Install distccd init file -install -Dm 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/distccd +#install -Dm 0755 %%{SOURCE2} $RPM_BUILD_ROOT%%{_sysconfdir}/init.d/distccd + +# Install distcdd unit file +mkdir -p $RPM_BUILD_ROOT%{_unitdir} +install -Dm 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/distccd.service %post @@ -78,16 +85,41 @@ update-desktop-database &> /dev/null ||: %post server -[ $1 -lt 2 ] && /sbin/chkconfig --add distccd ||: - +#[ $1 -lt 2 ] && /sbin/chkconfig --add distccd ||: +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi %preun server -[ $1 -eq 0 ] && /sbin/chkconfig --del distccd ||: +#[ $1 -eq 0 ] && /sbin/chkconfig --del distccd ||: +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable distccd.service > /dev/null 2>&1 || : + /bin/systemctl stop distccd.service > /dev/null 2>&1 || : +fi + +%postun server +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart distccd.service >/dev/null 2>&1 || : +fi %postun update-desktop-database &> /dev/null ||: +%triggerun -- distcc-server < 3.1-5 +# Save the current service runlevel info +# User must manually run systemd-sysv-convert --apply distccd +# to migrate them to systemd targets +/usr/bin/systemd-sysv-convert --save distccd >/dev/null 2>&1 ||: + +# Run these because the SysV package being removed won't do them +/sbin/chkconfig --del distccd >/dev/null 2>&1 || : +/bin/systemctl try-restart distccd.service >/dev/null 2>&1 || : + %clean rm -rf $RPM_BUILD_ROOT @@ -112,7 +144,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc COPYING README %{_bindir}/distccd -%{_sysconfdir}/init.d/* +#%%{_sysconfdir}/init.d/* +%{_unitdir}/* %{_sysconfdir}/default/distcc %{_sysconfdir}/distcc/*allow* %{_mandir}/man1/distccd* @@ -122,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Tue Jan 31 2012 Jon Ciesla - 3.1-5 +- Migrate to systemd, BZ 770409. + * Fri Jan 13 2012 Fedora Release Engineering - 3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/distccd.service b/distccd.service new file mode 100644 index 0000000..2caedf9 --- /dev/null +++ b/distccd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Distccd A Distributed Compilation Server +After=network.target + +[Service] +User=nobody +EnvironmentFile=-/etc/sysconfig/distccd +ExecStart=/usr/bin/distccd --verbose --no-detach --daemon $OPTIONS + +[Install] +WantedBy=multi-user.target From 991d32022cb8eff7f9e977a046d0fb19afa0a934 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 13 Apr 2012 07:41:37 -0500 Subject: [PATCH 10/82] Add hardened build. --- distcc.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 576070e..50b4581 100644 --- a/distcc.spec +++ b/distcc.spec @@ -1,3 +1,4 @@ +%define _hardened_build 1 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} # eval to 2.3 if python isn't yet present, workaround for no python in fc4 minimal buildroot %{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")} @@ -5,7 +6,7 @@ Name: distcc Version: 3.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -155,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Fri Apr 13 2012 Jon Ciesla - 3.1-6 +- Add hardened build. + * Tue Jan 31 2012 Jon Ciesla - 3.1-5 - Migrate to systemd, BZ 770409. From 3973ea971b85a4db669cafeb69910c453dbf1f75 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 15:47:08 -0500 Subject: [PATCH 11/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 50b4581..c854ff5 100644 --- a/distcc.spec +++ b/distcc.spec @@ -6,7 +6,7 @@ Name: distcc Version: 3.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Apr 13 2012 Jon Ciesla - 3.1-6 - Add hardened build. From 16742e9c9e305577893c26a3678f2bad9385da41 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 26 Oct 2012 07:13:22 -0500 Subject: [PATCH 12/82] New upstream. --- .gitignore | 1 + distcc.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f42c19b..5944bf1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ distcc-2.18.3.tar.bz2 /distcc-3.1.tar.bz2 +/distcc-3.2rc1.tar.bz2 diff --git a/distcc.spec b/distcc.spec index c854ff5..06cc31f 100644 --- a/distcc.spec +++ b/distcc.spec @@ -5,8 +5,8 @@ Name: distcc -Version: 3.1 -Release: 7%{?dist} +Version: 3.2rc1 +Release: 1%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Thu Oct 25 2012 Jon Ciesla - 3.2rc1-1 +- Latest upstream, BZ 870200. + * Wed Jul 18 2012 Fedora Release Engineering - 3.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 600a277..0556e33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1a9d3853df7133669fffec2a9aab9f3 distcc-3.1.tar.bz2 +18cd4f33f5cfc3e75675cafc568fb9cf distcc-3.2rc1.tar.bz2 From 148178ea948e6d765c2e522df52e66de223b177b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 13:46:14 -0600 Subject: [PATCH 13/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 06cc31f..554b35d 100644 --- a/distcc.spec +++ b/distcc.spec @@ -6,7 +6,7 @@ Name: distcc Version: 3.2rc1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 3.2rc1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Oct 25 2012 Jon Ciesla - 3.2rc1-1 - Latest upstream, BZ 870200. From 11a8a7e6c7641b81ad58c495d0a572385ee2eb80 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 16 May 2013 14:27:04 -0500 Subject: [PATCH 14/82] chmod -x .service --- distcc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/distcc.spec b/distcc.spec index 554b35d..2e63d27 100644 --- a/distcc.spec +++ b/distcc.spec @@ -6,7 +6,7 @@ Name: distcc Version: 3.2rc1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -78,7 +78,7 @@ install -Dm 0644 contrib/redhat/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfi # Install distcdd unit file mkdir -p $RPM_BUILD_ROOT%{_unitdir} -install -Dm 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/distccd.service +install -Dm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/distccd.service %post @@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Thu May 16 2013 Jon Ciesla - 3.2rc1-3 +- chmod -x .service, BZ 963912 + * Wed Feb 13 2013 Fedora Release Engineering - 3.2rc1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From e0d85727f2a66259a51f2dd7b4935afa214bfe2b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 02:19:41 -0500 Subject: [PATCH 15/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 2e63d27..881344f 100644 --- a/distcc.spec +++ b/distcc.spec @@ -6,7 +6,7 @@ Name: distcc Version: 3.2rc1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 3.2rc1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu May 16 2013 Jon Ciesla - 3.2rc1-3 - chmod -x .service, BZ 963912 From a1afe6eb800106e7e3ce0be4eb734f079099b1ab Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 8 Aug 2013 09:11:29 -0500 Subject: [PATCH 16/82] Fix versioned docdir. --- distcc.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/distcc.spec b/distcc.spec index 881344f..3d80015 100644 --- a/distcc.spec +++ b/distcc.spec @@ -6,7 +6,7 @@ Name: distcc Version: 3.2rc1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -54,7 +54,7 @@ This package contains the compilation server needed to use %{name}. %build -%configure --with-gnome --with-docdir=%{_datadir}/doc/%{name}-%{version} --disable-Werror +%configure --with-gnome --disable-Werror make %{?_smp_mflags} @@ -80,6 +80,7 @@ install -Dm 0644 contrib/redhat/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfi mkdir -p $RPM_BUILD_ROOT%{_unitdir} install -Dm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/distccd.service +rm -rf $RPM_BUILD_ROOT%{_docdir}/* %post update-desktop-database &> /dev/null ||: @@ -128,7 +129,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc %{_datadir}/doc/%{name}-%{version} +%doc AUTHORS doc/* NEWS README.pump TODO +%doc COPYING INSTALL README survey.txt %{_bindir}/distcc %{_bindir}/distccmon* %{_bindir}/lsdistcc @@ -156,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Thu Aug 08 2013 Jon Ciesla - 3.2rc1-5 +- Fixed unversioned docdir issue, BZ 993722. + * Sat Aug 03 2013 Fedora Release Engineering - 3.2rc1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From ff8386163aa90bce7b05baac6229fc19781301e8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 02:31:12 -0500 Subject: [PATCH 17/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 3d80015..62bde22 100644 --- a/distcc.spec +++ b/distcc.spec @@ -6,7 +6,7 @@ Name: distcc Version: 3.2rc1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -158,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 3.2rc1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Aug 08 2013 Jon Ciesla - 3.2rc1-5 - Fixed unversioned docdir issue, BZ 993722. From 2210342dc788fd6f37c0f0ea71371dd83acacf02 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 02:56:54 +0000 Subject: [PATCH 18/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 62bde22..7c98206 100644 --- a/distcc.spec +++ b/distcc.spec @@ -6,7 +6,7 @@ Name: distcc Version: 3.2rc1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -158,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 3.2rc1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 3.2rc1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 0d3f6f368228384420189b3f7f6fa7cf02a03406 Mon Sep 17 00:00:00 2001 From: Andy Grover Date: Wed, 20 Aug 2014 09:48:59 -0700 Subject: [PATCH 19/82] Fix CVE-2014-4607 by upgrading to minilzo 2.08 Patch from upstream svn. Signed-off-by: Andy Grover --- distcc-minilzo-2.08.patch | 11811 ++++++++++++++++++++++++++++++++++++ distcc.spec | 7 +- 2 files changed, 11817 insertions(+), 1 deletion(-) create mode 100644 distcc-minilzo-2.08.patch diff --git a/distcc-minilzo-2.08.patch b/distcc-minilzo-2.08.patch new file mode 100644 index 0000000..3a47d6b --- /dev/null +++ b/distcc-minilzo-2.08.patch @@ -0,0 +1,11811 @@ +commit 09641d0032b54aa21e3648f3c0d718b0c6ef80d5 +Author: mandyke@gmail.com +Date: Tue Jul 29 05:42:25 2014 +0000 + + lzo: Update to 2.08 + + Fixes issue 142 + + git-svn-id: http://distcc.googlecode.com/svn/trunk@795 01de4be4-8c4a-0410-9132-4925637da917 + +diff --git a/Makefile.in b/Makefile.in +index bb309a2..b398bc8 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -118,7 +118,11 @@ dist_files = \ + + dist_dirs = m4 include_server/test_data + +-dist_lzo = lzo/minilzo.c lzo/minilzo.h lzo/lzoconf.h lzo/.stamp-conf.in ++dist_lzo = lzo/minilzo.c \ ++ lzo/minilzo.h \ ++ lzo/lzoconf.h \ ++ lzo/lzodefs.h \ ++ lzo/.stamp-conf.in + + dist_contrib = contrib/distcc-absolutify \ + contrib/distcc.sh \ +diff --git a/configure.ac b/configure.ac +index 5847948..d795edc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -224,6 +224,9 @@ AC_ISC_POSIX + # variadic macros. If we can disable it, do so. + + ++# This is needed for our included version of lzo. ++CPPFLAGS="$CPPFLAGS -DMINILZO_HAVE_CONFIG_H" ++ + # This is needed for our included version of popt. + # TODO(csilvers): figure out what that above comment means, and if it's true. + CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H" +diff --git a/lzo/README.LZO b/lzo/README.LZO +new file mode 100644 +index 0000000..83e10e3 +--- /dev/null ++++ b/lzo/README.LZO +@@ -0,0 +1,123 @@ ++ ++ ============================================================================ ++ miniLZO -- mini subset of the LZO real-time data compression library ++ ============================================================================ ++ ++ Author : Markus Franz Xaver Johannes Oberhumer ++ ++ http://www.oberhumer.com/opensource/lzo/ ++ Version : 2.08 ++ Date : 29 Jun 2014 ++ ++ I've created miniLZO for projects where it is inconvenient to ++ include (or require) the full LZO source code just because you ++ want to add a little bit of data compression to your application. ++ ++ miniLZO implements the LZO1X-1 compressor and both the standard and ++ safe LZO1X decompressor. Apart from fast compression it also useful ++ for situations where you want to use pre-compressed data files (which ++ must have been compressed with LZO1X-999). ++ ++ miniLZO consists of one C source file and three header files: ++ minilzo.c ++ minilzo.h, lzoconf.h, lzodefs.h ++ ++ To use miniLZO just copy these files into your source directory, add ++ minilzo.c to your Makefile and #include minilzo.h from your program. ++ Note: you also must distribute this file ('README.LZO') with your project. ++ ++ minilzo.o compiles to about 6 KiB (using gcc or Visual C on an i386), and ++ the sources are about 30 KiB when packed with zip - so there's no more ++ excuse that your application doesn't support data compression :-) ++ ++ For more information, documentation, example programs and other support ++ files (like Makefiles and build scripts) please download the full LZO ++ package from ++ http://www.oberhumer.com/opensource/lzo/ ++ ++ Have fun, ++ Markus ++ ++ ++ P.S. minilzo.c is generated automatically from the LZO sources and ++ therefore functionality is completely identical ++ ++ ++ Appendix A: building miniLZO ++ ---------------------------- ++ miniLZO is written such a way that it should compile and run ++ out-of-the-box on most machines. ++ ++ If you are running on a very unusual architecture and lzo_init() fails then ++ you should first recompile with '-DLZO_DEBUG' to see what causes the failure. ++ The most probable case is something like 'sizeof(void *) != sizeof(size_t)'. ++ After identifying the problem you can compile by adding some defines ++ like '-DSIZEOF_VOID_P=8' to your Makefile. ++ ++ The best solution is (of course) using Autoconf - if your project uses ++ Autoconf anyway just add '-DMINILZO_HAVE_CONFIG_H' to your compiler ++ flags when compiling minilzo.c. See the LZO distribution for an example ++ how to set up configure.ac. ++ ++ ++ Appendix B: list of public functions available in miniLZO ++ --------------------------------------------------------- ++ Library initialization ++ lzo_init() ++ ++ Compression ++ lzo1x_1_compress() ++ ++ Decompression ++ lzo1x_decompress() ++ lzo1x_decompress_safe() ++ ++ Checksum functions ++ lzo_adler32() ++ ++ Version functions ++ lzo_version() ++ lzo_version_string() ++ lzo_version_date() ++ ++ Portable (but slow) string functions ++ lzo_memcmp() ++ lzo_memcpy() ++ lzo_memmove() ++ lzo_memset() ++ ++ ++ Appendix C: suggested macros for 'configure.ac' when using Autoconf ++ ------------------------------------------------------------------- ++ Checks for typedefs and structures ++ AC_CHECK_TYPE(ptrdiff_t,long) ++ AC_TYPE_SIZE_T ++ AC_CHECK_SIZEOF(short) ++ AC_CHECK_SIZEOF(int) ++ AC_CHECK_SIZEOF(long) ++ AC_CHECK_SIZEOF(long long) ++ AC_CHECK_SIZEOF(__int64) ++ AC_CHECK_SIZEOF(void *) ++ AC_CHECK_SIZEOF(size_t) ++ AC_CHECK_SIZEOF(ptrdiff_t) ++ ++ Checks for compiler characteristics ++ AC_C_CONST ++ ++ Checks for library functions ++ AC_CHECK_FUNCS(memcmp memcpy memmove memset) ++ ++ ++ Appendix D: Copyright ++ --------------------- ++ LZO and miniLZO are Copyright (C) 1996-2014 Markus Franz Xaver Oberhumer ++ All Rights Reserved. ++ ++ LZO and miniLZO are distributed under the terms of the GNU General ++ Public License (GPL). See the file COPYING. ++ ++ Special licenses for commercial and other applications which ++ are not willing to accept the GNU General Public License ++ are available by contacting the author. ++ ++ +diff --git a/lzo/lzoconf.h b/lzo/lzoconf.h +index 96db180..61be29c 100644 +--- a/lzo/lzoconf.h ++++ b/lzo/lzoconf.h +@@ -1,14 +1,8 @@ +-/* lzoconf.h -- configuration for the LZO real-time data compression library ++/* lzoconf.h -- configuration of the LZO data compression library + + This file is part of the LZO real-time data compression library. + +- 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 ++ Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer + All Rights Reserved. + + The LZO library is free software; you can redistribute it and/or +@@ -24,7 +18,7 @@ + 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., +- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Markus F.X.J. Oberhumer + +@@ -32,22 +26,19 @@ + */ + + +-#ifndef __LZOCONF_H +-#define __LZOCONF_H ++#ifndef __LZOCONF_H_INCLUDED ++#define __LZOCONF_H_INCLUDED 1 + +-#define LZO_VERSION 0x1080 +-#define LZO_VERSION_STRING "1.08" +-#define LZO_VERSION_DATE "Jul 12 2002" ++#define LZO_VERSION 0x2080 ++#define LZO_VERSION_STRING "2.08" ++#define LZO_VERSION_DATE "Jun 29 2014" + + /* internal Autoconf configuration file - only used when building LZO */ + #if defined(LZO_HAVE_CONFIG_H) + # include + #endif + #include +- +-#ifdef __cplusplus +-extern "C" { +-#endif ++#include + + + /*********************************************************************** +@@ -57,88 +48,38 @@ extern "C" { + #if !defined(CHAR_BIT) || (CHAR_BIT != 8) + # error "invalid CHAR_BIT" + #endif +-#if !defined(UCHAR_MAX) || !defined(UINT_MAX) || !defined(ULONG_MAX) ++#if !defined(UCHAR_MAX) || !defined(USHRT_MAX) || !defined(UINT_MAX) || !defined(ULONG_MAX) + # error "check your compiler installation" + #endif + #if (USHRT_MAX < 1) || (UINT_MAX < 1) || (ULONG_MAX < 1) + # error "your limits.h macros are broken" + #endif + +-/* workaround a cpp bug under hpux 10.20 */ +-#define LZO_0xffffffffL 4294967295ul +- +-#if !defined(LZO_UINT32_C) +-# if (UINT_MAX < LZO_0xffffffffL) +-# define LZO_UINT32_C(c) c ## UL +-# else +-# define LZO_UINT32_C(c) c ## U +-# endif ++/* get OS and architecture defines */ ++#ifndef __LZODEFS_H_INCLUDED ++#include "lzodefs.h" + #endif + + +-/*********************************************************************** +-// architecture defines +-************************************************************************/ +- +-#if !defined(__LZO_WIN) && !defined(__LZO_DOS) && !defined(__LZO_OS2) +-# if defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows) +-# define __LZO_WIN +-# elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32) +-# define __LZO_WIN +-# elif defined(__NT__) || defined(__NT_DLL__) || defined(__WINDOWS_386__) +-# define __LZO_WIN +-# elif defined(__DOS__) || defined(__MSDOS__) || defined(MSDOS) +-# define __LZO_DOS +-# elif defined(__OS2__) || defined(__OS2V2__) || defined(OS2) +-# define __LZO_OS2 +-# elif defined(__palmos__) +-# define __LZO_PALMOS +-# elif defined(__TOS__) || defined(__atarist__) +-# define __LZO_TOS +-# endif +-#endif +- +-#if (UINT_MAX < LZO_0xffffffffL) +-# if defined(__LZO_WIN) +-# define __LZO_WIN16 +-# elif defined(__LZO_DOS) +-# define __LZO_DOS16 +-# elif defined(__LZO_PALMOS) +-# define __LZO_PALMOS16 +-# elif defined(__LZO_TOS) +-# define __LZO_TOS16 +-# elif defined(__C166__) +-# else +- /* porting hint: for pure 16-bit architectures try compiling +- * everything with -D__LZO_STRICT_16BIT */ +-# error "16-bit target not supported - contact me for porting hints" +-# endif ++#ifdef __cplusplus ++extern "C" { + #endif + +-#if !defined(__LZO_i386) +-# if defined(__LZO_DOS) || defined(__LZO_WIN16) +-# define __LZO_i386 +-# elif defined(__i386__) || defined(__386__) || defined(_M_IX86) +-# define __LZO_i386 +-# endif +-#endif + +-#if defined(__LZO_STRICT_16BIT) +-# if (UINT_MAX < LZO_0xffffffffL) +-# include +-# endif +-#endif ++/*********************************************************************** ++// some core defines ++************************************************************************/ + + /* memory checkers */ + #if !defined(__LZO_CHECKER) + # if defined(__BOUNDS_CHECKING_ON) +-# define __LZO_CHECKER ++# define __LZO_CHECKER 1 + # elif defined(__CHECKER__) +-# define __LZO_CHECKER ++# define __LZO_CHECKER 1 + # elif defined(__INSURE__) +-# define __LZO_CHECKER ++# define __LZO_CHECKER 1 + # elif defined(__PURIFY__) +-# define __LZO_CHECKER ++# define __LZO_CHECKER 1 + # endif + #endif + +@@ -147,36 +88,31 @@ extern "C" { + // integral and pointer types + ************************************************************************/ + +-/* Integral types with 32 bits or more */ +-#if !defined(LZO_UINT32_MAX) +-# if (UINT_MAX >= LZO_0xffffffffL) +- typedef unsigned int lzo_uint32; +- typedef int lzo_int32; +-# define LZO_UINT32_MAX UINT_MAX +-# define LZO_INT32_MAX INT_MAX +-# define LZO_INT32_MIN INT_MIN +-# elif (ULONG_MAX >= LZO_0xffffffffL) +- typedef unsigned long lzo_uint32; +- typedef long lzo_int32; +-# define LZO_UINT32_MAX ULONG_MAX +-# define LZO_INT32_MAX LONG_MAX +-# define LZO_INT32_MIN LONG_MIN +-# else +-# error "lzo_uint32" +-# endif +-#endif +- +-/* lzo_uint is used like size_t */ ++/* lzo_uint must match size_t */ + #if !defined(LZO_UINT_MAX) +-# if (UINT_MAX >= LZO_0xffffffffL) ++# if (LZO_ABI_LLP64) ++# if (LZO_OS_WIN64) ++ typedef unsigned __int64 lzo_uint; ++ typedef __int64 lzo_int; ++# else ++ typedef lzo_ullong_t lzo_uint; ++ typedef lzo_llong_t lzo_int; ++# endif ++# define LZO_SIZEOF_LZO_UINT 8 ++# define LZO_UINT_MAX 0xffffffffffffffffull ++# define LZO_INT_MAX 9223372036854775807LL ++# define LZO_INT_MIN (-1LL - LZO_INT_MAX) ++# elif (LZO_ABI_IP32L64) /* MIPS R5900 */ + typedef unsigned int lzo_uint; + typedef int lzo_int; ++# define LZO_SIZEOF_LZO_UINT LZO_SIZEOF_INT + # define LZO_UINT_MAX UINT_MAX + # define LZO_INT_MAX INT_MAX + # define LZO_INT_MIN INT_MIN + # elif (ULONG_MAX >= LZO_0xffffffffL) + typedef unsigned long lzo_uint; + typedef long lzo_int; ++# define LZO_SIZEOF_LZO_UINT LZO_SIZEOF_LONG + # define LZO_UINT_MAX ULONG_MAX + # define LZO_INT_MAX LONG_MAX + # define LZO_INT_MIN LONG_MIN +@@ -185,73 +121,83 @@ extern "C" { + # endif + #endif + +-typedef int lzo_bool; +- +- +-/*********************************************************************** +-// memory models +-************************************************************************/ +- +-/* Memory model for the public code segment. */ +-#if !defined(__LZO_CMODEL) +-# if defined(__LZO_DOS16) || defined(__LZO_WIN16) +-# define __LZO_CMODEL __far +-# elif defined(__LZO_i386) && defined(__WATCOMC__) +-# define __LZO_CMODEL __near +-# else +-# define __LZO_CMODEL +-# endif ++/* The larger type of lzo_uint and lzo_uint32_t. */ ++#if (LZO_SIZEOF_LZO_UINT >= 4) ++# define lzo_xint lzo_uint ++#else ++# define lzo_xint lzo_uint32_t + #endif + +-/* Memory model for the public data segment. */ +-#if !defined(__LZO_DMODEL) +-# if defined(__LZO_DOS16) || defined(__LZO_WIN16) +-# define __LZO_DMODEL __far +-# elif defined(__LZO_i386) && defined(__WATCOMC__) +-# define __LZO_DMODEL __near +-# else +-# define __LZO_DMODEL +-# endif +-#endif ++typedef int lzo_bool; + +-/* Memory model that allows to access memory at offsets of lzo_uint. */ +-#if !defined(__LZO_MMODEL) +-# if (LZO_UINT_MAX <= UINT_MAX) +-# define __LZO_MMODEL +-# elif defined(__LZO_DOS16) || defined(__LZO_WIN16) +-# define __LZO_MMODEL __huge +-# define LZO_999_UNSUPPORTED +-# elif defined(__LZO_PALMOS16) || defined(__LZO_TOS16) +-# define __LZO_MMODEL +-# else +-# error "__LZO_MMODEL" +-# endif ++/* sanity checks */ ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) == LZO_SIZEOF_LZO_UINT) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_xint) >= sizeof(lzo_uint)) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_xint) >= sizeof(lzo_uint32_t)) ++ ++#ifndef __LZO_MMODEL ++#define __LZO_MMODEL /*empty*/ + #endif + + /* no typedef here because of const-pointer issues */ +-#define lzo_byte unsigned char __LZO_MMODEL + #define lzo_bytep unsigned char __LZO_MMODEL * + #define lzo_charp char __LZO_MMODEL * + #define lzo_voidp void __LZO_MMODEL * + #define lzo_shortp short __LZO_MMODEL * + #define lzo_ushortp unsigned short __LZO_MMODEL * +-#define lzo_uint32p lzo_uint32 __LZO_MMODEL * +-#define lzo_int32p lzo_int32 __LZO_MMODEL * +-#define lzo_uintp lzo_uint __LZO_MMODEL * + #define lzo_intp lzo_int __LZO_MMODEL * ++#define lzo_uintp lzo_uint __LZO_MMODEL * ++#define lzo_xintp lzo_xint __LZO_MMODEL * + #define lzo_voidpp lzo_voidp __LZO_MMODEL * + #define lzo_bytepp lzo_bytep __LZO_MMODEL * + +-#ifndef lzo_sizeof_dict_t +-# define lzo_sizeof_dict_t sizeof(lzo_bytep) ++#define lzo_int8_tp lzo_int8_t __LZO_MMODEL * ++#define lzo_uint8_tp lzo_uint8_t __LZO_MMODEL * ++#define lzo_int16_tp lzo_int16_t __LZO_MMODEL * ++#define lzo_uint16_tp lzo_uint16_t __LZO_MMODEL * ++#define lzo_int32_tp lzo_int32_t __LZO_MMODEL * ++#define lzo_uint32_tp lzo_uint32_t __LZO_MMODEL * ++#if defined(lzo_int64_t) ++#define lzo_int64_tp lzo_int64_t __LZO_MMODEL * ++#define lzo_uint64_tp lzo_uint64_t __LZO_MMODEL * + #endif + ++/* Older LZO versions used to support ancient systems and memory models ++ * like 16-bit MSDOS with __huge pointers and Cray PVP, but these ++ * obsolete configurations are not supported any longer. ++ */ ++#if defined(__LZO_MMODEL_HUGE) ++#error "__LZO_MMODEL_HUGE is unsupported" ++#endif ++#if (LZO_MM_PVP) ++#error "LZO_MM_PVP is unsupported" ++#endif ++#if (LZO_SIZEOF_INT < 4) ++#error "LZO_SIZEOF_INT < 4 is unsupported" ++#endif ++#if (__LZO_UINTPTR_T_IS_POINTER) ++#error "__LZO_UINTPTR_T_IS_POINTER is unsupported" ++#endif ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(int) >= 4) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) >= 4) ++/* Strange configurations where sizeof(lzo_uint) != sizeof(size_t) should ++ * work but have not received much testing lately, so be strict here. ++ */ ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) == sizeof(size_t)) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) == sizeof(ptrdiff_t)) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) == sizeof(lzo_uintptr_t)) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(void *) == sizeof(lzo_uintptr_t)) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(char *) == sizeof(lzo_uintptr_t)) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long *) == sizeof(lzo_uintptr_t)) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(void *) == sizeof(lzo_voidp)) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(char *) == sizeof(lzo_bytep)) ++ + + /*********************************************************************** +-// calling conventions and function types ++// function types + ************************************************************************/ + +-/* linkage */ ++/* name mangling */ + #if !defined(__LZO_EXTERN_C) + # ifdef __cplusplus + # define __LZO_EXTERN_C extern "C" +@@ -262,115 +208,90 @@ typedef int lzo_bool; + + /* calling convention */ + #if !defined(__LZO_CDECL) +-# if defined(__LZO_DOS16) || defined(__LZO_WIN16) +-# define __LZO_CDECL __LZO_CMODEL __cdecl +-# elif defined(__LZO_i386) && defined(_MSC_VER) +-# define __LZO_CDECL __LZO_CMODEL __cdecl +-# elif defined(__LZO_i386) && defined(__WATCOMC__) +-# define __LZO_CDECL __LZO_CMODEL __cdecl +-# else +-# define __LZO_CDECL __LZO_CMODEL +-# endif +-#endif +-#if !defined(__LZO_ENTRY) +-# define __LZO_ENTRY __LZO_CDECL ++# define __LZO_CDECL __lzo_cdecl + #endif + +-/* C++ exception specification for extern "C" function types */ +-#if !defined(__cplusplus) +-# undef LZO_NOTHROW +-# define LZO_NOTHROW +-#elif !defined(LZO_NOTHROW) +-# define LZO_NOTHROW ++/* DLL export information */ ++#if !defined(__LZO_EXPORT1) ++# define __LZO_EXPORT1 /*empty*/ ++#endif ++#if !defined(__LZO_EXPORT2) ++# define __LZO_EXPORT2 /*empty*/ + #endif + ++/* __cdecl calling convention for public C and assembly functions */ ++#if !defined(LZO_PUBLIC) ++# define LZO_PUBLIC(_rettype) __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_CDECL ++#endif ++#if !defined(LZO_EXTERN) ++# define LZO_EXTERN(_rettype) __LZO_EXTERN_C LZO_PUBLIC(_rettype) ++#endif ++#if !defined(LZO_PRIVATE) ++# define LZO_PRIVATE(_rettype) static _rettype __LZO_CDECL ++#endif + ++/* function types */ + typedef int +-(__LZO_ENTRY *lzo_compress_t) ( const lzo_byte *src, lzo_uint src_len, +- lzo_byte *dst, lzo_uintp dst_len, ++(__LZO_CDECL *lzo_compress_t) ( const lzo_bytep src, lzo_uint src_len, ++ lzo_bytep dst, lzo_uintp dst_len, + lzo_voidp wrkmem ); + + typedef int +-(__LZO_ENTRY *lzo_decompress_t) ( const lzo_byte *src, lzo_uint src_len, +- lzo_byte *dst, lzo_uintp dst_len, ++(__LZO_CDECL *lzo_decompress_t) ( const lzo_bytep src, lzo_uint src_len, ++ lzo_bytep dst, lzo_uintp dst_len, + lzo_voidp wrkmem ); + + typedef int +-(__LZO_ENTRY *lzo_optimize_t) ( lzo_byte *src, lzo_uint src_len, +- lzo_byte *dst, lzo_uintp dst_len, ++(__LZO_CDECL *lzo_optimize_t) ( lzo_bytep src, lzo_uint src_len, ++ lzo_bytep dst, lzo_uintp dst_len, + lzo_voidp wrkmem ); + + typedef int +-(__LZO_ENTRY *lzo_compress_dict_t)(const lzo_byte *src, lzo_uint src_len, +- lzo_byte *dst, lzo_uintp dst_len, +- lzo_voidp wrkmem, +- const lzo_byte *dict, lzo_uint dict_len ); ++(__LZO_CDECL *lzo_compress_dict_t)(const lzo_bytep src, lzo_uint src_len, ++ lzo_bytep dst, lzo_uintp dst_len, ++ lzo_voidp wrkmem, ++ const lzo_bytep dict, lzo_uint dict_len ); + + typedef int +-(__LZO_ENTRY *lzo_decompress_dict_t)(const lzo_byte *src, lzo_uint src_len, +- lzo_byte *dst, lzo_uintp dst_len, +- lzo_voidp wrkmem, +- const lzo_byte *dict, lzo_uint dict_len ); ++(__LZO_CDECL *lzo_decompress_dict_t)(const lzo_bytep src, lzo_uint src_len, ++ lzo_bytep dst, lzo_uintp dst_len, ++ lzo_voidp wrkmem, ++ const lzo_bytep dict, lzo_uint dict_len ); + + +-/* assembler versions always use __cdecl */ +-typedef int +-(__LZO_CDECL *lzo_compress_asm_t)( const lzo_byte *src, lzo_uint src_len, +- lzo_byte *dst, lzo_uintp dst_len, +- lzo_voidp wrkmem ); ++/* Callback interface. Currently only the progress indicator ("nprogress") ++ * is used, but this may change in a future release. */ + +-typedef int +-(__LZO_CDECL *lzo_decompress_asm_t)( const lzo_byte *src, lzo_uint src_len, +- lzo_byte *dst, lzo_uintp dst_len, +- lzo_voidp wrkmem ); ++struct lzo_callback_t; ++typedef struct lzo_callback_t lzo_callback_t; ++#define lzo_callback_p lzo_callback_t __LZO_MMODEL * + ++/* malloc & free function types */ ++typedef lzo_voidp (__LZO_CDECL *lzo_alloc_func_t) ++ (lzo_callback_p self, lzo_uint items, lzo_uint size); ++typedef void (__LZO_CDECL *lzo_free_func_t) ++ (lzo_callback_p self, lzo_voidp ptr); + + /* a progress indicator callback function */ +-typedef void (__LZO_ENTRY *lzo_progress_callback_t) (lzo_uint, lzo_uint); +- ++typedef void (__LZO_CDECL *lzo_progress_func_t) ++ (lzo_callback_p, lzo_uint, lzo_uint, int); + +-/*********************************************************************** +-// export information +-************************************************************************/ +- +-/* DLL export information */ +-#if !defined(__LZO_EXPORT1) +-# define __LZO_EXPORT1 +-#endif +-#if !defined(__LZO_EXPORT2) +-# define __LZO_EXPORT2 +-#endif +- +-/* exported calling convention for C functions */ +-#if !defined(LZO_PUBLIC) +-# define LZO_PUBLIC(_rettype) \ +- __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_ENTRY +-#endif +-#if !defined(LZO_EXTERN) +-# define LZO_EXTERN(_rettype) __LZO_EXTERN_C LZO_PUBLIC(_rettype) +-#endif +-#if !defined(LZO_PRIVATE) +-# define LZO_PRIVATE(_rettype) static _rettype __LZO_ENTRY +-#endif ++struct lzo_callback_t ++{ ++ /* custom allocators (set to 0 to disable) */ ++ lzo_alloc_func_t nalloc; /* [not used right now] */ ++ lzo_free_func_t nfree; /* [not used right now] */ + +-/* exported __cdecl calling convention for assembler functions */ +-#if !defined(LZO_PUBLIC_CDECL) +-# define LZO_PUBLIC_CDECL(_rettype) \ +- __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_CDECL +-#endif +-#if !defined(LZO_EXTERN_CDECL) +-# define LZO_EXTERN_CDECL(_rettype) __LZO_EXTERN_C LZO_PUBLIC_CDECL(_rettype) +-#endif ++ /* a progress indicator callback function (set to 0 to disable) */ ++ lzo_progress_func_t nprogress; + +-/* exported global variables (LZO currently uses no static variables and +- * is fully thread safe) */ +-#if !defined(LZO_PUBLIC_VAR) +-# define LZO_PUBLIC_VAR(_type) \ +- __LZO_EXPORT1 _type __LZO_EXPORT2 __LZO_DMODEL +-#endif +-#if !defined(LZO_EXTERN_VAR) +-# define LZO_EXTERN_VAR(_type) extern LZO_PUBLIC_VAR(_type) +-#endif ++ /* INFO: the first parameter "self" of the nalloc/nfree/nprogress ++ * callbacks points back to this struct, so you are free to store ++ * some extra info in the following variables. */ ++ lzo_voidp user1; ++ lzo_xint user2; ++ lzo_xint user3; ++}; + + + /*********************************************************************** +@@ -383,14 +304,23 @@ typedef void (__LZO_ENTRY *lzo_progress_callback_t) (lzo_uint, lzo_uint); + */ + #define LZO_E_OK 0 + #define LZO_E_ERROR (-1) +-#define LZO_E_OUT_OF_MEMORY (-2) /* not used right now */ +-#define LZO_E_NOT_COMPRESSIBLE (-3) /* not used right now */ ++#define LZO_E_OUT_OF_MEMORY (-2) /* [lzo_alloc_func_t failure] */ ++#define LZO_E_NOT_COMPRESSIBLE (-3) /* [not used right now] */ + #define LZO_E_INPUT_OVERRUN (-4) + #define LZO_E_OUTPUT_OVERRUN (-5) + #define LZO_E_LOOKBEHIND_OVERRUN (-6) + #define LZO_E_EOF_NOT_FOUND (-7) + #define LZO_E_INPUT_NOT_CONSUMED (-8) ++#define LZO_E_NOT_YET_IMPLEMENTED (-9) /* [not used right now] */ ++#define LZO_E_INVALID_ARGUMENT (-10) ++#define LZO_E_INVALID_ALIGNMENT (-11) /* pointer argument is not properly aligned */ ++#define LZO_E_OUTPUT_NOT_CONSUMED (-12) ++#define LZO_E_INTERNAL_ERROR (-99) ++ + ++#ifndef lzo_sizeof_dict_t ++# define lzo_sizeof_dict_t ((unsigned)sizeof(lzo_bytep)) ++#endif + + /* lzo_init() should be the first function you call. + * Check the return code ! +@@ -398,11 +328,11 @@ typedef void (__LZO_ENTRY *lzo_progress_callback_t) (lzo_uint, lzo_uint); + * lzo_init() is a macro to allow checking that the library and the + * compiler's view of various types are consistent. + */ +-#define lzo_init() __lzo_init2(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\ +- (int)sizeof(long),(int)sizeof(lzo_uint32),(int)sizeof(lzo_uint),\ ++#define lzo_init() __lzo_init_v2(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\ ++ (int)sizeof(long),(int)sizeof(lzo_uint32_t),(int)sizeof(lzo_uint),\ + (int)lzo_sizeof_dict_t,(int)sizeof(char *),(int)sizeof(lzo_voidp),\ +- (int)sizeof(lzo_compress_t)) +-LZO_EXTERN(int) __lzo_init2(unsigned,int,int,int,int,int,int,int,int,int); ++ (int)sizeof(lzo_callback_t)) ++LZO_EXTERN(int) __lzo_init_v2(unsigned,int,int,int,int,int,int,int,int,int); + + /* version functions (useful for shared libraries) */ + LZO_EXTERN(unsigned) lzo_version(void); +@@ -413,34 +343,95 @@ LZO_EXTERN(const lzo_charp) _lzo_version_date(void); + + /* string functions */ + LZO_EXTERN(int) +-lzo_memcmp(const lzo_voidp _s1, const lzo_voidp _s2, lzo_uint _len); ++ lzo_memcmp(const lzo_voidp a, const lzo_voidp b, lzo_uint len); + LZO_EXTERN(lzo_voidp) +-lzo_memcpy(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len); ++ lzo_memcpy(lzo_voidp dst, const lzo_voidp src, lzo_uint len); + LZO_EXTERN(lzo_voidp) +-lzo_memmove(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len); ++ lzo_memmove(lzo_voidp dst, const lzo_voidp src, lzo_uint len); + LZO_EXTERN(lzo_voidp) +-lzo_memset(lzo_voidp _s, int _c, lzo_uint _len); ++ lzo_memset(lzo_voidp buf, int c, lzo_uint len); + + /* checksum functions */ +-LZO_EXTERN(lzo_uint32) +-lzo_adler32(lzo_uint32 _adler, const lzo_byte *_buf, lzo_uint _len); +-LZO_EXTERN(lzo_uint32) +-lzo_crc32(lzo_uint32 _c, const lzo_byte *_buf, lzo_uint _len); ++LZO_EXTERN(lzo_uint32_t) ++ lzo_adler32(lzo_uint32_t c, const lzo_bytep buf, lzo_uint len); ++LZO_EXTERN(lzo_uint32_t) ++ lzo_crc32(lzo_uint32_t c, const lzo_bytep buf, lzo_uint len); ++LZO_EXTERN(const lzo_uint32_tp) ++ lzo_get_crc32_table(void); + + /* misc. */ +-LZO_EXTERN(lzo_bool) lzo_assert(int _expr); + LZO_EXTERN(int) _lzo_config_check(void); +-typedef union { lzo_bytep p; lzo_uint u; } __lzo_pu_u; +-typedef union { lzo_bytep p; lzo_uint32 u32; } __lzo_pu32_u; +-typedef union { void *vp; lzo_bytep bp; lzo_uint32 u32; long l; } lzo_align_t; ++typedef union { ++ lzo_voidp a00; lzo_bytep a01; lzo_uint a02; lzo_xint a03; lzo_uintptr_t a04; ++ void *a05; unsigned char *a06; unsigned long a07; size_t a08; ptrdiff_t a09; ++#if defined(lzo_int64_t) ++ lzo_uint64_t a10; ++#endif ++} lzo_align_t; + +-/* align a char pointer on a boundary that is a multiple of `size' */ +-LZO_EXTERN(unsigned) __lzo_align_gap(const lzo_voidp _ptr, lzo_uint _size); +-#define LZO_PTR_ALIGN_UP(_ptr,_size) \ +- ((_ptr) + (lzo_uint) __lzo_align_gap((const lzo_voidp)(_ptr),(lzo_uint)(_size))) ++/* align a char pointer on a boundary that is a multiple of 'size' */ ++LZO_EXTERN(unsigned) __lzo_align_gap(const lzo_voidp p, lzo_uint size); ++#define LZO_PTR_ALIGN_UP(p,size) \ ++ ((p) + (lzo_uint) __lzo_align_gap((const lzo_voidp)(p),(lzo_uint)(size))) + +-/* deprecated - only for backward compatibility */ +-#define LZO_ALIGN(_ptr,_size) LZO_PTR_ALIGN_UP(_ptr,_size) ++ ++/*********************************************************************** ++// deprecated macros - only for backward compatibility ++************************************************************************/ ++ ++/* deprecated - use 'lzo_bytep' instead of 'lzo_byte *' */ ++#define lzo_byte unsigned char ++/* deprecated type names */ ++#define lzo_int32 lzo_int32_t ++#define lzo_uint32 lzo_uint32_t ++#define lzo_int32p lzo_int32_t __LZO_MMODEL * ++#define lzo_uint32p lzo_uint32_t __LZO_MMODEL * ++#define LZO_INT32_MAX LZO_INT32_C(2147483647) ++#define LZO_UINT32_MAX LZO_UINT32_C(4294967295) ++#if defined(lzo_int64_t) ++#define lzo_int64 lzo_int64_t ++#define lzo_uint64 lzo_uint64_t ++#define lzo_int64p lzo_int64_t __LZO_MMODEL * ++#define lzo_uint64p lzo_uint64_t __LZO_MMODEL * ++#define LZO_INT64_MAX LZO_INT64_C(9223372036854775807) ++#define LZO_UINT64_MAX LZO_UINT64_C(18446744073709551615) ++#endif ++/* deprecated types */ ++typedef union { lzo_bytep a; lzo_uint b; } __lzo_pu_u; ++typedef union { lzo_bytep a; lzo_uint32_t b; } __lzo_pu32_u; ++ ++#if defined(LZO_CFG_COMPAT) ++ ++#define __LZOCONF_H 1 ++ ++#if defined(LZO_ARCH_I086) ++# define __LZO_i386 1 ++#elif defined(LZO_ARCH_I386) ++# define __LZO_i386 1 ++#endif ++ ++#if defined(LZO_OS_DOS16) ++# define __LZO_DOS 1 ++# define __LZO_DOS16 1 ++#elif defined(LZO_OS_DOS32) ++# define __LZO_DOS 1 ++#elif defined(LZO_OS_WIN16) ++# define __LZO_WIN 1 ++# define __LZO_WIN16 1 ++#elif defined(LZO_OS_WIN32) ++# define __LZO_WIN 1 ++#endif ++ ++#define __LZO_CMODEL /*empty*/ ++#define __LZO_DMODEL /*empty*/ ++#define __LZO_ENTRY __LZO_CDECL ++#define LZO_EXTERN_CDECL LZO_EXTERN ++#define LZO_ALIGN LZO_PTR_ALIGN_UP ++ ++#define lzo_compress_asm_t lzo_compress_t ++#define lzo_decompress_asm_t lzo_decompress_t ++ ++#endif /* LZO_CFG_COMPAT */ + + + #ifdef __cplusplus +@@ -449,3 +440,5 @@ LZO_EXTERN(unsigned) __lzo_align_gap(const lzo_voidp _ptr, lzo_uint _size); + + #endif /* already included */ + ++ ++/* vim:set ts=4 sw=4 et: */ +diff --git a/lzo/lzodefs.h b/lzo/lzodefs.h +new file mode 100644 +index 0000000..f4ae948 +--- /dev/null ++++ b/lzo/lzodefs.h +@@ -0,0 +1,2998 @@ ++/* lzodefs.h -- architecture, OS and compiler specific defines ++ ++ This file is part of the LZO real-time data compression library. ++ ++ Copyright (C) 1996-2014 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 ++ ++ http://www.oberhumer.com/opensource/lzo/ ++ */ ++ ++ ++#ifndef __LZODEFS_H_INCLUDED ++#define __LZODEFS_H_INCLUDED 1 ++ ++#if defined(__CYGWIN32__) && !defined(__CYGWIN__) ++# define __CYGWIN__ __CYGWIN32__ ++#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(LZO_CFG_NO_DISABLE_WUNDEF) ++#if defined(__ARMCC_VERSION) ++# pragma diag_suppress 193 ++#elif defined(__clang__) && defined(__clang_minor__) ++# pragma clang diagnostic ignored "-Wundef" ++#elif defined(__INTEL_COMPILER) ++# pragma warning(disable: 193) ++#elif defined(__KEIL__) && defined(__C166__) ++# pragma warning disable = 322 ++#elif defined(__GNUC__) && defined(__GNUC_MINOR__) && !defined(__PATHSCALE__) ++# if ((__GNUC__-0) >= 5 || ((__GNUC__-0) == 4 && (__GNUC_MINOR__-0) >= 2)) ++# pragma GCC diagnostic ignored "-Wundef" ++# endif ++#elif defined(_MSC_VER) && !defined(__clang__) && !defined(__INTEL_COMPILER) && !defined(__MWERKS__) ++# if ((_MSC_VER-0) >= 1300) ++# pragma warning(disable: 4668) ++# endif ++#endif ++#endif ++#if 0 && 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 !(LZO_CFG_NO_DISABLE_WCRTNONSTDC) ++#ifndef _CRT_NONSTDC_NO_DEPRECATE ++#define _CRT_NONSTDC_NO_DEPRECATE 1 ++#endif ++#ifndef _CRT_NONSTDC_NO_WARNINGS ++#define _CRT_NONSTDC_NO_WARNINGS 1 ++#endif ++#ifndef _CRT_SECURE_NO_DEPRECATE ++#define _CRT_SECURE_NO_DEPRECATE 1 ++#endif ++#ifndef _CRT_SECURE_NO_WARNINGS ++#define _CRT_SECURE_NO_WARNINGS 1 ++#endif ++#endif ++#if 0 ++#define LZO_0xffffUL 0xfffful ++#define LZO_0xffffffffUL 0xfffffffful ++#else ++#define LZO_0xffffUL 65535ul ++#define LZO_0xffffffffUL 4294967295ul ++#endif ++#define LZO_0xffffL LZO_0xffffUL ++#define LZO_0xffffffffL LZO_0xffffffffUL ++#if (LZO_0xffffL == LZO_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 defined(__COUNTER__) ++# ifndef LZO_CFG_USE_COUNTER ++# define LZO_CFG_USE_COUNTER 1 ++# endif ++#else ++# undef LZO_CFG_USE_COUNTER ++#endif ++#if (UINT_MAX == LZO_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 == LZO_0xffffL) ++# define ptrdiff_t long ++# define _PTRDIFF_T_DEFINED 1 ++#endif ++#if (UINT_MAX == LZO_0xffffL) ++# undef __LZO_RENAME_A ++# undef __LZO_RENAME_B ++# if defined(__AZTEC_C__) && defined(__DOS__) ++# define __LZO_RENAME_A 1 ++# elif defined(_MSC_VER) && defined(MSDOS) ++# if (_MSC_VER < 600) ++# define __LZO_RENAME_A 1 ++# elif (_MSC_VER < 700) ++# define __LZO_RENAME_B 1 ++# endif ++# elif defined(__TSC__) && defined(__OS2__) ++# define __LZO_RENAME_A 1 ++# elif defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0410) ++# define __LZO_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(__LZO_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(__LZO_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 __LZO_RENAME_A ++# undef __LZO_RENAME_B ++#endif ++#if (UINT_MAX == LZO_0xffffL) ++#if defined(__AZTEC_C__) && defined(__DOS__) ++# define LZO_BROKEN_CDECL_ALT_SYNTAX 1 ++#elif defined(_MSC_VER) && defined(MSDOS) ++# if (_MSC_VER < 600) ++# define LZO_BROKEN_INTEGRAL_CONSTANTS 1 ++# endif ++# if (_MSC_VER < 700) ++# define LZO_BROKEN_INTEGRAL_PROMOTION 1 ++# define LZO_BROKEN_SIZEOF 1 ++# endif ++#elif defined(__PACIFIC__) && defined(DOS) ++# define LZO_BROKEN_INTEGRAL_CONSTANTS 1 ++#elif defined(__TURBOC__) && defined(__MSDOS__) ++# if (__TURBOC__ < 0x0150) ++# define LZO_BROKEN_CDECL_ALT_SYNTAX 1 ++# define LZO_BROKEN_INTEGRAL_CONSTANTS 1 ++# define LZO_BROKEN_INTEGRAL_PROMOTION 1 ++# endif ++# if (__TURBOC__ < 0x0200) ++# define LZO_BROKEN_SIZEOF 1 ++# endif ++# if (__TURBOC__ < 0x0400) && defined(__cplusplus) ++# define LZO_BROKEN_CDECL_ALT_SYNTAX 1 ++# endif ++#elif (defined(__PUREC__) || defined(__TURBOC__)) && defined(__TOS__) ++# define LZO_BROKEN_CDECL_ALT_SYNTAX 1 ++# define LZO_BROKEN_SIZEOF 1 ++#endif ++#endif ++#if defined(__WATCOMC__) && (__WATCOMC__ < 900) ++# define LZO_BROKEN_INTEGRAL_CONSTANTS 1 ++#endif ++#if defined(_CRAY) && defined(_CRAY1) ++# define LZO_BROKEN_SIGNED_RIGHT_SHIFT 1 ++#endif ++#define LZO_PP_STRINGIZE(x) #x ++#define LZO_PP_MACRO_EXPAND(x) LZO_PP_STRINGIZE(x) ++#define LZO_PP_CONCAT0() /*empty*/ ++#define LZO_PP_CONCAT1(a) a ++#define LZO_PP_CONCAT2(a,b) a ## b ++#define LZO_PP_CONCAT3(a,b,c) a ## b ## c ++#define LZO_PP_CONCAT4(a,b,c,d) a ## b ## c ## d ++#define LZO_PP_CONCAT5(a,b,c,d,e) a ## b ## c ## d ## e ++#define LZO_PP_CONCAT6(a,b,c,d,e,f) a ## b ## c ## d ## e ## f ++#define LZO_PP_CONCAT7(a,b,c,d,e,f,g) a ## b ## c ## d ## e ## f ## g ++#define LZO_PP_ECONCAT0() LZO_PP_CONCAT0() ++#define LZO_PP_ECONCAT1(a) LZO_PP_CONCAT1(a) ++#define LZO_PP_ECONCAT2(a,b) LZO_PP_CONCAT2(a,b) ++#define LZO_PP_ECONCAT3(a,b,c) LZO_PP_CONCAT3(a,b,c) ++#define LZO_PP_ECONCAT4(a,b,c,d) LZO_PP_CONCAT4(a,b,c,d) ++#define LZO_PP_ECONCAT5(a,b,c,d,e) LZO_PP_CONCAT5(a,b,c,d,e) ++#define LZO_PP_ECONCAT6(a,b,c,d,e,f) LZO_PP_CONCAT6(a,b,c,d,e,f) ++#define LZO_PP_ECONCAT7(a,b,c,d,e,f,g) LZO_PP_CONCAT7(a,b,c,d,e,f,g) ++#define LZO_PP_EMPTY /*empty*/ ++#define LZO_PP_EMPTY0() /*empty*/ ++#define LZO_PP_EMPTY1(a) /*empty*/ ++#define LZO_PP_EMPTY2(a,b) /*empty*/ ++#define LZO_PP_EMPTY3(a,b,c) /*empty*/ ++#define LZO_PP_EMPTY4(a,b,c,d) /*empty*/ ++#define LZO_PP_EMPTY5(a,b,c,d,e) /*empty*/ ++#define LZO_PP_EMPTY6(a,b,c,d,e,f) /*empty*/ ++#define LZO_PP_EMPTY7(a,b,c,d,e,f,g) /*empty*/ ++#if 1 ++#define LZO_CPP_STRINGIZE(x) #x ++#define LZO_CPP_MACRO_EXPAND(x) LZO_CPP_STRINGIZE(x) ++#define LZO_CPP_CONCAT2(a,b) a ## b ++#define LZO_CPP_CONCAT3(a,b,c) a ## b ## c ++#define LZO_CPP_CONCAT4(a,b,c,d) a ## b ## c ## d ++#define LZO_CPP_CONCAT5(a,b,c,d,e) a ## b ## c ## d ## e ++#define LZO_CPP_CONCAT6(a,b,c,d,e,f) a ## b ## c ## d ## e ## f ++#define LZO_CPP_CONCAT7(a,b,c,d,e,f,g) a ## b ## c ## d ## e ## f ## g ++#define LZO_CPP_ECONCAT2(a,b) LZO_CPP_CONCAT2(a,b) ++#define LZO_CPP_ECONCAT3(a,b,c) LZO_CPP_CONCAT3(a,b,c) ++#define LZO_CPP_ECONCAT4(a,b,c,d) LZO_CPP_CONCAT4(a,b,c,d) ++#define LZO_CPP_ECONCAT5(a,b,c,d,e) LZO_CPP_CONCAT5(a,b,c,d,e) ++#define LZO_CPP_ECONCAT6(a,b,c,d,e,f) LZO_CPP_CONCAT6(a,b,c,d,e,f) ++#define LZO_CPP_ECONCAT7(a,b,c,d,e,f,g) LZO_CPP_CONCAT7(a,b,c,d,e,f,g) ++#endif ++#define __LZO_MASK_GEN(o,b) (((((o) << ((b)-!!(b))) - (o)) << 1) + (o)*!!(b)) ++#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 LZO_EXTERN_C extern "C" ++# define LZO_EXTERN_C_BEGIN extern "C" { ++# define LZO_EXTERN_C_END } ++#else ++# define LZO_EXTERN_C extern ++# define LZO_EXTERN_C_BEGIN /*empty*/ ++# define LZO_EXTERN_C_END /*empty*/ ++#endif ++#if !defined(__LZO_OS_OVERRIDE) ++#if (LZO_OS_FREESTANDING) ++# define LZO_INFO_OS "freestanding" ++#elif (LZO_OS_EMBEDDED) ++# define LZO_INFO_OS "embedded" ++#elif 1 && defined(__IAR_SYSTEMS_ICC__) ++# define LZO_OS_EMBEDDED 1 ++# define LZO_INFO_OS "embedded" ++#elif defined(__CYGWIN__) && defined(__GNUC__) ++# define LZO_OS_CYGWIN 1 ++# define LZO_INFO_OS "cygwin" ++#elif defined(__EMX__) && defined(__GNUC__) ++# define LZO_OS_EMX 1 ++# define LZO_INFO_OS "emx" ++#elif defined(__BEOS__) ++# define LZO_OS_BEOS 1 ++# define LZO_INFO_OS "beos" ++#elif defined(__Lynx__) ++# define LZO_OS_LYNXOS 1 ++# define LZO_INFO_OS "lynxos" ++#elif defined(__OS400__) ++# define LZO_OS_OS400 1 ++# define LZO_INFO_OS "os400" ++#elif defined(__QNX__) ++# define LZO_OS_QNX 1 ++# define LZO_INFO_OS "qnx" ++#elif defined(__BORLANDC__) && defined(__DPMI32__) && (__BORLANDC__ >= 0x0460) ++# define LZO_OS_DOS32 1 ++# define LZO_INFO_OS "dos32" ++#elif defined(__BORLANDC__) && defined(__DPMI16__) ++# define LZO_OS_DOS16 1 ++# define LZO_INFO_OS "dos16" ++#elif defined(__ZTC__) && defined(DOS386) ++# define LZO_OS_DOS32 1 ++# define LZO_INFO_OS "dos32" ++#elif defined(__OS2__) || defined(__OS2V2__) ++# if (UINT_MAX == LZO_0xffffL) ++# define LZO_OS_OS216 1 ++# define LZO_INFO_OS "os216" ++# elif (UINT_MAX == LZO_0xffffffffL) ++# define LZO_OS_OS2 1 ++# define LZO_INFO_OS "os2" ++# else ++# error "check your limits.h header" ++# endif ++#elif defined(__WIN64__) || defined(_WIN64) || defined(WIN64) ++# define LZO_OS_WIN64 1 ++# define LZO_INFO_OS "win64" ++#elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(__WINDOWS_386__) ++# define LZO_OS_WIN32 1 ++# define LZO_INFO_OS "win32" ++#elif defined(__MWERKS__) && defined(__INTEL__) ++# define LZO_OS_WIN32 1 ++# define LZO_INFO_OS "win32" ++#elif defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows) ++# if (UINT_MAX == LZO_0xffffL) ++# define LZO_OS_WIN16 1 ++# define LZO_INFO_OS "win16" ++# elif (UINT_MAX == LZO_0xffffffffL) ++# define LZO_OS_WIN32 1 ++# define LZO_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 == LZO_0xffffL) ++# define LZO_OS_DOS16 1 ++# define LZO_INFO_OS "dos16" ++# elif (UINT_MAX == LZO_0xffffffffL) ++# define LZO_OS_DOS32 1 ++# define LZO_INFO_OS "dos32" ++# else ++# error "check your limits.h header" ++# endif ++#elif defined(__WATCOMC__) ++# if defined(__NT__) && (UINT_MAX == LZO_0xffffL) ++# define LZO_OS_DOS16 1 ++# define LZO_INFO_OS "dos16" ++# elif defined(__NT__) && (__WATCOMC__ < 1100) ++# define LZO_OS_WIN32 1 ++# define LZO_INFO_OS "win32" ++# elif defined(__linux__) || defined(__LINUX__) ++# define LZO_OS_POSIX 1 ++# define LZO_INFO_OS "posix" ++# else ++# error "please specify a target using the -bt compiler option" ++# endif ++#elif defined(__palmos__) ++# define LZO_OS_PALMOS 1 ++# define LZO_INFO_OS "palmos" ++#elif defined(__TOS__) || defined(__atarist__) ++# define LZO_OS_TOS 1 ++# define LZO_INFO_OS "tos" ++#elif defined(macintosh) && !defined(__ppc__) ++# define LZO_OS_MACCLASSIC 1 ++# define LZO_INFO_OS "macclassic" ++#elif defined(__VMS) ++# define LZO_OS_VMS 1 ++# define LZO_INFO_OS "vms" ++#elif (defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__) ++# define LZO_OS_CONSOLE 1 ++# define LZO_OS_CONSOLE_PS2 1 ++# define LZO_INFO_OS "console" ++# define LZO_INFO_OS_CONSOLE "ps2" ++#elif defined(__mips__) && defined(__psp__) ++# define LZO_OS_CONSOLE 1 ++# define LZO_OS_CONSOLE_PSP 1 ++# define LZO_INFO_OS "console" ++# define LZO_INFO_OS_CONSOLE "psp" ++#else ++# define LZO_OS_POSIX 1 ++# define LZO_INFO_OS "posix" ++#endif ++#if (LZO_OS_POSIX) ++# if defined(_AIX) || defined(__AIX__) || defined(__aix__) ++# define LZO_OS_POSIX_AIX 1 ++# define LZO_INFO_OS_POSIX "aix" ++# elif defined(__FreeBSD__) ++# define LZO_OS_POSIX_FREEBSD 1 ++# define LZO_INFO_OS_POSIX "freebsd" ++# elif defined(__hpux__) || defined(__hpux) ++# define LZO_OS_POSIX_HPUX 1 ++# define LZO_INFO_OS_POSIX "hpux" ++# elif defined(__INTERIX) ++# define LZO_OS_POSIX_INTERIX 1 ++# define LZO_INFO_OS_POSIX "interix" ++# elif defined(__IRIX__) || defined(__irix__) ++# define LZO_OS_POSIX_IRIX 1 ++# define LZO_INFO_OS_POSIX "irix" ++# elif defined(__linux__) || defined(__linux) || defined(__LINUX__) ++# define LZO_OS_POSIX_LINUX 1 ++# define LZO_INFO_OS_POSIX "linux" ++# elif defined(__APPLE__) && defined(__MACH__) ++# if ((__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__-0) >= 20000) ++# define LZO_OS_POSIX_DARWIN 1040 ++# define LZO_INFO_OS_POSIX "darwin_iphone" ++# elif ((__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0) >= 1040) ++# define LZO_OS_POSIX_DARWIN __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ ++# define LZO_INFO_OS_POSIX "darwin" ++# else ++# define LZO_OS_POSIX_DARWIN 1 ++# define LZO_INFO_OS_POSIX "darwin" ++# endif ++# define LZO_OS_POSIX_MACOSX LZO_OS_POSIX_DARWIN ++# elif defined(__minix__) || defined(__minix) ++# define LZO_OS_POSIX_MINIX 1 ++# define LZO_INFO_OS_POSIX "minix" ++# elif defined(__NetBSD__) ++# define LZO_OS_POSIX_NETBSD 1 ++# define LZO_INFO_OS_POSIX "netbsd" ++# elif defined(__OpenBSD__) ++# define LZO_OS_POSIX_OPENBSD 1 ++# define LZO_INFO_OS_POSIX "openbsd" ++# elif defined(__osf__) ++# define LZO_OS_POSIX_OSF 1 ++# define LZO_INFO_OS_POSIX "osf" ++# elif defined(__solaris__) || defined(__sun) ++# if defined(__SVR4) || defined(__svr4__) ++# define LZO_OS_POSIX_SOLARIS 1 ++# define LZO_INFO_OS_POSIX "solaris" ++# else ++# define LZO_OS_POSIX_SUNOS 1 ++# define LZO_INFO_OS_POSIX "sunos" ++# endif ++# elif defined(__ultrix__) || defined(__ultrix) ++# define LZO_OS_POSIX_ULTRIX 1 ++# define LZO_INFO_OS_POSIX "ultrix" ++# elif defined(_UNICOS) ++# define LZO_OS_POSIX_UNICOS 1 ++# define LZO_INFO_OS_POSIX "unicos" ++# else ++# define LZO_OS_POSIX_UNKNOWN 1 ++# define LZO_INFO_OS_POSIX "unknown" ++# endif ++#endif ++#endif ++#if (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16) ++# if (UINT_MAX != LZO_0xffffL) ++# error "unexpected configuration - check your compiler defines" ++# endif ++# if (ULONG_MAX != LZO_0xffffffffL) ++# error "unexpected configuration - check your compiler defines" ++# endif ++#endif ++#if (LZO_OS_DOS32 || LZO_OS_OS2 || LZO_OS_WIN32 || LZO_OS_WIN64) ++# if (UINT_MAX != LZO_0xffffffffL) ++# error "unexpected configuration - check your compiler defines" ++# endif ++# if (ULONG_MAX != LZO_0xffffffffL) ++# error "unexpected configuration - check your compiler defines" ++# endif ++#endif ++#if defined(CIL) && defined(_GNUCC) && defined(__GNUC__) ++# define LZO_CC_CILLY 1 ++# define LZO_INFO_CC "Cilly" ++# if defined(__CILLY__) ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__CILLY__) ++# else ++# define LZO_INFO_CCVER "unknown" ++# endif ++#elif 0 && defined(SDCC) && defined(__VERSION__) && !defined(__GNUC__) ++# define LZO_CC_SDCC 1 ++# define LZO_INFO_CC "sdcc" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(SDCC) ++#elif defined(__PATHSCALE__) && defined(__PATHCC_PATCHLEVEL__) ++# define LZO_CC_PATHSCALE (__PATHCC__ * 0x10000L + (__PATHCC_MINOR__-0) * 0x100 + (__PATHCC_PATCHLEVEL__-0)) ++# define LZO_INFO_CC "Pathscale C" ++# define LZO_INFO_CCVER __PATHSCALE__ ++# if defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) ++# define LZO_CC_PATHSCALE_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) ++# endif ++#elif defined(__INTEL_COMPILER) && ((__INTEL_COMPILER-0) > 0) ++# define LZO_CC_INTELC __INTEL_COMPILER ++# define LZO_INFO_CC "Intel C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__INTEL_COMPILER) ++# if defined(_MSC_VER) && ((_MSC_VER-0) > 0) ++# define LZO_CC_INTELC_MSC _MSC_VER ++# elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) ++# define LZO_CC_INTELC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) ++# endif ++#elif defined(__POCC__) && defined(_WIN32) ++# define LZO_CC_PELLESC 1 ++# define LZO_INFO_CC "Pelles C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__POCC__) ++#elif defined(__ARMCC_VERSION) && defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) ++# if defined(__GNUC_PATCHLEVEL__) ++# define LZO_CC_ARMCC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) ++# else ++# define LZO_CC_ARMCC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100) ++# endif ++# define LZO_CC_ARMCC __ARMCC_VERSION ++# define LZO_INFO_CC "ARM C Compiler" ++# define LZO_INFO_CCVER __VERSION__ ++#elif defined(__clang__) && defined(__llvm__) && defined(__VERSION__) ++# if defined(__clang_major__) && defined(__clang_minor__) && defined(__clang_patchlevel__) ++# define LZO_CC_CLANG (__clang_major__ * 0x10000L + (__clang_minor__-0) * 0x100 + (__clang_patchlevel__-0)) ++# else ++# define LZO_CC_CLANG 0x010000L ++# endif ++# if defined(_MSC_VER) && ((_MSC_VER-0) > 0) ++# define LZO_CC_CLANG_MSC _MSC_VER ++# elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) ++# define LZO_CC_CLANG_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) ++# endif ++# define LZO_INFO_CC "clang" ++# define LZO_INFO_CCVER __VERSION__ ++#elif defined(__llvm__) && defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) ++# if defined(__GNUC_PATCHLEVEL__) ++# define LZO_CC_LLVM_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) ++# else ++# define LZO_CC_LLVM_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100) ++# endif ++# define LZO_CC_LLVM LZO_CC_LLVM_GNUC ++# define LZO_INFO_CC "llvm-gcc" ++# define LZO_INFO_CCVER __VERSION__ ++#elif defined(__ACK__) && defined(_ACK) ++# define LZO_CC_ACK 1 ++# define LZO_INFO_CC "Amsterdam Compiler Kit C" ++# define LZO_INFO_CCVER "unknown" ++#elif defined(__ARMCC_VERSION) && !defined(__GNUC__) ++# define LZO_CC_ARMCC __ARMCC_VERSION ++# define LZO_CC_ARMCC_ARMCC __ARMCC_VERSION ++# define LZO_INFO_CC "ARM C Compiler" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__ARMCC_VERSION) ++#elif defined(__AZTEC_C__) ++# define LZO_CC_AZTECC 1 ++# define LZO_INFO_CC "Aztec C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__AZTEC_C__) ++#elif defined(__CODEGEARC__) ++# define LZO_CC_CODEGEARC 1 ++# define LZO_INFO_CC "CodeGear C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__CODEGEARC__) ++#elif defined(__BORLANDC__) ++# define LZO_CC_BORLANDC 1 ++# define LZO_INFO_CC "Borland C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__BORLANDC__) ++#elif defined(_CRAYC) && defined(_RELEASE) ++# define LZO_CC_CRAYC 1 ++# define LZO_INFO_CC "Cray C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(_RELEASE) ++#elif defined(__DMC__) && defined(__SC__) ++# define LZO_CC_DMC 1 ++# define LZO_INFO_CC "Digital Mars C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__DMC__) ++#elif defined(__DECC) ++# define LZO_CC_DECC 1 ++# define LZO_INFO_CC "DEC C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__DECC) ++#elif (defined(__ghs) || defined(__ghs__)) && defined(__GHS_VERSION_NUMBER) && ((__GHS_VERSION_NUMBER-0) > 0) ++# define LZO_CC_GHS 1 ++# define LZO_INFO_CC "Green Hills C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__GHS_VERSION_NUMBER) ++# if defined(_MSC_VER) && ((_MSC_VER-0) > 0) ++# define LZO_CC_GHS_MSC _MSC_VER ++# elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) ++# define LZO_CC_GHS_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) ++# endif ++#elif defined(__HIGHC__) ++# define LZO_CC_HIGHC 1 ++# define LZO_INFO_CC "MetaWare High C" ++# define LZO_INFO_CCVER "unknown" ++#elif defined(__HP_aCC) && ((__HP_aCC-0) > 0) ++# define LZO_CC_HPACC __HP_aCC ++# define LZO_INFO_CC "HP aCC" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__HP_aCC) ++#elif defined(__IAR_SYSTEMS_ICC__) ++# define LZO_CC_IARC 1 ++# define LZO_INFO_CC "IAR C" ++# if defined(__VER__) ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__VER__) ++# else ++# define LZO_INFO_CCVER "unknown" ++# endif ++#elif defined(__IBMC__) && ((__IBMC__-0) > 0) ++# define LZO_CC_IBMC __IBMC__ ++# define LZO_INFO_CC "IBM C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__IBMC__) ++#elif defined(__IBMCPP__) && ((__IBMCPP__-0) > 0) ++# define LZO_CC_IBMC __IBMCPP__ ++# define LZO_INFO_CC "IBM C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__IBMCPP__) ++#elif defined(__KEIL__) && defined(__C166__) ++# define LZO_CC_KEILC 1 ++# define LZO_INFO_CC "Keil C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__C166__) ++#elif defined(__LCC__) && defined(_WIN32) && defined(__LCCOPTIMLEVEL) ++# define LZO_CC_LCCWIN32 1 ++# define LZO_INFO_CC "lcc-win32" ++# define LZO_INFO_CCVER "unknown" ++#elif defined(__LCC__) ++# define LZO_CC_LCC 1 ++# define LZO_INFO_CC "lcc" ++# if defined(__LCC_VERSION__) ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__LCC_VERSION__) ++# else ++# define LZO_INFO_CCVER "unknown" ++# endif ++#elif defined(__MWERKS__) && ((__MWERKS__-0) > 0) ++# define LZO_CC_MWERKS __MWERKS__ ++# define LZO_INFO_CC "Metrowerks C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__MWERKS__) ++#elif (defined(__NDPC__) || defined(__NDPX__)) && defined(__i386) ++# define LZO_CC_NDPC 1 ++# define LZO_INFO_CC "Microway NDP C" ++# define LZO_INFO_CCVER "unknown" ++#elif defined(__PACIFIC__) ++# define LZO_CC_PACIFICC 1 ++# define LZO_INFO_CC "Pacific C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__PACIFIC__) ++#elif defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) ++# if defined(__PGIC_PATCHLEVEL__) ++# define LZO_CC_PGI (__PGIC__ * 0x10000L + (__PGIC_MINOR__-0) * 0x100 + (__PGIC_PATCHLEVEL__-0)) ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__PGIC__) "." LZO_PP_MACRO_EXPAND(__PGIC_MINOR__) "." LZO_PP_MACRO_EXPAND(__PGIC_PATCHLEVEL__) ++# else ++# define LZO_CC_PGI (__PGIC__ * 0x10000L + (__PGIC_MINOR__-0) * 0x100) ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__PGIC__) "." LZO_PP_MACRO_EXPAND(__PGIC_MINOR__) ".0" ++# endif ++# define LZO_INFO_CC "Portland Group PGI C" ++#elif defined(__PGI) && (defined(__linux__) || defined(__WIN32__)) ++# define LZO_CC_PGI 1 ++# define LZO_INFO_CC "Portland Group PGI C" ++# define LZO_INFO_CCVER "unknown" ++#elif defined(__PUREC__) && defined(__TOS__) ++# define LZO_CC_PUREC 1 ++# define LZO_INFO_CC "Pure C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__PUREC__) ++#elif defined(__SC__) && defined(__ZTC__) ++# define LZO_CC_SYMANTECC 1 ++# define LZO_INFO_CC "Symantec C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__SC__) ++#elif defined(__SUNPRO_C) ++# define LZO_INFO_CC "SunPro C" ++# if ((__SUNPRO_C-0) > 0) ++# define LZO_CC_SUNPROC __SUNPRO_C ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__SUNPRO_C) ++# else ++# define LZO_CC_SUNPROC 1 ++# define LZO_INFO_CCVER "unknown" ++# endif ++#elif defined(__SUNPRO_CC) ++# define LZO_INFO_CC "SunPro C" ++# if ((__SUNPRO_CC-0) > 0) ++# define LZO_CC_SUNPROC __SUNPRO_CC ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__SUNPRO_CC) ++# else ++# define LZO_CC_SUNPROC 1 ++# define LZO_INFO_CCVER "unknown" ++# endif ++#elif defined(__TINYC__) ++# define LZO_CC_TINYC 1 ++# define LZO_INFO_CC "Tiny C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__TINYC__) ++#elif defined(__TSC__) ++# define LZO_CC_TOPSPEEDC 1 ++# define LZO_INFO_CC "TopSpeed C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__TSC__) ++#elif defined(__WATCOMC__) ++# define LZO_CC_WATCOMC 1 ++# define LZO_INFO_CC "Watcom C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__WATCOMC__) ++#elif defined(__TURBOC__) ++# define LZO_CC_TURBOC 1 ++# define LZO_INFO_CC "Turbo C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__TURBOC__) ++#elif defined(__ZTC__) ++# define LZO_CC_ZORTECHC 1 ++# define LZO_INFO_CC "Zortech C" ++# if ((__ZTC__-0) == 0x310) ++# define LZO_INFO_CCVER "0x310" ++# else ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__ZTC__) ++# endif ++#elif defined(__GNUC__) && defined(__VERSION__) ++# if defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__) ++# define LZO_CC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) ++# elif defined(__GNUC_MINOR__) ++# define LZO_CC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100) ++# else ++# define LZO_CC_GNUC (__GNUC__ * 0x10000L) ++# endif ++# define LZO_INFO_CC "gcc" ++# define LZO_INFO_CCVER __VERSION__ ++#elif defined(_MSC_VER) && ((_MSC_VER-0) > 0) ++# define LZO_CC_MSC _MSC_VER ++# define LZO_INFO_CC "Microsoft C" ++# if defined(_MSC_FULL_VER) ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(_MSC_VER) "." LZO_PP_MACRO_EXPAND(_MSC_FULL_VER) ++# else ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(_MSC_VER) ++# endif ++#else ++# define LZO_CC_UNKNOWN 1 ++# define LZO_INFO_CC "unknown" ++# define LZO_INFO_CCVER "unknown" ++#endif ++#if (LZO_CC_GNUC) && defined(__OPEN64__) ++# if defined(__OPENCC__) && defined(__OPENCC_MINOR__) && defined(__OPENCC_PATCHLEVEL__) ++# define LZO_CC_OPEN64 (__OPENCC__ * 0x10000L + (__OPENCC_MINOR__-0) * 0x100 + (__OPENCC_PATCHLEVEL__-0)) ++# define LZO_CC_OPEN64_GNUC LZO_CC_GNUC ++# endif ++#endif ++#if (LZO_CC_GNUC) && defined(__PCC__) ++# if defined(__PCC__) && defined(__PCC_MINOR__) && defined(__PCC_MINORMINOR__) ++# define LZO_CC_PCC (__PCC__ * 0x10000L + (__PCC_MINOR__-0) * 0x100 + (__PCC_MINORMINOR__-0)) ++# define LZO_CC_PCC_GNUC LZO_CC_GNUC ++# endif ++#endif ++#if 0 && (LZO_CC_MSC && (_MSC_VER >= 1200)) && !defined(_MSC_FULL_VER) ++# error "LZO_CC_MSC: _MSC_FULL_VER is not defined" ++#endif ++#if !defined(__LZO_ARCH_OVERRIDE) && !(LZO_ARCH_GENERIC) && defined(_CRAY) ++# if (UINT_MAX > LZO_0xffffffffL) && defined(_CRAY) ++# if defined(_CRAYMPP) || defined(_CRAYT3D) || defined(_CRAYT3E) ++# define LZO_ARCH_CRAY_MPP 1 ++# elif defined(_CRAY1) ++# define LZO_ARCH_CRAY_PVP 1 ++# endif ++# endif ++#endif ++#if !defined(__LZO_ARCH_OVERRIDE) ++#if (LZO_ARCH_GENERIC) ++# define LZO_INFO_ARCH "generic" ++#elif (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16) ++# define LZO_ARCH_I086 1 ++# define LZO_INFO_ARCH "i086" ++#elif defined(__aarch64__) ++# define LZO_ARCH_ARM64 1 ++# define LZO_INFO_ARCH "arm64" ++#elif defined(__alpha__) || defined(__alpha) || defined(_M_ALPHA) ++# define LZO_ARCH_ALPHA 1 ++# define LZO_INFO_ARCH "alpha" ++#elif (LZO_ARCH_CRAY_MPP) && (defined(_CRAYT3D) || defined(_CRAYT3E)) ++# define LZO_ARCH_ALPHA 1 ++# define LZO_INFO_ARCH "alpha" ++#elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64) ++# define LZO_ARCH_AMD64 1 ++# define LZO_INFO_ARCH "amd64" ++#elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB)) ++# define LZO_ARCH_ARM 1 ++# define LZO_ARCH_ARM_THUMB 1 ++# define LZO_INFO_ARCH "arm_thumb" ++#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCARM__) ++# define LZO_ARCH_ARM 1 ++# if defined(__CPU_MODE__) && ((__CPU_MODE__-0) == 1) ++# define LZO_ARCH_ARM_THUMB 1 ++# define LZO_INFO_ARCH "arm_thumb" ++# elif defined(__CPU_MODE__) && ((__CPU_MODE__-0) == 2) ++# define LZO_INFO_ARCH "arm" ++# else ++# define LZO_INFO_ARCH "arm" ++# endif ++#elif defined(__arm__) || defined(_M_ARM) ++# define LZO_ARCH_ARM 1 ++# define LZO_INFO_ARCH "arm" ++#elif (UINT_MAX <= LZO_0xffffL) && defined(__AVR__) ++# define LZO_ARCH_AVR 1 ++# define LZO_INFO_ARCH "avr" ++#elif defined(__avr32__) || defined(__AVR32__) ++# define LZO_ARCH_AVR32 1 ++# define LZO_INFO_ARCH "avr32" ++#elif defined(__bfin__) ++# define LZO_ARCH_BLACKFIN 1 ++# define LZO_INFO_ARCH "blackfin" ++#elif (UINT_MAX == LZO_0xffffL) && defined(__C166__) ++# define LZO_ARCH_C166 1 ++# define LZO_INFO_ARCH "c166" ++#elif defined(__cris__) ++# define LZO_ARCH_CRIS 1 ++# define LZO_INFO_ARCH "cris" ++#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCEZ80__) ++# define LZO_ARCH_EZ80 1 ++# define LZO_INFO_ARCH "ez80" ++#elif defined(__H8300__) || defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__) ++# define LZO_ARCH_H8300 1 ++# define LZO_INFO_ARCH "h8300" ++#elif defined(__hppa__) || defined(__hppa) ++# define LZO_ARCH_HPPA 1 ++# define LZO_INFO_ARCH "hppa" ++#elif defined(__386__) || defined(__i386__) || defined(__i386) || defined(_M_IX86) || defined(_M_I386) ++# define LZO_ARCH_I386 1 ++# define LZO_ARCH_IA32 1 ++# define LZO_INFO_ARCH "i386" ++#elif (LZO_CC_ZORTECHC && defined(__I86__)) ++# define LZO_ARCH_I386 1 ++# define LZO_ARCH_IA32 1 ++# define LZO_INFO_ARCH "i386" ++#elif (LZO_OS_DOS32 && LZO_CC_HIGHC) && defined(_I386) ++# define LZO_ARCH_I386 1 ++# define LZO_ARCH_IA32 1 ++# define LZO_INFO_ARCH "i386" ++#elif defined(__ia64__) || defined(__ia64) || defined(_M_IA64) ++# define LZO_ARCH_IA64 1 ++# define LZO_INFO_ARCH "ia64" ++#elif (UINT_MAX == LZO_0xffffL) && defined(__m32c__) ++# define LZO_ARCH_M16C 1 ++# define LZO_INFO_ARCH "m16c" ++#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCM16C__) ++# define LZO_ARCH_M16C 1 ++# define LZO_INFO_ARCH "m16c" ++#elif defined(__m32r__) ++# define LZO_ARCH_M32R 1 ++# define LZO_INFO_ARCH "m32r" ++#elif (LZO_OS_TOS) || defined(__m68k__) || defined(__m68000__) || defined(__mc68000__) || defined(__mc68020__) || defined(_M_M68K) ++# define LZO_ARCH_M68K 1 ++# define LZO_INFO_ARCH "m68k" ++#elif (UINT_MAX == LZO_0xffffL) && defined(__C251__) ++# define LZO_ARCH_MCS251 1 ++# define LZO_INFO_ARCH "mcs251" ++#elif (UINT_MAX == LZO_0xffffL) && defined(__C51__) ++# define LZO_ARCH_MCS51 1 ++# define LZO_INFO_ARCH "mcs51" ++#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICC8051__) ++# define LZO_ARCH_MCS51 1 ++# define LZO_INFO_ARCH "mcs51" ++#elif defined(__mips__) || defined(__mips) || defined(_MIPS_ARCH) || defined(_M_MRX000) ++# define LZO_ARCH_MIPS 1 ++# define LZO_INFO_ARCH "mips" ++#elif (UINT_MAX == LZO_0xffffL) && defined(__MSP430__) ++# define LZO_ARCH_MSP430 1 ++# define LZO_INFO_ARCH "msp430" ++#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICC430__) ++# define LZO_ARCH_MSP430 1 ++# define LZO_INFO_ARCH "msp430" ++#elif defined(__powerpc__) || defined(__powerpc) || defined(__ppc__) || defined(__PPC__) || defined(_M_PPC) || defined(_ARCH_PPC) || defined(_ARCH_PWR) ++# define LZO_ARCH_POWERPC 1 ++# define LZO_INFO_ARCH "powerpc" ++#elif defined(__s390__) || defined(__s390) || defined(__s390x__) || defined(__s390x) ++# define LZO_ARCH_S390 1 ++# define LZO_INFO_ARCH "s390" ++#elif defined(__sh__) || defined(_M_SH) ++# define LZO_ARCH_SH 1 ++# define LZO_INFO_ARCH "sh" ++#elif defined(__sparc__) || defined(__sparc) || defined(__sparcv8) ++# define LZO_ARCH_SPARC 1 ++# define LZO_INFO_ARCH "sparc" ++#elif defined(__SPU__) ++# define LZO_ARCH_SPU 1 ++# define LZO_INFO_ARCH "spu" ++#elif (UINT_MAX == LZO_0xffffL) && defined(__z80) ++# define LZO_ARCH_Z80 1 ++# define LZO_INFO_ARCH "z80" ++#elif (LZO_ARCH_CRAY_PVP) ++# if defined(_CRAYSV1) ++# define LZO_ARCH_CRAY_SV1 1 ++# define LZO_INFO_ARCH "cray_sv1" ++# elif (_ADDR64) ++# define LZO_ARCH_CRAY_T90 1 ++# define LZO_INFO_ARCH "cray_t90" ++# elif (_ADDR32) ++# define LZO_ARCH_CRAY_YMP 1 ++# define LZO_INFO_ARCH "cray_ymp" ++# else ++# define LZO_ARCH_CRAY_XMP 1 ++# define LZO_INFO_ARCH "cray_xmp" ++# endif ++#else ++# define LZO_ARCH_UNKNOWN 1 ++# define LZO_INFO_ARCH "unknown" ++#endif ++#endif ++#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_DOS32 || LZO_OS_OS2) ++# error "FIXME - missing define for CPU architecture" ++#endif ++#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_WIN32) ++# error "FIXME - missing LZO_OS_WIN32 define for CPU architecture" ++#endif ++#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_WIN64) ++# error "FIXME - missing LZO_OS_WIN64 define for CPU architecture" ++#endif ++#if (LZO_OS_OS216 || LZO_OS_WIN16) ++# define LZO_ARCH_I086PM 1 ++#elif 1 && (LZO_OS_DOS16 && defined(BLX286)) ++# define LZO_ARCH_I086PM 1 ++#elif 1 && (LZO_OS_DOS16 && defined(DOSX286)) ++# define LZO_ARCH_I086PM 1 ++#elif 1 && (LZO_OS_DOS16 && LZO_CC_BORLANDC && defined(__DPMI16__)) ++# define LZO_ARCH_I086PM 1 ++#endif ++#if (LZO_ARCH_AMD64 && !LZO_ARCH_X64) ++# define LZO_ARCH_X64 1 ++#elif (!LZO_ARCH_AMD64 && LZO_ARCH_X64) && defined(__LZO_ARCH_OVERRIDE) ++# define LZO_ARCH_AMD64 1 ++#endif ++#if (LZO_ARCH_ARM64 && !LZO_ARCH_AARCH64) ++# define LZO_ARCH_AARCH64 1 ++#elif (!LZO_ARCH_ARM64 && LZO_ARCH_AARCH64) && defined(__LZO_ARCH_OVERRIDE) ++# define LZO_ARCH_ARM64 1 ++#endif ++#if (LZO_ARCH_I386 && !LZO_ARCH_X86) ++# define LZO_ARCH_X86 1 ++#elif (!LZO_ARCH_I386 && LZO_ARCH_X86) && defined(__LZO_ARCH_OVERRIDE) ++# define LZO_ARCH_I386 1 ++#endif ++#if (LZO_ARCH_AMD64 && !LZO_ARCH_X64) || (!LZO_ARCH_AMD64 && LZO_ARCH_X64) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_ARM64 && !LZO_ARCH_AARCH64) || (!LZO_ARCH_ARM64 && LZO_ARCH_AARCH64) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_I386 && !LZO_ARCH_X86) || (!LZO_ARCH_I386 && LZO_ARCH_X86) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_ARM_THUMB && !LZO_ARCH_ARM) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_ARM_THUMB1 && !LZO_ARCH_ARM_THUMB) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_ARM_THUMB2 && !LZO_ARCH_ARM_THUMB) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_ARM_THUMB1 && LZO_ARCH_ARM_THUMB2) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_I086PM && !LZO_ARCH_I086) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_I086) ++# if (UINT_MAX != LZO_0xffffL) ++# error "unexpected configuration - check your compiler defines" ++# endif ++# if (ULONG_MAX != LZO_0xffffffffL) ++# error "unexpected configuration - check your compiler defines" ++# endif ++#endif ++#if (LZO_ARCH_I386) ++# if (UINT_MAX != LZO_0xffffL) && defined(__i386_int16__) ++# error "unexpected configuration - check your compiler defines" ++# endif ++# if (UINT_MAX != LZO_0xffffffffL) && !defined(__i386_int16__) ++# error "unexpected configuration - check your compiler defines" ++# endif ++# if (ULONG_MAX != LZO_0xffffffffL) ++# error "unexpected configuration - check your compiler defines" ++# endif ++#endif ++#if (LZO_ARCH_AMD64 || LZO_ARCH_I386) ++# if !defined(LZO_TARGET_FEATURE_SSE2) ++# if defined(__SSE2__) ++# define LZO_TARGET_FEATURE_SSE2 1 ++# elif defined(_MSC_VER) && ((defined(_M_IX86_FP) && ((_M_IX86_FP)+0 >= 2)) || defined(_M_AMD64)) ++# define LZO_TARGET_FEATURE_SSE2 1 ++# endif ++# endif ++# if !defined(LZO_TARGET_FEATURE_SSSE3) ++# if (LZO_TARGET_FEATURE_SSE2) ++# if defined(__SSSE3__) ++# define LZO_TARGET_FEATURE_SSSE3 1 ++# elif defined(_MSC_VER) && defined(__AVX__) ++# define LZO_TARGET_FEATURE_SSSE3 1 ++# endif ++# endif ++# endif ++# if !defined(LZO_TARGET_FEATURE_SSE4_2) ++# if (LZO_TARGET_FEATURE_SSSE3) ++# if defined(__SSE4_2__) ++# define LZO_TARGET_FEATURE_SSE4_2 1 ++# endif ++# endif ++# endif ++# if !defined(LZO_TARGET_FEATURE_AVX) ++# if (LZO_TARGET_FEATURE_SSSE3) ++# if defined(__AVX__) ++# define LZO_TARGET_FEATURE_AVX 1 ++# endif ++# endif ++# endif ++# if !defined(LZO_TARGET_FEATURE_AVX2) ++# if (LZO_TARGET_FEATURE_AVX) ++# if defined(__AVX2__) ++# define LZO_TARGET_FEATURE_AVX2 1 ++# endif ++# endif ++# endif ++#endif ++#if (LZO_TARGET_FEATURE_SSSE3 && !(LZO_TARGET_FEATURE_SSE2)) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_TARGET_FEATURE_SSE4_2 && !(LZO_TARGET_FEATURE_SSSE3)) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_TARGET_FEATURE_AVX && !(LZO_TARGET_FEATURE_SSSE3)) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_TARGET_FEATURE_AVX2 && !(LZO_TARGET_FEATURE_AVX)) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_ARM) ++# if !defined(LZO_TARGET_FEATURE_NEON) ++# if defined(__ARM_NEON__) ++# define LZO_TARGET_FEATURE_NEON 1 ++# endif ++# endif ++#elif (LZO_ARCH_ARM64) ++# if !defined(LZO_TARGET_FEATURE_NEON) ++# if 1 ++# define LZO_TARGET_FEATURE_NEON 1 ++# endif ++# endif ++#endif ++#if 0 ++#elif !defined(__LZO_MM_OVERRIDE) ++#if (LZO_ARCH_I086) ++#if (UINT_MAX != LZO_0xffffL) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if defined(__TINY__) || defined(M_I86TM) || defined(_M_I86TM) ++# define LZO_MM_TINY 1 ++#elif defined(__HUGE__) || defined(_HUGE_) || defined(M_I86HM) || defined(_M_I86HM) ++# define LZO_MM_HUGE 1 ++#elif defined(__SMALL__) || defined(M_I86SM) || defined(_M_I86SM) || defined(SMALL_MODEL) ++# define LZO_MM_SMALL 1 ++#elif defined(__MEDIUM__) || defined(M_I86MM) || defined(_M_I86MM) ++# define LZO_MM_MEDIUM 1 ++#elif defined(__COMPACT__) || defined(M_I86CM) || defined(_M_I86CM) ++# define LZO_MM_COMPACT 1 ++#elif defined(__LARGE__) || defined(M_I86LM) || defined(_M_I86LM) || defined(LARGE_MODEL) ++# define LZO_MM_LARGE 1 ++#elif (LZO_CC_AZTECC) ++# if defined(_LARGE_CODE) && defined(_LARGE_DATA) ++# define LZO_MM_LARGE 1 ++# elif defined(_LARGE_CODE) ++# define LZO_MM_MEDIUM 1 ++# elif defined(_LARGE_DATA) ++# define LZO_MM_COMPACT 1 ++# else ++# define LZO_MM_SMALL 1 ++# endif ++#elif (LZO_CC_ZORTECHC && defined(__VCM__)) ++# define LZO_MM_LARGE 1 ++#else ++# error "unknown LZO_ARCH_I086 memory model" ++#endif ++#if (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16) ++#define LZO_HAVE_MM_HUGE_PTR 1 ++#define LZO_HAVE_MM_HUGE_ARRAY 1 ++#if (LZO_MM_TINY) ++# undef LZO_HAVE_MM_HUGE_ARRAY ++#endif ++#if (LZO_CC_AZTECC || LZO_CC_PACIFICC || LZO_CC_ZORTECHC) ++# undef LZO_HAVE_MM_HUGE_PTR ++# undef LZO_HAVE_MM_HUGE_ARRAY ++#elif (LZO_CC_DMC || LZO_CC_SYMANTECC) ++# undef LZO_HAVE_MM_HUGE_ARRAY ++#elif (LZO_CC_MSC && defined(_QC)) ++# undef LZO_HAVE_MM_HUGE_ARRAY ++# if (_MSC_VER < 600) ++# undef LZO_HAVE_MM_HUGE_PTR ++# endif ++#elif (LZO_CC_TURBOC && (__TURBOC__ < 0x0295)) ++# undef LZO_HAVE_MM_HUGE_ARRAY ++#endif ++#if (LZO_ARCH_I086PM) && !(LZO_HAVE_MM_HUGE_PTR) ++# if (LZO_OS_DOS16) ++# error "unexpected configuration - check your compiler defines" ++# elif (LZO_CC_ZORTECHC) ++# else ++# error "unexpected configuration - check your compiler defines" ++# endif ++#endif ++#ifdef __cplusplus ++extern "C" { ++#endif ++#if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0200)) ++ extern void __near __cdecl _AHSHIFT(void); ++# define LZO_MM_AHSHIFT ((unsigned) _AHSHIFT) ++#elif (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC) ++ extern void __near __cdecl _AHSHIFT(void); ++# define LZO_MM_AHSHIFT ((unsigned) _AHSHIFT) ++#elif (LZO_CC_MSC || LZO_CC_TOPSPEEDC) ++ extern void __near __cdecl _AHSHIFT(void); ++# define LZO_MM_AHSHIFT ((unsigned) _AHSHIFT) ++#elif (LZO_CC_TURBOC && (__TURBOC__ >= 0x0295)) ++ extern void __near __cdecl _AHSHIFT(void); ++# define LZO_MM_AHSHIFT ((unsigned) _AHSHIFT) ++#elif ((LZO_CC_AZTECC || LZO_CC_PACIFICC || LZO_CC_TURBOC) && LZO_OS_DOS16) ++# define LZO_MM_AHSHIFT 12 ++#elif (LZO_CC_WATCOMC) ++ extern unsigned char _HShift; ++# define LZO_MM_AHSHIFT ((unsigned) _HShift) ++#else ++# error "FIXME - implement LZO_MM_AHSHIFT" ++#endif ++#ifdef __cplusplus ++} ++#endif ++#endif ++#elif (LZO_ARCH_C166) ++#if !defined(__MODEL__) ++# error "FIXME - LZO_ARCH_C166 __MODEL__" ++#elif ((__MODEL__) == 0) ++# define LZO_MM_SMALL 1 ++#elif ((__MODEL__) == 1) ++# define LZO_MM_SMALL 1 ++#elif ((__MODEL__) == 2) ++# define LZO_MM_LARGE 1 ++#elif ((__MODEL__) == 3) ++# define LZO_MM_TINY 1 ++#elif ((__MODEL__) == 4) ++# define LZO_MM_XTINY 1 ++#elif ((__MODEL__) == 5) ++# define LZO_MM_XSMALL 1 ++#else ++# error "FIXME - LZO_ARCH_C166 __MODEL__" ++#endif ++#elif (LZO_ARCH_MCS251) ++#if !defined(__MODEL__) ++# error "FIXME - LZO_ARCH_MCS251 __MODEL__" ++#elif ((__MODEL__) == 0) ++# define LZO_MM_SMALL 1 ++#elif ((__MODEL__) == 2) ++# define LZO_MM_LARGE 1 ++#elif ((__MODEL__) == 3) ++# define LZO_MM_TINY 1 ++#elif ((__MODEL__) == 4) ++# define LZO_MM_XTINY 1 ++#elif ((__MODEL__) == 5) ++# define LZO_MM_XSMALL 1 ++#else ++# error "FIXME - LZO_ARCH_MCS251 __MODEL__" ++#endif ++#elif (LZO_ARCH_MCS51) ++#if !defined(__MODEL__) ++# error "FIXME - LZO_ARCH_MCS51 __MODEL__" ++#elif ((__MODEL__) == 1) ++# define LZO_MM_SMALL 1 ++#elif ((__MODEL__) == 2) ++# define LZO_MM_LARGE 1 ++#elif ((__MODEL__) == 3) ++# define LZO_MM_TINY 1 ++#elif ((__MODEL__) == 4) ++# define LZO_MM_XTINY 1 ++#elif ((__MODEL__) == 5) ++# define LZO_MM_XSMALL 1 ++#else ++# error "FIXME - LZO_ARCH_MCS51 __MODEL__" ++#endif ++#elif (LZO_ARCH_CRAY_PVP) ++# define LZO_MM_PVP 1 ++#else ++# define LZO_MM_FLAT 1 ++#endif ++#if (LZO_MM_COMPACT) ++# define LZO_INFO_MM "compact" ++#elif (LZO_MM_FLAT) ++# define LZO_INFO_MM "flat" ++#elif (LZO_MM_HUGE) ++# define LZO_INFO_MM "huge" ++#elif (LZO_MM_LARGE) ++# define LZO_INFO_MM "large" ++#elif (LZO_MM_MEDIUM) ++# define LZO_INFO_MM "medium" ++#elif (LZO_MM_PVP) ++# define LZO_INFO_MM "pvp" ++#elif (LZO_MM_SMALL) ++# define LZO_INFO_MM "small" ++#elif (LZO_MM_TINY) ++# define LZO_INFO_MM "tiny" ++#else ++# error "unknown memory model" ++#endif ++#endif ++#if !defined(__lzo_gnuc_extension__) ++#if (LZO_CC_GNUC >= 0x020800ul) ++# define __lzo_gnuc_extension__ __extension__ ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_gnuc_extension__ __extension__ ++#elif (LZO_CC_IBMC >= 600) ++# define __lzo_gnuc_extension__ __extension__ ++#else ++#endif ++#endif ++#if !defined(__lzo_gnuc_extension__) ++# define __lzo_gnuc_extension__ /*empty*/ ++#endif ++#if !defined(LZO_CFG_USE_NEW_STYLE_CASTS) && defined(__cplusplus) && 0 ++# if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020800ul)) ++# define LZO_CFG_USE_NEW_STYLE_CASTS 0 ++# elif (LZO_CC_INTELC && (__INTEL_COMPILER < 1200)) ++# define LZO_CFG_USE_NEW_STYLE_CASTS 0 ++# else ++# define LZO_CFG_USE_NEW_STYLE_CASTS 1 ++# endif ++#endif ++#if !defined(LZO_CFG_USE_NEW_STYLE_CASTS) ++# define LZO_CFG_USE_NEW_STYLE_CASTS 0 ++#endif ++#if !defined(__cplusplus) ++# if defined(LZO_CFG_USE_NEW_STYLE_CASTS) ++# undef LZO_CFG_USE_NEW_STYLE_CASTS ++# endif ++# define LZO_CFG_USE_NEW_STYLE_CASTS 0 ++#endif ++#if !defined(LZO_REINTERPRET_CAST) ++# if (LZO_CFG_USE_NEW_STYLE_CASTS) ++# define LZO_REINTERPRET_CAST(t,e) (reinterpret_cast (e)) ++# endif ++#endif ++#if !defined(LZO_REINTERPRET_CAST) ++# define LZO_REINTERPRET_CAST(t,e) ((t) (e)) ++#endif ++#if !defined(LZO_STATIC_CAST) ++# if (LZO_CFG_USE_NEW_STYLE_CASTS) ++# define LZO_STATIC_CAST(t,e) (static_cast (e)) ++# endif ++#endif ++#if !defined(LZO_STATIC_CAST) ++# define LZO_STATIC_CAST(t,e) ((t) (e)) ++#endif ++#if !defined(LZO_STATIC_CAST2) ++# define LZO_STATIC_CAST2(t1,t2,e) LZO_STATIC_CAST(t1, LZO_STATIC_CAST(t2, e)) ++#endif ++#if !defined(LZO_UNCONST_CAST) ++# if (LZO_CFG_USE_NEW_STYLE_CASTS) ++# define LZO_UNCONST_CAST(t,e) (const_cast (e)) ++# elif (LZO_HAVE_MM_HUGE_PTR) ++# define LZO_UNCONST_CAST(t,e) ((t) (e)) ++# elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define LZO_UNCONST_CAST(t,e) ((t) ((void *) ((lzo_uintptr_t) ((const void *) (e))))) ++# endif ++#endif ++#if !defined(LZO_UNCONST_CAST) ++# define LZO_UNCONST_CAST(t,e) ((t) ((void *) ((const void *) (e)))) ++#endif ++#if !defined(LZO_UNCONST_VOLATILE_CAST) ++# if (LZO_CFG_USE_NEW_STYLE_CASTS) ++# define LZO_UNCONST_VOLATILE_CAST(t,e) (const_cast (e)) ++# elif (LZO_HAVE_MM_HUGE_PTR) ++# define LZO_UNCONST_VOLATILE_CAST(t,e) ((t) (e)) ++# elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define LZO_UNCONST_VOLATILE_CAST(t,e) ((t) ((volatile void *) ((lzo_uintptr_t) ((volatile const void *) (e))))) ++# endif ++#endif ++#if !defined(LZO_UNCONST_VOLATILE_CAST) ++# define LZO_UNCONST_VOLATILE_CAST(t,e) ((t) ((volatile void *) ((volatile const void *) (e)))) ++#endif ++#if !defined(LZO_UNVOLATILE_CAST) ++# if (LZO_CFG_USE_NEW_STYLE_CASTS) ++# define LZO_UNVOLATILE_CAST(t,e) (const_cast (e)) ++# elif (LZO_HAVE_MM_HUGE_PTR) ++# define LZO_UNVOLATILE_CAST(t,e) ((t) (e)) ++# elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define LZO_UNVOLATILE_CAST(t,e) ((t) ((void *) ((lzo_uintptr_t) ((volatile void *) (e))))) ++# endif ++#endif ++#if !defined(LZO_UNVOLATILE_CAST) ++# define LZO_UNVOLATILE_CAST(t,e) ((t) ((void *) ((volatile void *) (e)))) ++#endif ++#if !defined(LZO_UNVOLATILE_CONST_CAST) ++# if (LZO_CFG_USE_NEW_STYLE_CASTS) ++# define LZO_UNVOLATILE_CONST_CAST(t,e) (const_cast (e)) ++# elif (LZO_HAVE_MM_HUGE_PTR) ++# define LZO_UNVOLATILE_CONST_CAST(t,e) ((t) (e)) ++# elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define LZO_UNVOLATILE_CONST_CAST(t,e) ((t) ((const void *) ((lzo_uintptr_t) ((volatile const void *) (e))))) ++# endif ++#endif ++#if !defined(LZO_UNVOLATILE_CONST_CAST) ++# define LZO_UNVOLATILE_CONST_CAST(t,e) ((t) ((const void *) ((volatile const void *) (e)))) ++#endif ++#if !defined(LZO_PCAST) ++# if (LZO_HAVE_MM_HUGE_PTR) ++# define LZO_PCAST(t,e) ((t) (e)) ++# endif ++#endif ++#if !defined(LZO_PCAST) ++# define LZO_PCAST(t,e) LZO_STATIC_CAST(t, LZO_STATIC_CAST(void *, e)) ++#endif ++#if !defined(LZO_CCAST) ++# if (LZO_HAVE_MM_HUGE_PTR) ++# define LZO_CCAST(t,e) ((t) (e)) ++# endif ++#endif ++#if !defined(LZO_CCAST) ++# define LZO_CCAST(t,e) LZO_STATIC_CAST(t, LZO_STATIC_CAST(const void *, e)) ++#endif ++#if !defined(LZO_ICONV) ++# define LZO_ICONV(t,e) LZO_STATIC_CAST(t, e) ++#endif ++#if !defined(LZO_ICAST) ++# define LZO_ICAST(t,e) LZO_STATIC_CAST(t, e) ++#endif ++#if !defined(LZO_ITRUNC) ++# define LZO_ITRUNC(t,e) LZO_STATIC_CAST(t, e) ++#endif ++#if !defined(__lzo_cte) ++# if (LZO_CC_MSC || LZO_CC_WATCOMC) ++# define __lzo_cte(e) ((void)0,(e)) ++# elif 1 ++# define __lzo_cte(e) ((void)0,(e)) ++# endif ++#endif ++#if !defined(__lzo_cte) ++# define __lzo_cte(e) (e) ++#endif ++#if !defined(LZO_BLOCK_BEGIN) ++# define LZO_BLOCK_BEGIN do { ++# define LZO_BLOCK_END } while __lzo_cte(0) ++#endif ++#if !defined(LZO_UNUSED) ++# if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600)) ++# define LZO_UNUSED(var) ((void) &var) ++# elif (LZO_CC_BORLANDC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PELLESC || LZO_CC_TURBOC) ++# define LZO_UNUSED(var) if (&var) ; else ++# elif (LZO_CC_CLANG && (LZO_CC_CLANG >= 0x030200ul)) ++# define LZO_UNUSED(var) ((void) &var) ++# elif (LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define LZO_UNUSED(var) ((void) var) ++# elif (LZO_CC_MSC && (_MSC_VER < 900)) ++# define LZO_UNUSED(var) if (&var) ; else ++# elif (LZO_CC_KEILC) ++# define LZO_UNUSED(var) {LZO_EXTERN_C int lzo_unused__[1-2*!(sizeof(var)>0)];} ++# elif (LZO_CC_PACIFICC) ++# define LZO_UNUSED(var) ((void) sizeof(var)) ++# elif (LZO_CC_WATCOMC) && defined(__cplusplus) ++# define LZO_UNUSED(var) ((void) var) ++# else ++# define LZO_UNUSED(var) ((void) &var) ++# endif ++#endif ++#if !defined(LZO_UNUSED_FUNC) ++# if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600)) ++# define LZO_UNUSED_FUNC(func) ((void) func) ++# elif (LZO_CC_BORLANDC || LZO_CC_NDPC || LZO_CC_TURBOC) ++# define LZO_UNUSED_FUNC(func) if (func) ; else ++# elif (LZO_CC_CLANG || LZO_CC_LLVM) ++# define LZO_UNUSED_FUNC(func) ((void) &func) ++# elif (LZO_CC_MSC && (_MSC_VER < 900)) ++# define LZO_UNUSED_FUNC(func) if (func) ; else ++# elif (LZO_CC_MSC) ++# define LZO_UNUSED_FUNC(func) ((void) &func) ++# elif (LZO_CC_KEILC || LZO_CC_PELLESC) ++# define LZO_UNUSED_FUNC(func) {LZO_EXTERN_C int lzo_unused_func__[1-2*!(sizeof((int)func)>0)];} ++# else ++# define LZO_UNUSED_FUNC(func) ((void) func) ++# endif ++#endif ++#if !defined(LZO_UNUSED_LABEL) ++# if (LZO_CC_CLANG >= 0x020800ul) ++# define LZO_UNUSED_LABEL(l) (__lzo_gnuc_extension__ ((void) ((const void *) &&l))) ++# elif (LZO_CC_ARMCC || LZO_CC_CLANG || LZO_CC_INTELC || LZO_CC_WATCOMC) ++# define LZO_UNUSED_LABEL(l) if __lzo_cte(0) goto l ++# else ++# define LZO_UNUSED_LABEL(l) switch (0) case 1:goto l ++# endif ++#endif ++#if !defined(LZO_DEFINE_UNINITIALIZED_VAR) ++# if 0 ++# define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init) type var ++# elif 0 && (LZO_CC_GNUC) ++# define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init) type var = var ++# else ++# define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init) type var = init ++# endif ++#endif ++#if !defined(__lzo_inline) ++#if (LZO_CC_TURBOC && (__TURBOC__ <= 0x0295)) ++#elif defined(__cplusplus) ++# define __lzo_inline inline ++#elif defined(__STDC_VERSION__) && (__STDC_VERSION__-0 >= 199901L) ++# define __lzo_inline inline ++#elif (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0550)) ++# define __lzo_inline __inline ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CILLY || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) ++# define __lzo_inline __inline__ ++#elif (LZO_CC_DMC) ++# define __lzo_inline __inline ++#elif (LZO_CC_GHS) ++# define __lzo_inline __inline__ ++#elif (LZO_CC_IBMC >= 600) ++# define __lzo_inline __inline__ ++#elif (LZO_CC_INTELC) ++# define __lzo_inline __inline ++#elif (LZO_CC_MWERKS && (__MWERKS__ >= 0x2405)) ++# define __lzo_inline __inline ++#elif (LZO_CC_MSC && (_MSC_VER >= 900)) ++# define __lzo_inline __inline ++#elif (LZO_CC_SUNPROC >= 0x5100) ++# define __lzo_inline __inline__ ++#endif ++#endif ++#if defined(__lzo_inline) ++# ifndef __lzo_HAVE_inline ++# define __lzo_HAVE_inline 1 ++# endif ++#else ++# define __lzo_inline /*empty*/ ++#endif ++#if !defined(__lzo_forceinline) ++#if (LZO_CC_GNUC >= 0x030200ul) ++# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) ++#elif (LZO_CC_IBMC >= 700) ++# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) ++#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 450)) ++# define __lzo_forceinline __forceinline ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 800)) ++# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) ++#elif (LZO_CC_MSC && (_MSC_VER >= 1200)) ++# define __lzo_forceinline __forceinline ++#elif (LZO_CC_PGI >= 0x0d0a00ul) ++# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) ++#elif (LZO_CC_SUNPROC >= 0x5100) ++# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) ++#endif ++#endif ++#if defined(__lzo_forceinline) ++# ifndef __lzo_HAVE_forceinline ++# define __lzo_HAVE_forceinline 1 ++# endif ++#else ++# define __lzo_forceinline __lzo_inline ++#endif ++#if !defined(__lzo_noinline) ++#if 1 && (LZO_ARCH_I386) && (LZO_CC_GNUC >= 0x040000ul) && (LZO_CC_GNUC < 0x040003ul) ++# define __lzo_noinline __attribute__((__noinline__,__used__)) ++#elif (LZO_CC_GNUC >= 0x030200ul) ++# define __lzo_noinline __attribute__((__noinline__)) ++#elif (LZO_CC_IBMC >= 700) ++# define __lzo_noinline __attribute__((__noinline__)) ++#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 600)) ++# define __lzo_noinline __declspec(noinline) ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 800)) ++# define __lzo_noinline __attribute__((__noinline__)) ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_noinline __attribute__((__noinline__)) ++#elif (LZO_CC_MSC && (_MSC_VER >= 1300)) ++# define __lzo_noinline __declspec(noinline) ++#elif (LZO_CC_MWERKS && (__MWERKS__ >= 0x3200) && (LZO_OS_WIN32 || LZO_OS_WIN64)) ++# if defined(__cplusplus) ++# else ++# define __lzo_noinline __declspec(noinline) ++# endif ++#elif (LZO_CC_PGI >= 0x0d0a00ul) ++# define __lzo_noinline __attribute__((__noinline__)) ++#elif (LZO_CC_SUNPROC >= 0x5100) ++# define __lzo_noinline __attribute__((__noinline__)) ++#endif ++#endif ++#if defined(__lzo_noinline) ++# ifndef __lzo_HAVE_noinline ++# define __lzo_HAVE_noinline 1 ++# endif ++#else ++# define __lzo_noinline /*empty*/ ++#endif ++#if (__lzo_HAVE_forceinline || __lzo_HAVE_noinline) && !(__lzo_HAVE_inline) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if !defined(__lzo_static_inline) ++#if (LZO_CC_IBMC) ++# define __lzo_static_inline __lzo_gnuc_extension__ static __lzo_inline ++#endif ++#endif ++#if !defined(__lzo_static_inline) ++# define __lzo_static_inline static __lzo_inline ++#endif ++#if !defined(__lzo_static_forceinline) ++#if (LZO_CC_IBMC) ++# define __lzo_static_forceinline __lzo_gnuc_extension__ static __lzo_forceinline ++#endif ++#endif ++#if !defined(__lzo_static_forceinline) ++# define __lzo_static_forceinline static __lzo_forceinline ++#endif ++#if !defined(__lzo_static_noinline) ++#if (LZO_CC_IBMC) ++# define __lzo_static_noinline __lzo_gnuc_extension__ static __lzo_noinline ++#endif ++#endif ++#if !defined(__lzo_static_noinline) ++# define __lzo_static_noinline static __lzo_noinline ++#endif ++#if !defined(__lzo_c99_extern_inline) ++#if defined(__GNUC_GNU_INLINE__) ++# define __lzo_c99_extern_inline __lzo_inline ++#elif defined(__GNUC_STDC_INLINE__) ++# define __lzo_c99_extern_inline extern __lzo_inline ++#elif defined(__STDC_VERSION__) && (__STDC_VERSION__-0 >= 199901L) ++# define __lzo_c99_extern_inline extern __lzo_inline ++#endif ++#if !defined(__lzo_c99_extern_inline) && (__lzo_HAVE_inline) ++# define __lzo_c99_extern_inline __lzo_inline ++#endif ++#endif ++#if defined(__lzo_c99_extern_inline) ++# ifndef __lzo_HAVE_c99_extern_inline ++# define __lzo_HAVE_c99_extern_inline 1 ++# endif ++#else ++# define __lzo_c99_extern_inline /*empty*/ ++#endif ++#if !defined(__lzo_may_alias) ++#if (LZO_CC_GNUC >= 0x030400ul) ++# define __lzo_may_alias __attribute__((__may_alias__)) ++#elif (LZO_CC_CLANG >= 0x020900ul) ++# define __lzo_may_alias __attribute__((__may_alias__)) ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 1210)) && 0 ++# define __lzo_may_alias __attribute__((__may_alias__)) ++#elif (LZO_CC_PGI >= 0x0d0a00ul) && 0 ++# define __lzo_may_alias __attribute__((__may_alias__)) ++#endif ++#endif ++#if defined(__lzo_may_alias) ++# ifndef __lzo_HAVE_may_alias ++# define __lzo_HAVE_may_alias 1 ++# endif ++#else ++# define __lzo_may_alias /*empty*/ ++#endif ++#if !defined(__lzo_noreturn) ++#if (LZO_CC_GNUC >= 0x020700ul) ++# define __lzo_noreturn __attribute__((__noreturn__)) ++#elif (LZO_CC_IBMC >= 700) ++# define __lzo_noreturn __attribute__((__noreturn__)) ++#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 450)) ++# define __lzo_noreturn __declspec(noreturn) ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 600)) ++# define __lzo_noreturn __attribute__((__noreturn__)) ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_noreturn __attribute__((__noreturn__)) ++#elif (LZO_CC_MSC && (_MSC_VER >= 1200)) ++# define __lzo_noreturn __declspec(noreturn) ++#elif (LZO_CC_PGI >= 0x0d0a00ul) ++# define __lzo_noreturn __attribute__((__noreturn__)) ++#endif ++#endif ++#if defined(__lzo_noreturn) ++# ifndef __lzo_HAVE_noreturn ++# define __lzo_HAVE_noreturn 1 ++# endif ++#else ++# define __lzo_noreturn /*empty*/ ++#endif ++#if !defined(__lzo_nothrow) ++#if (LZO_CC_GNUC >= 0x030300ul) ++# define __lzo_nothrow __attribute__((__nothrow__)) ++#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 450)) && defined(__cplusplus) ++# define __lzo_nothrow __declspec(nothrow) ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 900)) ++# define __lzo_nothrow __attribute__((__nothrow__)) ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_nothrow __attribute__((__nothrow__)) ++#elif (LZO_CC_MSC && (_MSC_VER >= 1200)) && defined(__cplusplus) ++# define __lzo_nothrow __declspec(nothrow) ++#endif ++#endif ++#if defined(__lzo_nothrow) ++# ifndef __lzo_HAVE_nothrow ++# define __lzo_HAVE_nothrow 1 ++# endif ++#else ++# define __lzo_nothrow /*empty*/ ++#endif ++#if !defined(__lzo_restrict) ++#if (LZO_CC_GNUC >= 0x030400ul) ++# define __lzo_restrict __restrict__ ++#elif (LZO_CC_IBMC >= 800) && !defined(__cplusplus) ++# define __lzo_restrict __restrict__ ++#elif (LZO_CC_IBMC >= 1210) ++# define __lzo_restrict __restrict__ ++#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 600)) ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 600)) ++# define __lzo_restrict __restrict__ ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM) ++# define __lzo_restrict __restrict__ ++#elif (LZO_CC_MSC && (_MSC_VER >= 1400)) ++# define __lzo_restrict __restrict ++#elif (LZO_CC_PGI >= 0x0d0a00ul) ++# define __lzo_restrict __restrict__ ++#endif ++#endif ++#if defined(__lzo_restrict) ++# ifndef __lzo_HAVE_restrict ++# define __lzo_HAVE_restrict 1 ++# endif ++#else ++# define __lzo_restrict /*empty*/ ++#endif ++#if !defined(__lzo_alignof) ++#if (LZO_CC_ARMCC || LZO_CC_CILLY || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) ++# define __lzo_alignof(e) __alignof__(e) ++#elif (LZO_CC_GHS) && !defined(__cplusplus) ++# define __lzo_alignof(e) __alignof__(e) ++#elif (LZO_CC_IBMC >= 600) ++# define __lzo_alignof(e) (__lzo_gnuc_extension__ __alignof__(e)) ++#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 700)) ++# define __lzo_alignof(e) __alignof__(e) ++#elif (LZO_CC_MSC && (_MSC_VER >= 1300)) ++# define __lzo_alignof(e) __alignof(e) ++#elif (LZO_CC_SUNPROC >= 0x5100) ++# define __lzo_alignof(e) __alignof__(e) ++#endif ++#endif ++#if defined(__lzo_alignof) ++# ifndef __lzo_HAVE_alignof ++# define __lzo_HAVE_alignof 1 ++# endif ++#endif ++#if !defined(__lzo_struct_packed) ++#if (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020800ul)) && defined(__cplusplus) ++#elif (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020700ul)) ++#elif (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020800ul)) && defined(__cplusplus) ++#elif (LZO_CC_PCC && (LZO_CC_PCC < 0x010100ul)) ++#elif (LZO_CC_SUNPROC && (LZO_CC_SUNPROC < 0x5110)) && !defined(__cplusplus) ++#elif (LZO_CC_GNUC >= 0x030400ul) && !(LZO_CC_PCC_GNUC) && (LZO_ARCH_AMD64 || LZO_ARCH_I386) ++# define __lzo_struct_packed(s) struct s { ++# define __lzo_struct_packed_end() } __attribute__((__gcc_struct__,__packed__)); ++# define __lzo_struct_packed_ma_end() } __lzo_may_alias __attribute__((__gcc_struct__,__packed__)); ++#elif (LZO_CC_ARMCC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || (LZO_CC_PGI >= 0x0d0a00ul) || (LZO_CC_SUNPROC >= 0x5100)) ++# define __lzo_struct_packed(s) struct s { ++# define __lzo_struct_packed_end() } __attribute__((__packed__)); ++# define __lzo_struct_packed_ma_end() } __lzo_may_alias __attribute__((__packed__)); ++#elif (LZO_CC_IBMC >= 700) ++# define __lzo_struct_packed(s) __lzo_gnuc_extension__ struct s { ++# define __lzo_struct_packed_end() } __attribute__((__packed__)); ++# define __lzo_struct_packed_ma_end() } __lzo_may_alias __attribute__((__packed__)); ++#elif (LZO_CC_INTELC_MSC) || (LZO_CC_MSC && (_MSC_VER >= 1300)) ++# define __lzo_struct_packed(s) __pragma(pack(push,1)) struct s { ++# define __lzo_struct_packed_end() } __pragma(pack(pop)); ++#elif (LZO_CC_WATCOMC && (__WATCOMC__ >= 900)) ++# define __lzo_struct_packed(s) _Packed struct s { ++# define __lzo_struct_packed_end() }; ++#endif ++#endif ++#if defined(__lzo_struct_packed) && !defined(__lzo_struct_packed_ma) ++# define __lzo_struct_packed_ma(s) __lzo_struct_packed(s) ++#endif ++#if defined(__lzo_struct_packed_end) && !defined(__lzo_struct_packed_ma_end) ++# define __lzo_struct_packed_ma_end() __lzo_struct_packed_end() ++#endif ++#if !defined(__lzo_byte_struct) ++#if defined(__lzo_struct_packed) ++# define __lzo_byte_struct(s,n) __lzo_struct_packed(s) unsigned char a[n]; __lzo_struct_packed_end() ++# define __lzo_byte_struct_ma(s,n) __lzo_struct_packed_ma(s) unsigned char a[n]; __lzo_struct_packed_ma_end() ++#elif (LZO_CC_CILLY || LZO_CC_CLANG || LZO_CC_PGI || (LZO_CC_SUNPROC >= 0x5100)) ++# define __lzo_byte_struct(s,n) struct s { unsigned char a[n]; } __attribute__((__packed__)); ++# define __lzo_byte_struct_ma(s,n) struct s { unsigned char a[n]; } __lzo_may_alias __attribute__((__packed__)); ++#endif ++#endif ++#if defined(__lzo_byte_struct) && !defined(__lzo_byte_struct_ma) ++# define __lzo_byte_struct_ma(s,n) __lzo_byte_struct(s,n) ++#endif ++#if !defined(__lzo_struct_align16) && (__lzo_HAVE_alignof) ++#if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x030000ul)) ++#elif (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020800ul)) && defined(__cplusplus) ++#elif (LZO_CC_CILLY || LZO_CC_PCC) ++#elif (LZO_CC_INTELC_MSC) || (LZO_CC_MSC && (_MSC_VER >= 1300)) ++# define __lzo_struct_align16(s) struct __declspec(align(16)) s { ++# define __lzo_struct_align16_end() }; ++# define __lzo_struct_align32(s) struct __declspec(align(32)) s { ++# define __lzo_struct_align32_end() }; ++# define __lzo_struct_align64(s) struct __declspec(align(64)) s { ++# define __lzo_struct_align64_end() }; ++#elif (LZO_CC_ARMCC || LZO_CC_CLANG || LZO_CC_GNUC || (LZO_CC_IBMC >= 700) || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_struct_align16(s) struct s { ++# define __lzo_struct_align16_end() } __attribute__((__aligned__(16))); ++# define __lzo_struct_align32(s) struct s { ++# define __lzo_struct_align32_end() } __attribute__((__aligned__(32))); ++# define __lzo_struct_align64(s) struct s { ++# define __lzo_struct_align64_end() } __attribute__((__aligned__(64))); ++#endif ++#endif ++#if !defined(__lzo_union_um) ++#if (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020800ul)) && defined(__cplusplus) ++#elif (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020700ul)) ++#elif (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020800ul)) && defined(__cplusplus) ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER < 810)) ++#elif (LZO_CC_PCC && (LZO_CC_PCC < 0x010100ul)) ++#elif (LZO_CC_SUNPROC && (LZO_CC_SUNPROC < 0x5110)) && !defined(__cplusplus) ++#elif (LZO_CC_ARMCC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || (LZO_CC_PGI >= 0x0d0a00ul) || (LZO_CC_SUNPROC >= 0x5100)) ++# define __lzo_union_am(s) union s { ++# define __lzo_union_am_end() } __lzo_may_alias; ++# define __lzo_union_um(s) union s { ++# define __lzo_union_um_end() } __lzo_may_alias __attribute__((__packed__)); ++#elif (LZO_CC_IBMC >= 700) ++# define __lzo_union_am(s) __lzo_gnuc_extension__ union s { ++# define __lzo_union_am_end() } __lzo_may_alias; ++# define __lzo_union_um(s) __lzo_gnuc_extension__ union s { ++# define __lzo_union_um_end() } __lzo_may_alias __attribute__((__packed__)); ++#elif (LZO_CC_INTELC_MSC) || (LZO_CC_MSC && (_MSC_VER >= 1300)) ++# define __lzo_union_um(s) __pragma(pack(push,1)) union s { ++# define __lzo_union_um_end() } __pragma(pack(pop)); ++#elif (LZO_CC_WATCOMC && (__WATCOMC__ >= 900)) ++# define __lzo_union_um(s) _Packed union s { ++# define __lzo_union_um_end() }; ++#endif ++#endif ++#if !defined(__lzo_union_am) ++# define __lzo_union_am(s) union s { ++# define __lzo_union_am_end() }; ++#endif ++#if !defined(__lzo_constructor) ++#if (LZO_CC_GNUC >= 0x030400ul) ++# define __lzo_constructor __attribute__((__constructor__,__used__)) ++#elif (LZO_CC_GNUC >= 0x020700ul) ++# define __lzo_constructor __attribute__((__constructor__)) ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 800)) ++# define __lzo_constructor __attribute__((__constructor__,__used__)) ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_constructor __attribute__((__constructor__)) ++#endif ++#endif ++#if defined(__lzo_constructor) ++# ifndef __lzo_HAVE_constructor ++# define __lzo_HAVE_constructor 1 ++# endif ++#endif ++#if !defined(__lzo_destructor) ++#if (LZO_CC_GNUC >= 0x030400ul) ++# define __lzo_destructor __attribute__((__destructor__,__used__)) ++#elif (LZO_CC_GNUC >= 0x020700ul) ++# define __lzo_destructor __attribute__((__destructor__)) ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 800)) ++# define __lzo_destructor __attribute__((__destructor__,__used__)) ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_destructor __attribute__((__destructor__)) ++#endif ++#endif ++#if defined(__lzo_destructor) ++# ifndef __lzo_HAVE_destructor ++# define __lzo_HAVE_destructor 1 ++# endif ++#endif ++#if (__lzo_HAVE_destructor) && !(__lzo_HAVE_constructor) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if !defined(__lzo_likely) && !defined(__lzo_unlikely) ++#if (LZO_CC_GNUC >= 0x030200ul) ++# define __lzo_likely(e) (__builtin_expect(!!(e),1)) ++# define __lzo_unlikely(e) (__builtin_expect(!!(e),0)) ++#elif (LZO_CC_IBMC >= 1010) ++# define __lzo_likely(e) (__builtin_expect(!!(e),1)) ++# define __lzo_unlikely(e) (__builtin_expect(!!(e),0)) ++#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 800)) ++# define __lzo_likely(e) (__builtin_expect(!!(e),1)) ++# define __lzo_unlikely(e) (__builtin_expect(!!(e),0)) ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_likely(e) (__builtin_expect(!!(e),1)) ++# define __lzo_unlikely(e) (__builtin_expect(!!(e),0)) ++#endif ++#endif ++#if defined(__lzo_likely) ++# ifndef __lzo_HAVE_likely ++# define __lzo_HAVE_likely 1 ++# endif ++#else ++# define __lzo_likely(e) (e) ++#endif ++#if defined(__lzo_unlikely) ++# ifndef __lzo_HAVE_unlikely ++# define __lzo_HAVE_unlikely 1 ++# endif ++#else ++# define __lzo_unlikely(e) (e) ++#endif ++#if !defined(__lzo_static_unused_void_func) ++# if 1 && (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || (LZO_CC_GNUC >= 0x020700ul) || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) ++# define __lzo_static_unused_void_func(f) static void __attribute__((__unused__)) f(void) ++# else ++# define __lzo_static_unused_void_func(f) static __lzo_inline void f(void) ++# endif ++#endif ++#if !defined(__lzo_loop_forever) ++# if (LZO_CC_IBMC) ++# define __lzo_loop_forever() LZO_BLOCK_BEGIN for (;;) { ; } LZO_BLOCK_END ++# else ++# define __lzo_loop_forever() do { ; } while __lzo_cte(1) ++# endif ++#endif ++#if !defined(__lzo_unreachable) ++#if (LZO_CC_CLANG && (LZO_CC_CLANG >= 0x020800ul)) ++# define __lzo_unreachable() __builtin_unreachable(); ++#elif (LZO_CC_GNUC >= 0x040500ul) ++# define __lzo_unreachable() __builtin_unreachable(); ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 1300)) && 1 ++# define __lzo_unreachable() __builtin_unreachable(); ++#endif ++#endif ++#if defined(__lzo_unreachable) ++# ifndef __lzo_HAVE_unreachable ++# define __lzo_HAVE_unreachable 1 ++# endif ++#else ++# if 0 ++# define __lzo_unreachable() ((void)0); ++# else ++# define __lzo_unreachable() __lzo_loop_forever(); ++# endif ++#endif ++#ifndef __LZO_CTA_NAME ++#if (LZO_CFG_USE_COUNTER) ++# define __LZO_CTA_NAME(a) LZO_PP_ECONCAT2(a,__COUNTER__) ++#else ++# define __LZO_CTA_NAME(a) LZO_PP_ECONCAT2(a,__LINE__) ++#endif ++#endif ++#if !defined(LZO_COMPILE_TIME_ASSERT_HEADER) ++# if (LZO_CC_AZTECC || LZO_CC_ZORTECHC) ++# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1-!(e)]; LZO_EXTERN_C_END ++# elif (LZO_CC_DMC || LZO_CC_SYMANTECC) ++# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1u-2*!(e)]; LZO_EXTERN_C_END ++# elif (LZO_CC_TURBOC && (__TURBOC__ == 0x0295)) ++# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1-!(e)]; LZO_EXTERN_C_END ++# elif (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020900ul)) && defined(__cplusplus) ++# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN int __LZO_CTA_NAME(lzo_cta_f__)(int [1-2*!(e)]); LZO_EXTERN_C_END ++# elif (LZO_CC_GNUC) && defined(__CHECKER__) && defined(__SPARSE_CHECKER__) ++# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN enum {__LZO_CTA_NAME(lzo_cta_e__)=1/!!(e)} __attribute__((__unused__)); LZO_EXTERN_C_END ++# else ++# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1-2*!(e)]; LZO_EXTERN_C_END ++# endif ++#endif ++#if !defined(LZO_COMPILE_TIME_ASSERT) ++# if (LZO_CC_AZTECC) ++# define LZO_COMPILE_TIME_ASSERT(e) {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-!(e)];} ++# elif (LZO_CC_DMC || LZO_CC_PACIFICC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC) ++# define LZO_COMPILE_TIME_ASSERT(e) switch(0) case 1:case !(e):break; ++# elif (LZO_CC_GNUC) && defined(__CHECKER__) && defined(__SPARSE_CHECKER__) ++# define LZO_COMPILE_TIME_ASSERT(e) {(void) (0/!!(e));} ++# elif (LZO_CC_GNUC >= 0x040700ul) && (LZO_CFG_USE_COUNTER) && defined(__cplusplus) ++# define LZO_COMPILE_TIME_ASSERT(e) {enum {__LZO_CTA_NAME(lzo_cta_e__)=1/!!(e)} __attribute__((__unused__));} ++# elif (LZO_CC_GNUC >= 0x040700ul) ++# define LZO_COMPILE_TIME_ASSERT(e) {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-2*!(e)] __attribute__((__unused__));} ++# elif (LZO_CC_MSC && (_MSC_VER < 900)) ++# define LZO_COMPILE_TIME_ASSERT(e) switch(0) case 1:case !(e):break; ++# elif (LZO_CC_TURBOC && (__TURBOC__ == 0x0295)) ++# define LZO_COMPILE_TIME_ASSERT(e) switch(0) case 1:case !(e):break; ++# else ++# define LZO_COMPILE_TIME_ASSERT(e) {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-2*!(e)];} ++# endif ++#endif ++LZO_COMPILE_TIME_ASSERT_HEADER(1 == 1) ++#if defined(__cplusplus) ++extern "C" { LZO_COMPILE_TIME_ASSERT_HEADER(2 == 2) } ++#endif ++LZO_COMPILE_TIME_ASSERT_HEADER(3 == 3) ++#if (LZO_ARCH_I086 || LZO_ARCH_I386) && (LZO_OS_DOS16 || LZO_OS_DOS32 || LZO_OS_OS2 || LZO_OS_OS216 || LZO_OS_WIN16 || LZO_OS_WIN32 || LZO_OS_WIN64) ++# if (LZO_CC_GNUC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PACIFICC) ++# elif (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC) ++# define __lzo_cdecl __cdecl ++# define __lzo_cdecl_atexit /*empty*/ ++# define __lzo_cdecl_main __cdecl ++# if (LZO_OS_OS2 && (LZO_CC_DMC || LZO_CC_SYMANTECC)) ++# define __lzo_cdecl_qsort __pascal ++# elif (LZO_OS_OS2 && (LZO_CC_ZORTECHC)) ++# define __lzo_cdecl_qsort _stdcall ++# else ++# define __lzo_cdecl_qsort __cdecl ++# endif ++# elif (LZO_CC_WATCOMC) ++# define __lzo_cdecl __cdecl ++# else ++# define __lzo_cdecl __cdecl ++# define __lzo_cdecl_atexit __cdecl ++# define __lzo_cdecl_main __cdecl ++# define __lzo_cdecl_qsort __cdecl ++# endif ++# if (LZO_CC_GNUC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PACIFICC || LZO_CC_WATCOMC) ++# elif (LZO_OS_OS2 && (LZO_CC_DMC || LZO_CC_SYMANTECC)) ++# define __lzo_cdecl_sighandler __pascal ++# elif (LZO_OS_OS2 && (LZO_CC_ZORTECHC)) ++# define __lzo_cdecl_sighandler _stdcall ++# elif (LZO_CC_MSC && (_MSC_VER >= 1400)) && defined(_M_CEE_PURE) ++# define __lzo_cdecl_sighandler __clrcall ++# elif (LZO_CC_MSC && (_MSC_VER >= 600 && _MSC_VER < 700)) ++# if defined(_DLL) ++# define __lzo_cdecl_sighandler _far _cdecl _loadds ++# elif defined(_MT) ++# define __lzo_cdecl_sighandler _far _cdecl ++# else ++# define __lzo_cdecl_sighandler _cdecl ++# endif ++# else ++# define __lzo_cdecl_sighandler __cdecl ++# endif ++#elif (LZO_ARCH_I386) && (LZO_CC_WATCOMC) ++# define __lzo_cdecl __cdecl ++#elif (LZO_ARCH_M68K && LZO_OS_TOS && (LZO_CC_PUREC || LZO_CC_TURBOC)) ++# define __lzo_cdecl cdecl ++#endif ++#if !defined(__lzo_cdecl) ++# define __lzo_cdecl /*empty*/ ++#endif ++#if !defined(__lzo_cdecl_atexit) ++# define __lzo_cdecl_atexit /*empty*/ ++#endif ++#if !defined(__lzo_cdecl_main) ++# define __lzo_cdecl_main /*empty*/ ++#endif ++#if !defined(__lzo_cdecl_qsort) ++# define __lzo_cdecl_qsort /*empty*/ ++#endif ++#if !defined(__lzo_cdecl_sighandler) ++# define __lzo_cdecl_sighandler /*empty*/ ++#endif ++#if !defined(__lzo_cdecl_va) ++# define __lzo_cdecl_va __lzo_cdecl ++#endif ++#if !(LZO_CFG_NO_WINDOWS_H) ++#if !defined(LZO_HAVE_WINDOWS_H) ++#if (LZO_OS_CYGWIN || (LZO_OS_EMX && defined(__RSXNT__)) || LZO_OS_WIN32 || LZO_OS_WIN64) ++# if (LZO_CC_WATCOMC && (__WATCOMC__ < 1000)) ++# elif (LZO_OS_WIN32 && LZO_CC_GNUC) && defined(__PW32__) ++# elif ((LZO_OS_CYGWIN || defined(__MINGW32__)) && (LZO_CC_GNUC && (LZO_CC_GNUC < 0x025f00ul))) ++# else ++# define LZO_HAVE_WINDOWS_H 1 ++# endif ++#endif ++#endif ++#endif ++#ifndef LZO_SIZEOF_SHORT ++#if defined(SIZEOF_SHORT) ++# define LZO_SIZEOF_SHORT (SIZEOF_SHORT) ++#elif defined(__SIZEOF_SHORT__) ++# define LZO_SIZEOF_SHORT (__SIZEOF_SHORT__) ++#endif ++#endif ++#ifndef LZO_SIZEOF_INT ++#if defined(SIZEOF_INT) ++# define LZO_SIZEOF_INT (SIZEOF_INT) ++#elif defined(__SIZEOF_INT__) ++# define LZO_SIZEOF_INT (__SIZEOF_INT__) ++#endif ++#endif ++#ifndef LZO_SIZEOF_LONG ++#if defined(SIZEOF_LONG) ++# define LZO_SIZEOF_LONG (SIZEOF_LONG) ++#elif defined(__SIZEOF_LONG__) ++# define LZO_SIZEOF_LONG (__SIZEOF_LONG__) ++#endif ++#endif ++#ifndef LZO_SIZEOF_LONG_LONG ++#if defined(SIZEOF_LONG_LONG) ++# define LZO_SIZEOF_LONG_LONG (SIZEOF_LONG_LONG) ++#elif defined(__SIZEOF_LONG_LONG__) ++# define LZO_SIZEOF_LONG_LONG (__SIZEOF_LONG_LONG__) ++#endif ++#endif ++#ifndef LZO_SIZEOF___INT16 ++#if defined(SIZEOF___INT16) ++# define LZO_SIZEOF___INT16 (SIZEOF___INT16) ++#endif ++#endif ++#ifndef LZO_SIZEOF___INT32 ++#if defined(SIZEOF___INT32) ++# define LZO_SIZEOF___INT32 (SIZEOF___INT32) ++#endif ++#endif ++#ifndef LZO_SIZEOF___INT64 ++#if defined(SIZEOF___INT64) ++# define LZO_SIZEOF___INT64 (SIZEOF___INT64) ++#endif ++#endif ++#ifndef LZO_SIZEOF_VOID_P ++#if defined(SIZEOF_VOID_P) ++# define LZO_SIZEOF_VOID_P (SIZEOF_VOID_P) ++#elif defined(__SIZEOF_POINTER__) ++# define LZO_SIZEOF_VOID_P (__SIZEOF_POINTER__) ++#endif ++#endif ++#ifndef LZO_SIZEOF_SIZE_T ++#if defined(SIZEOF_SIZE_T) ++# define LZO_SIZEOF_SIZE_T (SIZEOF_SIZE_T) ++#elif defined(__SIZEOF_SIZE_T__) ++# define LZO_SIZEOF_SIZE_T (__SIZEOF_SIZE_T__) ++#endif ++#endif ++#ifndef LZO_SIZEOF_PTRDIFF_T ++#if defined(SIZEOF_PTRDIFF_T) ++# define LZO_SIZEOF_PTRDIFF_T (SIZEOF_PTRDIFF_T) ++#elif defined(__SIZEOF_PTRDIFF_T__) ++# define LZO_SIZEOF_PTRDIFF_T (__SIZEOF_PTRDIFF_T__) ++#endif ++#endif ++#define __LZO_LSR(x,b) (((x)+0ul) >> (b)) ++#if !defined(LZO_SIZEOF_SHORT) ++# if (LZO_ARCH_CRAY_PVP) ++# define LZO_SIZEOF_SHORT 8 ++# elif (USHRT_MAX == LZO_0xffffL) ++# define LZO_SIZEOF_SHORT 2 ++# elif (__LZO_LSR(USHRT_MAX,7) == 1) ++# define LZO_SIZEOF_SHORT 1 ++# elif (__LZO_LSR(USHRT_MAX,15) == 1) ++# define LZO_SIZEOF_SHORT 2 ++# elif (__LZO_LSR(USHRT_MAX,31) == 1) ++# define LZO_SIZEOF_SHORT 4 ++# elif (__LZO_LSR(USHRT_MAX,63) == 1) ++# define LZO_SIZEOF_SHORT 8 ++# elif (__LZO_LSR(USHRT_MAX,127) == 1) ++# define LZO_SIZEOF_SHORT 16 ++# else ++# error "LZO_SIZEOF_SHORT" ++# endif ++#endif ++LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_SHORT == sizeof(short)) ++#if !defined(LZO_SIZEOF_INT) ++# if (LZO_ARCH_CRAY_PVP) ++# define LZO_SIZEOF_INT 8 ++# elif (UINT_MAX == LZO_0xffffL) ++# define LZO_SIZEOF_INT 2 ++# elif (UINT_MAX == LZO_0xffffffffL) ++# define LZO_SIZEOF_INT 4 ++# elif (__LZO_LSR(UINT_MAX,7) == 1) ++# define LZO_SIZEOF_INT 1 ++# elif (__LZO_LSR(UINT_MAX,15) == 1) ++# define LZO_SIZEOF_INT 2 ++# elif (__LZO_LSR(UINT_MAX,31) == 1) ++# define LZO_SIZEOF_INT 4 ++# elif (__LZO_LSR(UINT_MAX,63) == 1) ++# define LZO_SIZEOF_INT 8 ++# elif (__LZO_LSR(UINT_MAX,127) == 1) ++# define LZO_SIZEOF_INT 16 ++# else ++# error "LZO_SIZEOF_INT" ++# endif ++#endif ++LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_INT == sizeof(int)) ++#if !defined(LZO_SIZEOF_LONG) ++# if (ULONG_MAX == LZO_0xffffffffL) ++# define LZO_SIZEOF_LONG 4 ++# elif (__LZO_LSR(ULONG_MAX,7) == 1) ++# define LZO_SIZEOF_LONG 1 ++# elif (__LZO_LSR(ULONG_MAX,15) == 1) ++# define LZO_SIZEOF_LONG 2 ++# elif (__LZO_LSR(ULONG_MAX,31) == 1) ++# define LZO_SIZEOF_LONG 4 ++# elif (__LZO_LSR(ULONG_MAX,39) == 1) ++# define LZO_SIZEOF_LONG 5 ++# elif (__LZO_LSR(ULONG_MAX,63) == 1) ++# define LZO_SIZEOF_LONG 8 ++# elif (__LZO_LSR(ULONG_MAX,127) == 1) ++# define LZO_SIZEOF_LONG 16 ++# else ++# error "LZO_SIZEOF_LONG" ++# endif ++#endif ++LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_LONG == sizeof(long)) ++#if !defined(LZO_SIZEOF_LONG_LONG) && !defined(LZO_SIZEOF___INT64) ++#if (LZO_SIZEOF_LONG > 0 && LZO_SIZEOF_LONG < 8) ++# if defined(__LONG_MAX__) && defined(__LONG_LONG_MAX__) ++# if (LZO_CC_GNUC >= 0x030300ul) ++# if ((__LONG_MAX__-0) == (__LONG_LONG_MAX__-0)) ++# define LZO_SIZEOF_LONG_LONG LZO_SIZEOF_LONG ++# elif (__LZO_LSR(__LONG_LONG_MAX__,30) == 1) ++# define LZO_SIZEOF_LONG_LONG 4 ++# endif ++# endif ++# endif ++#endif ++#endif ++#if !defined(LZO_SIZEOF_LONG_LONG) && !defined(LZO_SIZEOF___INT64) ++#if (LZO_SIZEOF_LONG > 0 && LZO_SIZEOF_LONG < 8) ++#if (LZO_ARCH_I086 && LZO_CC_DMC) ++#elif (LZO_CC_CILLY) && defined(__GNUC__) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif ((LZO_OS_WIN32 || LZO_OS_WIN64 || defined(_WIN32)) && LZO_CC_MSC && (_MSC_VER >= 1400)) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (LZO_OS_WIN64 || defined(_WIN64)) ++# define LZO_SIZEOF___INT64 8 ++#elif (LZO_ARCH_I386 && (LZO_CC_DMC)) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (LZO_ARCH_I386 && (LZO_CC_SYMANTECC && (__SC__ >= 0x700))) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (LZO_ARCH_I386 && (LZO_CC_INTELC && defined(__linux__))) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (LZO_ARCH_I386 && (LZO_CC_MWERKS || LZO_CC_PELLESC || LZO_CC_PGI || LZO_CC_SUNPROC)) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (LZO_ARCH_I386 && (LZO_CC_INTELC || LZO_CC_MSC)) ++# define LZO_SIZEOF___INT64 8 ++#elif ((LZO_OS_WIN32 || defined(_WIN32)) && (LZO_CC_MSC)) ++# define LZO_SIZEOF___INT64 8 ++#elif (LZO_ARCH_I386 && (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0520))) ++# define LZO_SIZEOF___INT64 8 ++#elif (LZO_ARCH_I386 && (LZO_CC_WATCOMC && (__WATCOMC__ >= 1100))) ++# define LZO_SIZEOF___INT64 8 ++#elif (LZO_CC_GHS && defined(__LLONG_BIT) && ((__LLONG_BIT-0) == 64)) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (LZO_CC_WATCOMC && defined(_INTEGRAL_MAX_BITS) && ((_INTEGRAL_MAX_BITS-0) == 64)) ++# define LZO_SIZEOF___INT64 8 ++#elif (LZO_OS_OS400 || defined(__OS400__)) && defined(__LLP64_IFC__) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (defined(__vms) || defined(__VMS)) && ((__INITIAL_POINTER_SIZE-0) == 64) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (LZO_CC_SDCC) && (LZO_SIZEOF_INT == 2) ++#elif 1 && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) ++# define LZO_SIZEOF_LONG_LONG 8 ++#endif ++#endif ++#endif ++#if defined(__cplusplus) && (LZO_CC_GNUC) ++# if (LZO_CC_GNUC < 0x020800ul) ++# undef LZO_SIZEOF_LONG_LONG ++# endif ++#endif ++#if (LZO_CFG_NO_LONG_LONG) ++# undef LZO_SIZEOF_LONG_LONG ++#elif defined(__NO_LONG_LONG) ++# undef LZO_SIZEOF_LONG_LONG ++#elif defined(_NO_LONGLONG) ++# undef LZO_SIZEOF_LONG_LONG ++#endif ++#if !defined(LZO_WORDSIZE) ++#if (LZO_ARCH_ALPHA) ++# define LZO_WORDSIZE 8 ++#elif (LZO_ARCH_AMD64) ++# define LZO_WORDSIZE 8 ++#elif (LZO_ARCH_AVR) ++# define LZO_WORDSIZE 1 ++#elif (LZO_ARCH_H8300) ++# if defined(__NORMAL_MODE__) ++# define LZO_WORDSIZE 4 ++# elif defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__) ++# define LZO_WORDSIZE 4 ++# else ++# define LZO_WORDSIZE 2 ++# endif ++#elif (LZO_ARCH_I086) ++# define LZO_WORDSIZE 2 ++#elif (LZO_ARCH_IA64) ++# define LZO_WORDSIZE 8 ++#elif (LZO_ARCH_M16C) ++# define LZO_WORDSIZE 2 ++#elif (LZO_ARCH_SPU) ++# define LZO_WORDSIZE 4 ++#elif (LZO_ARCH_Z80) ++# define LZO_WORDSIZE 1 ++#elif (LZO_SIZEOF_LONG == 8) && ((defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__)) ++# define LZO_WORDSIZE 8 ++#elif (LZO_OS_OS400 || defined(__OS400__)) ++# define LZO_WORDSIZE 8 ++#elif (defined(__vms) || defined(__VMS)) && (__INITIAL_POINTER_SIZE+0 == 64) ++# define LZO_WORDSIZE 8 ++#endif ++#endif ++#if !defined(LZO_SIZEOF_VOID_P) ++#if defined(__ILP32__) || defined(__ILP32) || defined(_ILP32) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(int) == 4) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 4) ++# define LZO_SIZEOF_VOID_P 4 ++#elif defined(__ILP64__) || defined(__ILP64) || defined(_ILP64) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(int) == 8) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 8) ++# define LZO_SIZEOF_VOID_P 8 ++#elif defined(__LLP64__) || defined(__LLP64) || defined(_LLP64) || defined(_WIN64) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 4) ++# define LZO_SIZEOF_VOID_P 8 ++#elif defined(__LP64__) || defined(__LP64) || defined(_LP64) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 8) ++# define LZO_SIZEOF_VOID_P 8 ++#elif (LZO_ARCH_AVR) ++# define LZO_SIZEOF_VOID_P 2 ++#elif (LZO_ARCH_C166 || LZO_ARCH_MCS51 || LZO_ARCH_MCS251 || LZO_ARCH_MSP430) ++# define LZO_SIZEOF_VOID_P 2 ++#elif (LZO_ARCH_H8300) ++# if defined(__NORMAL_MODE__) ++# define LZO_SIZEOF_VOID_P 2 ++# elif defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__) ++# define LZO_SIZEOF_VOID_P 4 ++# else ++# define LZO_SIZEOF_VOID_P 2 ++# endif ++# if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x040000ul)) && (LZO_SIZEOF_INT == 4) ++# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_INT ++# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_INT ++# endif ++#elif (LZO_ARCH_I086) ++# if (LZO_MM_TINY || LZO_MM_SMALL || LZO_MM_MEDIUM) ++# define LZO_SIZEOF_VOID_P 2 ++# elif (LZO_MM_COMPACT || LZO_MM_LARGE || LZO_MM_HUGE) ++# define LZO_SIZEOF_VOID_P 4 ++# else ++# error "invalid LZO_ARCH_I086 memory model" ++# endif ++#elif (LZO_ARCH_M16C) ++# if defined(__m32c_cpu__) || defined(__m32cm_cpu__) ++# define LZO_SIZEOF_VOID_P 4 ++# else ++# define LZO_SIZEOF_VOID_P 2 ++# endif ++#elif (LZO_ARCH_SPU) ++# define LZO_SIZEOF_VOID_P 4 ++#elif (LZO_ARCH_Z80) ++# define LZO_SIZEOF_VOID_P 2 ++#elif (LZO_SIZEOF_LONG == 8) && ((defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__)) ++# define LZO_SIZEOF_VOID_P 4 ++#elif (LZO_OS_OS400 || defined(__OS400__)) ++# if defined(__LLP64_IFC__) ++# define LZO_SIZEOF_VOID_P 8 ++# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_LONG ++# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_LONG ++# else ++# define LZO_SIZEOF_VOID_P 16 ++# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_LONG ++# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_LONG ++# endif ++#elif (defined(__vms) || defined(__VMS)) && (__INITIAL_POINTER_SIZE+0 == 64) ++# define LZO_SIZEOF_VOID_P 8 ++# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_LONG ++# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_LONG ++#endif ++#endif ++#if !defined(LZO_SIZEOF_VOID_P) ++# define LZO_SIZEOF_VOID_P LZO_SIZEOF_LONG ++#endif ++LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_VOID_P == sizeof(void *)) ++#if !defined(LZO_SIZEOF_SIZE_T) ++#if (LZO_ARCH_I086 || LZO_ARCH_M16C) ++# define LZO_SIZEOF_SIZE_T 2 ++#endif ++#endif ++#if !defined(LZO_SIZEOF_SIZE_T) ++# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_VOID_P ++#endif ++#if defined(offsetof) ++LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_SIZE_T == sizeof(size_t)) ++#endif ++#if !defined(LZO_SIZEOF_PTRDIFF_T) ++#if (LZO_ARCH_I086) ++# if (LZO_MM_TINY || LZO_MM_SMALL || LZO_MM_MEDIUM || LZO_MM_HUGE) ++# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_VOID_P ++# elif (LZO_MM_COMPACT || LZO_MM_LARGE) ++# if (LZO_CC_BORLANDC || LZO_CC_TURBOC) ++# define LZO_SIZEOF_PTRDIFF_T 4 ++# else ++# define LZO_SIZEOF_PTRDIFF_T 2 ++# endif ++# else ++# error "invalid LZO_ARCH_I086 memory model" ++# endif ++#endif ++#endif ++#if !defined(LZO_SIZEOF_PTRDIFF_T) ++# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_SIZE_T ++#endif ++#if defined(offsetof) ++LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t)) ++#endif ++#if !defined(LZO_WORDSIZE) ++# define LZO_WORDSIZE LZO_SIZEOF_VOID_P ++#endif ++#if (LZO_ABI_NEUTRAL_ENDIAN) ++# undef LZO_ABI_BIG_ENDIAN ++# undef LZO_ABI_LITTLE_ENDIAN ++#elif !(LZO_ABI_BIG_ENDIAN) && !(LZO_ABI_LITTLE_ENDIAN) ++#if (LZO_ARCH_ALPHA) && (LZO_ARCH_CRAY_MPP) ++# define LZO_ABI_BIG_ENDIAN 1 ++#elif (LZO_ARCH_IA64) && (LZO_OS_POSIX_LINUX || LZO_OS_WIN64) ++# define LZO_ABI_LITTLE_ENDIAN 1 ++#elif (LZO_ARCH_ALPHA || LZO_ARCH_AMD64 || LZO_ARCH_BLACKFIN || LZO_ARCH_CRIS || LZO_ARCH_I086 || LZO_ARCH_I386 || LZO_ARCH_MSP430) ++# define LZO_ABI_LITTLE_ENDIAN 1 ++#elif (LZO_ARCH_AVR32 || LZO_ARCH_M68K || LZO_ARCH_S390 || LZO_ARCH_SPU) ++# define LZO_ABI_BIG_ENDIAN 1 ++#elif 1 && defined(__IAR_SYSTEMS_ICC__) && defined(__LITTLE_ENDIAN__) ++# if (__LITTLE_ENDIAN__ == 1) ++# define LZO_ABI_LITTLE_ENDIAN 1 ++# else ++# define LZO_ABI_BIG_ENDIAN 1 ++# endif ++#elif 1 && defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) ++# define LZO_ABI_BIG_ENDIAN 1 ++#elif 1 && defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__) ++# define LZO_ABI_LITTLE_ENDIAN 1 ++#elif 1 && (LZO_ARCH_ARM) && defined(__ARMEB__) && !defined(__ARMEL__) ++# define LZO_ABI_BIG_ENDIAN 1 ++#elif 1 && (LZO_ARCH_ARM) && defined(__ARMEL__) && !defined(__ARMEB__) ++# define LZO_ABI_LITTLE_ENDIAN 1 ++#elif 1 && (LZO_ARCH_ARM && LZO_CC_ARMCC_ARMCC) ++# if defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN) ++# error "unexpected configuration - check your compiler defines" ++# elif defined(__BIG_ENDIAN) ++# define LZO_ABI_BIG_ENDIAN 1 ++# else ++# define LZO_ABI_LITTLE_ENDIAN 1 ++# endif ++# define LZO_ABI_LITTLE_ENDIAN 1 ++#elif 1 && (LZO_ARCH_ARM64) && defined(__AARCH64EB__) && !defined(__AARCH64EL__) ++# define LZO_ABI_BIG_ENDIAN 1 ++#elif 1 && (LZO_ARCH_ARM64) && defined(__AARCH64EL__) && !defined(__AARCH64EB__) ++# define LZO_ABI_LITTLE_ENDIAN 1 ++#elif 1 && (LZO_ARCH_MIPS) && defined(__MIPSEB__) && !defined(__MIPSEL__) ++# define LZO_ABI_BIG_ENDIAN 1 ++#elif 1 && (LZO_ARCH_MIPS) && defined(__MIPSEL__) && !defined(__MIPSEB__) ++# define LZO_ABI_LITTLE_ENDIAN 1 ++#endif ++#endif ++#if (LZO_ABI_BIG_ENDIAN) && (LZO_ABI_LITTLE_ENDIAN) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ABI_BIG_ENDIAN) ++# define LZO_INFO_ABI_ENDIAN "be" ++#elif (LZO_ABI_LITTLE_ENDIAN) ++# define LZO_INFO_ABI_ENDIAN "le" ++#elif (LZO_ABI_NEUTRAL_ENDIAN) ++# define LZO_INFO_ABI_ENDIAN "neutral" ++#endif ++#if (LZO_SIZEOF_INT == 1 && LZO_SIZEOF_LONG == 2 && LZO_SIZEOF_VOID_P == 2) ++# define LZO_ABI_I8LP16 1 ++# define LZO_INFO_ABI_PM "i8lp16" ++#elif (LZO_SIZEOF_INT == 2 && LZO_SIZEOF_LONG == 2 && LZO_SIZEOF_VOID_P == 2) ++# define LZO_ABI_ILP16 1 ++# define LZO_INFO_ABI_PM "ilp16" ++#elif (LZO_SIZEOF_INT == 2 && LZO_SIZEOF_LONG == 4 && LZO_SIZEOF_VOID_P == 4) ++# define LZO_ABI_LP32 1 ++# define LZO_INFO_ABI_PM "lp32" ++#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 4 && LZO_SIZEOF_VOID_P == 4) ++# define LZO_ABI_ILP32 1 ++# define LZO_INFO_ABI_PM "ilp32" ++#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 4 && LZO_SIZEOF_VOID_P == 8 && LZO_SIZEOF_SIZE_T == 8) ++# define LZO_ABI_LLP64 1 ++# define LZO_INFO_ABI_PM "llp64" ++#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 8) ++# define LZO_ABI_LP64 1 ++# define LZO_INFO_ABI_PM "lp64" ++#elif (LZO_SIZEOF_INT == 8 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 8) ++# define LZO_ABI_ILP64 1 ++# define LZO_INFO_ABI_PM "ilp64" ++#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 4) ++# define LZO_ABI_IP32L64 1 ++# define LZO_INFO_ABI_PM "ip32l64" ++#endif ++#if 0 ++#elif !defined(__LZO_LIBC_OVERRIDE) ++#if (LZO_LIBC_NAKED) ++# define LZO_INFO_LIBC "naked" ++#elif (LZO_LIBC_FREESTANDING) ++# define LZO_INFO_LIBC "freestanding" ++#elif (LZO_LIBC_MOSTLY_FREESTANDING) ++# define LZO_INFO_LIBC "mfreestanding" ++#elif (LZO_LIBC_ISOC90) ++# define LZO_INFO_LIBC "isoc90" ++#elif (LZO_LIBC_ISOC99) ++# define LZO_INFO_LIBC "isoc99" ++#elif (LZO_CC_ARMCC_ARMCC) && defined(__ARMCLIB_VERSION) ++# define LZO_LIBC_ISOC90 1 ++# define LZO_INFO_LIBC "isoc90" ++#elif defined(__dietlibc__) ++# define LZO_LIBC_DIETLIBC 1 ++# define LZO_INFO_LIBC "dietlibc" ++#elif defined(_NEWLIB_VERSION) ++# define LZO_LIBC_NEWLIB 1 ++# define LZO_INFO_LIBC "newlib" ++#elif defined(__UCLIBC__) && defined(__UCLIBC_MAJOR__) && defined(__UCLIBC_MINOR__) ++# if defined(__UCLIBC_SUBLEVEL__) ++# define LZO_LIBC_UCLIBC (__UCLIBC_MAJOR__ * 0x10000L + (__UCLIBC_MINOR__-0) * 0x100 + (__UCLIBC_SUBLEVEL__-0)) ++# else ++# define LZO_LIBC_UCLIBC 0x00090bL ++# endif ++# define LZO_INFO_LIBC "uc" "libc" ++#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) ++# define LZO_LIBC_GLIBC (__GLIBC__ * 0x10000L + (__GLIBC_MINOR__-0) * 0x100) ++# define LZO_INFO_LIBC "glibc" ++#elif (LZO_CC_MWERKS) && defined(__MSL__) ++# define LZO_LIBC_MSL __MSL__ ++# define LZO_INFO_LIBC "msl" ++#elif 1 && defined(__IAR_SYSTEMS_ICC__) ++# define LZO_LIBC_ISOC90 1 ++# define LZO_INFO_LIBC "isoc90" ++#else ++# define LZO_LIBC_DEFAULT 1 ++# define LZO_INFO_LIBC "default" ++#endif ++#endif ++#if (LZO_ARCH_I386 && (LZO_OS_DOS32 || LZO_OS_WIN32) && (LZO_CC_DMC || LZO_CC_INTELC || LZO_CC_MSC || LZO_CC_PELLESC)) ++# define LZO_ASM_SYNTAX_MSC 1 ++#elif (LZO_OS_WIN64 && (LZO_CC_DMC || LZO_CC_INTELC || LZO_CC_MSC || LZO_CC_PELLESC)) ++#elif (LZO_ARCH_I386 && LZO_CC_GNUC && (LZO_CC_GNUC == 0x011f00ul)) ++#elif (LZO_ARCH_I386 && (LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_INTELC || LZO_CC_PATHSCALE)) ++# define LZO_ASM_SYNTAX_GNUC 1 ++#elif (LZO_ARCH_AMD64 && (LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_INTELC || LZO_CC_PATHSCALE)) ++# define LZO_ASM_SYNTAX_GNUC 1 ++#elif (LZO_CC_GNUC) ++# define LZO_ASM_SYNTAX_GNUC 1 ++#endif ++#if (LZO_ASM_SYNTAX_GNUC) ++#if (LZO_ARCH_I386 && LZO_CC_GNUC && (LZO_CC_GNUC < 0x020000ul)) ++# define __LZO_ASM_CLOBBER "ax" ++# define __LZO_ASM_CLOBBER_LIST_CC /*empty*/ ++# define __LZO_ASM_CLOBBER_LIST_CC_MEMORY /*empty*/ ++# define __LZO_ASM_CLOBBER_LIST_EMPTY /*empty*/ ++#elif (LZO_CC_INTELC && (__INTEL_COMPILER < 1000)) ++# define __LZO_ASM_CLOBBER "memory" ++# define __LZO_ASM_CLOBBER_LIST_CC /*empty*/ ++# define __LZO_ASM_CLOBBER_LIST_CC_MEMORY : "memory" ++# define __LZO_ASM_CLOBBER_LIST_EMPTY /*empty*/ ++#else ++# define __LZO_ASM_CLOBBER "cc", "memory" ++# define __LZO_ASM_CLOBBER_LIST_CC : "cc" ++# define __LZO_ASM_CLOBBER_LIST_CC_MEMORY : "cc", "memory" ++# define __LZO_ASM_CLOBBER_LIST_EMPTY /*empty*/ ++#endif ++#endif ++#if (LZO_ARCH_ALPHA) ++# define LZO_OPT_AVOID_UINT_INDEX 1 ++#elif (LZO_ARCH_AMD64) ++# define LZO_OPT_AVOID_INT_INDEX 1 ++# define LZO_OPT_AVOID_UINT_INDEX 1 ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED64 ++# define LZO_OPT_UNALIGNED64 1 ++# endif ++#elif (LZO_ARCH_ARM) ++# if defined(__ARM_FEATURE_UNALIGNED) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++# elif defined(__TARGET_ARCH_ARM) && ((__TARGET_ARCH_ARM+0) >= 7) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++# elif defined(__TARGET_ARCH_ARM) && ((__TARGET_ARCH_ARM+0) >= 6) && !defined(__TARGET_PROFILE_M) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++# endif ++#elif (LZO_ARCH_ARM64) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED64 ++# define LZO_OPT_UNALIGNED64 1 ++# endif ++#elif (LZO_ARCH_CRIS) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++#elif (LZO_ARCH_I386) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++#elif (LZO_ARCH_IA64) ++# define LZO_OPT_AVOID_INT_INDEX 1 ++# define LZO_OPT_AVOID_UINT_INDEX 1 ++# define LZO_OPT_PREFER_POSTINC 1 ++#elif (LZO_ARCH_M68K) ++# define LZO_OPT_PREFER_POSTINC 1 ++# define LZO_OPT_PREFER_PREDEC 1 ++# if defined(__mc68020__) && !defined(__mcoldfire__) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++# endif ++#elif (LZO_ARCH_MIPS) ++# define LZO_OPT_AVOID_UINT_INDEX 1 ++#elif (LZO_ARCH_POWERPC) ++# define LZO_OPT_PREFER_PREINC 1 ++# define LZO_OPT_PREFER_PREDEC 1 ++# if (LZO_ABI_BIG_ENDIAN) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++# if (LZO_WORDSIZE == 8) ++# ifndef LZO_OPT_UNALIGNED64 ++# define LZO_OPT_UNALIGNED64 1 ++# endif ++# endif ++# endif ++#elif (LZO_ARCH_S390) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++# if (LZO_WORDSIZE == 8) ++# ifndef LZO_OPT_UNALIGNED64 ++# define LZO_OPT_UNALIGNED64 1 ++# endif ++# endif ++#elif (LZO_ARCH_SH) ++# define LZO_OPT_PREFER_POSTINC 1 ++# define LZO_OPT_PREFER_PREDEC 1 ++#endif ++#ifndef LZO_CFG_NO_INLINE_ASM ++#if (LZO_ABI_NEUTRAL_ENDIAN) || (LZO_ARCH_GENERIC) ++# define LZO_CFG_NO_INLINE_ASM 1 ++#elif (LZO_CC_LLVM) ++# define LZO_CFG_NO_INLINE_ASM 1 ++#endif ++#endif ++#if (LZO_CFG_NO_INLINE_ASM) ++# undef LZO_ASM_SYNTAX_MSC ++# undef LZO_ASM_SYNTAX_GNUC ++# undef __LZO_ASM_CLOBBER ++# undef __LZO_ASM_CLOBBER_LIST_CC ++# undef __LZO_ASM_CLOBBER_LIST_CC_MEMORY ++# undef __LZO_ASM_CLOBBER_LIST_EMPTY ++#endif ++#ifndef LZO_CFG_NO_UNALIGNED ++#if (LZO_ABI_NEUTRAL_ENDIAN) || (LZO_ARCH_GENERIC) ++# define LZO_CFG_NO_UNALIGNED 1 ++#endif ++#endif ++#if (LZO_CFG_NO_UNALIGNED) ++# undef LZO_OPT_UNALIGNED16 ++# undef LZO_OPT_UNALIGNED32 ++# undef LZO_OPT_UNALIGNED64 ++#endif ++#if defined(__LZO_INFOSTR_MM) ++#elif (LZO_MM_FLAT) && (defined(__LZO_INFOSTR_PM) || defined(LZO_INFO_ABI_PM)) ++# define __LZO_INFOSTR_MM "" ++#elif defined(LZO_INFO_MM) ++# define __LZO_INFOSTR_MM "." LZO_INFO_MM ++#else ++# define __LZO_INFOSTR_MM "" ++#endif ++#if defined(__LZO_INFOSTR_PM) ++#elif defined(LZO_INFO_ABI_PM) ++# define __LZO_INFOSTR_PM "." LZO_INFO_ABI_PM ++#else ++# define __LZO_INFOSTR_PM "" ++#endif ++#if defined(__LZO_INFOSTR_ENDIAN) ++#elif defined(LZO_INFO_ABI_ENDIAN) ++# define __LZO_INFOSTR_ENDIAN "." LZO_INFO_ABI_ENDIAN ++#else ++# define __LZO_INFOSTR_ENDIAN "" ++#endif ++#if defined(__LZO_INFOSTR_OSNAME) ++#elif defined(LZO_INFO_OS_CONSOLE) ++# define __LZO_INFOSTR_OSNAME LZO_INFO_OS "." LZO_INFO_OS_CONSOLE ++#elif defined(LZO_INFO_OS_POSIX) ++# define __LZO_INFOSTR_OSNAME LZO_INFO_OS "." LZO_INFO_OS_POSIX ++#else ++# define __LZO_INFOSTR_OSNAME LZO_INFO_OS ++#endif ++#if defined(__LZO_INFOSTR_LIBC) ++#elif defined(LZO_INFO_LIBC) ++# define __LZO_INFOSTR_LIBC "." LZO_INFO_LIBC ++#else ++# define __LZO_INFOSTR_LIBC "" ++#endif ++#if defined(__LZO_INFOSTR_CCVER) ++#elif defined(LZO_INFO_CCVER) ++# define __LZO_INFOSTR_CCVER " " LZO_INFO_CCVER ++#else ++# define __LZO_INFOSTR_CCVER "" ++#endif ++#define LZO_INFO_STRING \ ++ LZO_INFO_ARCH __LZO_INFOSTR_MM __LZO_INFOSTR_PM __LZO_INFOSTR_ENDIAN \ ++ " " __LZO_INFOSTR_OSNAME __LZO_INFOSTR_LIBC " " LZO_INFO_CC __LZO_INFOSTR_CCVER ++#if !(LZO_CFG_SKIP_LZO_TYPES) ++#if (!(LZO_SIZEOF_SHORT+0 > 0 && LZO_SIZEOF_INT+0 > 0 && LZO_SIZEOF_LONG+0 > 0)) ++# error "missing defines for sizes" ++#endif ++#if (!(LZO_SIZEOF_PTRDIFF_T+0 > 0 && LZO_SIZEOF_SIZE_T+0 > 0 && LZO_SIZEOF_VOID_P+0 > 0)) ++# error "missing defines for sizes" ++#endif ++#if !defined(lzo_llong_t) ++#if (LZO_SIZEOF_LONG_LONG+0 > 0) ++__lzo_gnuc_extension__ typedef long long lzo_llong_t__; ++__lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__; ++# define lzo_llong_t lzo_llong_t__ ++# define lzo_ullong_t lzo_ullong_t__ ++#endif ++#endif ++#if !defined(lzo_int16e_t) ++#if (LZO_SIZEOF_LONG == 2) ++# define lzo_int16e_t long ++# define lzo_uint16e_t unsigned long ++#elif (LZO_SIZEOF_INT == 2) ++# define lzo_int16e_t int ++# define lzo_uint16e_t unsigned int ++#elif (LZO_SIZEOF_SHORT == 2) ++# define lzo_int16e_t short int ++# define lzo_uint16e_t unsigned short int ++#elif 1 && !(LZO_CFG_TYPE_NO_MODE_HI) && (LZO_CC_CLANG || (LZO_CC_GNUC >= 0x025f00ul) || LZO_CC_LLVM) ++ typedef int lzo_int16e_hi_t__ __attribute__((__mode__(__HI__))); ++ typedef unsigned int lzo_uint16e_hi_t__ __attribute__((__mode__(__HI__))); ++# define lzo_int16e_t lzo_int16e_hi_t__ ++# define lzo_uint16e_t lzo_uint16e_hi_t__ ++#elif (LZO_SIZEOF___INT16 == 2) ++# define lzo_int16e_t __int16 ++# define lzo_uint16e_t unsigned __int16 ++#else ++#endif ++#endif ++#if defined(lzo_int16e_t) ++# define LZO_SIZEOF_LZO_INT16E_T 2 ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16e_t) == 2) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16e_t) == LZO_SIZEOF_LZO_INT16E_T) ++#endif ++#if !defined(lzo_int32e_t) ++#if (LZO_SIZEOF_LONG == 4) ++# define lzo_int32e_t long int ++# define lzo_uint32e_t unsigned long int ++#elif (LZO_SIZEOF_INT == 4) ++# define lzo_int32e_t int ++# define lzo_uint32e_t unsigned int ++#elif (LZO_SIZEOF_SHORT == 4) ++# define lzo_int32e_t short int ++# define lzo_uint32e_t unsigned short int ++#elif (LZO_SIZEOF_LONG_LONG == 4) ++# define lzo_int32e_t lzo_llong_t ++# define lzo_uint32e_t lzo_ullong_t ++#elif 1 && !(LZO_CFG_TYPE_NO_MODE_SI) && (LZO_CC_CLANG || (LZO_CC_GNUC >= 0x025f00ul) || LZO_CC_LLVM) && (__INT_MAX__+0 > 2147483647L) ++ typedef int lzo_int32e_si_t__ __attribute__((__mode__(__SI__))); ++ typedef unsigned int lzo_uint32e_si_t__ __attribute__((__mode__(__SI__))); ++# define lzo_int32e_t lzo_int32e_si_t__ ++# define lzo_uint32e_t lzo_uint32e_si_t__ ++#elif 1 && !(LZO_CFG_TYPE_NO_MODE_SI) && (LZO_CC_GNUC >= 0x025f00ul) && defined(__AVR__) && (__LONG_MAX__+0 == 32767L) ++ typedef int lzo_int32e_si_t__ __attribute__((__mode__(__SI__))); ++ typedef unsigned int lzo_uint32e_si_t__ __attribute__((__mode__(__SI__))); ++# define lzo_int32e_t lzo_int32e_si_t__ ++# define lzo_uint32e_t lzo_uint32e_si_t__ ++# define LZO_INT32_C(c) (c##LL) ++# define LZO_UINT32_C(c) (c##ULL) ++#elif (LZO_SIZEOF___INT32 == 4) ++# define lzo_int32e_t __int32 ++# define lzo_uint32e_t unsigned __int32 ++#else ++#endif ++#endif ++#if defined(lzo_int32e_t) ++# define LZO_SIZEOF_LZO_INT32E_T 4 ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32e_t) == 4) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32e_t) == LZO_SIZEOF_LZO_INT32E_T) ++#endif ++#if !defined(lzo_int64e_t) ++#if (LZO_SIZEOF___INT64 == 8) ++# if (LZO_CC_BORLANDC) && !(LZO_CFG_TYPE_PREFER___INT64) ++# define LZO_CFG_TYPE_PREFER___INT64 1 ++# endif ++#endif ++#if (LZO_SIZEOF_INT == 8) && (LZO_SIZEOF_INT < LZO_SIZEOF_LONG) ++# define lzo_int64e_t int ++# define lzo_uint64e_t unsigned int ++# define LZO_SIZEOF_LZO_INT64E_T LZO_SIZEOF_INT ++#elif (LZO_SIZEOF_LONG == 8) ++# define lzo_int64e_t long int ++# define lzo_uint64e_t unsigned long int ++# define LZO_SIZEOF_LZO_INT64E_T LZO_SIZEOF_LONG ++#elif (LZO_SIZEOF_LONG_LONG == 8) && !(LZO_CFG_TYPE_PREFER___INT64) ++# define lzo_int64e_t lzo_llong_t ++# define lzo_uint64e_t lzo_ullong_t ++# if (LZO_CC_BORLANDC) ++# define LZO_INT64_C(c) ((c) + 0ll) ++# define LZO_UINT64_C(c) ((c) + 0ull) ++# elif 0 ++# define LZO_INT64_C(c) (__lzo_gnuc_extension__ (c##LL)) ++# define LZO_UINT64_C(c) (__lzo_gnuc_extension__ (c##ULL)) ++# else ++# define LZO_INT64_C(c) (c##LL) ++# define LZO_UINT64_C(c) (c##ULL) ++# endif ++# define LZO_SIZEOF_LZO_INT64E_T LZO_SIZEOF_LONG_LONG ++#elif (LZO_SIZEOF___INT64 == 8) ++# define lzo_int64e_t __int64 ++# define lzo_uint64e_t unsigned __int64 ++# if (LZO_CC_BORLANDC) ++# define LZO_INT64_C(c) ((c) + 0i64) ++# define LZO_UINT64_C(c) ((c) + 0ui64) ++# else ++# define LZO_INT64_C(c) (c##i64) ++# define LZO_UINT64_C(c) (c##ui64) ++# endif ++# define LZO_SIZEOF_LZO_INT64E_T LZO_SIZEOF___INT64 ++#else ++#endif ++#endif ++#if defined(lzo_int64e_t) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64e_t) == 8) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64e_t) == LZO_SIZEOF_LZO_INT64E_T) ++#endif ++#if !defined(lzo_int32l_t) ++#if defined(lzo_int32e_t) ++# define lzo_int32l_t lzo_int32e_t ++# define lzo_uint32l_t lzo_uint32e_t ++# define LZO_SIZEOF_LZO_INT32L_T LZO_SIZEOF_LZO_INT32E_T ++#elif (LZO_SIZEOF_INT >= 4) && (LZO_SIZEOF_INT < LZO_SIZEOF_LONG) ++# define lzo_int32l_t int ++# define lzo_uint32l_t unsigned int ++# define LZO_SIZEOF_LZO_INT32L_T LZO_SIZEOF_INT ++#elif (LZO_SIZEOF_LONG >= 4) ++# define lzo_int32l_t long int ++# define lzo_uint32l_t unsigned long int ++# define LZO_SIZEOF_LZO_INT32L_T LZO_SIZEOF_LONG ++#else ++# error "lzo_int32l_t" ++#endif ++#endif ++#if 1 ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32l_t) >= 4) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32l_t) == LZO_SIZEOF_LZO_INT32L_T) ++#endif ++#if !defined(lzo_int64l_t) ++#if defined(lzo_int64e_t) ++# define lzo_int64l_t lzo_int64e_t ++# define lzo_uint64l_t lzo_uint64e_t ++# define LZO_SIZEOF_LZO_INT64L_T LZO_SIZEOF_LZO_INT64E_T ++#else ++#endif ++#endif ++#if defined(lzo_int64l_t) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64l_t) >= 8) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64l_t) == LZO_SIZEOF_LZO_INT64L_T) ++#endif ++#if !defined(lzo_int32f_t) ++#if (LZO_SIZEOF_SIZE_T >= 8) ++# define lzo_int32f_t lzo_int64l_t ++# define lzo_uint32f_t lzo_uint64l_t ++# define LZO_SIZEOF_LZO_INT32F_T LZO_SIZEOF_LZO_INT64L_T ++#else ++# define lzo_int32f_t lzo_int32l_t ++# define lzo_uint32f_t lzo_uint32l_t ++# define LZO_SIZEOF_LZO_INT32F_T LZO_SIZEOF_LZO_INT32L_T ++#endif ++#endif ++#if 1 ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32f_t) >= 4) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32f_t) == LZO_SIZEOF_LZO_INT32F_T) ++#endif ++#if !defined(lzo_int64f_t) ++#if defined(lzo_int64l_t) ++# define lzo_int64f_t lzo_int64l_t ++# define lzo_uint64f_t lzo_uint64l_t ++# define LZO_SIZEOF_LZO_INT64F_T LZO_SIZEOF_LZO_INT64L_T ++#else ++#endif ++#endif ++#if defined(lzo_int64f_t) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64f_t) >= 8) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64f_t) == LZO_SIZEOF_LZO_INT64F_T) ++#endif ++#if !defined(lzo_intptr_t) ++#if 1 && (LZO_OS_OS400 && (LZO_SIZEOF_VOID_P == 16)) ++# define __LZO_INTPTR_T_IS_POINTER 1 ++ typedef char* lzo_intptr_t; ++ typedef char* lzo_uintptr_t; ++# define lzo_intptr_t lzo_intptr_t ++# define lzo_uintptr_t lzo_uintptr_t ++# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_VOID_P ++#elif (LZO_CC_MSC && (_MSC_VER >= 1300) && (LZO_SIZEOF_VOID_P == 4) && (LZO_SIZEOF_INT == 4)) ++ typedef __w64 int lzo_intptr_t; ++ typedef __w64 unsigned int lzo_uintptr_t; ++# define lzo_intptr_t lzo_intptr_t ++# define lzo_uintptr_t lzo_uintptr_t ++# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_INT ++#elif (LZO_SIZEOF_SHORT == LZO_SIZEOF_VOID_P) && (LZO_SIZEOF_INT > LZO_SIZEOF_VOID_P) ++# define lzo_intptr_t short ++# define lzo_uintptr_t unsigned short ++# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_SHORT ++#elif (LZO_SIZEOF_INT >= LZO_SIZEOF_VOID_P) && (LZO_SIZEOF_INT < LZO_SIZEOF_LONG) ++# define lzo_intptr_t int ++# define lzo_uintptr_t unsigned int ++# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_INT ++#elif (LZO_SIZEOF_LONG >= LZO_SIZEOF_VOID_P) ++# define lzo_intptr_t long ++# define lzo_uintptr_t unsigned long ++# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_LONG ++#elif (LZO_SIZEOF_LZO_INT64L_T >= LZO_SIZEOF_VOID_P) ++# define lzo_intptr_t lzo_int64l_t ++# define lzo_uintptr_t lzo_uint64l_t ++# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_LZO_INT64L_T ++#else ++# error "lzo_intptr_t" ++#endif ++#endif ++#if 1 ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_intptr_t) >= sizeof(void *)) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_intptr_t) == sizeof(lzo_uintptr_t)) ++#endif ++#if !defined(lzo_word_t) ++#if defined(LZO_WORDSIZE) && (LZO_WORDSIZE+0 > 0) ++#if (LZO_WORDSIZE == LZO_SIZEOF_LZO_INTPTR_T) && !(__LZO_INTPTR_T_IS_POINTER) ++# define lzo_word_t lzo_uintptr_t ++# define lzo_sword_t lzo_intptr_t ++# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_LZO_INTPTR_T ++#elif (LZO_WORDSIZE == LZO_SIZEOF_LONG) ++# define lzo_word_t unsigned long ++# define lzo_sword_t long ++# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_LONG ++#elif (LZO_WORDSIZE == LZO_SIZEOF_INT) ++# define lzo_word_t unsigned int ++# define lzo_sword_t int ++# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_INT ++#elif (LZO_WORDSIZE == LZO_SIZEOF_SHORT) ++# define lzo_word_t unsigned short ++# define lzo_sword_t short ++# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_SHORT ++#elif (LZO_WORDSIZE == 1) ++# define lzo_word_t unsigned char ++# define lzo_sword_t signed char ++# define LZO_SIZEOF_LZO_WORD_T 1 ++#elif (LZO_WORDSIZE == LZO_SIZEOF_LZO_INT64L_T) ++# define lzo_word_t lzo_uint64l_t ++# define lzo_sword_t lzo_int64l_t ++# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_LZO_INT64L_T ++#elif (LZO_ARCH_SPU) && (LZO_CC_GNUC) ++#if 0 ++ typedef unsigned lzo_word_t __attribute__((__mode__(__V16QI__))); ++ typedef int lzo_sword_t __attribute__((__mode__(__V16QI__))); ++# define lzo_word_t lzo_word_t ++# define lzo_sword_t lzo_sword_t ++# define LZO_SIZEOF_LZO_WORD_T 16 ++#endif ++#else ++# error "lzo_word_t" ++#endif ++#endif ++#endif ++#if 1 && defined(lzo_word_t) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_word_t) == LZO_WORDSIZE) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_sword_t) == LZO_WORDSIZE) ++#endif ++#if 1 ++#define lzo_int8_t signed char ++#define lzo_uint8_t unsigned char ++#define LZO_SIZEOF_LZO_INT8_T 1 ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int8_t) == 1) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int8_t) == sizeof(lzo_uint8_t)) ++#endif ++#if defined(lzo_int16e_t) ++#define lzo_int16_t lzo_int16e_t ++#define lzo_uint16_t lzo_uint16e_t ++#define LZO_SIZEOF_LZO_INT16_T LZO_SIZEOF_LZO_INT16E_T ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16_t) == 2) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16_t) == sizeof(lzo_uint16_t)) ++#endif ++#if defined(lzo_int32e_t) ++#define lzo_int32_t lzo_int32e_t ++#define lzo_uint32_t lzo_uint32e_t ++#define LZO_SIZEOF_LZO_INT32_T LZO_SIZEOF_LZO_INT32E_T ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32_t) == 4) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32_t) == sizeof(lzo_uint32_t)) ++#endif ++#if defined(lzo_int64e_t) ++#define lzo_int64_t lzo_int64e_t ++#define lzo_uint64_t lzo_uint64e_t ++#define LZO_SIZEOF_LZO_INT64_T LZO_SIZEOF_LZO_INT64E_T ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64_t) == 8) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64_t) == sizeof(lzo_uint64_t)) ++#endif ++#if 1 ++#define lzo_int_least32_t lzo_int32l_t ++#define lzo_uint_least32_t lzo_uint32l_t ++#define LZO_SIZEOF_LZO_INT_LEAST32_T LZO_SIZEOF_LZO_INT32L_T ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_least32_t) >= 4) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_least32_t) == sizeof(lzo_uint_least32_t)) ++#endif ++#if defined(lzo_int64l_t) ++#define lzo_int_least64_t lzo_int64l_t ++#define lzo_uint_least64_t lzo_uint64l_t ++#define LZO_SIZEOF_LZO_INT_LEAST64_T LZO_SIZEOF_LZO_INT64L_T ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_least64_t) >= 8) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_least64_t) == sizeof(lzo_uint_least64_t)) ++#endif ++#if 1 ++#define lzo_int_fast32_t lzo_int32f_t ++#define lzo_uint_fast32_t lzo_uint32f_t ++#define LZO_SIZEOF_LZO_INT_FAST32_T LZO_SIZEOF_LZO_INT32F_T ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast32_t) >= 4) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast32_t) == sizeof(lzo_uint_fast32_t)) ++#endif ++#if defined(lzo_int64f_t) ++#define lzo_int_fast64_t lzo_int64f_t ++#define lzo_uint_fast64_t lzo_uint64f_t ++#define LZO_SIZEOF_LZO_INT_FAST64_T LZO_SIZEOF_LZO_INT64F_T ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast64_t) >= 8) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast64_t) == sizeof(lzo_uint_fast64_t)) ++#endif ++#if !defined(LZO_INT16_C) ++# if (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_INT >= 2) ++# define LZO_INT16_C(c) ((c) + 0) ++# define LZO_UINT16_C(c) ((c) + 0U) ++# elif (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_LONG >= 2) ++# define LZO_INT16_C(c) ((c) + 0L) ++# define LZO_UINT16_C(c) ((c) + 0UL) ++# elif (LZO_SIZEOF_INT >= 2) ++# define LZO_INT16_C(c) (c) ++# define LZO_UINT16_C(c) (c##U) ++# elif (LZO_SIZEOF_LONG >= 2) ++# define LZO_INT16_C(c) (c##L) ++# define LZO_UINT16_C(c) (c##UL) ++# else ++# error "LZO_INT16_C" ++# endif ++#endif ++#if !defined(LZO_INT32_C) ++# if (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_INT >= 4) ++# define LZO_INT32_C(c) ((c) + 0) ++# define LZO_UINT32_C(c) ((c) + 0U) ++# elif (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_LONG >= 4) ++# define LZO_INT32_C(c) ((c) + 0L) ++# define LZO_UINT32_C(c) ((c) + 0UL) ++# elif (LZO_SIZEOF_INT >= 4) ++# define LZO_INT32_C(c) (c) ++# define LZO_UINT32_C(c) (c##U) ++# elif (LZO_SIZEOF_LONG >= 4) ++# define LZO_INT32_C(c) (c##L) ++# define LZO_UINT32_C(c) (c##UL) ++# elif (LZO_SIZEOF_LONG_LONG >= 4) ++# define LZO_INT32_C(c) (c##LL) ++# define LZO_UINT32_C(c) (c##ULL) ++# else ++# error "LZO_INT32_C" ++# endif ++#endif ++#if !defined(LZO_INT64_C) && defined(lzo_int64l_t) ++# if (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_INT >= 8) ++# define LZO_INT64_C(c) ((c) + 0) ++# define LZO_UINT64_C(c) ((c) + 0U) ++# elif (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_LONG >= 8) ++# define LZO_INT64_C(c) ((c) + 0L) ++# define LZO_UINT64_C(c) ((c) + 0UL) ++# elif (LZO_SIZEOF_INT >= 8) ++# define LZO_INT64_C(c) (c) ++# define LZO_UINT64_C(c) (c##U) ++# elif (LZO_SIZEOF_LONG >= 8) ++# define LZO_INT64_C(c) (c##L) ++# define LZO_UINT64_C(c) (c##UL) ++# else ++# error "LZO_INT64_C" ++# endif ++#endif ++#endif ++ ++#endif /* already included */ ++ ++/* vim:set ts=4 sw=4 et: */ +diff --git a/lzo/minilzo.c b/lzo/minilzo.c +index 85771eb..ab2be5f 100644 +--- a/lzo/minilzo.c ++++ b/lzo/minilzo.c +@@ -2,13 +2,7 @@ + + This file is part of the LZO real-time data compression library. + +- 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 ++ Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer + All Rights Reserved. + + The LZO library is free software; you can redistribute it and/or +@@ -24,7 +18,7 @@ + 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., +- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Markus F.X.J. Oberhumer + +@@ -37,374 +31,3763 @@ + * http://www.oberhumer.com/opensource/lzo/ + */ + +-#define __LZO_IN_MINILZO +-#define LZO_BUILD ++#define __LZO_IN_MINILZO 1 ++ ++#if defined(LZO_CFG_FREESTANDING) ++# undef MINILZO_HAVE_CONFIG_H ++# define LZO_LIBC_FREESTANDING 1 ++# define LZO_OS_FREESTANDING 1 ++#endif + + #ifdef MINILZO_HAVE_CONFIG_H + # include + #endif ++#include ++#include ++#if defined(MINILZO_CFG_USE_INTERNAL_LZODEFS) ++ ++#ifndef __LZODEFS_H_INCLUDED ++#define __LZODEFS_H_INCLUDED 1 ++ ++#if defined(__CYGWIN32__) && !defined(__CYGWIN__) ++# define __CYGWIN__ __CYGWIN32__ ++#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(LZO_CFG_NO_DISABLE_WUNDEF) ++#if defined(__ARMCC_VERSION) ++# pragma diag_suppress 193 ++#elif defined(__clang__) && defined(__clang_minor__) ++# pragma clang diagnostic ignored "-Wundef" ++#elif defined(__INTEL_COMPILER) ++# pragma warning(disable: 193) ++#elif defined(__KEIL__) && defined(__C166__) ++# pragma warning disable = 322 ++#elif defined(__GNUC__) && defined(__GNUC_MINOR__) && !defined(__PATHSCALE__) ++# if ((__GNUC__-0) >= 5 || ((__GNUC__-0) == 4 && (__GNUC_MINOR__-0) >= 2)) ++# pragma GCC diagnostic ignored "-Wundef" ++# endif ++#elif defined(_MSC_VER) && !defined(__clang__) && !defined(__INTEL_COMPILER) && !defined(__MWERKS__) ++# if ((_MSC_VER-0) >= 1300) ++# pragma warning(disable: 4668) ++# endif ++#endif ++#endif ++#if 0 && 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 !(LZO_CFG_NO_DISABLE_WCRTNONSTDC) ++#ifndef _CRT_NONSTDC_NO_DEPRECATE ++#define _CRT_NONSTDC_NO_DEPRECATE 1 ++#endif ++#ifndef _CRT_NONSTDC_NO_WARNINGS ++#define _CRT_NONSTDC_NO_WARNINGS 1 ++#endif ++#ifndef _CRT_SECURE_NO_DEPRECATE ++#define _CRT_SECURE_NO_DEPRECATE 1 ++#endif ++#ifndef _CRT_SECURE_NO_WARNINGS ++#define _CRT_SECURE_NO_WARNINGS 1 ++#endif ++#endif ++#if 0 ++#define LZO_0xffffUL 0xfffful ++#define LZO_0xffffffffUL 0xfffffffful ++#else ++#define LZO_0xffffUL 65535ul ++#define LZO_0xffffffffUL 4294967295ul ++#endif ++#define LZO_0xffffL LZO_0xffffUL ++#define LZO_0xffffffffL LZO_0xffffffffUL ++#if (LZO_0xffffL == LZO_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 defined(__COUNTER__) ++# ifndef LZO_CFG_USE_COUNTER ++# define LZO_CFG_USE_COUNTER 1 ++# endif ++#else ++# undef LZO_CFG_USE_COUNTER ++#endif ++#if (UINT_MAX == LZO_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 == LZO_0xffffL) ++# define ptrdiff_t long ++# define _PTRDIFF_T_DEFINED 1 ++#endif ++#if (UINT_MAX == LZO_0xffffL) ++# undef __LZO_RENAME_A ++# undef __LZO_RENAME_B ++# if defined(__AZTEC_C__) && defined(__DOS__) ++# define __LZO_RENAME_A 1 ++# elif defined(_MSC_VER) && defined(MSDOS) ++# if (_MSC_VER < 600) ++# define __LZO_RENAME_A 1 ++# elif (_MSC_VER < 700) ++# define __LZO_RENAME_B 1 ++# endif ++# elif defined(__TSC__) && defined(__OS2__) ++# define __LZO_RENAME_A 1 ++# elif defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0410) ++# define __LZO_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(__LZO_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(__LZO_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 __LZO_RENAME_A ++# undef __LZO_RENAME_B ++#endif ++#if (UINT_MAX == LZO_0xffffL) ++#if defined(__AZTEC_C__) && defined(__DOS__) ++# define LZO_BROKEN_CDECL_ALT_SYNTAX 1 ++#elif defined(_MSC_VER) && defined(MSDOS) ++# if (_MSC_VER < 600) ++# define LZO_BROKEN_INTEGRAL_CONSTANTS 1 ++# endif ++# if (_MSC_VER < 700) ++# define LZO_BROKEN_INTEGRAL_PROMOTION 1 ++# define LZO_BROKEN_SIZEOF 1 ++# endif ++#elif defined(__PACIFIC__) && defined(DOS) ++# define LZO_BROKEN_INTEGRAL_CONSTANTS 1 ++#elif defined(__TURBOC__) && defined(__MSDOS__) ++# if (__TURBOC__ < 0x0150) ++# define LZO_BROKEN_CDECL_ALT_SYNTAX 1 ++# define LZO_BROKEN_INTEGRAL_CONSTANTS 1 ++# define LZO_BROKEN_INTEGRAL_PROMOTION 1 ++# endif ++# if (__TURBOC__ < 0x0200) ++# define LZO_BROKEN_SIZEOF 1 ++# endif ++# if (__TURBOC__ < 0x0400) && defined(__cplusplus) ++# define LZO_BROKEN_CDECL_ALT_SYNTAX 1 ++# endif ++#elif (defined(__PUREC__) || defined(__TURBOC__)) && defined(__TOS__) ++# define LZO_BROKEN_CDECL_ALT_SYNTAX 1 ++# define LZO_BROKEN_SIZEOF 1 ++#endif ++#endif ++#if defined(__WATCOMC__) && (__WATCOMC__ < 900) ++# define LZO_BROKEN_INTEGRAL_CONSTANTS 1 ++#endif ++#if defined(_CRAY) && defined(_CRAY1) ++# define LZO_BROKEN_SIGNED_RIGHT_SHIFT 1 ++#endif ++#define LZO_PP_STRINGIZE(x) #x ++#define LZO_PP_MACRO_EXPAND(x) LZO_PP_STRINGIZE(x) ++#define LZO_PP_CONCAT0() /*empty*/ ++#define LZO_PP_CONCAT1(a) a ++#define LZO_PP_CONCAT2(a,b) a ## b ++#define LZO_PP_CONCAT3(a,b,c) a ## b ## c ++#define LZO_PP_CONCAT4(a,b,c,d) a ## b ## c ## d ++#define LZO_PP_CONCAT5(a,b,c,d,e) a ## b ## c ## d ## e ++#define LZO_PP_CONCAT6(a,b,c,d,e,f) a ## b ## c ## d ## e ## f ++#define LZO_PP_CONCAT7(a,b,c,d,e,f,g) a ## b ## c ## d ## e ## f ## g ++#define LZO_PP_ECONCAT0() LZO_PP_CONCAT0() ++#define LZO_PP_ECONCAT1(a) LZO_PP_CONCAT1(a) ++#define LZO_PP_ECONCAT2(a,b) LZO_PP_CONCAT2(a,b) ++#define LZO_PP_ECONCAT3(a,b,c) LZO_PP_CONCAT3(a,b,c) ++#define LZO_PP_ECONCAT4(a,b,c,d) LZO_PP_CONCAT4(a,b,c,d) ++#define LZO_PP_ECONCAT5(a,b,c,d,e) LZO_PP_CONCAT5(a,b,c,d,e) ++#define LZO_PP_ECONCAT6(a,b,c,d,e,f) LZO_PP_CONCAT6(a,b,c,d,e,f) ++#define LZO_PP_ECONCAT7(a,b,c,d,e,f,g) LZO_PP_CONCAT7(a,b,c,d,e,f,g) ++#define LZO_PP_EMPTY /*empty*/ ++#define LZO_PP_EMPTY0() /*empty*/ ++#define LZO_PP_EMPTY1(a) /*empty*/ ++#define LZO_PP_EMPTY2(a,b) /*empty*/ ++#define LZO_PP_EMPTY3(a,b,c) /*empty*/ ++#define LZO_PP_EMPTY4(a,b,c,d) /*empty*/ ++#define LZO_PP_EMPTY5(a,b,c,d,e) /*empty*/ ++#define LZO_PP_EMPTY6(a,b,c,d,e,f) /*empty*/ ++#define LZO_PP_EMPTY7(a,b,c,d,e,f,g) /*empty*/ ++#if 1 ++#define LZO_CPP_STRINGIZE(x) #x ++#define LZO_CPP_MACRO_EXPAND(x) LZO_CPP_STRINGIZE(x) ++#define LZO_CPP_CONCAT2(a,b) a ## b ++#define LZO_CPP_CONCAT3(a,b,c) a ## b ## c ++#define LZO_CPP_CONCAT4(a,b,c,d) a ## b ## c ## d ++#define LZO_CPP_CONCAT5(a,b,c,d,e) a ## b ## c ## d ## e ++#define LZO_CPP_CONCAT6(a,b,c,d,e,f) a ## b ## c ## d ## e ## f ++#define LZO_CPP_CONCAT7(a,b,c,d,e,f,g) a ## b ## c ## d ## e ## f ## g ++#define LZO_CPP_ECONCAT2(a,b) LZO_CPP_CONCAT2(a,b) ++#define LZO_CPP_ECONCAT3(a,b,c) LZO_CPP_CONCAT3(a,b,c) ++#define LZO_CPP_ECONCAT4(a,b,c,d) LZO_CPP_CONCAT4(a,b,c,d) ++#define LZO_CPP_ECONCAT5(a,b,c,d,e) LZO_CPP_CONCAT5(a,b,c,d,e) ++#define LZO_CPP_ECONCAT6(a,b,c,d,e,f) LZO_CPP_CONCAT6(a,b,c,d,e,f) ++#define LZO_CPP_ECONCAT7(a,b,c,d,e,f,g) LZO_CPP_CONCAT7(a,b,c,d,e,f,g) ++#endif ++#define __LZO_MASK_GEN(o,b) (((((o) << ((b)-!!(b))) - (o)) << 1) + (o)*!!(b)) ++#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 LZO_EXTERN_C extern "C" ++# define LZO_EXTERN_C_BEGIN extern "C" { ++# define LZO_EXTERN_C_END } ++#else ++# define LZO_EXTERN_C extern ++# define LZO_EXTERN_C_BEGIN /*empty*/ ++# define LZO_EXTERN_C_END /*empty*/ ++#endif ++#if !defined(__LZO_OS_OVERRIDE) ++#if (LZO_OS_FREESTANDING) ++# define LZO_INFO_OS "freestanding" ++#elif (LZO_OS_EMBEDDED) ++# define LZO_INFO_OS "embedded" ++#elif 1 && defined(__IAR_SYSTEMS_ICC__) ++# define LZO_OS_EMBEDDED 1 ++# define LZO_INFO_OS "embedded" ++#elif defined(__CYGWIN__) && defined(__GNUC__) ++# define LZO_OS_CYGWIN 1 ++# define LZO_INFO_OS "cygwin" ++#elif defined(__EMX__) && defined(__GNUC__) ++# define LZO_OS_EMX 1 ++# define LZO_INFO_OS "emx" ++#elif defined(__BEOS__) ++# define LZO_OS_BEOS 1 ++# define LZO_INFO_OS "beos" ++#elif defined(__Lynx__) ++# define LZO_OS_LYNXOS 1 ++# define LZO_INFO_OS "lynxos" ++#elif defined(__OS400__) ++# define LZO_OS_OS400 1 ++# define LZO_INFO_OS "os400" ++#elif defined(__QNX__) ++# define LZO_OS_QNX 1 ++# define LZO_INFO_OS "qnx" ++#elif defined(__BORLANDC__) && defined(__DPMI32__) && (__BORLANDC__ >= 0x0460) ++# define LZO_OS_DOS32 1 ++# define LZO_INFO_OS "dos32" ++#elif defined(__BORLANDC__) && defined(__DPMI16__) ++# define LZO_OS_DOS16 1 ++# define LZO_INFO_OS "dos16" ++#elif defined(__ZTC__) && defined(DOS386) ++# define LZO_OS_DOS32 1 ++# define LZO_INFO_OS "dos32" ++#elif defined(__OS2__) || defined(__OS2V2__) ++# if (UINT_MAX == LZO_0xffffL) ++# define LZO_OS_OS216 1 ++# define LZO_INFO_OS "os216" ++# elif (UINT_MAX == LZO_0xffffffffL) ++# define LZO_OS_OS2 1 ++# define LZO_INFO_OS "os2" ++# else ++# error "check your limits.h header" ++# endif ++#elif defined(__WIN64__) || defined(_WIN64) || defined(WIN64) ++# define LZO_OS_WIN64 1 ++# define LZO_INFO_OS "win64" ++#elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(__WINDOWS_386__) ++# define LZO_OS_WIN32 1 ++# define LZO_INFO_OS "win32" ++#elif defined(__MWERKS__) && defined(__INTEL__) ++# define LZO_OS_WIN32 1 ++# define LZO_INFO_OS "win32" ++#elif defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows) ++# if (UINT_MAX == LZO_0xffffL) ++# define LZO_OS_WIN16 1 ++# define LZO_INFO_OS "win16" ++# elif (UINT_MAX == LZO_0xffffffffL) ++# define LZO_OS_WIN32 1 ++# define LZO_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 == LZO_0xffffL) ++# define LZO_OS_DOS16 1 ++# define LZO_INFO_OS "dos16" ++# elif (UINT_MAX == LZO_0xffffffffL) ++# define LZO_OS_DOS32 1 ++# define LZO_INFO_OS "dos32" ++# else ++# error "check your limits.h header" ++# endif ++#elif defined(__WATCOMC__) ++# if defined(__NT__) && (UINT_MAX == LZO_0xffffL) ++# define LZO_OS_DOS16 1 ++# define LZO_INFO_OS "dos16" ++# elif defined(__NT__) && (__WATCOMC__ < 1100) ++# define LZO_OS_WIN32 1 ++# define LZO_INFO_OS "win32" ++# elif defined(__linux__) || defined(__LINUX__) ++# define LZO_OS_POSIX 1 ++# define LZO_INFO_OS "posix" ++# else ++# error "please specify a target using the -bt compiler option" ++# endif ++#elif defined(__palmos__) ++# define LZO_OS_PALMOS 1 ++# define LZO_INFO_OS "palmos" ++#elif defined(__TOS__) || defined(__atarist__) ++# define LZO_OS_TOS 1 ++# define LZO_INFO_OS "tos" ++#elif defined(macintosh) && !defined(__ppc__) ++# define LZO_OS_MACCLASSIC 1 ++# define LZO_INFO_OS "macclassic" ++#elif defined(__VMS) ++# define LZO_OS_VMS 1 ++# define LZO_INFO_OS "vms" ++#elif (defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__) ++# define LZO_OS_CONSOLE 1 ++# define LZO_OS_CONSOLE_PS2 1 ++# define LZO_INFO_OS "console" ++# define LZO_INFO_OS_CONSOLE "ps2" ++#elif defined(__mips__) && defined(__psp__) ++# define LZO_OS_CONSOLE 1 ++# define LZO_OS_CONSOLE_PSP 1 ++# define LZO_INFO_OS "console" ++# define LZO_INFO_OS_CONSOLE "psp" ++#else ++# define LZO_OS_POSIX 1 ++# define LZO_INFO_OS "posix" ++#endif ++#if (LZO_OS_POSIX) ++# if defined(_AIX) || defined(__AIX__) || defined(__aix__) ++# define LZO_OS_POSIX_AIX 1 ++# define LZO_INFO_OS_POSIX "aix" ++# elif defined(__FreeBSD__) ++# define LZO_OS_POSIX_FREEBSD 1 ++# define LZO_INFO_OS_POSIX "freebsd" ++# elif defined(__hpux__) || defined(__hpux) ++# define LZO_OS_POSIX_HPUX 1 ++# define LZO_INFO_OS_POSIX "hpux" ++# elif defined(__INTERIX) ++# define LZO_OS_POSIX_INTERIX 1 ++# define LZO_INFO_OS_POSIX "interix" ++# elif defined(__IRIX__) || defined(__irix__) ++# define LZO_OS_POSIX_IRIX 1 ++# define LZO_INFO_OS_POSIX "irix" ++# elif defined(__linux__) || defined(__linux) || defined(__LINUX__) ++# define LZO_OS_POSIX_LINUX 1 ++# define LZO_INFO_OS_POSIX "linux" ++# elif defined(__APPLE__) && defined(__MACH__) ++# if ((__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__-0) >= 20000) ++# define LZO_OS_POSIX_DARWIN 1040 ++# define LZO_INFO_OS_POSIX "darwin_iphone" ++# elif ((__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0) >= 1040) ++# define LZO_OS_POSIX_DARWIN __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ ++# define LZO_INFO_OS_POSIX "darwin" ++# else ++# define LZO_OS_POSIX_DARWIN 1 ++# define LZO_INFO_OS_POSIX "darwin" ++# endif ++# define LZO_OS_POSIX_MACOSX LZO_OS_POSIX_DARWIN ++# elif defined(__minix__) || defined(__minix) ++# define LZO_OS_POSIX_MINIX 1 ++# define LZO_INFO_OS_POSIX "minix" ++# elif defined(__NetBSD__) ++# define LZO_OS_POSIX_NETBSD 1 ++# define LZO_INFO_OS_POSIX "netbsd" ++# elif defined(__OpenBSD__) ++# define LZO_OS_POSIX_OPENBSD 1 ++# define LZO_INFO_OS_POSIX "openbsd" ++# elif defined(__osf__) ++# define LZO_OS_POSIX_OSF 1 ++# define LZO_INFO_OS_POSIX "osf" ++# elif defined(__solaris__) || defined(__sun) ++# if defined(__SVR4) || defined(__svr4__) ++# define LZO_OS_POSIX_SOLARIS 1 ++# define LZO_INFO_OS_POSIX "solaris" ++# else ++# define LZO_OS_POSIX_SUNOS 1 ++# define LZO_INFO_OS_POSIX "sunos" ++# endif ++# elif defined(__ultrix__) || defined(__ultrix) ++# define LZO_OS_POSIX_ULTRIX 1 ++# define LZO_INFO_OS_POSIX "ultrix" ++# elif defined(_UNICOS) ++# define LZO_OS_POSIX_UNICOS 1 ++# define LZO_INFO_OS_POSIX "unicos" ++# else ++# define LZO_OS_POSIX_UNKNOWN 1 ++# define LZO_INFO_OS_POSIX "unknown" ++# endif ++#endif ++#endif ++#if (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16) ++# if (UINT_MAX != LZO_0xffffL) ++# error "unexpected configuration - check your compiler defines" ++# endif ++# if (ULONG_MAX != LZO_0xffffffffL) ++# error "unexpected configuration - check your compiler defines" ++# endif ++#endif ++#if (LZO_OS_DOS32 || LZO_OS_OS2 || LZO_OS_WIN32 || LZO_OS_WIN64) ++# if (UINT_MAX != LZO_0xffffffffL) ++# error "unexpected configuration - check your compiler defines" ++# endif ++# if (ULONG_MAX != LZO_0xffffffffL) ++# error "unexpected configuration - check your compiler defines" ++# endif ++#endif ++#if defined(CIL) && defined(_GNUCC) && defined(__GNUC__) ++# define LZO_CC_CILLY 1 ++# define LZO_INFO_CC "Cilly" ++# if defined(__CILLY__) ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__CILLY__) ++# else ++# define LZO_INFO_CCVER "unknown" ++# endif ++#elif 0 && defined(SDCC) && defined(__VERSION__) && !defined(__GNUC__) ++# define LZO_CC_SDCC 1 ++# define LZO_INFO_CC "sdcc" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(SDCC) ++#elif defined(__PATHSCALE__) && defined(__PATHCC_PATCHLEVEL__) ++# define LZO_CC_PATHSCALE (__PATHCC__ * 0x10000L + (__PATHCC_MINOR__-0) * 0x100 + (__PATHCC_PATCHLEVEL__-0)) ++# define LZO_INFO_CC "Pathscale C" ++# define LZO_INFO_CCVER __PATHSCALE__ ++# if defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) ++# define LZO_CC_PATHSCALE_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) ++# endif ++#elif defined(__INTEL_COMPILER) && ((__INTEL_COMPILER-0) > 0) ++# define LZO_CC_INTELC __INTEL_COMPILER ++# define LZO_INFO_CC "Intel C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__INTEL_COMPILER) ++# if defined(_MSC_VER) && ((_MSC_VER-0) > 0) ++# define LZO_CC_INTELC_MSC _MSC_VER ++# elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) ++# define LZO_CC_INTELC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) ++# endif ++#elif defined(__POCC__) && defined(_WIN32) ++# define LZO_CC_PELLESC 1 ++# define LZO_INFO_CC "Pelles C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__POCC__) ++#elif defined(__ARMCC_VERSION) && defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) ++# if defined(__GNUC_PATCHLEVEL__) ++# define LZO_CC_ARMCC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) ++# else ++# define LZO_CC_ARMCC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100) ++# endif ++# define LZO_CC_ARMCC __ARMCC_VERSION ++# define LZO_INFO_CC "ARM C Compiler" ++# define LZO_INFO_CCVER __VERSION__ ++#elif defined(__clang__) && defined(__llvm__) && defined(__VERSION__) ++# if defined(__clang_major__) && defined(__clang_minor__) && defined(__clang_patchlevel__) ++# define LZO_CC_CLANG (__clang_major__ * 0x10000L + (__clang_minor__-0) * 0x100 + (__clang_patchlevel__-0)) ++# else ++# define LZO_CC_CLANG 0x010000L ++# endif ++# if defined(_MSC_VER) && ((_MSC_VER-0) > 0) ++# define LZO_CC_CLANG_MSC _MSC_VER ++# elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) ++# define LZO_CC_CLANG_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) ++# endif ++# define LZO_INFO_CC "clang" ++# define LZO_INFO_CCVER __VERSION__ ++#elif defined(__llvm__) && defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) ++# if defined(__GNUC_PATCHLEVEL__) ++# define LZO_CC_LLVM_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) ++# else ++# define LZO_CC_LLVM_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100) ++# endif ++# define LZO_CC_LLVM LZO_CC_LLVM_GNUC ++# define LZO_INFO_CC "llvm-gcc" ++# define LZO_INFO_CCVER __VERSION__ ++#elif defined(__ACK__) && defined(_ACK) ++# define LZO_CC_ACK 1 ++# define LZO_INFO_CC "Amsterdam Compiler Kit C" ++# define LZO_INFO_CCVER "unknown" ++#elif defined(__ARMCC_VERSION) && !defined(__GNUC__) ++# define LZO_CC_ARMCC __ARMCC_VERSION ++# define LZO_CC_ARMCC_ARMCC __ARMCC_VERSION ++# define LZO_INFO_CC "ARM C Compiler" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__ARMCC_VERSION) ++#elif defined(__AZTEC_C__) ++# define LZO_CC_AZTECC 1 ++# define LZO_INFO_CC "Aztec C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__AZTEC_C__) ++#elif defined(__CODEGEARC__) ++# define LZO_CC_CODEGEARC 1 ++# define LZO_INFO_CC "CodeGear C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__CODEGEARC__) ++#elif defined(__BORLANDC__) ++# define LZO_CC_BORLANDC 1 ++# define LZO_INFO_CC "Borland C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__BORLANDC__) ++#elif defined(_CRAYC) && defined(_RELEASE) ++# define LZO_CC_CRAYC 1 ++# define LZO_INFO_CC "Cray C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(_RELEASE) ++#elif defined(__DMC__) && defined(__SC__) ++# define LZO_CC_DMC 1 ++# define LZO_INFO_CC "Digital Mars C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__DMC__) ++#elif defined(__DECC) ++# define LZO_CC_DECC 1 ++# define LZO_INFO_CC "DEC C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__DECC) ++#elif (defined(__ghs) || defined(__ghs__)) && defined(__GHS_VERSION_NUMBER) && ((__GHS_VERSION_NUMBER-0) > 0) ++# define LZO_CC_GHS 1 ++# define LZO_INFO_CC "Green Hills C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__GHS_VERSION_NUMBER) ++# if defined(_MSC_VER) && ((_MSC_VER-0) > 0) ++# define LZO_CC_GHS_MSC _MSC_VER ++# elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) ++# define LZO_CC_GHS_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) ++# endif ++#elif defined(__HIGHC__) ++# define LZO_CC_HIGHC 1 ++# define LZO_INFO_CC "MetaWare High C" ++# define LZO_INFO_CCVER "unknown" ++#elif defined(__HP_aCC) && ((__HP_aCC-0) > 0) ++# define LZO_CC_HPACC __HP_aCC ++# define LZO_INFO_CC "HP aCC" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__HP_aCC) ++#elif defined(__IAR_SYSTEMS_ICC__) ++# define LZO_CC_IARC 1 ++# define LZO_INFO_CC "IAR C" ++# if defined(__VER__) ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__VER__) ++# else ++# define LZO_INFO_CCVER "unknown" ++# endif ++#elif defined(__IBMC__) && ((__IBMC__-0) > 0) ++# define LZO_CC_IBMC __IBMC__ ++# define LZO_INFO_CC "IBM C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__IBMC__) ++#elif defined(__IBMCPP__) && ((__IBMCPP__-0) > 0) ++# define LZO_CC_IBMC __IBMCPP__ ++# define LZO_INFO_CC "IBM C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__IBMCPP__) ++#elif defined(__KEIL__) && defined(__C166__) ++# define LZO_CC_KEILC 1 ++# define LZO_INFO_CC "Keil C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__C166__) ++#elif defined(__LCC__) && defined(_WIN32) && defined(__LCCOPTIMLEVEL) ++# define LZO_CC_LCCWIN32 1 ++# define LZO_INFO_CC "lcc-win32" ++# define LZO_INFO_CCVER "unknown" ++#elif defined(__LCC__) ++# define LZO_CC_LCC 1 ++# define LZO_INFO_CC "lcc" ++# if defined(__LCC_VERSION__) ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__LCC_VERSION__) ++# else ++# define LZO_INFO_CCVER "unknown" ++# endif ++#elif defined(__MWERKS__) && ((__MWERKS__-0) > 0) ++# define LZO_CC_MWERKS __MWERKS__ ++# define LZO_INFO_CC "Metrowerks C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__MWERKS__) ++#elif (defined(__NDPC__) || defined(__NDPX__)) && defined(__i386) ++# define LZO_CC_NDPC 1 ++# define LZO_INFO_CC "Microway NDP C" ++# define LZO_INFO_CCVER "unknown" ++#elif defined(__PACIFIC__) ++# define LZO_CC_PACIFICC 1 ++# define LZO_INFO_CC "Pacific C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__PACIFIC__) ++#elif defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) ++# if defined(__PGIC_PATCHLEVEL__) ++# define LZO_CC_PGI (__PGIC__ * 0x10000L + (__PGIC_MINOR__-0) * 0x100 + (__PGIC_PATCHLEVEL__-0)) ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__PGIC__) "." LZO_PP_MACRO_EXPAND(__PGIC_MINOR__) "." LZO_PP_MACRO_EXPAND(__PGIC_PATCHLEVEL__) ++# else ++# define LZO_CC_PGI (__PGIC__ * 0x10000L + (__PGIC_MINOR__-0) * 0x100) ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__PGIC__) "." LZO_PP_MACRO_EXPAND(__PGIC_MINOR__) ".0" ++# endif ++# define LZO_INFO_CC "Portland Group PGI C" ++#elif defined(__PGI) && (defined(__linux__) || defined(__WIN32__)) ++# define LZO_CC_PGI 1 ++# define LZO_INFO_CC "Portland Group PGI C" ++# define LZO_INFO_CCVER "unknown" ++#elif defined(__PUREC__) && defined(__TOS__) ++# define LZO_CC_PUREC 1 ++# define LZO_INFO_CC "Pure C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__PUREC__) ++#elif defined(__SC__) && defined(__ZTC__) ++# define LZO_CC_SYMANTECC 1 ++# define LZO_INFO_CC "Symantec C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__SC__) ++#elif defined(__SUNPRO_C) ++# define LZO_INFO_CC "SunPro C" ++# if ((__SUNPRO_C-0) > 0) ++# define LZO_CC_SUNPROC __SUNPRO_C ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__SUNPRO_C) ++# else ++# define LZO_CC_SUNPROC 1 ++# define LZO_INFO_CCVER "unknown" ++# endif ++#elif defined(__SUNPRO_CC) ++# define LZO_INFO_CC "SunPro C" ++# if ((__SUNPRO_CC-0) > 0) ++# define LZO_CC_SUNPROC __SUNPRO_CC ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__SUNPRO_CC) ++# else ++# define LZO_CC_SUNPROC 1 ++# define LZO_INFO_CCVER "unknown" ++# endif ++#elif defined(__TINYC__) ++# define LZO_CC_TINYC 1 ++# define LZO_INFO_CC "Tiny C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__TINYC__) ++#elif defined(__TSC__) ++# define LZO_CC_TOPSPEEDC 1 ++# define LZO_INFO_CC "TopSpeed C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__TSC__) ++#elif defined(__WATCOMC__) ++# define LZO_CC_WATCOMC 1 ++# define LZO_INFO_CC "Watcom C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__WATCOMC__) ++#elif defined(__TURBOC__) ++# define LZO_CC_TURBOC 1 ++# define LZO_INFO_CC "Turbo C" ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__TURBOC__) ++#elif defined(__ZTC__) ++# define LZO_CC_ZORTECHC 1 ++# define LZO_INFO_CC "Zortech C" ++# if ((__ZTC__-0) == 0x310) ++# define LZO_INFO_CCVER "0x310" ++# else ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__ZTC__) ++# endif ++#elif defined(__GNUC__) && defined(__VERSION__) ++# if defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__) ++# define LZO_CC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) ++# elif defined(__GNUC_MINOR__) ++# define LZO_CC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100) ++# else ++# define LZO_CC_GNUC (__GNUC__ * 0x10000L) ++# endif ++# define LZO_INFO_CC "gcc" ++# define LZO_INFO_CCVER __VERSION__ ++#elif defined(_MSC_VER) && ((_MSC_VER-0) > 0) ++# define LZO_CC_MSC _MSC_VER ++# define LZO_INFO_CC "Microsoft C" ++# if defined(_MSC_FULL_VER) ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(_MSC_VER) "." LZO_PP_MACRO_EXPAND(_MSC_FULL_VER) ++# else ++# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(_MSC_VER) ++# endif ++#else ++# define LZO_CC_UNKNOWN 1 ++# define LZO_INFO_CC "unknown" ++# define LZO_INFO_CCVER "unknown" ++#endif ++#if (LZO_CC_GNUC) && defined(__OPEN64__) ++# if defined(__OPENCC__) && defined(__OPENCC_MINOR__) && defined(__OPENCC_PATCHLEVEL__) ++# define LZO_CC_OPEN64 (__OPENCC__ * 0x10000L + (__OPENCC_MINOR__-0) * 0x100 + (__OPENCC_PATCHLEVEL__-0)) ++# define LZO_CC_OPEN64_GNUC LZO_CC_GNUC ++# endif ++#endif ++#if (LZO_CC_GNUC) && defined(__PCC__) ++# if defined(__PCC__) && defined(__PCC_MINOR__) && defined(__PCC_MINORMINOR__) ++# define LZO_CC_PCC (__PCC__ * 0x10000L + (__PCC_MINOR__-0) * 0x100 + (__PCC_MINORMINOR__-0)) ++# define LZO_CC_PCC_GNUC LZO_CC_GNUC ++# endif ++#endif ++#if 0 && (LZO_CC_MSC && (_MSC_VER >= 1200)) && !defined(_MSC_FULL_VER) ++# error "LZO_CC_MSC: _MSC_FULL_VER is not defined" ++#endif ++#if !defined(__LZO_ARCH_OVERRIDE) && !(LZO_ARCH_GENERIC) && defined(_CRAY) ++# if (UINT_MAX > LZO_0xffffffffL) && defined(_CRAY) ++# if defined(_CRAYMPP) || defined(_CRAYT3D) || defined(_CRAYT3E) ++# define LZO_ARCH_CRAY_MPP 1 ++# elif defined(_CRAY1) ++# define LZO_ARCH_CRAY_PVP 1 ++# endif ++# endif ++#endif ++#if !defined(__LZO_ARCH_OVERRIDE) ++#if (LZO_ARCH_GENERIC) ++# define LZO_INFO_ARCH "generic" ++#elif (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16) ++# define LZO_ARCH_I086 1 ++# define LZO_INFO_ARCH "i086" ++#elif defined(__aarch64__) ++# define LZO_ARCH_ARM64 1 ++# define LZO_INFO_ARCH "arm64" ++#elif defined(__alpha__) || defined(__alpha) || defined(_M_ALPHA) ++# define LZO_ARCH_ALPHA 1 ++# define LZO_INFO_ARCH "alpha" ++#elif (LZO_ARCH_CRAY_MPP) && (defined(_CRAYT3D) || defined(_CRAYT3E)) ++# define LZO_ARCH_ALPHA 1 ++# define LZO_INFO_ARCH "alpha" ++#elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64) ++# define LZO_ARCH_AMD64 1 ++# define LZO_INFO_ARCH "amd64" ++#elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB)) ++# define LZO_ARCH_ARM 1 ++# define LZO_ARCH_ARM_THUMB 1 ++# define LZO_INFO_ARCH "arm_thumb" ++#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCARM__) ++# define LZO_ARCH_ARM 1 ++# if defined(__CPU_MODE__) && ((__CPU_MODE__-0) == 1) ++# define LZO_ARCH_ARM_THUMB 1 ++# define LZO_INFO_ARCH "arm_thumb" ++# elif defined(__CPU_MODE__) && ((__CPU_MODE__-0) == 2) ++# define LZO_INFO_ARCH "arm" ++# else ++# define LZO_INFO_ARCH "arm" ++# endif ++#elif defined(__arm__) || defined(_M_ARM) ++# define LZO_ARCH_ARM 1 ++# define LZO_INFO_ARCH "arm" ++#elif (UINT_MAX <= LZO_0xffffL) && defined(__AVR__) ++# define LZO_ARCH_AVR 1 ++# define LZO_INFO_ARCH "avr" ++#elif defined(__avr32__) || defined(__AVR32__) ++# define LZO_ARCH_AVR32 1 ++# define LZO_INFO_ARCH "avr32" ++#elif defined(__bfin__) ++# define LZO_ARCH_BLACKFIN 1 ++# define LZO_INFO_ARCH "blackfin" ++#elif (UINT_MAX == LZO_0xffffL) && defined(__C166__) ++# define LZO_ARCH_C166 1 ++# define LZO_INFO_ARCH "c166" ++#elif defined(__cris__) ++# define LZO_ARCH_CRIS 1 ++# define LZO_INFO_ARCH "cris" ++#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCEZ80__) ++# define LZO_ARCH_EZ80 1 ++# define LZO_INFO_ARCH "ez80" ++#elif defined(__H8300__) || defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__) ++# define LZO_ARCH_H8300 1 ++# define LZO_INFO_ARCH "h8300" ++#elif defined(__hppa__) || defined(__hppa) ++# define LZO_ARCH_HPPA 1 ++# define LZO_INFO_ARCH "hppa" ++#elif defined(__386__) || defined(__i386__) || defined(__i386) || defined(_M_IX86) || defined(_M_I386) ++# define LZO_ARCH_I386 1 ++# define LZO_ARCH_IA32 1 ++# define LZO_INFO_ARCH "i386" ++#elif (LZO_CC_ZORTECHC && defined(__I86__)) ++# define LZO_ARCH_I386 1 ++# define LZO_ARCH_IA32 1 ++# define LZO_INFO_ARCH "i386" ++#elif (LZO_OS_DOS32 && LZO_CC_HIGHC) && defined(_I386) ++# define LZO_ARCH_I386 1 ++# define LZO_ARCH_IA32 1 ++# define LZO_INFO_ARCH "i386" ++#elif defined(__ia64__) || defined(__ia64) || defined(_M_IA64) ++# define LZO_ARCH_IA64 1 ++# define LZO_INFO_ARCH "ia64" ++#elif (UINT_MAX == LZO_0xffffL) && defined(__m32c__) ++# define LZO_ARCH_M16C 1 ++# define LZO_INFO_ARCH "m16c" ++#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCM16C__) ++# define LZO_ARCH_M16C 1 ++# define LZO_INFO_ARCH "m16c" ++#elif defined(__m32r__) ++# define LZO_ARCH_M32R 1 ++# define LZO_INFO_ARCH "m32r" ++#elif (LZO_OS_TOS) || defined(__m68k__) || defined(__m68000__) || defined(__mc68000__) || defined(__mc68020__) || defined(_M_M68K) ++# define LZO_ARCH_M68K 1 ++# define LZO_INFO_ARCH "m68k" ++#elif (UINT_MAX == LZO_0xffffL) && defined(__C251__) ++# define LZO_ARCH_MCS251 1 ++# define LZO_INFO_ARCH "mcs251" ++#elif (UINT_MAX == LZO_0xffffL) && defined(__C51__) ++# define LZO_ARCH_MCS51 1 ++# define LZO_INFO_ARCH "mcs51" ++#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICC8051__) ++# define LZO_ARCH_MCS51 1 ++# define LZO_INFO_ARCH "mcs51" ++#elif defined(__mips__) || defined(__mips) || defined(_MIPS_ARCH) || defined(_M_MRX000) ++# define LZO_ARCH_MIPS 1 ++# define LZO_INFO_ARCH "mips" ++#elif (UINT_MAX == LZO_0xffffL) && defined(__MSP430__) ++# define LZO_ARCH_MSP430 1 ++# define LZO_INFO_ARCH "msp430" ++#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICC430__) ++# define LZO_ARCH_MSP430 1 ++# define LZO_INFO_ARCH "msp430" ++#elif defined(__powerpc__) || defined(__powerpc) || defined(__ppc__) || defined(__PPC__) || defined(_M_PPC) || defined(_ARCH_PPC) || defined(_ARCH_PWR) ++# define LZO_ARCH_POWERPC 1 ++# define LZO_INFO_ARCH "powerpc" ++#elif defined(__s390__) || defined(__s390) || defined(__s390x__) || defined(__s390x) ++# define LZO_ARCH_S390 1 ++# define LZO_INFO_ARCH "s390" ++#elif defined(__sh__) || defined(_M_SH) ++# define LZO_ARCH_SH 1 ++# define LZO_INFO_ARCH "sh" ++#elif defined(__sparc__) || defined(__sparc) || defined(__sparcv8) ++# define LZO_ARCH_SPARC 1 ++# define LZO_INFO_ARCH "sparc" ++#elif defined(__SPU__) ++# define LZO_ARCH_SPU 1 ++# define LZO_INFO_ARCH "spu" ++#elif (UINT_MAX == LZO_0xffffL) && defined(__z80) ++# define LZO_ARCH_Z80 1 ++# define LZO_INFO_ARCH "z80" ++#elif (LZO_ARCH_CRAY_PVP) ++# if defined(_CRAYSV1) ++# define LZO_ARCH_CRAY_SV1 1 ++# define LZO_INFO_ARCH "cray_sv1" ++# elif (_ADDR64) ++# define LZO_ARCH_CRAY_T90 1 ++# define LZO_INFO_ARCH "cray_t90" ++# elif (_ADDR32) ++# define LZO_ARCH_CRAY_YMP 1 ++# define LZO_INFO_ARCH "cray_ymp" ++# else ++# define LZO_ARCH_CRAY_XMP 1 ++# define LZO_INFO_ARCH "cray_xmp" ++# endif ++#else ++# define LZO_ARCH_UNKNOWN 1 ++# define LZO_INFO_ARCH "unknown" ++#endif ++#endif ++#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_DOS32 || LZO_OS_OS2) ++# error "FIXME - missing define for CPU architecture" ++#endif ++#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_WIN32) ++# error "FIXME - missing LZO_OS_WIN32 define for CPU architecture" ++#endif ++#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_WIN64) ++# error "FIXME - missing LZO_OS_WIN64 define for CPU architecture" ++#endif ++#if (LZO_OS_OS216 || LZO_OS_WIN16) ++# define LZO_ARCH_I086PM 1 ++#elif 1 && (LZO_OS_DOS16 && defined(BLX286)) ++# define LZO_ARCH_I086PM 1 ++#elif 1 && (LZO_OS_DOS16 && defined(DOSX286)) ++# define LZO_ARCH_I086PM 1 ++#elif 1 && (LZO_OS_DOS16 && LZO_CC_BORLANDC && defined(__DPMI16__)) ++# define LZO_ARCH_I086PM 1 ++#endif ++#if (LZO_ARCH_AMD64 && !LZO_ARCH_X64) ++# define LZO_ARCH_X64 1 ++#elif (!LZO_ARCH_AMD64 && LZO_ARCH_X64) && defined(__LZO_ARCH_OVERRIDE) ++# define LZO_ARCH_AMD64 1 ++#endif ++#if (LZO_ARCH_ARM64 && !LZO_ARCH_AARCH64) ++# define LZO_ARCH_AARCH64 1 ++#elif (!LZO_ARCH_ARM64 && LZO_ARCH_AARCH64) && defined(__LZO_ARCH_OVERRIDE) ++# define LZO_ARCH_ARM64 1 ++#endif ++#if (LZO_ARCH_I386 && !LZO_ARCH_X86) ++# define LZO_ARCH_X86 1 ++#elif (!LZO_ARCH_I386 && LZO_ARCH_X86) && defined(__LZO_ARCH_OVERRIDE) ++# define LZO_ARCH_I386 1 ++#endif ++#if (LZO_ARCH_AMD64 && !LZO_ARCH_X64) || (!LZO_ARCH_AMD64 && LZO_ARCH_X64) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_ARM64 && !LZO_ARCH_AARCH64) || (!LZO_ARCH_ARM64 && LZO_ARCH_AARCH64) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_I386 && !LZO_ARCH_X86) || (!LZO_ARCH_I386 && LZO_ARCH_X86) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_ARM_THUMB && !LZO_ARCH_ARM) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_ARM_THUMB1 && !LZO_ARCH_ARM_THUMB) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_ARM_THUMB2 && !LZO_ARCH_ARM_THUMB) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_ARM_THUMB1 && LZO_ARCH_ARM_THUMB2) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_I086PM && !LZO_ARCH_I086) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_I086) ++# if (UINT_MAX != LZO_0xffffL) ++# error "unexpected configuration - check your compiler defines" ++# endif ++# if (ULONG_MAX != LZO_0xffffffffL) ++# error "unexpected configuration - check your compiler defines" ++# endif ++#endif ++#if (LZO_ARCH_I386) ++# if (UINT_MAX != LZO_0xffffL) && defined(__i386_int16__) ++# error "unexpected configuration - check your compiler defines" ++# endif ++# if (UINT_MAX != LZO_0xffffffffL) && !defined(__i386_int16__) ++# error "unexpected configuration - check your compiler defines" ++# endif ++# if (ULONG_MAX != LZO_0xffffffffL) ++# error "unexpected configuration - check your compiler defines" ++# endif ++#endif ++#if (LZO_ARCH_AMD64 || LZO_ARCH_I386) ++# if !defined(LZO_TARGET_FEATURE_SSE2) ++# if defined(__SSE2__) ++# define LZO_TARGET_FEATURE_SSE2 1 ++# elif defined(_MSC_VER) && ((defined(_M_IX86_FP) && ((_M_IX86_FP)+0 >= 2)) || defined(_M_AMD64)) ++# define LZO_TARGET_FEATURE_SSE2 1 ++# endif ++# endif ++# if !defined(LZO_TARGET_FEATURE_SSSE3) ++# if (LZO_TARGET_FEATURE_SSE2) ++# if defined(__SSSE3__) ++# define LZO_TARGET_FEATURE_SSSE3 1 ++# elif defined(_MSC_VER) && defined(__AVX__) ++# define LZO_TARGET_FEATURE_SSSE3 1 ++# endif ++# endif ++# endif ++# if !defined(LZO_TARGET_FEATURE_SSE4_2) ++# if (LZO_TARGET_FEATURE_SSSE3) ++# if defined(__SSE4_2__) ++# define LZO_TARGET_FEATURE_SSE4_2 1 ++# endif ++# endif ++# endif ++# if !defined(LZO_TARGET_FEATURE_AVX) ++# if (LZO_TARGET_FEATURE_SSSE3) ++# if defined(__AVX__) ++# define LZO_TARGET_FEATURE_AVX 1 ++# endif ++# endif ++# endif ++# if !defined(LZO_TARGET_FEATURE_AVX2) ++# if (LZO_TARGET_FEATURE_AVX) ++# if defined(__AVX2__) ++# define LZO_TARGET_FEATURE_AVX2 1 ++# endif ++# endif ++# endif ++#endif ++#if (LZO_TARGET_FEATURE_SSSE3 && !(LZO_TARGET_FEATURE_SSE2)) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_TARGET_FEATURE_SSE4_2 && !(LZO_TARGET_FEATURE_SSSE3)) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_TARGET_FEATURE_AVX && !(LZO_TARGET_FEATURE_SSSE3)) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_TARGET_FEATURE_AVX2 && !(LZO_TARGET_FEATURE_AVX)) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ARCH_ARM) ++# if !defined(LZO_TARGET_FEATURE_NEON) ++# if defined(__ARM_NEON__) ++# define LZO_TARGET_FEATURE_NEON 1 ++# endif ++# endif ++#elif (LZO_ARCH_ARM64) ++# if !defined(LZO_TARGET_FEATURE_NEON) ++# if 1 ++# define LZO_TARGET_FEATURE_NEON 1 ++# endif ++# endif ++#endif ++#if 0 ++#elif !defined(__LZO_MM_OVERRIDE) ++#if (LZO_ARCH_I086) ++#if (UINT_MAX != LZO_0xffffL) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if defined(__TINY__) || defined(M_I86TM) || defined(_M_I86TM) ++# define LZO_MM_TINY 1 ++#elif defined(__HUGE__) || defined(_HUGE_) || defined(M_I86HM) || defined(_M_I86HM) ++# define LZO_MM_HUGE 1 ++#elif defined(__SMALL__) || defined(M_I86SM) || defined(_M_I86SM) || defined(SMALL_MODEL) ++# define LZO_MM_SMALL 1 ++#elif defined(__MEDIUM__) || defined(M_I86MM) || defined(_M_I86MM) ++# define LZO_MM_MEDIUM 1 ++#elif defined(__COMPACT__) || defined(M_I86CM) || defined(_M_I86CM) ++# define LZO_MM_COMPACT 1 ++#elif defined(__LARGE__) || defined(M_I86LM) || defined(_M_I86LM) || defined(LARGE_MODEL) ++# define LZO_MM_LARGE 1 ++#elif (LZO_CC_AZTECC) ++# if defined(_LARGE_CODE) && defined(_LARGE_DATA) ++# define LZO_MM_LARGE 1 ++# elif defined(_LARGE_CODE) ++# define LZO_MM_MEDIUM 1 ++# elif defined(_LARGE_DATA) ++# define LZO_MM_COMPACT 1 ++# else ++# define LZO_MM_SMALL 1 ++# endif ++#elif (LZO_CC_ZORTECHC && defined(__VCM__)) ++# define LZO_MM_LARGE 1 ++#else ++# error "unknown LZO_ARCH_I086 memory model" ++#endif ++#if (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16) ++#define LZO_HAVE_MM_HUGE_PTR 1 ++#define LZO_HAVE_MM_HUGE_ARRAY 1 ++#if (LZO_MM_TINY) ++# undef LZO_HAVE_MM_HUGE_ARRAY ++#endif ++#if (LZO_CC_AZTECC || LZO_CC_PACIFICC || LZO_CC_ZORTECHC) ++# undef LZO_HAVE_MM_HUGE_PTR ++# undef LZO_HAVE_MM_HUGE_ARRAY ++#elif (LZO_CC_DMC || LZO_CC_SYMANTECC) ++# undef LZO_HAVE_MM_HUGE_ARRAY ++#elif (LZO_CC_MSC && defined(_QC)) ++# undef LZO_HAVE_MM_HUGE_ARRAY ++# if (_MSC_VER < 600) ++# undef LZO_HAVE_MM_HUGE_PTR ++# endif ++#elif (LZO_CC_TURBOC && (__TURBOC__ < 0x0295)) ++# undef LZO_HAVE_MM_HUGE_ARRAY ++#endif ++#if (LZO_ARCH_I086PM) && !(LZO_HAVE_MM_HUGE_PTR) ++# if (LZO_OS_DOS16) ++# error "unexpected configuration - check your compiler defines" ++# elif (LZO_CC_ZORTECHC) ++# else ++# error "unexpected configuration - check your compiler defines" ++# endif ++#endif ++#ifdef __cplusplus ++extern "C" { ++#endif ++#if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0200)) ++ extern void __near __cdecl _AHSHIFT(void); ++# define LZO_MM_AHSHIFT ((unsigned) _AHSHIFT) ++#elif (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC) ++ extern void __near __cdecl _AHSHIFT(void); ++# define LZO_MM_AHSHIFT ((unsigned) _AHSHIFT) ++#elif (LZO_CC_MSC || LZO_CC_TOPSPEEDC) ++ extern void __near __cdecl _AHSHIFT(void); ++# define LZO_MM_AHSHIFT ((unsigned) _AHSHIFT) ++#elif (LZO_CC_TURBOC && (__TURBOC__ >= 0x0295)) ++ extern void __near __cdecl _AHSHIFT(void); ++# define LZO_MM_AHSHIFT ((unsigned) _AHSHIFT) ++#elif ((LZO_CC_AZTECC || LZO_CC_PACIFICC || LZO_CC_TURBOC) && LZO_OS_DOS16) ++# define LZO_MM_AHSHIFT 12 ++#elif (LZO_CC_WATCOMC) ++ extern unsigned char _HShift; ++# define LZO_MM_AHSHIFT ((unsigned) _HShift) ++#else ++# error "FIXME - implement LZO_MM_AHSHIFT" ++#endif ++#ifdef __cplusplus ++} ++#endif ++#endif ++#elif (LZO_ARCH_C166) ++#if !defined(__MODEL__) ++# error "FIXME - LZO_ARCH_C166 __MODEL__" ++#elif ((__MODEL__) == 0) ++# define LZO_MM_SMALL 1 ++#elif ((__MODEL__) == 1) ++# define LZO_MM_SMALL 1 ++#elif ((__MODEL__) == 2) ++# define LZO_MM_LARGE 1 ++#elif ((__MODEL__) == 3) ++# define LZO_MM_TINY 1 ++#elif ((__MODEL__) == 4) ++# define LZO_MM_XTINY 1 ++#elif ((__MODEL__) == 5) ++# define LZO_MM_XSMALL 1 ++#else ++# error "FIXME - LZO_ARCH_C166 __MODEL__" ++#endif ++#elif (LZO_ARCH_MCS251) ++#if !defined(__MODEL__) ++# error "FIXME - LZO_ARCH_MCS251 __MODEL__" ++#elif ((__MODEL__) == 0) ++# define LZO_MM_SMALL 1 ++#elif ((__MODEL__) == 2) ++# define LZO_MM_LARGE 1 ++#elif ((__MODEL__) == 3) ++# define LZO_MM_TINY 1 ++#elif ((__MODEL__) == 4) ++# define LZO_MM_XTINY 1 ++#elif ((__MODEL__) == 5) ++# define LZO_MM_XSMALL 1 ++#else ++# error "FIXME - LZO_ARCH_MCS251 __MODEL__" ++#endif ++#elif (LZO_ARCH_MCS51) ++#if !defined(__MODEL__) ++# error "FIXME - LZO_ARCH_MCS51 __MODEL__" ++#elif ((__MODEL__) == 1) ++# define LZO_MM_SMALL 1 ++#elif ((__MODEL__) == 2) ++# define LZO_MM_LARGE 1 ++#elif ((__MODEL__) == 3) ++# define LZO_MM_TINY 1 ++#elif ((__MODEL__) == 4) ++# define LZO_MM_XTINY 1 ++#elif ((__MODEL__) == 5) ++# define LZO_MM_XSMALL 1 ++#else ++# error "FIXME - LZO_ARCH_MCS51 __MODEL__" ++#endif ++#elif (LZO_ARCH_CRAY_PVP) ++# define LZO_MM_PVP 1 ++#else ++# define LZO_MM_FLAT 1 ++#endif ++#if (LZO_MM_COMPACT) ++# define LZO_INFO_MM "compact" ++#elif (LZO_MM_FLAT) ++# define LZO_INFO_MM "flat" ++#elif (LZO_MM_HUGE) ++# define LZO_INFO_MM "huge" ++#elif (LZO_MM_LARGE) ++# define LZO_INFO_MM "large" ++#elif (LZO_MM_MEDIUM) ++# define LZO_INFO_MM "medium" ++#elif (LZO_MM_PVP) ++# define LZO_INFO_MM "pvp" ++#elif (LZO_MM_SMALL) ++# define LZO_INFO_MM "small" ++#elif (LZO_MM_TINY) ++# define LZO_INFO_MM "tiny" ++#else ++# error "unknown memory model" ++#endif ++#endif ++#if !defined(__lzo_gnuc_extension__) ++#if (LZO_CC_GNUC >= 0x020800ul) ++# define __lzo_gnuc_extension__ __extension__ ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_gnuc_extension__ __extension__ ++#elif (LZO_CC_IBMC >= 600) ++# define __lzo_gnuc_extension__ __extension__ ++#else ++#endif ++#endif ++#if !defined(__lzo_gnuc_extension__) ++# define __lzo_gnuc_extension__ /*empty*/ ++#endif ++#if !defined(LZO_CFG_USE_NEW_STYLE_CASTS) && defined(__cplusplus) && 0 ++# if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020800ul)) ++# define LZO_CFG_USE_NEW_STYLE_CASTS 0 ++# elif (LZO_CC_INTELC && (__INTEL_COMPILER < 1200)) ++# define LZO_CFG_USE_NEW_STYLE_CASTS 0 ++# else ++# define LZO_CFG_USE_NEW_STYLE_CASTS 1 ++# endif ++#endif ++#if !defined(LZO_CFG_USE_NEW_STYLE_CASTS) ++# define LZO_CFG_USE_NEW_STYLE_CASTS 0 ++#endif ++#if !defined(__cplusplus) ++# if defined(LZO_CFG_USE_NEW_STYLE_CASTS) ++# undef LZO_CFG_USE_NEW_STYLE_CASTS ++# endif ++# define LZO_CFG_USE_NEW_STYLE_CASTS 0 ++#endif ++#if !defined(LZO_REINTERPRET_CAST) ++# if (LZO_CFG_USE_NEW_STYLE_CASTS) ++# define LZO_REINTERPRET_CAST(t,e) (reinterpret_cast (e)) ++# endif ++#endif ++#if !defined(LZO_REINTERPRET_CAST) ++# define LZO_REINTERPRET_CAST(t,e) ((t) (e)) ++#endif ++#if !defined(LZO_STATIC_CAST) ++# if (LZO_CFG_USE_NEW_STYLE_CASTS) ++# define LZO_STATIC_CAST(t,e) (static_cast (e)) ++# endif ++#endif ++#if !defined(LZO_STATIC_CAST) ++# define LZO_STATIC_CAST(t,e) ((t) (e)) ++#endif ++#if !defined(LZO_STATIC_CAST2) ++# define LZO_STATIC_CAST2(t1,t2,e) LZO_STATIC_CAST(t1, LZO_STATIC_CAST(t2, e)) ++#endif ++#if !defined(LZO_UNCONST_CAST) ++# if (LZO_CFG_USE_NEW_STYLE_CASTS) ++# define LZO_UNCONST_CAST(t,e) (const_cast (e)) ++# elif (LZO_HAVE_MM_HUGE_PTR) ++# define LZO_UNCONST_CAST(t,e) ((t) (e)) ++# elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define LZO_UNCONST_CAST(t,e) ((t) ((void *) ((lzo_uintptr_t) ((const void *) (e))))) ++# endif ++#endif ++#if !defined(LZO_UNCONST_CAST) ++# define LZO_UNCONST_CAST(t,e) ((t) ((void *) ((const void *) (e)))) ++#endif ++#if !defined(LZO_UNCONST_VOLATILE_CAST) ++# if (LZO_CFG_USE_NEW_STYLE_CASTS) ++# define LZO_UNCONST_VOLATILE_CAST(t,e) (const_cast (e)) ++# elif (LZO_HAVE_MM_HUGE_PTR) ++# define LZO_UNCONST_VOLATILE_CAST(t,e) ((t) (e)) ++# elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define LZO_UNCONST_VOLATILE_CAST(t,e) ((t) ((volatile void *) ((lzo_uintptr_t) ((volatile const void *) (e))))) ++# endif ++#endif ++#if !defined(LZO_UNCONST_VOLATILE_CAST) ++# define LZO_UNCONST_VOLATILE_CAST(t,e) ((t) ((volatile void *) ((volatile const void *) (e)))) ++#endif ++#if !defined(LZO_UNVOLATILE_CAST) ++# if (LZO_CFG_USE_NEW_STYLE_CASTS) ++# define LZO_UNVOLATILE_CAST(t,e) (const_cast (e)) ++# elif (LZO_HAVE_MM_HUGE_PTR) ++# define LZO_UNVOLATILE_CAST(t,e) ((t) (e)) ++# elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define LZO_UNVOLATILE_CAST(t,e) ((t) ((void *) ((lzo_uintptr_t) ((volatile void *) (e))))) ++# endif ++#endif ++#if !defined(LZO_UNVOLATILE_CAST) ++# define LZO_UNVOLATILE_CAST(t,e) ((t) ((void *) ((volatile void *) (e)))) ++#endif ++#if !defined(LZO_UNVOLATILE_CONST_CAST) ++# if (LZO_CFG_USE_NEW_STYLE_CASTS) ++# define LZO_UNVOLATILE_CONST_CAST(t,e) (const_cast (e)) ++# elif (LZO_HAVE_MM_HUGE_PTR) ++# define LZO_UNVOLATILE_CONST_CAST(t,e) ((t) (e)) ++# elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define LZO_UNVOLATILE_CONST_CAST(t,e) ((t) ((const void *) ((lzo_uintptr_t) ((volatile const void *) (e))))) ++# endif ++#endif ++#if !defined(LZO_UNVOLATILE_CONST_CAST) ++# define LZO_UNVOLATILE_CONST_CAST(t,e) ((t) ((const void *) ((volatile const void *) (e)))) ++#endif ++#if !defined(LZO_PCAST) ++# if (LZO_HAVE_MM_HUGE_PTR) ++# define LZO_PCAST(t,e) ((t) (e)) ++# endif ++#endif ++#if !defined(LZO_PCAST) ++# define LZO_PCAST(t,e) LZO_STATIC_CAST(t, LZO_STATIC_CAST(void *, e)) ++#endif ++#if !defined(LZO_CCAST) ++# if (LZO_HAVE_MM_HUGE_PTR) ++# define LZO_CCAST(t,e) ((t) (e)) ++# endif ++#endif ++#if !defined(LZO_CCAST) ++# define LZO_CCAST(t,e) LZO_STATIC_CAST(t, LZO_STATIC_CAST(const void *, e)) ++#endif ++#if !defined(LZO_ICONV) ++# define LZO_ICONV(t,e) LZO_STATIC_CAST(t, e) ++#endif ++#if !defined(LZO_ICAST) ++# define LZO_ICAST(t,e) LZO_STATIC_CAST(t, e) ++#endif ++#if !defined(LZO_ITRUNC) ++# define LZO_ITRUNC(t,e) LZO_STATIC_CAST(t, e) ++#endif ++#if !defined(__lzo_cte) ++# if (LZO_CC_MSC || LZO_CC_WATCOMC) ++# define __lzo_cte(e) ((void)0,(e)) ++# elif 1 ++# define __lzo_cte(e) ((void)0,(e)) ++# endif ++#endif ++#if !defined(__lzo_cte) ++# define __lzo_cte(e) (e) ++#endif ++#if !defined(LZO_BLOCK_BEGIN) ++# define LZO_BLOCK_BEGIN do { ++# define LZO_BLOCK_END } while __lzo_cte(0) ++#endif ++#if !defined(LZO_UNUSED) ++# if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600)) ++# define LZO_UNUSED(var) ((void) &var) ++# elif (LZO_CC_BORLANDC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PELLESC || LZO_CC_TURBOC) ++# define LZO_UNUSED(var) if (&var) ; else ++# elif (LZO_CC_CLANG && (LZO_CC_CLANG >= 0x030200ul)) ++# define LZO_UNUSED(var) ((void) &var) ++# elif (LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define LZO_UNUSED(var) ((void) var) ++# elif (LZO_CC_MSC && (_MSC_VER < 900)) ++# define LZO_UNUSED(var) if (&var) ; else ++# elif (LZO_CC_KEILC) ++# define LZO_UNUSED(var) {LZO_EXTERN_C int lzo_unused__[1-2*!(sizeof(var)>0)];} ++# elif (LZO_CC_PACIFICC) ++# define LZO_UNUSED(var) ((void) sizeof(var)) ++# elif (LZO_CC_WATCOMC) && defined(__cplusplus) ++# define LZO_UNUSED(var) ((void) var) ++# else ++# define LZO_UNUSED(var) ((void) &var) ++# endif ++#endif ++#if !defined(LZO_UNUSED_FUNC) ++# if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600)) ++# define LZO_UNUSED_FUNC(func) ((void) func) ++# elif (LZO_CC_BORLANDC || LZO_CC_NDPC || LZO_CC_TURBOC) ++# define LZO_UNUSED_FUNC(func) if (func) ; else ++# elif (LZO_CC_CLANG || LZO_CC_LLVM) ++# define LZO_UNUSED_FUNC(func) ((void) &func) ++# elif (LZO_CC_MSC && (_MSC_VER < 900)) ++# define LZO_UNUSED_FUNC(func) if (func) ; else ++# elif (LZO_CC_MSC) ++# define LZO_UNUSED_FUNC(func) ((void) &func) ++# elif (LZO_CC_KEILC || LZO_CC_PELLESC) ++# define LZO_UNUSED_FUNC(func) {LZO_EXTERN_C int lzo_unused_func__[1-2*!(sizeof((int)func)>0)];} ++# else ++# define LZO_UNUSED_FUNC(func) ((void) func) ++# endif ++#endif ++#if !defined(LZO_UNUSED_LABEL) ++# if (LZO_CC_CLANG >= 0x020800ul) ++# define LZO_UNUSED_LABEL(l) (__lzo_gnuc_extension__ ((void) ((const void *) &&l))) ++# elif (LZO_CC_ARMCC || LZO_CC_CLANG || LZO_CC_INTELC || LZO_CC_WATCOMC) ++# define LZO_UNUSED_LABEL(l) if __lzo_cte(0) goto l ++# else ++# define LZO_UNUSED_LABEL(l) switch (0) case 1:goto l ++# endif ++#endif ++#if !defined(LZO_DEFINE_UNINITIALIZED_VAR) ++# if 0 ++# define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init) type var ++# elif 0 && (LZO_CC_GNUC) ++# define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init) type var = var ++# else ++# define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init) type var = init ++# endif ++#endif ++#if !defined(__lzo_inline) ++#if (LZO_CC_TURBOC && (__TURBOC__ <= 0x0295)) ++#elif defined(__cplusplus) ++# define __lzo_inline inline ++#elif defined(__STDC_VERSION__) && (__STDC_VERSION__-0 >= 199901L) ++# define __lzo_inline inline ++#elif (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0550)) ++# define __lzo_inline __inline ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CILLY || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) ++# define __lzo_inline __inline__ ++#elif (LZO_CC_DMC) ++# define __lzo_inline __inline ++#elif (LZO_CC_GHS) ++# define __lzo_inline __inline__ ++#elif (LZO_CC_IBMC >= 600) ++# define __lzo_inline __inline__ ++#elif (LZO_CC_INTELC) ++# define __lzo_inline __inline ++#elif (LZO_CC_MWERKS && (__MWERKS__ >= 0x2405)) ++# define __lzo_inline __inline ++#elif (LZO_CC_MSC && (_MSC_VER >= 900)) ++# define __lzo_inline __inline ++#elif (LZO_CC_SUNPROC >= 0x5100) ++# define __lzo_inline __inline__ ++#endif ++#endif ++#if defined(__lzo_inline) ++# ifndef __lzo_HAVE_inline ++# define __lzo_HAVE_inline 1 ++# endif ++#else ++# define __lzo_inline /*empty*/ ++#endif ++#if !defined(__lzo_forceinline) ++#if (LZO_CC_GNUC >= 0x030200ul) ++# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) ++#elif (LZO_CC_IBMC >= 700) ++# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) ++#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 450)) ++# define __lzo_forceinline __forceinline ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 800)) ++# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) ++#elif (LZO_CC_MSC && (_MSC_VER >= 1200)) ++# define __lzo_forceinline __forceinline ++#elif (LZO_CC_PGI >= 0x0d0a00ul) ++# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) ++#elif (LZO_CC_SUNPROC >= 0x5100) ++# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) ++#endif ++#endif ++#if defined(__lzo_forceinline) ++# ifndef __lzo_HAVE_forceinline ++# define __lzo_HAVE_forceinline 1 ++# endif ++#else ++# define __lzo_forceinline __lzo_inline ++#endif ++#if !defined(__lzo_noinline) ++#if 1 && (LZO_ARCH_I386) && (LZO_CC_GNUC >= 0x040000ul) && (LZO_CC_GNUC < 0x040003ul) ++# define __lzo_noinline __attribute__((__noinline__,__used__)) ++#elif (LZO_CC_GNUC >= 0x030200ul) ++# define __lzo_noinline __attribute__((__noinline__)) ++#elif (LZO_CC_IBMC >= 700) ++# define __lzo_noinline __attribute__((__noinline__)) ++#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 600)) ++# define __lzo_noinline __declspec(noinline) ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 800)) ++# define __lzo_noinline __attribute__((__noinline__)) ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_noinline __attribute__((__noinline__)) ++#elif (LZO_CC_MSC && (_MSC_VER >= 1300)) ++# define __lzo_noinline __declspec(noinline) ++#elif (LZO_CC_MWERKS && (__MWERKS__ >= 0x3200) && (LZO_OS_WIN32 || LZO_OS_WIN64)) ++# if defined(__cplusplus) ++# else ++# define __lzo_noinline __declspec(noinline) ++# endif ++#elif (LZO_CC_PGI >= 0x0d0a00ul) ++# define __lzo_noinline __attribute__((__noinline__)) ++#elif (LZO_CC_SUNPROC >= 0x5100) ++# define __lzo_noinline __attribute__((__noinline__)) ++#endif ++#endif ++#if defined(__lzo_noinline) ++# ifndef __lzo_HAVE_noinline ++# define __lzo_HAVE_noinline 1 ++# endif ++#else ++# define __lzo_noinline /*empty*/ ++#endif ++#if (__lzo_HAVE_forceinline || __lzo_HAVE_noinline) && !(__lzo_HAVE_inline) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if !defined(__lzo_static_inline) ++#if (LZO_CC_IBMC) ++# define __lzo_static_inline __lzo_gnuc_extension__ static __lzo_inline ++#endif ++#endif ++#if !defined(__lzo_static_inline) ++# define __lzo_static_inline static __lzo_inline ++#endif ++#if !defined(__lzo_static_forceinline) ++#if (LZO_CC_IBMC) ++# define __lzo_static_forceinline __lzo_gnuc_extension__ static __lzo_forceinline ++#endif ++#endif ++#if !defined(__lzo_static_forceinline) ++# define __lzo_static_forceinline static __lzo_forceinline ++#endif ++#if !defined(__lzo_static_noinline) ++#if (LZO_CC_IBMC) ++# define __lzo_static_noinline __lzo_gnuc_extension__ static __lzo_noinline ++#endif ++#endif ++#if !defined(__lzo_static_noinline) ++# define __lzo_static_noinline static __lzo_noinline ++#endif ++#if !defined(__lzo_c99_extern_inline) ++#if defined(__GNUC_GNU_INLINE__) ++# define __lzo_c99_extern_inline __lzo_inline ++#elif defined(__GNUC_STDC_INLINE__) ++# define __lzo_c99_extern_inline extern __lzo_inline ++#elif defined(__STDC_VERSION__) && (__STDC_VERSION__-0 >= 199901L) ++# define __lzo_c99_extern_inline extern __lzo_inline ++#endif ++#if !defined(__lzo_c99_extern_inline) && (__lzo_HAVE_inline) ++# define __lzo_c99_extern_inline __lzo_inline ++#endif ++#endif ++#if defined(__lzo_c99_extern_inline) ++# ifndef __lzo_HAVE_c99_extern_inline ++# define __lzo_HAVE_c99_extern_inline 1 ++# endif ++#else ++# define __lzo_c99_extern_inline /*empty*/ ++#endif ++#if !defined(__lzo_may_alias) ++#if (LZO_CC_GNUC >= 0x030400ul) ++# define __lzo_may_alias __attribute__((__may_alias__)) ++#elif (LZO_CC_CLANG >= 0x020900ul) ++# define __lzo_may_alias __attribute__((__may_alias__)) ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 1210)) && 0 ++# define __lzo_may_alias __attribute__((__may_alias__)) ++#elif (LZO_CC_PGI >= 0x0d0a00ul) && 0 ++# define __lzo_may_alias __attribute__((__may_alias__)) ++#endif ++#endif ++#if defined(__lzo_may_alias) ++# ifndef __lzo_HAVE_may_alias ++# define __lzo_HAVE_may_alias 1 ++# endif ++#else ++# define __lzo_may_alias /*empty*/ ++#endif ++#if !defined(__lzo_noreturn) ++#if (LZO_CC_GNUC >= 0x020700ul) ++# define __lzo_noreturn __attribute__((__noreturn__)) ++#elif (LZO_CC_IBMC >= 700) ++# define __lzo_noreturn __attribute__((__noreturn__)) ++#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 450)) ++# define __lzo_noreturn __declspec(noreturn) ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 600)) ++# define __lzo_noreturn __attribute__((__noreturn__)) ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_noreturn __attribute__((__noreturn__)) ++#elif (LZO_CC_MSC && (_MSC_VER >= 1200)) ++# define __lzo_noreturn __declspec(noreturn) ++#elif (LZO_CC_PGI >= 0x0d0a00ul) ++# define __lzo_noreturn __attribute__((__noreturn__)) ++#endif ++#endif ++#if defined(__lzo_noreturn) ++# ifndef __lzo_HAVE_noreturn ++# define __lzo_HAVE_noreturn 1 ++# endif ++#else ++# define __lzo_noreturn /*empty*/ ++#endif ++#if !defined(__lzo_nothrow) ++#if (LZO_CC_GNUC >= 0x030300ul) ++# define __lzo_nothrow __attribute__((__nothrow__)) ++#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 450)) && defined(__cplusplus) ++# define __lzo_nothrow __declspec(nothrow) ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 900)) ++# define __lzo_nothrow __attribute__((__nothrow__)) ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_nothrow __attribute__((__nothrow__)) ++#elif (LZO_CC_MSC && (_MSC_VER >= 1200)) && defined(__cplusplus) ++# define __lzo_nothrow __declspec(nothrow) ++#endif ++#endif ++#if defined(__lzo_nothrow) ++# ifndef __lzo_HAVE_nothrow ++# define __lzo_HAVE_nothrow 1 ++# endif ++#else ++# define __lzo_nothrow /*empty*/ ++#endif ++#if !defined(__lzo_restrict) ++#if (LZO_CC_GNUC >= 0x030400ul) ++# define __lzo_restrict __restrict__ ++#elif (LZO_CC_IBMC >= 800) && !defined(__cplusplus) ++# define __lzo_restrict __restrict__ ++#elif (LZO_CC_IBMC >= 1210) ++# define __lzo_restrict __restrict__ ++#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 600)) ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 600)) ++# define __lzo_restrict __restrict__ ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM) ++# define __lzo_restrict __restrict__ ++#elif (LZO_CC_MSC && (_MSC_VER >= 1400)) ++# define __lzo_restrict __restrict ++#elif (LZO_CC_PGI >= 0x0d0a00ul) ++# define __lzo_restrict __restrict__ ++#endif ++#endif ++#if defined(__lzo_restrict) ++# ifndef __lzo_HAVE_restrict ++# define __lzo_HAVE_restrict 1 ++# endif ++#else ++# define __lzo_restrict /*empty*/ ++#endif ++#if !defined(__lzo_alignof) ++#if (LZO_CC_ARMCC || LZO_CC_CILLY || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) ++# define __lzo_alignof(e) __alignof__(e) ++#elif (LZO_CC_GHS) && !defined(__cplusplus) ++# define __lzo_alignof(e) __alignof__(e) ++#elif (LZO_CC_IBMC >= 600) ++# define __lzo_alignof(e) (__lzo_gnuc_extension__ __alignof__(e)) ++#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 700)) ++# define __lzo_alignof(e) __alignof__(e) ++#elif (LZO_CC_MSC && (_MSC_VER >= 1300)) ++# define __lzo_alignof(e) __alignof(e) ++#elif (LZO_CC_SUNPROC >= 0x5100) ++# define __lzo_alignof(e) __alignof__(e) ++#endif ++#endif ++#if defined(__lzo_alignof) ++# ifndef __lzo_HAVE_alignof ++# define __lzo_HAVE_alignof 1 ++# endif ++#endif ++#if !defined(__lzo_struct_packed) ++#if (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020800ul)) && defined(__cplusplus) ++#elif (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020700ul)) ++#elif (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020800ul)) && defined(__cplusplus) ++#elif (LZO_CC_PCC && (LZO_CC_PCC < 0x010100ul)) ++#elif (LZO_CC_SUNPROC && (LZO_CC_SUNPROC < 0x5110)) && !defined(__cplusplus) ++#elif (LZO_CC_GNUC >= 0x030400ul) && !(LZO_CC_PCC_GNUC) && (LZO_ARCH_AMD64 || LZO_ARCH_I386) ++# define __lzo_struct_packed(s) struct s { ++# define __lzo_struct_packed_end() } __attribute__((__gcc_struct__,__packed__)); ++# define __lzo_struct_packed_ma_end() } __lzo_may_alias __attribute__((__gcc_struct__,__packed__)); ++#elif (LZO_CC_ARMCC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || (LZO_CC_PGI >= 0x0d0a00ul) || (LZO_CC_SUNPROC >= 0x5100)) ++# define __lzo_struct_packed(s) struct s { ++# define __lzo_struct_packed_end() } __attribute__((__packed__)); ++# define __lzo_struct_packed_ma_end() } __lzo_may_alias __attribute__((__packed__)); ++#elif (LZO_CC_IBMC >= 700) ++# define __lzo_struct_packed(s) __lzo_gnuc_extension__ struct s { ++# define __lzo_struct_packed_end() } __attribute__((__packed__)); ++# define __lzo_struct_packed_ma_end() } __lzo_may_alias __attribute__((__packed__)); ++#elif (LZO_CC_INTELC_MSC) || (LZO_CC_MSC && (_MSC_VER >= 1300)) ++# define __lzo_struct_packed(s) __pragma(pack(push,1)) struct s { ++# define __lzo_struct_packed_end() } __pragma(pack(pop)); ++#elif (LZO_CC_WATCOMC && (__WATCOMC__ >= 900)) ++# define __lzo_struct_packed(s) _Packed struct s { ++# define __lzo_struct_packed_end() }; ++#endif ++#endif ++#if defined(__lzo_struct_packed) && !defined(__lzo_struct_packed_ma) ++# define __lzo_struct_packed_ma(s) __lzo_struct_packed(s) ++#endif ++#if defined(__lzo_struct_packed_end) && !defined(__lzo_struct_packed_ma_end) ++# define __lzo_struct_packed_ma_end() __lzo_struct_packed_end() ++#endif ++#if !defined(__lzo_byte_struct) ++#if defined(__lzo_struct_packed) ++# define __lzo_byte_struct(s,n) __lzo_struct_packed(s) unsigned char a[n]; __lzo_struct_packed_end() ++# define __lzo_byte_struct_ma(s,n) __lzo_struct_packed_ma(s) unsigned char a[n]; __lzo_struct_packed_ma_end() ++#elif (LZO_CC_CILLY || LZO_CC_CLANG || LZO_CC_PGI || (LZO_CC_SUNPROC >= 0x5100)) ++# define __lzo_byte_struct(s,n) struct s { unsigned char a[n]; } __attribute__((__packed__)); ++# define __lzo_byte_struct_ma(s,n) struct s { unsigned char a[n]; } __lzo_may_alias __attribute__((__packed__)); ++#endif ++#endif ++#if defined(__lzo_byte_struct) && !defined(__lzo_byte_struct_ma) ++# define __lzo_byte_struct_ma(s,n) __lzo_byte_struct(s,n) ++#endif ++#if !defined(__lzo_struct_align16) && (__lzo_HAVE_alignof) ++#if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x030000ul)) ++#elif (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020800ul)) && defined(__cplusplus) ++#elif (LZO_CC_CILLY || LZO_CC_PCC) ++#elif (LZO_CC_INTELC_MSC) || (LZO_CC_MSC && (_MSC_VER >= 1300)) ++# define __lzo_struct_align16(s) struct __declspec(align(16)) s { ++# define __lzo_struct_align16_end() }; ++# define __lzo_struct_align32(s) struct __declspec(align(32)) s { ++# define __lzo_struct_align32_end() }; ++# define __lzo_struct_align64(s) struct __declspec(align(64)) s { ++# define __lzo_struct_align64_end() }; ++#elif (LZO_CC_ARMCC || LZO_CC_CLANG || LZO_CC_GNUC || (LZO_CC_IBMC >= 700) || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_struct_align16(s) struct s { ++# define __lzo_struct_align16_end() } __attribute__((__aligned__(16))); ++# define __lzo_struct_align32(s) struct s { ++# define __lzo_struct_align32_end() } __attribute__((__aligned__(32))); ++# define __lzo_struct_align64(s) struct s { ++# define __lzo_struct_align64_end() } __attribute__((__aligned__(64))); ++#endif ++#endif ++#if !defined(__lzo_union_um) ++#if (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020800ul)) && defined(__cplusplus) ++#elif (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020700ul)) ++#elif (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020800ul)) && defined(__cplusplus) ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER < 810)) ++#elif (LZO_CC_PCC && (LZO_CC_PCC < 0x010100ul)) ++#elif (LZO_CC_SUNPROC && (LZO_CC_SUNPROC < 0x5110)) && !defined(__cplusplus) ++#elif (LZO_CC_ARMCC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || (LZO_CC_PGI >= 0x0d0a00ul) || (LZO_CC_SUNPROC >= 0x5100)) ++# define __lzo_union_am(s) union s { ++# define __lzo_union_am_end() } __lzo_may_alias; ++# define __lzo_union_um(s) union s { ++# define __lzo_union_um_end() } __lzo_may_alias __attribute__((__packed__)); ++#elif (LZO_CC_IBMC >= 700) ++# define __lzo_union_am(s) __lzo_gnuc_extension__ union s { ++# define __lzo_union_am_end() } __lzo_may_alias; ++# define __lzo_union_um(s) __lzo_gnuc_extension__ union s { ++# define __lzo_union_um_end() } __lzo_may_alias __attribute__((__packed__)); ++#elif (LZO_CC_INTELC_MSC) || (LZO_CC_MSC && (_MSC_VER >= 1300)) ++# define __lzo_union_um(s) __pragma(pack(push,1)) union s { ++# define __lzo_union_um_end() } __pragma(pack(pop)); ++#elif (LZO_CC_WATCOMC && (__WATCOMC__ >= 900)) ++# define __lzo_union_um(s) _Packed union s { ++# define __lzo_union_um_end() }; ++#endif ++#endif ++#if !defined(__lzo_union_am) ++# define __lzo_union_am(s) union s { ++# define __lzo_union_am_end() }; ++#endif ++#if !defined(__lzo_constructor) ++#if (LZO_CC_GNUC >= 0x030400ul) ++# define __lzo_constructor __attribute__((__constructor__,__used__)) ++#elif (LZO_CC_GNUC >= 0x020700ul) ++# define __lzo_constructor __attribute__((__constructor__)) ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 800)) ++# define __lzo_constructor __attribute__((__constructor__,__used__)) ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_constructor __attribute__((__constructor__)) ++#endif ++#endif ++#if defined(__lzo_constructor) ++# ifndef __lzo_HAVE_constructor ++# define __lzo_HAVE_constructor 1 ++# endif ++#endif ++#if !defined(__lzo_destructor) ++#if (LZO_CC_GNUC >= 0x030400ul) ++# define __lzo_destructor __attribute__((__destructor__,__used__)) ++#elif (LZO_CC_GNUC >= 0x020700ul) ++# define __lzo_destructor __attribute__((__destructor__)) ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 800)) ++# define __lzo_destructor __attribute__((__destructor__,__used__)) ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_destructor __attribute__((__destructor__)) ++#endif ++#endif ++#if defined(__lzo_destructor) ++# ifndef __lzo_HAVE_destructor ++# define __lzo_HAVE_destructor 1 ++# endif ++#endif ++#if (__lzo_HAVE_destructor) && !(__lzo_HAVE_constructor) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if !defined(__lzo_likely) && !defined(__lzo_unlikely) ++#if (LZO_CC_GNUC >= 0x030200ul) ++# define __lzo_likely(e) (__builtin_expect(!!(e),1)) ++# define __lzo_unlikely(e) (__builtin_expect(!!(e),0)) ++#elif (LZO_CC_IBMC >= 1010) ++# define __lzo_likely(e) (__builtin_expect(!!(e),1)) ++# define __lzo_unlikely(e) (__builtin_expect(!!(e),0)) ++#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 800)) ++# define __lzo_likely(e) (__builtin_expect(!!(e),1)) ++# define __lzo_unlikely(e) (__builtin_expect(!!(e),0)) ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define __lzo_likely(e) (__builtin_expect(!!(e),1)) ++# define __lzo_unlikely(e) (__builtin_expect(!!(e),0)) ++#endif ++#endif ++#if defined(__lzo_likely) ++# ifndef __lzo_HAVE_likely ++# define __lzo_HAVE_likely 1 ++# endif ++#else ++# define __lzo_likely(e) (e) ++#endif ++#if defined(__lzo_unlikely) ++# ifndef __lzo_HAVE_unlikely ++# define __lzo_HAVE_unlikely 1 ++# endif ++#else ++# define __lzo_unlikely(e) (e) ++#endif ++#if !defined(__lzo_static_unused_void_func) ++# if 1 && (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || (LZO_CC_GNUC >= 0x020700ul) || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) ++# define __lzo_static_unused_void_func(f) static void __attribute__((__unused__)) f(void) ++# else ++# define __lzo_static_unused_void_func(f) static __lzo_inline void f(void) ++# endif ++#endif ++#if !defined(__lzo_loop_forever) ++# if (LZO_CC_IBMC) ++# define __lzo_loop_forever() LZO_BLOCK_BEGIN for (;;) { ; } LZO_BLOCK_END ++# else ++# define __lzo_loop_forever() do { ; } while __lzo_cte(1) ++# endif ++#endif ++#if !defined(__lzo_unreachable) ++#if (LZO_CC_CLANG && (LZO_CC_CLANG >= 0x020800ul)) ++# define __lzo_unreachable() __builtin_unreachable(); ++#elif (LZO_CC_GNUC >= 0x040500ul) ++# define __lzo_unreachable() __builtin_unreachable(); ++#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 1300)) && 1 ++# define __lzo_unreachable() __builtin_unreachable(); ++#endif ++#endif ++#if defined(__lzo_unreachable) ++# ifndef __lzo_HAVE_unreachable ++# define __lzo_HAVE_unreachable 1 ++# endif ++#else ++# if 0 ++# define __lzo_unreachable() ((void)0); ++# else ++# define __lzo_unreachable() __lzo_loop_forever(); ++# endif ++#endif ++#ifndef __LZO_CTA_NAME ++#if (LZO_CFG_USE_COUNTER) ++# define __LZO_CTA_NAME(a) LZO_PP_ECONCAT2(a,__COUNTER__) ++#else ++# define __LZO_CTA_NAME(a) LZO_PP_ECONCAT2(a,__LINE__) ++#endif ++#endif ++#if !defined(LZO_COMPILE_TIME_ASSERT_HEADER) ++# if (LZO_CC_AZTECC || LZO_CC_ZORTECHC) ++# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1-!(e)]; LZO_EXTERN_C_END ++# elif (LZO_CC_DMC || LZO_CC_SYMANTECC) ++# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1u-2*!(e)]; LZO_EXTERN_C_END ++# elif (LZO_CC_TURBOC && (__TURBOC__ == 0x0295)) ++# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1-!(e)]; LZO_EXTERN_C_END ++# elif (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020900ul)) && defined(__cplusplus) ++# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN int __LZO_CTA_NAME(lzo_cta_f__)(int [1-2*!(e)]); LZO_EXTERN_C_END ++# elif (LZO_CC_GNUC) && defined(__CHECKER__) && defined(__SPARSE_CHECKER__) ++# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN enum {__LZO_CTA_NAME(lzo_cta_e__)=1/!!(e)} __attribute__((__unused__)); LZO_EXTERN_C_END ++# else ++# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1-2*!(e)]; LZO_EXTERN_C_END ++# endif ++#endif ++#if !defined(LZO_COMPILE_TIME_ASSERT) ++# if (LZO_CC_AZTECC) ++# define LZO_COMPILE_TIME_ASSERT(e) {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-!(e)];} ++# elif (LZO_CC_DMC || LZO_CC_PACIFICC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC) ++# define LZO_COMPILE_TIME_ASSERT(e) switch(0) case 1:case !(e):break; ++# elif (LZO_CC_GNUC) && defined(__CHECKER__) && defined(__SPARSE_CHECKER__) ++# define LZO_COMPILE_TIME_ASSERT(e) {(void) (0/!!(e));} ++# elif (LZO_CC_GNUC >= 0x040700ul) && (LZO_CFG_USE_COUNTER) && defined(__cplusplus) ++# define LZO_COMPILE_TIME_ASSERT(e) {enum {__LZO_CTA_NAME(lzo_cta_e__)=1/!!(e)} __attribute__((__unused__));} ++# elif (LZO_CC_GNUC >= 0x040700ul) ++# define LZO_COMPILE_TIME_ASSERT(e) {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-2*!(e)] __attribute__((__unused__));} ++# elif (LZO_CC_MSC && (_MSC_VER < 900)) ++# define LZO_COMPILE_TIME_ASSERT(e) switch(0) case 1:case !(e):break; ++# elif (LZO_CC_TURBOC && (__TURBOC__ == 0x0295)) ++# define LZO_COMPILE_TIME_ASSERT(e) switch(0) case 1:case !(e):break; ++# else ++# define LZO_COMPILE_TIME_ASSERT(e) {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-2*!(e)];} ++# endif ++#endif ++LZO_COMPILE_TIME_ASSERT_HEADER(1 == 1) ++#if defined(__cplusplus) ++extern "C" { LZO_COMPILE_TIME_ASSERT_HEADER(2 == 2) } ++#endif ++LZO_COMPILE_TIME_ASSERT_HEADER(3 == 3) ++#if (LZO_ARCH_I086 || LZO_ARCH_I386) && (LZO_OS_DOS16 || LZO_OS_DOS32 || LZO_OS_OS2 || LZO_OS_OS216 || LZO_OS_WIN16 || LZO_OS_WIN32 || LZO_OS_WIN64) ++# if (LZO_CC_GNUC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PACIFICC) ++# elif (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC) ++# define __lzo_cdecl __cdecl ++# define __lzo_cdecl_atexit /*empty*/ ++# define __lzo_cdecl_main __cdecl ++# if (LZO_OS_OS2 && (LZO_CC_DMC || LZO_CC_SYMANTECC)) ++# define __lzo_cdecl_qsort __pascal ++# elif (LZO_OS_OS2 && (LZO_CC_ZORTECHC)) ++# define __lzo_cdecl_qsort _stdcall ++# else ++# define __lzo_cdecl_qsort __cdecl ++# endif ++# elif (LZO_CC_WATCOMC) ++# define __lzo_cdecl __cdecl ++# else ++# define __lzo_cdecl __cdecl ++# define __lzo_cdecl_atexit __cdecl ++# define __lzo_cdecl_main __cdecl ++# define __lzo_cdecl_qsort __cdecl ++# endif ++# if (LZO_CC_GNUC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PACIFICC || LZO_CC_WATCOMC) ++# elif (LZO_OS_OS2 && (LZO_CC_DMC || LZO_CC_SYMANTECC)) ++# define __lzo_cdecl_sighandler __pascal ++# elif (LZO_OS_OS2 && (LZO_CC_ZORTECHC)) ++# define __lzo_cdecl_sighandler _stdcall ++# elif (LZO_CC_MSC && (_MSC_VER >= 1400)) && defined(_M_CEE_PURE) ++# define __lzo_cdecl_sighandler __clrcall ++# elif (LZO_CC_MSC && (_MSC_VER >= 600 && _MSC_VER < 700)) ++# if defined(_DLL) ++# define __lzo_cdecl_sighandler _far _cdecl _loadds ++# elif defined(_MT) ++# define __lzo_cdecl_sighandler _far _cdecl ++# else ++# define __lzo_cdecl_sighandler _cdecl ++# endif ++# else ++# define __lzo_cdecl_sighandler __cdecl ++# endif ++#elif (LZO_ARCH_I386) && (LZO_CC_WATCOMC) ++# define __lzo_cdecl __cdecl ++#elif (LZO_ARCH_M68K && LZO_OS_TOS && (LZO_CC_PUREC || LZO_CC_TURBOC)) ++# define __lzo_cdecl cdecl ++#endif ++#if !defined(__lzo_cdecl) ++# define __lzo_cdecl /*empty*/ ++#endif ++#if !defined(__lzo_cdecl_atexit) ++# define __lzo_cdecl_atexit /*empty*/ ++#endif ++#if !defined(__lzo_cdecl_main) ++# define __lzo_cdecl_main /*empty*/ ++#endif ++#if !defined(__lzo_cdecl_qsort) ++# define __lzo_cdecl_qsort /*empty*/ ++#endif ++#if !defined(__lzo_cdecl_sighandler) ++# define __lzo_cdecl_sighandler /*empty*/ ++#endif ++#if !defined(__lzo_cdecl_va) ++# define __lzo_cdecl_va __lzo_cdecl ++#endif ++#if !(LZO_CFG_NO_WINDOWS_H) ++#if !defined(LZO_HAVE_WINDOWS_H) ++#if (LZO_OS_CYGWIN || (LZO_OS_EMX && defined(__RSXNT__)) || LZO_OS_WIN32 || LZO_OS_WIN64) ++# if (LZO_CC_WATCOMC && (__WATCOMC__ < 1000)) ++# elif (LZO_OS_WIN32 && LZO_CC_GNUC) && defined(__PW32__) ++# elif ((LZO_OS_CYGWIN || defined(__MINGW32__)) && (LZO_CC_GNUC && (LZO_CC_GNUC < 0x025f00ul))) ++# else ++# define LZO_HAVE_WINDOWS_H 1 ++# endif ++#endif ++#endif ++#endif ++#ifndef LZO_SIZEOF_SHORT ++#if defined(SIZEOF_SHORT) ++# define LZO_SIZEOF_SHORT (SIZEOF_SHORT) ++#elif defined(__SIZEOF_SHORT__) ++# define LZO_SIZEOF_SHORT (__SIZEOF_SHORT__) ++#endif ++#endif ++#ifndef LZO_SIZEOF_INT ++#if defined(SIZEOF_INT) ++# define LZO_SIZEOF_INT (SIZEOF_INT) ++#elif defined(__SIZEOF_INT__) ++# define LZO_SIZEOF_INT (__SIZEOF_INT__) ++#endif ++#endif ++#ifndef LZO_SIZEOF_LONG ++#if defined(SIZEOF_LONG) ++# define LZO_SIZEOF_LONG (SIZEOF_LONG) ++#elif defined(__SIZEOF_LONG__) ++# define LZO_SIZEOF_LONG (__SIZEOF_LONG__) ++#endif ++#endif ++#ifndef LZO_SIZEOF_LONG_LONG ++#if defined(SIZEOF_LONG_LONG) ++# define LZO_SIZEOF_LONG_LONG (SIZEOF_LONG_LONG) ++#elif defined(__SIZEOF_LONG_LONG__) ++# define LZO_SIZEOF_LONG_LONG (__SIZEOF_LONG_LONG__) ++#endif ++#endif ++#ifndef LZO_SIZEOF___INT16 ++#if defined(SIZEOF___INT16) ++# define LZO_SIZEOF___INT16 (SIZEOF___INT16) ++#endif ++#endif ++#ifndef LZO_SIZEOF___INT32 ++#if defined(SIZEOF___INT32) ++# define LZO_SIZEOF___INT32 (SIZEOF___INT32) ++#endif ++#endif ++#ifndef LZO_SIZEOF___INT64 ++#if defined(SIZEOF___INT64) ++# define LZO_SIZEOF___INT64 (SIZEOF___INT64) ++#endif ++#endif ++#ifndef LZO_SIZEOF_VOID_P ++#if defined(SIZEOF_VOID_P) ++# define LZO_SIZEOF_VOID_P (SIZEOF_VOID_P) ++#elif defined(__SIZEOF_POINTER__) ++# define LZO_SIZEOF_VOID_P (__SIZEOF_POINTER__) ++#endif ++#endif ++#ifndef LZO_SIZEOF_SIZE_T ++#if defined(SIZEOF_SIZE_T) ++# define LZO_SIZEOF_SIZE_T (SIZEOF_SIZE_T) ++#elif defined(__SIZEOF_SIZE_T__) ++# define LZO_SIZEOF_SIZE_T (__SIZEOF_SIZE_T__) ++#endif ++#endif ++#ifndef LZO_SIZEOF_PTRDIFF_T ++#if defined(SIZEOF_PTRDIFF_T) ++# define LZO_SIZEOF_PTRDIFF_T (SIZEOF_PTRDIFF_T) ++#elif defined(__SIZEOF_PTRDIFF_T__) ++# define LZO_SIZEOF_PTRDIFF_T (__SIZEOF_PTRDIFF_T__) ++#endif ++#endif ++#define __LZO_LSR(x,b) (((x)+0ul) >> (b)) ++#if !defined(LZO_SIZEOF_SHORT) ++# if (LZO_ARCH_CRAY_PVP) ++# define LZO_SIZEOF_SHORT 8 ++# elif (USHRT_MAX == LZO_0xffffL) ++# define LZO_SIZEOF_SHORT 2 ++# elif (__LZO_LSR(USHRT_MAX,7) == 1) ++# define LZO_SIZEOF_SHORT 1 ++# elif (__LZO_LSR(USHRT_MAX,15) == 1) ++# define LZO_SIZEOF_SHORT 2 ++# elif (__LZO_LSR(USHRT_MAX,31) == 1) ++# define LZO_SIZEOF_SHORT 4 ++# elif (__LZO_LSR(USHRT_MAX,63) == 1) ++# define LZO_SIZEOF_SHORT 8 ++# elif (__LZO_LSR(USHRT_MAX,127) == 1) ++# define LZO_SIZEOF_SHORT 16 ++# else ++# error "LZO_SIZEOF_SHORT" ++# endif ++#endif ++LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_SHORT == sizeof(short)) ++#if !defined(LZO_SIZEOF_INT) ++# if (LZO_ARCH_CRAY_PVP) ++# define LZO_SIZEOF_INT 8 ++# elif (UINT_MAX == LZO_0xffffL) ++# define LZO_SIZEOF_INT 2 ++# elif (UINT_MAX == LZO_0xffffffffL) ++# define LZO_SIZEOF_INT 4 ++# elif (__LZO_LSR(UINT_MAX,7) == 1) ++# define LZO_SIZEOF_INT 1 ++# elif (__LZO_LSR(UINT_MAX,15) == 1) ++# define LZO_SIZEOF_INT 2 ++# elif (__LZO_LSR(UINT_MAX,31) == 1) ++# define LZO_SIZEOF_INT 4 ++# elif (__LZO_LSR(UINT_MAX,63) == 1) ++# define LZO_SIZEOF_INT 8 ++# elif (__LZO_LSR(UINT_MAX,127) == 1) ++# define LZO_SIZEOF_INT 16 ++# else ++# error "LZO_SIZEOF_INT" ++# endif ++#endif ++LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_INT == sizeof(int)) ++#if !defined(LZO_SIZEOF_LONG) ++# if (ULONG_MAX == LZO_0xffffffffL) ++# define LZO_SIZEOF_LONG 4 ++# elif (__LZO_LSR(ULONG_MAX,7) == 1) ++# define LZO_SIZEOF_LONG 1 ++# elif (__LZO_LSR(ULONG_MAX,15) == 1) ++# define LZO_SIZEOF_LONG 2 ++# elif (__LZO_LSR(ULONG_MAX,31) == 1) ++# define LZO_SIZEOF_LONG 4 ++# elif (__LZO_LSR(ULONG_MAX,39) == 1) ++# define LZO_SIZEOF_LONG 5 ++# elif (__LZO_LSR(ULONG_MAX,63) == 1) ++# define LZO_SIZEOF_LONG 8 ++# elif (__LZO_LSR(ULONG_MAX,127) == 1) ++# define LZO_SIZEOF_LONG 16 ++# else ++# error "LZO_SIZEOF_LONG" ++# endif ++#endif ++LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_LONG == sizeof(long)) ++#if !defined(LZO_SIZEOF_LONG_LONG) && !defined(LZO_SIZEOF___INT64) ++#if (LZO_SIZEOF_LONG > 0 && LZO_SIZEOF_LONG < 8) ++# if defined(__LONG_MAX__) && defined(__LONG_LONG_MAX__) ++# if (LZO_CC_GNUC >= 0x030300ul) ++# if ((__LONG_MAX__-0) == (__LONG_LONG_MAX__-0)) ++# define LZO_SIZEOF_LONG_LONG LZO_SIZEOF_LONG ++# elif (__LZO_LSR(__LONG_LONG_MAX__,30) == 1) ++# define LZO_SIZEOF_LONG_LONG 4 ++# endif ++# endif ++# endif ++#endif ++#endif ++#if !defined(LZO_SIZEOF_LONG_LONG) && !defined(LZO_SIZEOF___INT64) ++#if (LZO_SIZEOF_LONG > 0 && LZO_SIZEOF_LONG < 8) ++#if (LZO_ARCH_I086 && LZO_CC_DMC) ++#elif (LZO_CC_CILLY) && defined(__GNUC__) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif ((LZO_OS_WIN32 || LZO_OS_WIN64 || defined(_WIN32)) && LZO_CC_MSC && (_MSC_VER >= 1400)) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (LZO_OS_WIN64 || defined(_WIN64)) ++# define LZO_SIZEOF___INT64 8 ++#elif (LZO_ARCH_I386 && (LZO_CC_DMC)) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (LZO_ARCH_I386 && (LZO_CC_SYMANTECC && (__SC__ >= 0x700))) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (LZO_ARCH_I386 && (LZO_CC_INTELC && defined(__linux__))) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (LZO_ARCH_I386 && (LZO_CC_MWERKS || LZO_CC_PELLESC || LZO_CC_PGI || LZO_CC_SUNPROC)) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (LZO_ARCH_I386 && (LZO_CC_INTELC || LZO_CC_MSC)) ++# define LZO_SIZEOF___INT64 8 ++#elif ((LZO_OS_WIN32 || defined(_WIN32)) && (LZO_CC_MSC)) ++# define LZO_SIZEOF___INT64 8 ++#elif (LZO_ARCH_I386 && (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0520))) ++# define LZO_SIZEOF___INT64 8 ++#elif (LZO_ARCH_I386 && (LZO_CC_WATCOMC && (__WATCOMC__ >= 1100))) ++# define LZO_SIZEOF___INT64 8 ++#elif (LZO_CC_GHS && defined(__LLONG_BIT) && ((__LLONG_BIT-0) == 64)) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (LZO_CC_WATCOMC && defined(_INTEGRAL_MAX_BITS) && ((_INTEGRAL_MAX_BITS-0) == 64)) ++# define LZO_SIZEOF___INT64 8 ++#elif (LZO_OS_OS400 || defined(__OS400__)) && defined(__LLP64_IFC__) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (defined(__vms) || defined(__VMS)) && ((__INITIAL_POINTER_SIZE-0) == 64) ++# define LZO_SIZEOF_LONG_LONG 8 ++#elif (LZO_CC_SDCC) && (LZO_SIZEOF_INT == 2) ++#elif 1 && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) ++# define LZO_SIZEOF_LONG_LONG 8 ++#endif ++#endif ++#endif ++#if defined(__cplusplus) && (LZO_CC_GNUC) ++# if (LZO_CC_GNUC < 0x020800ul) ++# undef LZO_SIZEOF_LONG_LONG ++# endif ++#endif ++#if (LZO_CFG_NO_LONG_LONG) ++# undef LZO_SIZEOF_LONG_LONG ++#elif defined(__NO_LONG_LONG) ++# undef LZO_SIZEOF_LONG_LONG ++#elif defined(_NO_LONGLONG) ++# undef LZO_SIZEOF_LONG_LONG ++#endif ++#if !defined(LZO_WORDSIZE) ++#if (LZO_ARCH_ALPHA) ++# define LZO_WORDSIZE 8 ++#elif (LZO_ARCH_AMD64) ++# define LZO_WORDSIZE 8 ++#elif (LZO_ARCH_AVR) ++# define LZO_WORDSIZE 1 ++#elif (LZO_ARCH_H8300) ++# if defined(__NORMAL_MODE__) ++# define LZO_WORDSIZE 4 ++# elif defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__) ++# define LZO_WORDSIZE 4 ++# else ++# define LZO_WORDSIZE 2 ++# endif ++#elif (LZO_ARCH_I086) ++# define LZO_WORDSIZE 2 ++#elif (LZO_ARCH_IA64) ++# define LZO_WORDSIZE 8 ++#elif (LZO_ARCH_M16C) ++# define LZO_WORDSIZE 2 ++#elif (LZO_ARCH_SPU) ++# define LZO_WORDSIZE 4 ++#elif (LZO_ARCH_Z80) ++# define LZO_WORDSIZE 1 ++#elif (LZO_SIZEOF_LONG == 8) && ((defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__)) ++# define LZO_WORDSIZE 8 ++#elif (LZO_OS_OS400 || defined(__OS400__)) ++# define LZO_WORDSIZE 8 ++#elif (defined(__vms) || defined(__VMS)) && (__INITIAL_POINTER_SIZE+0 == 64) ++# define LZO_WORDSIZE 8 ++#endif ++#endif ++#if !defined(LZO_SIZEOF_VOID_P) ++#if defined(__ILP32__) || defined(__ILP32) || defined(_ILP32) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(int) == 4) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 4) ++# define LZO_SIZEOF_VOID_P 4 ++#elif defined(__ILP64__) || defined(__ILP64) || defined(_ILP64) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(int) == 8) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 8) ++# define LZO_SIZEOF_VOID_P 8 ++#elif defined(__LLP64__) || defined(__LLP64) || defined(_LLP64) || defined(_WIN64) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 4) ++# define LZO_SIZEOF_VOID_P 8 ++#elif defined(__LP64__) || defined(__LP64) || defined(_LP64) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 8) ++# define LZO_SIZEOF_VOID_P 8 ++#elif (LZO_ARCH_AVR) ++# define LZO_SIZEOF_VOID_P 2 ++#elif (LZO_ARCH_C166 || LZO_ARCH_MCS51 || LZO_ARCH_MCS251 || LZO_ARCH_MSP430) ++# define LZO_SIZEOF_VOID_P 2 ++#elif (LZO_ARCH_H8300) ++# if defined(__NORMAL_MODE__) ++# define LZO_SIZEOF_VOID_P 2 ++# elif defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__) ++# define LZO_SIZEOF_VOID_P 4 ++# else ++# define LZO_SIZEOF_VOID_P 2 ++# endif ++# if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x040000ul)) && (LZO_SIZEOF_INT == 4) ++# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_INT ++# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_INT ++# endif ++#elif (LZO_ARCH_I086) ++# if (LZO_MM_TINY || LZO_MM_SMALL || LZO_MM_MEDIUM) ++# define LZO_SIZEOF_VOID_P 2 ++# elif (LZO_MM_COMPACT || LZO_MM_LARGE || LZO_MM_HUGE) ++# define LZO_SIZEOF_VOID_P 4 ++# else ++# error "invalid LZO_ARCH_I086 memory model" ++# endif ++#elif (LZO_ARCH_M16C) ++# if defined(__m32c_cpu__) || defined(__m32cm_cpu__) ++# define LZO_SIZEOF_VOID_P 4 ++# else ++# define LZO_SIZEOF_VOID_P 2 ++# endif ++#elif (LZO_ARCH_SPU) ++# define LZO_SIZEOF_VOID_P 4 ++#elif (LZO_ARCH_Z80) ++# define LZO_SIZEOF_VOID_P 2 ++#elif (LZO_SIZEOF_LONG == 8) && ((defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__)) ++# define LZO_SIZEOF_VOID_P 4 ++#elif (LZO_OS_OS400 || defined(__OS400__)) ++# if defined(__LLP64_IFC__) ++# define LZO_SIZEOF_VOID_P 8 ++# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_LONG ++# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_LONG ++# else ++# define LZO_SIZEOF_VOID_P 16 ++# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_LONG ++# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_LONG ++# endif ++#elif (defined(__vms) || defined(__VMS)) && (__INITIAL_POINTER_SIZE+0 == 64) ++# define LZO_SIZEOF_VOID_P 8 ++# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_LONG ++# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_LONG ++#endif ++#endif ++#if !defined(LZO_SIZEOF_VOID_P) ++# define LZO_SIZEOF_VOID_P LZO_SIZEOF_LONG ++#endif ++LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_VOID_P == sizeof(void *)) ++#if !defined(LZO_SIZEOF_SIZE_T) ++#if (LZO_ARCH_I086 || LZO_ARCH_M16C) ++# define LZO_SIZEOF_SIZE_T 2 ++#endif ++#endif ++#if !defined(LZO_SIZEOF_SIZE_T) ++# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_VOID_P ++#endif ++#if defined(offsetof) ++LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_SIZE_T == sizeof(size_t)) ++#endif ++#if !defined(LZO_SIZEOF_PTRDIFF_T) ++#if (LZO_ARCH_I086) ++# if (LZO_MM_TINY || LZO_MM_SMALL || LZO_MM_MEDIUM || LZO_MM_HUGE) ++# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_VOID_P ++# elif (LZO_MM_COMPACT || LZO_MM_LARGE) ++# if (LZO_CC_BORLANDC || LZO_CC_TURBOC) ++# define LZO_SIZEOF_PTRDIFF_T 4 ++# else ++# define LZO_SIZEOF_PTRDIFF_T 2 ++# endif ++# else ++# error "invalid LZO_ARCH_I086 memory model" ++# endif ++#endif ++#endif ++#if !defined(LZO_SIZEOF_PTRDIFF_T) ++# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_SIZE_T ++#endif ++#if defined(offsetof) ++LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t)) ++#endif ++#if !defined(LZO_WORDSIZE) ++# define LZO_WORDSIZE LZO_SIZEOF_VOID_P ++#endif ++#if (LZO_ABI_NEUTRAL_ENDIAN) ++# undef LZO_ABI_BIG_ENDIAN ++# undef LZO_ABI_LITTLE_ENDIAN ++#elif !(LZO_ABI_BIG_ENDIAN) && !(LZO_ABI_LITTLE_ENDIAN) ++#if (LZO_ARCH_ALPHA) && (LZO_ARCH_CRAY_MPP) ++# define LZO_ABI_BIG_ENDIAN 1 ++#elif (LZO_ARCH_IA64) && (LZO_OS_POSIX_LINUX || LZO_OS_WIN64) ++# define LZO_ABI_LITTLE_ENDIAN 1 ++#elif (LZO_ARCH_ALPHA || LZO_ARCH_AMD64 || LZO_ARCH_BLACKFIN || LZO_ARCH_CRIS || LZO_ARCH_I086 || LZO_ARCH_I386 || LZO_ARCH_MSP430) ++# define LZO_ABI_LITTLE_ENDIAN 1 ++#elif (LZO_ARCH_AVR32 || LZO_ARCH_M68K || LZO_ARCH_S390 || LZO_ARCH_SPU) ++# define LZO_ABI_BIG_ENDIAN 1 ++#elif 1 && defined(__IAR_SYSTEMS_ICC__) && defined(__LITTLE_ENDIAN__) ++# if (__LITTLE_ENDIAN__ == 1) ++# define LZO_ABI_LITTLE_ENDIAN 1 ++# else ++# define LZO_ABI_BIG_ENDIAN 1 ++# endif ++#elif 1 && defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) ++# define LZO_ABI_BIG_ENDIAN 1 ++#elif 1 && defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__) ++# define LZO_ABI_LITTLE_ENDIAN 1 ++#elif 1 && (LZO_ARCH_ARM) && defined(__ARMEB__) && !defined(__ARMEL__) ++# define LZO_ABI_BIG_ENDIAN 1 ++#elif 1 && (LZO_ARCH_ARM) && defined(__ARMEL__) && !defined(__ARMEB__) ++# define LZO_ABI_LITTLE_ENDIAN 1 ++#elif 1 && (LZO_ARCH_ARM && LZO_CC_ARMCC_ARMCC) ++# if defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN) ++# error "unexpected configuration - check your compiler defines" ++# elif defined(__BIG_ENDIAN) ++# define LZO_ABI_BIG_ENDIAN 1 ++# else ++# define LZO_ABI_LITTLE_ENDIAN 1 ++# endif ++# define LZO_ABI_LITTLE_ENDIAN 1 ++#elif 1 && (LZO_ARCH_ARM64) && defined(__AARCH64EB__) && !defined(__AARCH64EL__) ++# define LZO_ABI_BIG_ENDIAN 1 ++#elif 1 && (LZO_ARCH_ARM64) && defined(__AARCH64EL__) && !defined(__AARCH64EB__) ++# define LZO_ABI_LITTLE_ENDIAN 1 ++#elif 1 && (LZO_ARCH_MIPS) && defined(__MIPSEB__) && !defined(__MIPSEL__) ++# define LZO_ABI_BIG_ENDIAN 1 ++#elif 1 && (LZO_ARCH_MIPS) && defined(__MIPSEL__) && !defined(__MIPSEB__) ++# define LZO_ABI_LITTLE_ENDIAN 1 ++#endif ++#endif ++#if (LZO_ABI_BIG_ENDIAN) && (LZO_ABI_LITTLE_ENDIAN) ++# error "unexpected configuration - check your compiler defines" ++#endif ++#if (LZO_ABI_BIG_ENDIAN) ++# define LZO_INFO_ABI_ENDIAN "be" ++#elif (LZO_ABI_LITTLE_ENDIAN) ++# define LZO_INFO_ABI_ENDIAN "le" ++#elif (LZO_ABI_NEUTRAL_ENDIAN) ++# define LZO_INFO_ABI_ENDIAN "neutral" ++#endif ++#if (LZO_SIZEOF_INT == 1 && LZO_SIZEOF_LONG == 2 && LZO_SIZEOF_VOID_P == 2) ++# define LZO_ABI_I8LP16 1 ++# define LZO_INFO_ABI_PM "i8lp16" ++#elif (LZO_SIZEOF_INT == 2 && LZO_SIZEOF_LONG == 2 && LZO_SIZEOF_VOID_P == 2) ++# define LZO_ABI_ILP16 1 ++# define LZO_INFO_ABI_PM "ilp16" ++#elif (LZO_SIZEOF_INT == 2 && LZO_SIZEOF_LONG == 4 && LZO_SIZEOF_VOID_P == 4) ++# define LZO_ABI_LP32 1 ++# define LZO_INFO_ABI_PM "lp32" ++#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 4 && LZO_SIZEOF_VOID_P == 4) ++# define LZO_ABI_ILP32 1 ++# define LZO_INFO_ABI_PM "ilp32" ++#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 4 && LZO_SIZEOF_VOID_P == 8 && LZO_SIZEOF_SIZE_T == 8) ++# define LZO_ABI_LLP64 1 ++# define LZO_INFO_ABI_PM "llp64" ++#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 8) ++# define LZO_ABI_LP64 1 ++# define LZO_INFO_ABI_PM "lp64" ++#elif (LZO_SIZEOF_INT == 8 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 8) ++# define LZO_ABI_ILP64 1 ++# define LZO_INFO_ABI_PM "ilp64" ++#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 4) ++# define LZO_ABI_IP32L64 1 ++# define LZO_INFO_ABI_PM "ip32l64" ++#endif ++#if 0 ++#elif !defined(__LZO_LIBC_OVERRIDE) ++#if (LZO_LIBC_NAKED) ++# define LZO_INFO_LIBC "naked" ++#elif (LZO_LIBC_FREESTANDING) ++# define LZO_INFO_LIBC "freestanding" ++#elif (LZO_LIBC_MOSTLY_FREESTANDING) ++# define LZO_INFO_LIBC "mfreestanding" ++#elif (LZO_LIBC_ISOC90) ++# define LZO_INFO_LIBC "isoc90" ++#elif (LZO_LIBC_ISOC99) ++# define LZO_INFO_LIBC "isoc99" ++#elif (LZO_CC_ARMCC_ARMCC) && defined(__ARMCLIB_VERSION) ++# define LZO_LIBC_ISOC90 1 ++# define LZO_INFO_LIBC "isoc90" ++#elif defined(__dietlibc__) ++# define LZO_LIBC_DIETLIBC 1 ++# define LZO_INFO_LIBC "dietlibc" ++#elif defined(_NEWLIB_VERSION) ++# define LZO_LIBC_NEWLIB 1 ++# define LZO_INFO_LIBC "newlib" ++#elif defined(__UCLIBC__) && defined(__UCLIBC_MAJOR__) && defined(__UCLIBC_MINOR__) ++# if defined(__UCLIBC_SUBLEVEL__) ++# define LZO_LIBC_UCLIBC (__UCLIBC_MAJOR__ * 0x10000L + (__UCLIBC_MINOR__-0) * 0x100 + (__UCLIBC_SUBLEVEL__-0)) ++# else ++# define LZO_LIBC_UCLIBC 0x00090bL ++# endif ++# define LZO_INFO_LIBC "uc" "libc" ++#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) ++# define LZO_LIBC_GLIBC (__GLIBC__ * 0x10000L + (__GLIBC_MINOR__-0) * 0x100) ++# define LZO_INFO_LIBC "glibc" ++#elif (LZO_CC_MWERKS) && defined(__MSL__) ++# define LZO_LIBC_MSL __MSL__ ++# define LZO_INFO_LIBC "msl" ++#elif 1 && defined(__IAR_SYSTEMS_ICC__) ++# define LZO_LIBC_ISOC90 1 ++# define LZO_INFO_LIBC "isoc90" ++#else ++# define LZO_LIBC_DEFAULT 1 ++# define LZO_INFO_LIBC "default" ++#endif ++#endif ++#if (LZO_ARCH_I386 && (LZO_OS_DOS32 || LZO_OS_WIN32) && (LZO_CC_DMC || LZO_CC_INTELC || LZO_CC_MSC || LZO_CC_PELLESC)) ++# define LZO_ASM_SYNTAX_MSC 1 ++#elif (LZO_OS_WIN64 && (LZO_CC_DMC || LZO_CC_INTELC || LZO_CC_MSC || LZO_CC_PELLESC)) ++#elif (LZO_ARCH_I386 && LZO_CC_GNUC && (LZO_CC_GNUC == 0x011f00ul)) ++#elif (LZO_ARCH_I386 && (LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_INTELC || LZO_CC_PATHSCALE)) ++# define LZO_ASM_SYNTAX_GNUC 1 ++#elif (LZO_ARCH_AMD64 && (LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_INTELC || LZO_CC_PATHSCALE)) ++# define LZO_ASM_SYNTAX_GNUC 1 ++#elif (LZO_CC_GNUC) ++# define LZO_ASM_SYNTAX_GNUC 1 ++#endif ++#if (LZO_ASM_SYNTAX_GNUC) ++#if (LZO_ARCH_I386 && LZO_CC_GNUC && (LZO_CC_GNUC < 0x020000ul)) ++# define __LZO_ASM_CLOBBER "ax" ++# define __LZO_ASM_CLOBBER_LIST_CC /*empty*/ ++# define __LZO_ASM_CLOBBER_LIST_CC_MEMORY /*empty*/ ++# define __LZO_ASM_CLOBBER_LIST_EMPTY /*empty*/ ++#elif (LZO_CC_INTELC && (__INTEL_COMPILER < 1000)) ++# define __LZO_ASM_CLOBBER "memory" ++# define __LZO_ASM_CLOBBER_LIST_CC /*empty*/ ++# define __LZO_ASM_CLOBBER_LIST_CC_MEMORY : "memory" ++# define __LZO_ASM_CLOBBER_LIST_EMPTY /*empty*/ ++#else ++# define __LZO_ASM_CLOBBER "cc", "memory" ++# define __LZO_ASM_CLOBBER_LIST_CC : "cc" ++# define __LZO_ASM_CLOBBER_LIST_CC_MEMORY : "cc", "memory" ++# define __LZO_ASM_CLOBBER_LIST_EMPTY /*empty*/ ++#endif ++#endif ++#if (LZO_ARCH_ALPHA) ++# define LZO_OPT_AVOID_UINT_INDEX 1 ++#elif (LZO_ARCH_AMD64) ++# define LZO_OPT_AVOID_INT_INDEX 1 ++# define LZO_OPT_AVOID_UINT_INDEX 1 ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED64 ++# define LZO_OPT_UNALIGNED64 1 ++# endif ++#elif (LZO_ARCH_ARM) ++# if defined(__ARM_FEATURE_UNALIGNED) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++# elif defined(__TARGET_ARCH_ARM) && ((__TARGET_ARCH_ARM+0) >= 7) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++# elif defined(__TARGET_ARCH_ARM) && ((__TARGET_ARCH_ARM+0) >= 6) && !defined(__TARGET_PROFILE_M) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++# endif ++#elif (LZO_ARCH_ARM64) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED64 ++# define LZO_OPT_UNALIGNED64 1 ++# endif ++#elif (LZO_ARCH_CRIS) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++#elif (LZO_ARCH_I386) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++#elif (LZO_ARCH_IA64) ++# define LZO_OPT_AVOID_INT_INDEX 1 ++# define LZO_OPT_AVOID_UINT_INDEX 1 ++# define LZO_OPT_PREFER_POSTINC 1 ++#elif (LZO_ARCH_M68K) ++# define LZO_OPT_PREFER_POSTINC 1 ++# define LZO_OPT_PREFER_PREDEC 1 ++# if defined(__mc68020__) && !defined(__mcoldfire__) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++# endif ++#elif (LZO_ARCH_MIPS) ++# define LZO_OPT_AVOID_UINT_INDEX 1 ++#elif (LZO_ARCH_POWERPC) ++# define LZO_OPT_PREFER_PREINC 1 ++# define LZO_OPT_PREFER_PREDEC 1 ++# if (LZO_ABI_BIG_ENDIAN) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++# if (LZO_WORDSIZE == 8) ++# ifndef LZO_OPT_UNALIGNED64 ++# define LZO_OPT_UNALIGNED64 1 ++# endif ++# endif ++# endif ++#elif (LZO_ARCH_S390) ++# ifndef LZO_OPT_UNALIGNED16 ++# define LZO_OPT_UNALIGNED16 1 ++# endif ++# ifndef LZO_OPT_UNALIGNED32 ++# define LZO_OPT_UNALIGNED32 1 ++# endif ++# if (LZO_WORDSIZE == 8) ++# ifndef LZO_OPT_UNALIGNED64 ++# define LZO_OPT_UNALIGNED64 1 ++# endif ++# endif ++#elif (LZO_ARCH_SH) ++# define LZO_OPT_PREFER_POSTINC 1 ++# define LZO_OPT_PREFER_PREDEC 1 ++#endif ++#ifndef LZO_CFG_NO_INLINE_ASM ++#if (LZO_ABI_NEUTRAL_ENDIAN) || (LZO_ARCH_GENERIC) ++# define LZO_CFG_NO_INLINE_ASM 1 ++#elif (LZO_CC_LLVM) ++# define LZO_CFG_NO_INLINE_ASM 1 ++#endif ++#endif ++#if (LZO_CFG_NO_INLINE_ASM) ++# undef LZO_ASM_SYNTAX_MSC ++# undef LZO_ASM_SYNTAX_GNUC ++# undef __LZO_ASM_CLOBBER ++# undef __LZO_ASM_CLOBBER_LIST_CC ++# undef __LZO_ASM_CLOBBER_LIST_CC_MEMORY ++# undef __LZO_ASM_CLOBBER_LIST_EMPTY ++#endif ++#ifndef LZO_CFG_NO_UNALIGNED ++#if (LZO_ABI_NEUTRAL_ENDIAN) || (LZO_ARCH_GENERIC) ++# define LZO_CFG_NO_UNALIGNED 1 ++#endif ++#endif ++#if (LZO_CFG_NO_UNALIGNED) ++# undef LZO_OPT_UNALIGNED16 ++# undef LZO_OPT_UNALIGNED32 ++# undef LZO_OPT_UNALIGNED64 ++#endif ++#if defined(__LZO_INFOSTR_MM) ++#elif (LZO_MM_FLAT) && (defined(__LZO_INFOSTR_PM) || defined(LZO_INFO_ABI_PM)) ++# define __LZO_INFOSTR_MM "" ++#elif defined(LZO_INFO_MM) ++# define __LZO_INFOSTR_MM "." LZO_INFO_MM ++#else ++# define __LZO_INFOSTR_MM "" ++#endif ++#if defined(__LZO_INFOSTR_PM) ++#elif defined(LZO_INFO_ABI_PM) ++# define __LZO_INFOSTR_PM "." LZO_INFO_ABI_PM ++#else ++# define __LZO_INFOSTR_PM "" ++#endif ++#if defined(__LZO_INFOSTR_ENDIAN) ++#elif defined(LZO_INFO_ABI_ENDIAN) ++# define __LZO_INFOSTR_ENDIAN "." LZO_INFO_ABI_ENDIAN ++#else ++# define __LZO_INFOSTR_ENDIAN "" ++#endif ++#if defined(__LZO_INFOSTR_OSNAME) ++#elif defined(LZO_INFO_OS_CONSOLE) ++# define __LZO_INFOSTR_OSNAME LZO_INFO_OS "." LZO_INFO_OS_CONSOLE ++#elif defined(LZO_INFO_OS_POSIX) ++# define __LZO_INFOSTR_OSNAME LZO_INFO_OS "." LZO_INFO_OS_POSIX ++#else ++# define __LZO_INFOSTR_OSNAME LZO_INFO_OS ++#endif ++#if defined(__LZO_INFOSTR_LIBC) ++#elif defined(LZO_INFO_LIBC) ++# define __LZO_INFOSTR_LIBC "." LZO_INFO_LIBC ++#else ++# define __LZO_INFOSTR_LIBC "" ++#endif ++#if defined(__LZO_INFOSTR_CCVER) ++#elif defined(LZO_INFO_CCVER) ++# define __LZO_INFOSTR_CCVER " " LZO_INFO_CCVER ++#else ++# define __LZO_INFOSTR_CCVER "" ++#endif ++#define LZO_INFO_STRING \ ++ LZO_INFO_ARCH __LZO_INFOSTR_MM __LZO_INFOSTR_PM __LZO_INFOSTR_ENDIAN \ ++ " " __LZO_INFOSTR_OSNAME __LZO_INFOSTR_LIBC " " LZO_INFO_CC __LZO_INFOSTR_CCVER ++#if !(LZO_CFG_SKIP_LZO_TYPES) ++#if (!(LZO_SIZEOF_SHORT+0 > 0 && LZO_SIZEOF_INT+0 > 0 && LZO_SIZEOF_LONG+0 > 0)) ++# error "missing defines for sizes" ++#endif ++#if (!(LZO_SIZEOF_PTRDIFF_T+0 > 0 && LZO_SIZEOF_SIZE_T+0 > 0 && LZO_SIZEOF_VOID_P+0 > 0)) ++# error "missing defines for sizes" ++#endif ++#if !defined(lzo_llong_t) ++#if (LZO_SIZEOF_LONG_LONG+0 > 0) ++__lzo_gnuc_extension__ typedef long long lzo_llong_t__; ++__lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__; ++# define lzo_llong_t lzo_llong_t__ ++# define lzo_ullong_t lzo_ullong_t__ ++#endif ++#endif ++#if !defined(lzo_int16e_t) ++#if (LZO_SIZEOF_LONG == 2) ++# define lzo_int16e_t long ++# define lzo_uint16e_t unsigned long ++#elif (LZO_SIZEOF_INT == 2) ++# define lzo_int16e_t int ++# define lzo_uint16e_t unsigned int ++#elif (LZO_SIZEOF_SHORT == 2) ++# define lzo_int16e_t short int ++# define lzo_uint16e_t unsigned short int ++#elif 1 && !(LZO_CFG_TYPE_NO_MODE_HI) && (LZO_CC_CLANG || (LZO_CC_GNUC >= 0x025f00ul) || LZO_CC_LLVM) ++ typedef int lzo_int16e_hi_t__ __attribute__((__mode__(__HI__))); ++ typedef unsigned int lzo_uint16e_hi_t__ __attribute__((__mode__(__HI__))); ++# define lzo_int16e_t lzo_int16e_hi_t__ ++# define lzo_uint16e_t lzo_uint16e_hi_t__ ++#elif (LZO_SIZEOF___INT16 == 2) ++# define lzo_int16e_t __int16 ++# define lzo_uint16e_t unsigned __int16 ++#else ++#endif ++#endif ++#if defined(lzo_int16e_t) ++# define LZO_SIZEOF_LZO_INT16E_T 2 ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16e_t) == 2) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16e_t) == LZO_SIZEOF_LZO_INT16E_T) ++#endif ++#if !defined(lzo_int32e_t) ++#if (LZO_SIZEOF_LONG == 4) ++# define lzo_int32e_t long int ++# define lzo_uint32e_t unsigned long int ++#elif (LZO_SIZEOF_INT == 4) ++# define lzo_int32e_t int ++# define lzo_uint32e_t unsigned int ++#elif (LZO_SIZEOF_SHORT == 4) ++# define lzo_int32e_t short int ++# define lzo_uint32e_t unsigned short int ++#elif (LZO_SIZEOF_LONG_LONG == 4) ++# define lzo_int32e_t lzo_llong_t ++# define lzo_uint32e_t lzo_ullong_t ++#elif 1 && !(LZO_CFG_TYPE_NO_MODE_SI) && (LZO_CC_CLANG || (LZO_CC_GNUC >= 0x025f00ul) || LZO_CC_LLVM) && (__INT_MAX__+0 > 2147483647L) ++ typedef int lzo_int32e_si_t__ __attribute__((__mode__(__SI__))); ++ typedef unsigned int lzo_uint32e_si_t__ __attribute__((__mode__(__SI__))); ++# define lzo_int32e_t lzo_int32e_si_t__ ++# define lzo_uint32e_t lzo_uint32e_si_t__ ++#elif 1 && !(LZO_CFG_TYPE_NO_MODE_SI) && (LZO_CC_GNUC >= 0x025f00ul) && defined(__AVR__) && (__LONG_MAX__+0 == 32767L) ++ typedef int lzo_int32e_si_t__ __attribute__((__mode__(__SI__))); ++ typedef unsigned int lzo_uint32e_si_t__ __attribute__((__mode__(__SI__))); ++# define lzo_int32e_t lzo_int32e_si_t__ ++# define lzo_uint32e_t lzo_uint32e_si_t__ ++# define LZO_INT32_C(c) (c##LL) ++# define LZO_UINT32_C(c) (c##ULL) ++#elif (LZO_SIZEOF___INT32 == 4) ++# define lzo_int32e_t __int32 ++# define lzo_uint32e_t unsigned __int32 ++#else ++#endif ++#endif ++#if defined(lzo_int32e_t) ++# define LZO_SIZEOF_LZO_INT32E_T 4 ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32e_t) == 4) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32e_t) == LZO_SIZEOF_LZO_INT32E_T) ++#endif ++#if !defined(lzo_int64e_t) ++#if (LZO_SIZEOF___INT64 == 8) ++# if (LZO_CC_BORLANDC) && !(LZO_CFG_TYPE_PREFER___INT64) ++# define LZO_CFG_TYPE_PREFER___INT64 1 ++# endif ++#endif ++#if (LZO_SIZEOF_INT == 8) && (LZO_SIZEOF_INT < LZO_SIZEOF_LONG) ++# define lzo_int64e_t int ++# define lzo_uint64e_t unsigned int ++# define LZO_SIZEOF_LZO_INT64E_T LZO_SIZEOF_INT ++#elif (LZO_SIZEOF_LONG == 8) ++# define lzo_int64e_t long int ++# define lzo_uint64e_t unsigned long int ++# define LZO_SIZEOF_LZO_INT64E_T LZO_SIZEOF_LONG ++#elif (LZO_SIZEOF_LONG_LONG == 8) && !(LZO_CFG_TYPE_PREFER___INT64) ++# define lzo_int64e_t lzo_llong_t ++# define lzo_uint64e_t lzo_ullong_t ++# if (LZO_CC_BORLANDC) ++# define LZO_INT64_C(c) ((c) + 0ll) ++# define LZO_UINT64_C(c) ((c) + 0ull) ++# elif 0 ++# define LZO_INT64_C(c) (__lzo_gnuc_extension__ (c##LL)) ++# define LZO_UINT64_C(c) (__lzo_gnuc_extension__ (c##ULL)) ++# else ++# define LZO_INT64_C(c) (c##LL) ++# define LZO_UINT64_C(c) (c##ULL) ++# endif ++# define LZO_SIZEOF_LZO_INT64E_T LZO_SIZEOF_LONG_LONG ++#elif (LZO_SIZEOF___INT64 == 8) ++# define lzo_int64e_t __int64 ++# define lzo_uint64e_t unsigned __int64 ++# if (LZO_CC_BORLANDC) ++# define LZO_INT64_C(c) ((c) + 0i64) ++# define LZO_UINT64_C(c) ((c) + 0ui64) ++# else ++# define LZO_INT64_C(c) (c##i64) ++# define LZO_UINT64_C(c) (c##ui64) ++# endif ++# define LZO_SIZEOF_LZO_INT64E_T LZO_SIZEOF___INT64 ++#else ++#endif ++#endif ++#if defined(lzo_int64e_t) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64e_t) == 8) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64e_t) == LZO_SIZEOF_LZO_INT64E_T) ++#endif ++#if !defined(lzo_int32l_t) ++#if defined(lzo_int32e_t) ++# define lzo_int32l_t lzo_int32e_t ++# define lzo_uint32l_t lzo_uint32e_t ++# define LZO_SIZEOF_LZO_INT32L_T LZO_SIZEOF_LZO_INT32E_T ++#elif (LZO_SIZEOF_INT >= 4) && (LZO_SIZEOF_INT < LZO_SIZEOF_LONG) ++# define lzo_int32l_t int ++# define lzo_uint32l_t unsigned int ++# define LZO_SIZEOF_LZO_INT32L_T LZO_SIZEOF_INT ++#elif (LZO_SIZEOF_LONG >= 4) ++# define lzo_int32l_t long int ++# define lzo_uint32l_t unsigned long int ++# define LZO_SIZEOF_LZO_INT32L_T LZO_SIZEOF_LONG ++#else ++# error "lzo_int32l_t" ++#endif ++#endif ++#if 1 ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32l_t) >= 4) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32l_t) == LZO_SIZEOF_LZO_INT32L_T) ++#endif ++#if !defined(lzo_int64l_t) ++#if defined(lzo_int64e_t) ++# define lzo_int64l_t lzo_int64e_t ++# define lzo_uint64l_t lzo_uint64e_t ++# define LZO_SIZEOF_LZO_INT64L_T LZO_SIZEOF_LZO_INT64E_T ++#else ++#endif ++#endif ++#if defined(lzo_int64l_t) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64l_t) >= 8) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64l_t) == LZO_SIZEOF_LZO_INT64L_T) ++#endif ++#if !defined(lzo_int32f_t) ++#if (LZO_SIZEOF_SIZE_T >= 8) ++# define lzo_int32f_t lzo_int64l_t ++# define lzo_uint32f_t lzo_uint64l_t ++# define LZO_SIZEOF_LZO_INT32F_T LZO_SIZEOF_LZO_INT64L_T ++#else ++# define lzo_int32f_t lzo_int32l_t ++# define lzo_uint32f_t lzo_uint32l_t ++# define LZO_SIZEOF_LZO_INT32F_T LZO_SIZEOF_LZO_INT32L_T ++#endif ++#endif ++#if 1 ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32f_t) >= 4) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32f_t) == LZO_SIZEOF_LZO_INT32F_T) ++#endif ++#if !defined(lzo_int64f_t) ++#if defined(lzo_int64l_t) ++# define lzo_int64f_t lzo_int64l_t ++# define lzo_uint64f_t lzo_uint64l_t ++# define LZO_SIZEOF_LZO_INT64F_T LZO_SIZEOF_LZO_INT64L_T ++#else ++#endif ++#endif ++#if defined(lzo_int64f_t) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64f_t) >= 8) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64f_t) == LZO_SIZEOF_LZO_INT64F_T) ++#endif ++#if !defined(lzo_intptr_t) ++#if 1 && (LZO_OS_OS400 && (LZO_SIZEOF_VOID_P == 16)) ++# define __LZO_INTPTR_T_IS_POINTER 1 ++ typedef char* lzo_intptr_t; ++ typedef char* lzo_uintptr_t; ++# define lzo_intptr_t lzo_intptr_t ++# define lzo_uintptr_t lzo_uintptr_t ++# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_VOID_P ++#elif (LZO_CC_MSC && (_MSC_VER >= 1300) && (LZO_SIZEOF_VOID_P == 4) && (LZO_SIZEOF_INT == 4)) ++ typedef __w64 int lzo_intptr_t; ++ typedef __w64 unsigned int lzo_uintptr_t; ++# define lzo_intptr_t lzo_intptr_t ++# define lzo_uintptr_t lzo_uintptr_t ++# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_INT ++#elif (LZO_SIZEOF_SHORT == LZO_SIZEOF_VOID_P) && (LZO_SIZEOF_INT > LZO_SIZEOF_VOID_P) ++# define lzo_intptr_t short ++# define lzo_uintptr_t unsigned short ++# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_SHORT ++#elif (LZO_SIZEOF_INT >= LZO_SIZEOF_VOID_P) && (LZO_SIZEOF_INT < LZO_SIZEOF_LONG) ++# define lzo_intptr_t int ++# define lzo_uintptr_t unsigned int ++# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_INT ++#elif (LZO_SIZEOF_LONG >= LZO_SIZEOF_VOID_P) ++# define lzo_intptr_t long ++# define lzo_uintptr_t unsigned long ++# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_LONG ++#elif (LZO_SIZEOF_LZO_INT64L_T >= LZO_SIZEOF_VOID_P) ++# define lzo_intptr_t lzo_int64l_t ++# define lzo_uintptr_t lzo_uint64l_t ++# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_LZO_INT64L_T ++#else ++# error "lzo_intptr_t" ++#endif ++#endif ++#if 1 ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_intptr_t) >= sizeof(void *)) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_intptr_t) == sizeof(lzo_uintptr_t)) ++#endif ++#if !defined(lzo_word_t) ++#if defined(LZO_WORDSIZE) && (LZO_WORDSIZE+0 > 0) ++#if (LZO_WORDSIZE == LZO_SIZEOF_LZO_INTPTR_T) && !(__LZO_INTPTR_T_IS_POINTER) ++# define lzo_word_t lzo_uintptr_t ++# define lzo_sword_t lzo_intptr_t ++# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_LZO_INTPTR_T ++#elif (LZO_WORDSIZE == LZO_SIZEOF_LONG) ++# define lzo_word_t unsigned long ++# define lzo_sword_t long ++# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_LONG ++#elif (LZO_WORDSIZE == LZO_SIZEOF_INT) ++# define lzo_word_t unsigned int ++# define lzo_sword_t int ++# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_INT ++#elif (LZO_WORDSIZE == LZO_SIZEOF_SHORT) ++# define lzo_word_t unsigned short ++# define lzo_sword_t short ++# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_SHORT ++#elif (LZO_WORDSIZE == 1) ++# define lzo_word_t unsigned char ++# define lzo_sword_t signed char ++# define LZO_SIZEOF_LZO_WORD_T 1 ++#elif (LZO_WORDSIZE == LZO_SIZEOF_LZO_INT64L_T) ++# define lzo_word_t lzo_uint64l_t ++# define lzo_sword_t lzo_int64l_t ++# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_LZO_INT64L_T ++#elif (LZO_ARCH_SPU) && (LZO_CC_GNUC) ++#if 0 ++ typedef unsigned lzo_word_t __attribute__((__mode__(__V16QI__))); ++ typedef int lzo_sword_t __attribute__((__mode__(__V16QI__))); ++# define lzo_word_t lzo_word_t ++# define lzo_sword_t lzo_sword_t ++# define LZO_SIZEOF_LZO_WORD_T 16 ++#endif ++#else ++# error "lzo_word_t" ++#endif ++#endif ++#endif ++#if 1 && defined(lzo_word_t) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_word_t) == LZO_WORDSIZE) ++ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_sword_t) == LZO_WORDSIZE) ++#endif ++#if 1 ++#define lzo_int8_t signed char ++#define lzo_uint8_t unsigned char ++#define LZO_SIZEOF_LZO_INT8_T 1 ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int8_t) == 1) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int8_t) == sizeof(lzo_uint8_t)) ++#endif ++#if defined(lzo_int16e_t) ++#define lzo_int16_t lzo_int16e_t ++#define lzo_uint16_t lzo_uint16e_t ++#define LZO_SIZEOF_LZO_INT16_T LZO_SIZEOF_LZO_INT16E_T ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16_t) == 2) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16_t) == sizeof(lzo_uint16_t)) ++#endif ++#if defined(lzo_int32e_t) ++#define lzo_int32_t lzo_int32e_t ++#define lzo_uint32_t lzo_uint32e_t ++#define LZO_SIZEOF_LZO_INT32_T LZO_SIZEOF_LZO_INT32E_T ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32_t) == 4) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32_t) == sizeof(lzo_uint32_t)) ++#endif ++#if defined(lzo_int64e_t) ++#define lzo_int64_t lzo_int64e_t ++#define lzo_uint64_t lzo_uint64e_t ++#define LZO_SIZEOF_LZO_INT64_T LZO_SIZEOF_LZO_INT64E_T ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64_t) == 8) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64_t) == sizeof(lzo_uint64_t)) ++#endif ++#if 1 ++#define lzo_int_least32_t lzo_int32l_t ++#define lzo_uint_least32_t lzo_uint32l_t ++#define LZO_SIZEOF_LZO_INT_LEAST32_T LZO_SIZEOF_LZO_INT32L_T ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_least32_t) >= 4) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_least32_t) == sizeof(lzo_uint_least32_t)) ++#endif ++#if defined(lzo_int64l_t) ++#define lzo_int_least64_t lzo_int64l_t ++#define lzo_uint_least64_t lzo_uint64l_t ++#define LZO_SIZEOF_LZO_INT_LEAST64_T LZO_SIZEOF_LZO_INT64L_T ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_least64_t) >= 8) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_least64_t) == sizeof(lzo_uint_least64_t)) ++#endif ++#if 1 ++#define lzo_int_fast32_t lzo_int32f_t ++#define lzo_uint_fast32_t lzo_uint32f_t ++#define LZO_SIZEOF_LZO_INT_FAST32_T LZO_SIZEOF_LZO_INT32F_T ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast32_t) >= 4) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast32_t) == sizeof(lzo_uint_fast32_t)) ++#endif ++#if defined(lzo_int64f_t) ++#define lzo_int_fast64_t lzo_int64f_t ++#define lzo_uint_fast64_t lzo_uint64f_t ++#define LZO_SIZEOF_LZO_INT_FAST64_T LZO_SIZEOF_LZO_INT64F_T ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast64_t) >= 8) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast64_t) == sizeof(lzo_uint_fast64_t)) ++#endif ++#if !defined(LZO_INT16_C) ++# if (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_INT >= 2) ++# define LZO_INT16_C(c) ((c) + 0) ++# define LZO_UINT16_C(c) ((c) + 0U) ++# elif (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_LONG >= 2) ++# define LZO_INT16_C(c) ((c) + 0L) ++# define LZO_UINT16_C(c) ((c) + 0UL) ++# elif (LZO_SIZEOF_INT >= 2) ++# define LZO_INT16_C(c) (c) ++# define LZO_UINT16_C(c) (c##U) ++# elif (LZO_SIZEOF_LONG >= 2) ++# define LZO_INT16_C(c) (c##L) ++# define LZO_UINT16_C(c) (c##UL) ++# else ++# error "LZO_INT16_C" ++# endif ++#endif ++#if !defined(LZO_INT32_C) ++# if (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_INT >= 4) ++# define LZO_INT32_C(c) ((c) + 0) ++# define LZO_UINT32_C(c) ((c) + 0U) ++# elif (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_LONG >= 4) ++# define LZO_INT32_C(c) ((c) + 0L) ++# define LZO_UINT32_C(c) ((c) + 0UL) ++# elif (LZO_SIZEOF_INT >= 4) ++# define LZO_INT32_C(c) (c) ++# define LZO_UINT32_C(c) (c##U) ++# elif (LZO_SIZEOF_LONG >= 4) ++# define LZO_INT32_C(c) (c##L) ++# define LZO_UINT32_C(c) (c##UL) ++# elif (LZO_SIZEOF_LONG_LONG >= 4) ++# define LZO_INT32_C(c) (c##LL) ++# define LZO_UINT32_C(c) (c##ULL) ++# else ++# error "LZO_INT32_C" ++# endif ++#endif ++#if !defined(LZO_INT64_C) && defined(lzo_int64l_t) ++# if (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_INT >= 8) ++# define LZO_INT64_C(c) ((c) + 0) ++# define LZO_UINT64_C(c) ((c) + 0U) ++# elif (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_LONG >= 8) ++# define LZO_INT64_C(c) ((c) + 0L) ++# define LZO_UINT64_C(c) ((c) + 0UL) ++# elif (LZO_SIZEOF_INT >= 8) ++# define LZO_INT64_C(c) (c) ++# define LZO_UINT64_C(c) (c##U) ++# elif (LZO_SIZEOF_LONG >= 8) ++# define LZO_INT64_C(c) (c##L) ++# define LZO_UINT64_C(c) (c##UL) ++# else ++# error "LZO_INT64_C" ++# endif ++#endif ++#endif ++ ++#endif ++ ++#endif ++ ++#undef LZO_HAVE_CONFIG_H ++#include "minilzo.h" ++ ++#if !defined(MINILZO_VERSION) || (MINILZO_VERSION != 0x2080) ++# error "version mismatch in miniLZO source files" ++#endif ++ ++#ifdef MINILZO_HAVE_CONFIG_H ++# define LZO_HAVE_CONFIG_H 1 ++#endif ++ ++#ifndef __LZO_CONF_H ++#define __LZO_CONF_H 1 ++ ++#if !defined(__LZO_IN_MINILZO) ++#if defined(LZO_CFG_FREESTANDING) && (LZO_CFG_FREESTANDING) ++# define LZO_LIBC_FREESTANDING 1 ++# define LZO_OS_FREESTANDING 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" ++#if defined(LZO_CFG_EXTRA_CONFIG_HEADER2) ++# include LZO_CFG_EXTRA_CONFIG_HEADER2 ++#endif ++#endif ++ ++#if (LZO_VERSION < 0x2080) || !defined(__LZOCONF_H_INCLUDED) ++# error "version mismatch" ++#endif ++ ++#if (LZO_CC_MSC && (_MSC_VER >= 1000 && _MSC_VER < 1100)) ++# pragma warning(disable: 4702) ++#endif ++#if (LZO_CC_MSC && (_MSC_VER >= 1000)) ++# pragma warning(disable: 4127 4701) ++# pragma warning(disable: 4514 4710 4711) ++#endif ++#if (LZO_CC_MSC && (_MSC_VER >= 1300)) ++# pragma warning(disable: 4820) ++#endif ++#if (LZO_CC_MSC && (_MSC_VER >= 1800)) ++# pragma warning(disable: 4746) ++#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 defined(__LZO_IN_MINILZO) || (LZO_CFG_FREESTANDING) ++#elif 1 ++# include ++#else ++# define LZO_WANT_ACC_INCD_H 1 ++#endif ++#if defined(LZO_HAVE_CONFIG_H) ++# define LZO_CFG_NO_CONFIG_HEADER 1 ++#endif ++ ++#if 1 && !defined(LZO_CFG_FREESTANDING) ++#if 1 && !defined(HAVE_STRING_H) ++#define HAVE_STRING_H 1 ++#endif ++#if 1 && !defined(HAVE_MEMCMP) ++#define HAVE_MEMCMP 1 ++#endif ++#if 1 && !defined(HAVE_MEMCPY) ++#define HAVE_MEMCPY 1 ++#endif ++#if 1 && !defined(HAVE_MEMMOVE) ++#define HAVE_MEMMOVE 1 ++#endif ++#if 1 && !defined(HAVE_MEMSET) ++#define HAVE_MEMSET 1 ++#endif ++#endif ++ ++#if 1 && defined(HAVE_STRING_H) ++#include ++#endif ++ ++#if 1 || defined(lzo_int8_t) || defined(lzo_uint8_t) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int8_t) == 1) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint8_t) == 1) ++#endif ++#if 1 || defined(lzo_int16_t) || defined(lzo_uint16_t) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16_t) == 2) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint16_t) == 2) ++#endif ++#if 1 || defined(lzo_int32_t) || defined(lzo_uint32_t) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32_t) == 4) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint32_t) == 4) ++#endif ++#if defined(lzo_int64_t) || defined(lzo_uint64_t) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64_t) == 8) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint64_t) == 8) ++#endif ++ ++#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) ++#else ++# 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) ++#else ++# 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) ++#else ++# 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) ++#else ++# 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 ++#endif ++ ++#if 0 && defined(__BOUNDS_CHECKING_ON) ++# include ++#else ++# define BOUNDS_CHECKING_OFF_DURING(stmt) stmt ++# define BOUNDS_CHECKING_OFF_IN_EXPR(expr) (expr) ++#endif ++ ++#if (LZO_CFG_PGO) ++# undef __lzo_likely ++# undef __lzo_unlikely ++# define __lzo_likely(e) (e) ++# define __lzo_unlikely(e) (e) ++#endif ++ ++#undef _ ++#undef __ ++#undef ___ ++#undef ____ ++#undef _p0 ++#undef _p1 ++#undef _p2 ++#undef _p3 ++#undef _p4 ++#undef _s0 ++#undef _s1 ++#undef _s2 ++#undef _s3 ++#undef _s4 ++#undef _ww ++ ++#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)))) ++ ++#define LZO_SIZE(bits) (1u << (bits)) ++#define LZO_MASK(bits) (LZO_SIZE(bits) - 1) ++ ++#define LZO_USIZE(bits) ((lzo_uint) 1 << (bits)) ++#define LZO_UMASK(bits) (LZO_USIZE(bits) - 1) ++ ++#if !defined(DMUL) ++#if 0 ++ ++# define DMUL(a,b) ((lzo_xint) ((lzo_uint32_t)(a) * (lzo_uint32_t)(b))) ++#else ++# define DMUL(a,b) ((lzo_xint) ((a) * (b))) ++#endif ++#endif ++ ++#ifndef __LZO_FUNC_H ++#define __LZO_FUNC_H 1 ++ ++#if !defined(LZO_BITOPS_USE_ASM_BITSCAN) && !defined(LZO_BITOPS_USE_GNUC_BITSCAN) && !defined(LZO_BITOPS_USE_MSC_BITSCAN) ++#if 1 && (LZO_ARCH_AMD64) && (LZO_CC_GNUC && (LZO_CC_GNUC < 0x040000ul)) && (LZO_ASM_SYNTAX_GNUC) ++#define LZO_BITOPS_USE_ASM_BITSCAN 1 ++#elif (LZO_CC_CLANG || (LZO_CC_GNUC >= 0x030400ul) || (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 1000)) || (LZO_CC_LLVM && (!defined(__llvm_tools_version__) || (__llvm_tools_version__+0 >= 0x010500ul)))) ++#define LZO_BITOPS_USE_GNUC_BITSCAN 1 ++#elif (LZO_OS_WIN32 || LZO_OS_WIN64) && ((LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 1010)) || (LZO_CC_MSC && (_MSC_VER >= 1400))) ++#define LZO_BITOPS_USE_MSC_BITSCAN 1 ++#if (LZO_CC_MSC) && (LZO_ARCH_AMD64 || LZO_ARCH_I386) ++#include ++#endif ++#if (LZO_CC_MSC) && (LZO_ARCH_AMD64 || LZO_ARCH_I386) ++#pragma intrinsic(_BitScanReverse) ++#pragma intrinsic(_BitScanForward) ++#endif ++#if (LZO_CC_MSC) && (LZO_ARCH_AMD64) ++#pragma intrinsic(_BitScanReverse64) ++#pragma intrinsic(_BitScanForward64) ++#endif ++#endif ++#endif ++ ++__lzo_static_forceinline unsigned lzo_bitops_ctlz32_func(lzo_uint32_t v) ++{ ++#if (LZO_BITOPS_USE_MSC_BITSCAN) && (LZO_ARCH_AMD64 || LZO_ARCH_I386) ++ unsigned long r; (void) _BitScanReverse(&r, v); return (unsigned) r ^ 31; ++#define lzo_bitops_ctlz32(v) lzo_bitops_ctlz32_func(v) ++#elif (LZO_BITOPS_USE_ASM_BITSCAN) && (LZO_ARCH_AMD64 || LZO_ARCH_I386) && (LZO_ASM_SYNTAX_GNUC) ++ lzo_uint32_t r; ++ __asm__("bsr %1,%0" : "=r" (r) : "rm" (v) __LZO_ASM_CLOBBER_LIST_CC); ++ return (unsigned) r ^ 31; ++#define lzo_bitops_ctlz32(v) lzo_bitops_ctlz32_func(v) ++#elif (LZO_BITOPS_USE_GNUC_BITSCAN) && (LZO_SIZEOF_INT == 4) ++ unsigned r; r = (unsigned) __builtin_clz(v); return r; ++#define lzo_bitops_ctlz32(v) ((unsigned) __builtin_clz(v)) ++#else ++ LZO_UNUSED(v); return 0; ++#endif ++} ++ ++#if defined(lzo_uint64_t) ++__lzo_static_forceinline unsigned lzo_bitops_ctlz64_func(lzo_uint64_t v) ++{ ++#if (LZO_BITOPS_USE_MSC_BITSCAN) && (LZO_ARCH_AMD64) ++ unsigned long r; (void) _BitScanReverse64(&r, v); return (unsigned) r ^ 63; ++#define lzo_bitops_ctlz64(v) lzo_bitops_ctlz64_func(v) ++#elif (LZO_BITOPS_USE_ASM_BITSCAN) && (LZO_ARCH_AMD64) && (LZO_ASM_SYNTAX_GNUC) ++ lzo_uint64_t r; ++ __asm__("bsr %1,%0" : "=r" (r) : "rm" (v) __LZO_ASM_CLOBBER_LIST_CC); ++ return (unsigned) r ^ 63; ++#define lzo_bitops_ctlz64(v) lzo_bitops_ctlz64_func(v) ++#elif (LZO_BITOPS_USE_GNUC_BITSCAN) && (LZO_SIZEOF_LONG == 8) && (LZO_WORDSIZE >= 8) ++ unsigned r; r = (unsigned) __builtin_clzl(v); return r; ++#define lzo_bitops_ctlz64(v) ((unsigned) __builtin_clzl(v)) ++#elif (LZO_BITOPS_USE_GNUC_BITSCAN) && (LZO_SIZEOF_LONG_LONG == 8) && (LZO_WORDSIZE >= 8) ++ unsigned r; r = (unsigned) __builtin_clzll(v); return r; ++#define lzo_bitops_ctlz64(v) ((unsigned) __builtin_clzll(v)) ++#else ++ LZO_UNUSED(v); return 0; ++#endif ++} ++#endif ++ ++__lzo_static_forceinline unsigned lzo_bitops_cttz32_func(lzo_uint32_t v) ++{ ++#if (LZO_BITOPS_USE_MSC_BITSCAN) && (LZO_ARCH_AMD64 || LZO_ARCH_I386) ++ unsigned long r; (void) _BitScanForward(&r, v); return (unsigned) r; ++#define lzo_bitops_cttz32(v) lzo_bitops_cttz32_func(v) ++#elif (LZO_BITOPS_USE_ASM_BITSCAN) && (LZO_ARCH_AMD64 || LZO_ARCH_I386) && (LZO_ASM_SYNTAX_GNUC) ++ lzo_uint32_t r; ++ __asm__("bsf %1,%0" : "=r" (r) : "rm" (v) __LZO_ASM_CLOBBER_LIST_CC); ++ return (unsigned) r; ++#define lzo_bitops_cttz32(v) lzo_bitops_cttz32_func(v) ++#elif (LZO_BITOPS_USE_GNUC_BITSCAN) && (LZO_SIZEOF_INT >= 4) ++ unsigned r; r = (unsigned) __builtin_ctz(v); return r; ++#define lzo_bitops_cttz32(v) ((unsigned) __builtin_ctz(v)) ++#else ++ LZO_UNUSED(v); return 0; ++#endif ++} ++ ++#if defined(lzo_uint64_t) ++__lzo_static_forceinline unsigned lzo_bitops_cttz64_func(lzo_uint64_t v) ++{ ++#if (LZO_BITOPS_USE_MSC_BITSCAN) && (LZO_ARCH_AMD64) ++ unsigned long r; (void) _BitScanForward64(&r, v); return (unsigned) r; ++#define lzo_bitops_cttz64(v) lzo_bitops_cttz64_func(v) ++#elif (LZO_BITOPS_USE_ASM_BITSCAN) && (LZO_ARCH_AMD64) && (LZO_ASM_SYNTAX_GNUC) ++ lzo_uint64_t r; ++ __asm__("bsf %1,%0" : "=r" (r) : "rm" (v) __LZO_ASM_CLOBBER_LIST_CC); ++ return (unsigned) r; ++#define lzo_bitops_cttz64(v) lzo_bitops_cttz64_func(v) ++#elif (LZO_BITOPS_USE_GNUC_BITSCAN) && (LZO_SIZEOF_LONG >= 8) && (LZO_WORDSIZE >= 8) ++ unsigned r; r = (unsigned) __builtin_ctzl(v); return r; ++#define lzo_bitops_cttz64(v) ((unsigned) __builtin_ctzl(v)) ++#elif (LZO_BITOPS_USE_GNUC_BITSCAN) && (LZO_SIZEOF_LONG_LONG >= 8) && (LZO_WORDSIZE >= 8) ++ unsigned r; r = (unsigned) __builtin_ctzll(v); return r; ++#define lzo_bitops_cttz64(v) ((unsigned) __builtin_ctzll(v)) ++#else ++ LZO_UNUSED(v); return 0; ++#endif ++} ++#endif ++ ++#if 1 && (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || (LZO_CC_GNUC >= 0x020700ul) || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) ++static void __attribute__((__unused__)) ++#else ++__lzo_static_forceinline void ++#endif ++lzo_bitops_unused_funcs(void) ++{ ++ LZO_UNUSED_FUNC(lzo_bitops_ctlz32_func); ++ LZO_UNUSED_FUNC(lzo_bitops_cttz32_func); ++#if defined(lzo_uint64_t) ++ LZO_UNUSED_FUNC(lzo_bitops_ctlz64_func); ++ LZO_UNUSED_FUNC(lzo_bitops_cttz64_func); ++#endif ++ LZO_UNUSED_FUNC(lzo_bitops_unused_funcs); ++} ++ ++#if defined(__lzo_alignof) && !(LZO_CFG_NO_UNALIGNED) ++#ifndef __lzo_memops_tcheck ++#define __lzo_memops_tcheck(t,a,b) ((void)0, sizeof(t) == (a) && __lzo_alignof(t) == (b)) ++#endif ++#endif ++#ifndef lzo_memops_TU0p ++#define lzo_memops_TU0p void __LZO_MMODEL * ++#endif ++#ifndef lzo_memops_TU1p ++#define lzo_memops_TU1p unsigned char __LZO_MMODEL * ++#endif ++#ifndef lzo_memops_TU2p ++#if (LZO_OPT_UNALIGNED16) ++typedef lzo_uint16_t __lzo_may_alias lzo_memops_TU2; ++#define lzo_memops_TU2p volatile lzo_memops_TU2 * ++#elif defined(__lzo_byte_struct) ++__lzo_byte_struct(lzo_memops_TU2_struct,2) ++typedef struct lzo_memops_TU2_struct lzo_memops_TU2; ++#else ++struct lzo_memops_TU2_struct { unsigned char a[2]; } __lzo_may_alias; ++typedef struct lzo_memops_TU2_struct lzo_memops_TU2; ++#endif ++#ifndef lzo_memops_TU2p ++#define lzo_memops_TU2p lzo_memops_TU2 * ++#endif ++#endif ++#ifndef lzo_memops_TU4p ++#if (LZO_OPT_UNALIGNED32) ++typedef lzo_uint32_t __lzo_may_alias lzo_memops_TU4; ++#define lzo_memops_TU4p volatile lzo_memops_TU4 __LZO_MMODEL * ++#elif defined(__lzo_byte_struct) ++__lzo_byte_struct(lzo_memops_TU4_struct,4) ++typedef struct lzo_memops_TU4_struct lzo_memops_TU4; ++#else ++struct lzo_memops_TU4_struct { unsigned char a[4]; } __lzo_may_alias; ++typedef struct lzo_memops_TU4_struct lzo_memops_TU4; ++#endif ++#ifndef lzo_memops_TU4p ++#define lzo_memops_TU4p lzo_memops_TU4 __LZO_MMODEL * ++#endif ++#endif ++#ifndef lzo_memops_TU8p ++#if (LZO_OPT_UNALIGNED64) ++typedef lzo_uint64_t __lzo_may_alias lzo_memops_TU8; ++#define lzo_memops_TU8p volatile lzo_memops_TU8 __LZO_MMODEL * ++#elif defined(__lzo_byte_struct) ++__lzo_byte_struct(lzo_memops_TU8_struct,8) ++typedef struct lzo_memops_TU8_struct lzo_memops_TU8; ++#else ++struct lzo_memops_TU8_struct { unsigned char a[8]; } __lzo_may_alias; ++typedef struct lzo_memops_TU8_struct lzo_memops_TU8; ++#endif ++#ifndef lzo_memops_TU8p ++#define lzo_memops_TU8p lzo_memops_TU8 __LZO_MMODEL * ++#endif ++#endif ++#ifndef lzo_memops_set_TU1p ++#define lzo_memops_set_TU1p volatile lzo_memops_TU1p ++#endif ++#ifndef lzo_memops_move_TU1p ++#define lzo_memops_move_TU1p lzo_memops_TU1p ++#endif ++#define LZO_MEMOPS_SET1(dd,cc) \ ++ LZO_BLOCK_BEGIN \ ++ lzo_memops_set_TU1p d__1 = (lzo_memops_set_TU1p) (lzo_memops_TU0p) (dd); \ ++ d__1[0] = LZO_BYTE(cc); \ ++ LZO_BLOCK_END ++#define LZO_MEMOPS_SET2(dd,cc) \ ++ LZO_BLOCK_BEGIN \ ++ lzo_memops_set_TU1p d__2 = (lzo_memops_set_TU1p) (lzo_memops_TU0p) (dd); \ ++ d__2[0] = LZO_BYTE(cc); d__2[1] = LZO_BYTE(cc); \ ++ LZO_BLOCK_END ++#define LZO_MEMOPS_SET3(dd,cc) \ ++ LZO_BLOCK_BEGIN \ ++ lzo_memops_set_TU1p d__3 = (lzo_memops_set_TU1p) (lzo_memops_TU0p) (dd); \ ++ d__3[0] = LZO_BYTE(cc); d__3[1] = LZO_BYTE(cc); d__3[2] = LZO_BYTE(cc); \ ++ LZO_BLOCK_END ++#define LZO_MEMOPS_SET4(dd,cc) \ ++ LZO_BLOCK_BEGIN \ ++ lzo_memops_set_TU1p d__4 = (lzo_memops_set_TU1p) (lzo_memops_TU0p) (dd); \ ++ d__4[0] = LZO_BYTE(cc); d__4[1] = LZO_BYTE(cc); d__4[2] = LZO_BYTE(cc); d__4[3] = LZO_BYTE(cc); \ ++ LZO_BLOCK_END ++#define LZO_MEMOPS_MOVE1(dd,ss) \ ++ LZO_BLOCK_BEGIN \ ++ lzo_memops_move_TU1p d__1 = (lzo_memops_move_TU1p) (lzo_memops_TU0p) (dd); \ ++ const lzo_memops_move_TU1p s__1 = (const lzo_memops_move_TU1p) (const lzo_memops_TU0p) (ss); \ ++ d__1[0] = s__1[0]; \ ++ LZO_BLOCK_END ++#define LZO_MEMOPS_MOVE2(dd,ss) \ ++ LZO_BLOCK_BEGIN \ ++ lzo_memops_move_TU1p d__2 = (lzo_memops_move_TU1p) (lzo_memops_TU0p) (dd); \ ++ const lzo_memops_move_TU1p s__2 = (const lzo_memops_move_TU1p) (const lzo_memops_TU0p) (ss); \ ++ d__2[0] = s__2[0]; d__2[1] = s__2[1]; \ ++ LZO_BLOCK_END ++#define LZO_MEMOPS_MOVE3(dd,ss) \ ++ LZO_BLOCK_BEGIN \ ++ lzo_memops_move_TU1p d__3 = (lzo_memops_move_TU1p) (lzo_memops_TU0p) (dd); \ ++ const lzo_memops_move_TU1p s__3 = (const lzo_memops_move_TU1p) (const lzo_memops_TU0p) (ss); \ ++ d__3[0] = s__3[0]; d__3[1] = s__3[1]; d__3[2] = s__3[2]; \ ++ LZO_BLOCK_END ++#define LZO_MEMOPS_MOVE4(dd,ss) \ ++ LZO_BLOCK_BEGIN \ ++ lzo_memops_move_TU1p d__4 = (lzo_memops_move_TU1p) (lzo_memops_TU0p) (dd); \ ++ const lzo_memops_move_TU1p s__4 = (const lzo_memops_move_TU1p) (const lzo_memops_TU0p) (ss); \ ++ d__4[0] = s__4[0]; d__4[1] = s__4[1]; d__4[2] = s__4[2]; d__4[3] = s__4[3]; \ ++ LZO_BLOCK_END ++#define LZO_MEMOPS_MOVE8(dd,ss) \ ++ LZO_BLOCK_BEGIN \ ++ lzo_memops_move_TU1p d__8 = (lzo_memops_move_TU1p) (lzo_memops_TU0p) (dd); \ ++ const lzo_memops_move_TU1p s__8 = (const lzo_memops_move_TU1p) (const lzo_memops_TU0p) (ss); \ ++ d__8[0] = s__8[0]; d__8[1] = s__8[1]; d__8[2] = s__8[2]; d__8[3] = s__8[3]; \ ++ d__8[4] = s__8[4]; d__8[5] = s__8[5]; d__8[6] = s__8[6]; d__8[7] = s__8[7]; \ ++ LZO_BLOCK_END ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU1p)0)==1) ++#define LZO_MEMOPS_COPY1(dd,ss) LZO_MEMOPS_MOVE1(dd,ss) ++#if (LZO_OPT_UNALIGNED16) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU2p)0)==2) ++#define LZO_MEMOPS_COPY2(dd,ss) \ ++ * (lzo_memops_TU2p) (lzo_memops_TU0p) (dd) = * (const lzo_memops_TU2p) (const lzo_memops_TU0p) (ss) ++#elif defined(__lzo_memops_tcheck) ++#define LZO_MEMOPS_COPY2(dd,ss) \ ++ LZO_BLOCK_BEGIN if (__lzo_memops_tcheck(lzo_memops_TU2,2,1)) { \ ++ * (lzo_memops_TU2p) (lzo_memops_TU0p) (dd) = * (const lzo_memops_TU2p) (const lzo_memops_TU0p) (ss); \ ++ } else { LZO_MEMOPS_MOVE2(dd,ss); } LZO_BLOCK_END ++#else ++#define LZO_MEMOPS_COPY2(dd,ss) LZO_MEMOPS_MOVE2(dd,ss) ++#endif ++#if (LZO_OPT_UNALIGNED32) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU4p)0)==4) ++#define LZO_MEMOPS_COPY4(dd,ss) \ ++ * (lzo_memops_TU4p) (lzo_memops_TU0p) (dd) = * (const lzo_memops_TU4p) (const lzo_memops_TU0p) (ss) ++#elif defined(__lzo_memops_tcheck) ++#define LZO_MEMOPS_COPY4(dd,ss) \ ++ LZO_BLOCK_BEGIN if (__lzo_memops_tcheck(lzo_memops_TU4,4,1)) { \ ++ * (lzo_memops_TU4p) (lzo_memops_TU0p) (dd) = * (const lzo_memops_TU4p) (const lzo_memops_TU0p) (ss); \ ++ } else { LZO_MEMOPS_MOVE4(dd,ss); } LZO_BLOCK_END ++#else ++#define LZO_MEMOPS_COPY4(dd,ss) LZO_MEMOPS_MOVE4(dd,ss) ++#endif ++#if (LZO_WORDSIZE != 8) ++#define LZO_MEMOPS_COPY8(dd,ss) \ ++ LZO_BLOCK_BEGIN LZO_MEMOPS_COPY4(dd,ss); LZO_MEMOPS_COPY4((lzo_memops_TU1p)(lzo_memops_TU0p)(dd)+4,(const lzo_memops_TU1p)(const lzo_memops_TU0p)(ss)+4); LZO_BLOCK_END ++#else ++#if (LZO_OPT_UNALIGNED64) ++LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU8p)0)==8) ++#define LZO_MEMOPS_COPY8(dd,ss) \ ++ * (lzo_memops_TU8p) (lzo_memops_TU0p) (dd) = * (const lzo_memops_TU8p) (const lzo_memops_TU0p) (ss) ++#elif (LZO_OPT_UNALIGNED32) ++#define LZO_MEMOPS_COPY8(dd,ss) \ ++ LZO_BLOCK_BEGIN LZO_MEMOPS_COPY4(dd,ss); LZO_MEMOPS_COPY4((lzo_memops_TU1p)(lzo_memops_TU0p)(dd)+4,(const lzo_memops_TU1p)(const lzo_memops_TU0p)(ss)+4); LZO_BLOCK_END ++#elif defined(__lzo_memops_tcheck) ++#define LZO_MEMOPS_COPY8(dd,ss) \ ++ LZO_BLOCK_BEGIN if (__lzo_memops_tcheck(lzo_memops_TU8,8,1)) { \ ++ * (lzo_memops_TU8p) (lzo_memops_TU0p) (dd) = * (const lzo_memops_TU8p) (const lzo_memops_TU0p) (ss); \ ++ } else { LZO_MEMOPS_MOVE8(dd,ss); } LZO_BLOCK_END ++#else ++#define LZO_MEMOPS_COPY8(dd,ss) LZO_MEMOPS_MOVE8(dd,ss) ++#endif ++#endif ++#define LZO_MEMOPS_COPYN(dd,ss,nn) \ ++ LZO_BLOCK_BEGIN \ ++ lzo_memops_TU1p d__n = (lzo_memops_TU1p) (lzo_memops_TU0p) (dd); \ ++ const lzo_memops_TU1p s__n = (const lzo_memops_TU1p) (const lzo_memops_TU0p) (ss); \ ++ lzo_uint n__n = (nn); \ ++ while ((void)0, n__n >= 8) { LZO_MEMOPS_COPY8(d__n, s__n); d__n += 8; s__n += 8; n__n -= 8; } \ ++ if ((void)0, n__n >= 4) { LZO_MEMOPS_COPY4(d__n, s__n); d__n += 4; s__n += 4; n__n -= 4; } \ ++ if ((void)0, n__n > 0) do { *d__n++ = *s__n++; } while (--n__n > 0); \ ++ LZO_BLOCK_END ++ ++__lzo_static_forceinline lzo_uint16_t lzo_memops_get_le16(const lzo_voidp ss) ++{ ++ lzo_uint16_t v; ++#if (LZO_ABI_LITTLE_ENDIAN) ++ LZO_MEMOPS_COPY2(&v, ss); ++#elif (LZO_OPT_UNALIGNED16 && LZO_ARCH_POWERPC && LZO_ABI_BIG_ENDIAN) && (LZO_ASM_SYNTAX_GNUC) ++ const lzo_memops_TU2p s = (const lzo_memops_TU2p) ss; ++ unsigned long vv; ++ __asm__("lhbrx %0,0,%1" : "=r" (vv) : "r" (s), "m" (*s)); ++ v = (lzo_uint16_t) vv; ++#else ++ const lzo_memops_TU1p s = (const lzo_memops_TU1p) ss; ++ v = (lzo_uint16_t) (((lzo_uint16_t)s[0]) | ((lzo_uint16_t)s[1] << 8)); ++#endif ++ return v; ++} ++#if (LZO_OPT_UNALIGNED16) && (LZO_ABI_LITTLE_ENDIAN) ++#define LZO_MEMOPS_GET_LE16(ss) * (const lzo_memops_TU2p) (const lzo_memops_TU0p) (ss) ++#else ++#define LZO_MEMOPS_GET_LE16(ss) lzo_memops_get_le16(ss) ++#endif + +-#undef LZO_HAVE_CONFIG_H +-#include "minilzo.h" +- +-#if !defined(MINILZO_VERSION) || (MINILZO_VERSION != 0x1080) +-# error "version mismatch in miniLZO source files" ++__lzo_static_forceinline lzo_uint32_t lzo_memops_get_le32(const lzo_voidp ss) ++{ ++ lzo_uint32_t v; ++#if (LZO_ABI_LITTLE_ENDIAN) ++ LZO_MEMOPS_COPY4(&v, ss); ++#elif (LZO_OPT_UNALIGNED32 && LZO_ARCH_POWERPC && LZO_ABI_BIG_ENDIAN) && (LZO_ASM_SYNTAX_GNUC) ++ const lzo_memops_TU4p s = (const lzo_memops_TU4p) ss; ++ unsigned long vv; ++ __asm__("lwbrx %0,0,%1" : "=r" (vv) : "r" (s), "m" (*s)); ++ v = (lzo_uint32_t) vv; ++#else ++ const lzo_memops_TU1p s = (const lzo_memops_TU1p) ss; ++ v = (lzo_uint32_t) (((lzo_uint32_t)s[0]) | ((lzo_uint32_t)s[1] << 8) | ((lzo_uint32_t)s[2] << 16) | ((lzo_uint32_t)s[3] << 24)); + #endif +- +-#ifdef MINILZO_HAVE_CONFIG_H +-# define LZO_HAVE_CONFIG_H ++ return v; ++} ++#if (LZO_OPT_UNALIGNED32) && (LZO_ABI_LITTLE_ENDIAN) ++#define LZO_MEMOPS_GET_LE32(ss) * (const lzo_memops_TU4p) (const lzo_memops_TU0p) (ss) ++#else ++#define LZO_MEMOPS_GET_LE32(ss) lzo_memops_get_le32(ss) + #endif + +-#if !defined(LZO_NO_SYS_TYPES_H) +-# include ++#if (LZO_OPT_UNALIGNED64) && (LZO_ABI_LITTLE_ENDIAN) ++#define LZO_MEMOPS_GET_LE64(ss) * (const lzo_memops_TU8p) (const lzo_memops_TU0p) (ss) + #endif +-#include +- +-#ifndef __LZO_CONF_H +-#define __LZO_CONF_H + +-#if !defined(__LZO_IN_MINILZO) +-# ifndef __LZOCONF_H +-# include +-# endif ++__lzo_static_forceinline lzo_uint16_t lzo_memops_get_ne16(const lzo_voidp ss) ++{ ++ lzo_uint16_t v; ++ LZO_MEMOPS_COPY2(&v, ss); ++ return v; ++} ++#if (LZO_OPT_UNALIGNED16) ++#define LZO_MEMOPS_GET_NE16(ss) * (const lzo_memops_TU2p) (const lzo_memops_TU0p) (ss) ++#else ++#define LZO_MEMOPS_GET_NE16(ss) lzo_memops_get_ne16(ss) + #endif + +-#if defined(__BOUNDS_CHECKING_ON) +-# include ++__lzo_static_forceinline lzo_uint32_t lzo_memops_get_ne32(const lzo_voidp ss) ++{ ++ lzo_uint32_t v; ++ LZO_MEMOPS_COPY4(&v, ss); ++ return v; ++} ++#if (LZO_OPT_UNALIGNED32) ++#define LZO_MEMOPS_GET_NE32(ss) * (const lzo_memops_TU4p) (const lzo_memops_TU0p) (ss) + #else +-# define BOUNDS_CHECKING_OFF_DURING(stmt) stmt +-# define BOUNDS_CHECKING_OFF_IN_EXPR(expr) (expr) ++#define LZO_MEMOPS_GET_NE32(ss) lzo_memops_get_ne32(ss) + #endif + +-#if !defined(LZO_HAVE_CONFIG_H) +-# include +-# include +-# if !defined(NO_STDLIB_H) +-# include +-# endif +-# define HAVE_MEMCMP +-# define HAVE_MEMCPY +-# define HAVE_MEMMOVE +-# define HAVE_MEMSET +-#else +-# include +-# if defined(HAVE_STDDEF_H) +-# include +-# endif +-# if defined(STDC_HEADERS) +-# include +-# include +-# endif ++#if (LZO_OPT_UNALIGNED64) ++#define LZO_MEMOPS_GET_NE64(ss) * (const lzo_memops_TU8p) (const lzo_memops_TU0p) (ss) + #endif + +-#if defined(__LZO_DOS16) || defined(__LZO_WIN16) +-# define HAVE_MALLOC_H +-# define HAVE_HALLOC ++__lzo_static_forceinline void lzo_memops_put_le16(lzo_voidp dd, lzo_uint16_t vv) ++{ ++#if (LZO_ABI_LITTLE_ENDIAN) ++ LZO_MEMOPS_COPY2(dd, &vv); ++#elif (LZO_OPT_UNALIGNED16 && LZO_ARCH_POWERPC && LZO_ABI_BIG_ENDIAN) && (LZO_ASM_SYNTAX_GNUC) ++ lzo_memops_TU2p d = (lzo_memops_TU2p) dd; ++ unsigned long v = vv; ++ __asm__("sthbrx %2,0,%1" : "=m" (*d) : "r" (d), "r" (v)); ++#else ++ lzo_memops_TU1p d = (lzo_memops_TU1p) dd; ++ d[0] = LZO_BYTE((vv ) & 0xff); ++ d[1] = LZO_BYTE((vv >> 8) & 0xff); ++#endif ++} ++#if (LZO_OPT_UNALIGNED16) && (LZO_ABI_LITTLE_ENDIAN) ++#define LZO_MEMOPS_PUT_LE16(dd,vv) (* (lzo_memops_TU2p) (lzo_memops_TU0p) (dd) = (vv)) ++#else ++#define LZO_MEMOPS_PUT_LE16(dd,vv) lzo_memops_put_le16(dd,vv) + #endif + +-#undef NDEBUG +-#if !defined(LZO_DEBUG) +-# define NDEBUG ++__lzo_static_forceinline void lzo_memops_put_le32(lzo_voidp dd, lzo_uint32_t vv) ++{ ++#if (LZO_ABI_LITTLE_ENDIAN) ++ LZO_MEMOPS_COPY4(dd, &vv); ++#elif (LZO_OPT_UNALIGNED32 && LZO_ARCH_POWERPC && LZO_ABI_BIG_ENDIAN) && (LZO_ASM_SYNTAX_GNUC) ++ lzo_memops_TU4p d = (lzo_memops_TU4p) dd; ++ unsigned long v = vv; ++ __asm__("stwbrx %2,0,%1" : "=m" (*d) : "r" (d), "r" (v)); ++#else ++ lzo_memops_TU1p d = (lzo_memops_TU1p) dd; ++ d[0] = LZO_BYTE((vv ) & 0xff); ++ d[1] = LZO_BYTE((vv >> 8) & 0xff); ++ d[2] = LZO_BYTE((vv >> 16) & 0xff); ++ d[3] = LZO_BYTE((vv >> 24) & 0xff); + #endif +-#if defined(LZO_DEBUG) || !defined(NDEBUG) +-# if !defined(NO_STDIO_H) +-# include +-# endif ++} ++#if (LZO_OPT_UNALIGNED32) && (LZO_ABI_LITTLE_ENDIAN) ++#define LZO_MEMOPS_PUT_LE32(dd,vv) (* (lzo_memops_TU4p) (lzo_memops_TU0p) (dd) = (vv)) ++#else ++#define LZO_MEMOPS_PUT_LE32(dd,vv) lzo_memops_put_le32(dd,vv) + #endif +-#include + +-#if !defined(LZO_COMPILE_TIME_ASSERT) +-# define LZO_COMPILE_TIME_ASSERT(expr) \ +- { typedef int __lzo_compile_time_assert_fail[1 - 2 * !(expr)]; } ++__lzo_static_forceinline void lzo_memops_put_ne16(lzo_voidp dd, lzo_uint16_t vv) ++{ ++ LZO_MEMOPS_COPY2(dd, &vv); ++} ++#if (LZO_OPT_UNALIGNED16) ++#define LZO_MEMOPS_PUT_NE16(dd,vv) (* (lzo_memops_TU2p) (lzo_memops_TU0p) (dd) = (vv)) ++#else ++#define LZO_MEMOPS_PUT_NE16(dd,vv) lzo_memops_put_ne16(dd,vv) + #endif + +-#if !defined(LZO_UNUSED) +-# if 1 +-# define LZO_UNUSED(var) ((void)&var) +-# elif 0 +-# define LZO_UNUSED(var) { typedef int __lzo_unused[sizeof(var) ? 2 : 1]; } +-# else +-# define LZO_UNUSED(parm) (parm = parm) +-# endif ++__lzo_static_forceinline void lzo_memops_put_ne32(lzo_voidp dd, lzo_uint32_t vv) ++{ ++ LZO_MEMOPS_COPY4(dd, &vv); ++} ++#if (LZO_OPT_UNALIGNED32) ++#define LZO_MEMOPS_PUT_NE32(dd,vv) (* (lzo_memops_TU4p) (lzo_memops_TU0p) (dd) = (vv)) ++#else ++#define LZO_MEMOPS_PUT_NE32(dd,vv) lzo_memops_put_ne32(dd,vv) + #endif + +-#if !defined(__inline__) && !defined(__GNUC__) +-# if defined(__cplusplus) +-# define __inline__ inline +-# else +-# define __inline__ +-# endif ++#if 1 && (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || (LZO_CC_GNUC >= 0x020700ul) || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) ++static void __attribute__((__unused__)) ++#else ++__lzo_static_forceinline void + #endif ++lzo_memops_unused_funcs(void) ++{ ++ LZO_UNUSED_FUNC(lzo_memops_get_le16); ++ LZO_UNUSED_FUNC(lzo_memops_get_le32); ++ LZO_UNUSED_FUNC(lzo_memops_get_ne16); ++ LZO_UNUSED_FUNC(lzo_memops_get_ne32); ++ LZO_UNUSED_FUNC(lzo_memops_put_le16); ++ LZO_UNUSED_FUNC(lzo_memops_put_le32); ++ LZO_UNUSED_FUNC(lzo_memops_put_ne16); ++ LZO_UNUSED_FUNC(lzo_memops_put_ne32); ++ LZO_UNUSED_FUNC(lzo_memops_unused_funcs); ++} + +-#if defined(NO_MEMCMP) +-# undef HAVE_MEMCMP + #endif + +-#if !defined(HAVE_MEMCMP) +-# undef memcmp +-# define memcmp lzo_memcmp ++#ifndef UA_SET1 ++#define UA_SET1 LZO_MEMOPS_SET1 + #endif +-#if !defined(HAVE_MEMCPY) +-# undef memcpy +-# define memcpy lzo_memcpy ++#ifndef UA_SET2 ++#define UA_SET2 LZO_MEMOPS_SET2 + #endif +-#if !defined(HAVE_MEMMOVE) +-# undef memmove +-# define memmove lzo_memmove ++#ifndef UA_SET3 ++#define UA_SET3 LZO_MEMOPS_SET3 + #endif +-#if !defined(HAVE_MEMSET) +-# undef memset +-# define memset lzo_memset ++#ifndef UA_SET4 ++#define UA_SET4 LZO_MEMOPS_SET4 + #endif +- +-#if 0 +-# define LZO_BYTE(x) ((unsigned char) (x)) +-#else +-# define LZO_BYTE(x) ((unsigned char) ((x) & 0xff)) ++#ifndef UA_MOVE1 ++#define UA_MOVE1 LZO_MEMOPS_MOVE1 + #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)))) +- +-#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) +- +-#define LZO_STYPE_MAX(b) (((1l << (8*(b)-2)) - 1l) + (1l << (8*(b)-2))) +-#define LZO_UTYPE_MAX(b) (((1ul << (8*(b)-1)) - 1ul) + (1ul << (8*(b)-1))) +- +-#if !defined(SIZEOF_UNSIGNED) +-# if (UINT_MAX == 0xffff) +-# define SIZEOF_UNSIGNED 2 +-# elif (UINT_MAX == LZO_0xffffffffL) +-# define SIZEOF_UNSIGNED 4 +-# elif (UINT_MAX >= LZO_0xffffffffL) +-# define SIZEOF_UNSIGNED 8 +-# else +-# error "SIZEOF_UNSIGNED" +-# endif ++#ifndef UA_MOVE2 ++#define UA_MOVE2 LZO_MEMOPS_MOVE2 + #endif +- +-#if !defined(SIZEOF_UNSIGNED_LONG) +-# if (ULONG_MAX == LZO_0xffffffffL) +-# define SIZEOF_UNSIGNED_LONG 4 +-# elif (ULONG_MAX >= LZO_0xffffffffL) +-# define SIZEOF_UNSIGNED_LONG 8 +-# else +-# error "SIZEOF_UNSIGNED_LONG" +-# endif ++#ifndef UA_MOVE3 ++#define UA_MOVE3 LZO_MEMOPS_MOVE3 + #endif +- +-#if !defined(SIZEOF_SIZE_T) +-# define SIZEOF_SIZE_T SIZEOF_UNSIGNED ++#ifndef UA_MOVE4 ++#define UA_MOVE4 LZO_MEMOPS_MOVE4 + #endif +-#if !defined(SIZE_T_MAX) +-# define SIZE_T_MAX LZO_UTYPE_MAX(SIZEOF_SIZE_T) ++#ifndef UA_MOVE8 ++#define UA_MOVE8 LZO_MEMOPS_MOVE8 + #endif +- +-#if 1 && defined(__LZO_i386) && (UINT_MAX == LZO_0xffffffffL) +-# if !defined(LZO_UNALIGNED_OK_2) && (USHRT_MAX == 0xffff) +-# define LZO_UNALIGNED_OK_2 +-# endif +-# if !defined(LZO_UNALIGNED_OK_4) && (LZO_UINT32_MAX == LZO_0xffffffffL) +-# define LZO_UNALIGNED_OK_4 +-# endif ++#ifndef UA_COPY1 ++#define UA_COPY1 LZO_MEMOPS_COPY1 + #endif +- +-#if defined(LZO_UNALIGNED_OK_2) || defined(LZO_UNALIGNED_OK_4) +-# if !defined(LZO_UNALIGNED_OK) +-# define LZO_UNALIGNED_OK +-# endif ++#ifndef UA_COPY2 ++#define UA_COPY2 LZO_MEMOPS_COPY2 + #endif +- +-#if defined(__LZO_NO_UNALIGNED) +-# undef LZO_UNALIGNED_OK +-# undef LZO_UNALIGNED_OK_2 +-# undef LZO_UNALIGNED_OK_4 ++#ifndef UA_COPY3 ++#define UA_COPY3 LZO_MEMOPS_COPY3 + #endif +- +-#if defined(LZO_UNALIGNED_OK_2) && (USHRT_MAX != 0xffff) +-# error "LZO_UNALIGNED_OK_2 must not be defined on this system" ++#ifndef UA_COPY4 ++#define UA_COPY4 LZO_MEMOPS_COPY4 + #endif +-#if defined(LZO_UNALIGNED_OK_4) && (LZO_UINT32_MAX != LZO_0xffffffffL) +-# error "LZO_UNALIGNED_OK_4 must not be defined on this system" ++#ifndef UA_COPY8 ++#define UA_COPY8 LZO_MEMOPS_COPY8 + #endif +- +-#if defined(__LZO_NO_ALIGNED) +-# undef LZO_ALIGNED_OK_4 ++#ifndef UA_COPYN ++#define UA_COPYN LZO_MEMOPS_COPYN + #endif +- +-#if defined(LZO_ALIGNED_OK_4) && (LZO_UINT32_MAX != LZO_0xffffffffL) +-# error "LZO_ALIGNED_OK_4 must not be defined on this system" ++#ifndef UA_COPYN_X ++#define UA_COPYN_X LZO_MEMOPS_COPYN + #endif +- +-#define LZO_LITTLE_ENDIAN 1234 +-#define LZO_BIG_ENDIAN 4321 +-#define LZO_PDP_ENDIAN 3412 +- +-#if !defined(LZO_BYTE_ORDER) +-# if defined(MFX_BYTE_ORDER) +-# define LZO_BYTE_ORDER MFX_BYTE_ORDER +-# elif defined(__LZO_i386) +-# define LZO_BYTE_ORDER LZO_LITTLE_ENDIAN +-# elif defined(BYTE_ORDER) +-# define LZO_BYTE_ORDER BYTE_ORDER +-# elif defined(__BYTE_ORDER) +-# define LZO_BYTE_ORDER __BYTE_ORDER +-# endif ++#ifndef UA_GET_LE16 ++#define UA_GET_LE16 LZO_MEMOPS_GET_LE16 + #endif +- +-#if defined(LZO_BYTE_ORDER) +-# if (LZO_BYTE_ORDER != LZO_LITTLE_ENDIAN) && \ +- (LZO_BYTE_ORDER != LZO_BIG_ENDIAN) +-# error "invalid LZO_BYTE_ORDER" +-# endif ++#ifndef UA_GET_LE32 ++#define UA_GET_LE32 LZO_MEMOPS_GET_LE32 + #endif +- +-#if defined(LZO_UNALIGNED_OK) && !defined(LZO_BYTE_ORDER) +-# error "LZO_BYTE_ORDER is not defined" ++#ifdef LZO_MEMOPS_GET_LE64 ++#ifndef UA_GET_LE64 ++#define UA_GET_LE64 LZO_MEMOPS_GET_LE64 + #endif +- +-#define LZO_OPTIMIZE_GNUC_i386_IS_BUGGY +- +-#if defined(NDEBUG) && !defined(LZO_DEBUG) && !defined(__LZO_CHECKER) +-# if defined(__GNUC__) && defined(__i386__) +-# if !defined(LZO_OPTIMIZE_GNUC_i386_IS_BUGGY) +-# define LZO_OPTIMIZE_GNUC_i386 +-# endif +-# endif ++#endif ++#ifndef UA_GET_NE16 ++#define UA_GET_NE16 LZO_MEMOPS_GET_NE16 ++#endif ++#ifndef UA_GET_NE32 ++#define UA_GET_NE32 LZO_MEMOPS_GET_NE32 ++#endif ++#ifdef LZO_MEMOPS_GET_NE64 ++#ifndef UA_GET_NE64 ++#define UA_GET_NE64 LZO_MEMOPS_GET_NE64 ++#endif ++#endif ++#ifndef UA_PUT_LE16 ++#define UA_PUT_LE16 LZO_MEMOPS_PUT_LE16 ++#endif ++#ifndef UA_PUT_LE32 ++#define UA_PUT_LE32 LZO_MEMOPS_PUT_LE32 ++#endif ++#ifndef UA_PUT_NE16 ++#define UA_PUT_NE16 LZO_MEMOPS_PUT_NE16 ++#endif ++#ifndef UA_PUT_NE32 ++#define UA_PUT_NE32 LZO_MEMOPS_PUT_NE32 + #endif + +-__LZO_EXTERN_C int __lzo_init_done; +-__LZO_EXTERN_C const lzo_byte __lzo_copyright[]; +-LZO_EXTERN(const lzo_byte *) lzo_copyright(void); +-__LZO_EXTERN_C const lzo_uint32 _lzo_crc32_table[256]; +- +-#define _LZO_STRINGIZE(x) #x +-#define _LZO_MEXPAND(x) _LZO_STRINGIZE(x) +- +-#define _LZO_CONCAT2(a,b) a ## b +-#define _LZO_CONCAT3(a,b,c) a ## b ## c +-#define _LZO_CONCAT4(a,b,c,d) a ## b ## c ## d +-#define _LZO_CONCAT5(a,b,c,d,e) a ## b ## c ## d ## e +- +-#define _LZO_ECONCAT2(a,b) _LZO_CONCAT2(a,b) +-#define _LZO_ECONCAT3(a,b,c) _LZO_CONCAT3(a,b,c) +-#define _LZO_ECONCAT4(a,b,c,d) _LZO_CONCAT4(a,b,c,d) +-#define _LZO_ECONCAT5(a,b,c,d,e) _LZO_CONCAT5(a,b,c,d,e) +- +-#if 0 +- +-#define __LZO_IS_COMPRESS_QUERY(i,il,o,ol,w) ((lzo_voidp)(o) == (w)) +-#define __LZO_QUERY_COMPRESS(i,il,o,ol,w,n,s) \ +- (*ol = (n)*(s), LZO_E_OK) ++#define MEMCPY8_DS(dest,src,len) \ ++ lzo_memcpy(dest,src,len); dest += len; src += len + +-#define __LZO_IS_DECOMPRESS_QUERY(i,il,o,ol,w) ((lzo_voidp)(o) == (w)) +-#define __LZO_QUERY_DECOMPRESS(i,il,o,ol,w,n,s) \ +- (*ol = (n)*(s), LZO_E_OK) ++#define BZERO8_PTR(s,l,n) \ ++ lzo_memset((lzo_voidp)(s),0,(lzo_uint)(l)*(n)) + +-#define __LZO_IS_OPTIMIZE_QUERY(i,il,o,ol,w) ((lzo_voidp)(o) == (w)) +-#define __LZO_QUERY_OPTIMIZE(i,il,o,ol,w,n,s) \ +- (*ol = (n)*(s), LZO_E_OK) ++#define MEMCPY_DS(dest,src,len) \ ++ do *dest++ = *src++; while (--len > 0) + +-#endif ++LZO_EXTERN(const lzo_bytep) lzo_copyright(void); + + #ifndef __LZO_PTR_H +-#define __LZO_PTR_H ++#define __LZO_PTR_H 1 + + #ifdef __cplusplus + extern "C" { + #endif + +-#if defined(__LZO_DOS16) || defined(__LZO_WIN16) +-# include +-# if 1 && defined(__WATCOMC__) +-# include +- __LZO_EXTERN_C unsigned char _HShift; +-# define __LZO_HShift _HShift +-# elif 1 && defined(_MSC_VER) +- __LZO_EXTERN_C unsigned short __near _AHSHIFT; +-# define __LZO_HShift ((unsigned) &_AHSHIFT) +-# elif defined(__LZO_WIN16) +-# define __LZO_HShift 3 +-# else +-# define __LZO_HShift 12 +-# endif +-# if !defined(_FP_SEG) && defined(FP_SEG) +-# define _FP_SEG FP_SEG +-# endif +-# if !defined(_FP_OFF) && defined(FP_OFF) +-# define _FP_OFF FP_OFF +-# endif +-#endif +- +-#if !defined(lzo_ptrdiff_t) +-# if (UINT_MAX >= LZO_0xffffffffL) +- typedef ptrdiff_t lzo_ptrdiff_t; +-# else +- typedef long lzo_ptrdiff_t; +-# endif +-#endif +- +-#if !defined(__LZO_HAVE_PTR_T) +-# if defined(lzo_ptr_t) +-# define __LZO_HAVE_PTR_T +-# endif +-#endif +-#if !defined(__LZO_HAVE_PTR_T) +-# if defined(SIZEOF_CHAR_P) && defined(SIZEOF_UNSIGNED_LONG) +-# if (SIZEOF_CHAR_P == SIZEOF_UNSIGNED_LONG) +- typedef unsigned long lzo_ptr_t; +- typedef long lzo_sptr_t; +-# define __LZO_HAVE_PTR_T +-# endif +-# endif +-#endif +-#if !defined(__LZO_HAVE_PTR_T) +-# if defined(SIZEOF_CHAR_P) && defined(SIZEOF_UNSIGNED) +-# if (SIZEOF_CHAR_P == SIZEOF_UNSIGNED) +- typedef unsigned int lzo_ptr_t; +- typedef int lzo_sptr_t; +-# define __LZO_HAVE_PTR_T +-# endif +-# endif +-#endif +-#if !defined(__LZO_HAVE_PTR_T) +-# if defined(SIZEOF_CHAR_P) && defined(SIZEOF_UNSIGNED_SHORT) +-# if (SIZEOF_CHAR_P == SIZEOF_UNSIGNED_SHORT) +- typedef unsigned short lzo_ptr_t; +- typedef short lzo_sptr_t; +-# define __LZO_HAVE_PTR_T +-# endif +-# endif +-#endif +-#if !defined(__LZO_HAVE_PTR_T) +-# if defined(LZO_HAVE_CONFIG_H) || defined(SIZEOF_CHAR_P) +-# error "no suitable type for lzo_ptr_t" +-# else +- typedef unsigned long lzo_ptr_t; +- typedef long lzo_sptr_t; +-# define __LZO_HAVE_PTR_T +-# endif +-#endif +- +-#if defined(__LZO_DOS16) || defined(__LZO_WIN16) +-#define PTR(a) ((lzo_bytep) (a)) +-#define PTR_ALIGNED_4(a) ((_FP_OFF(a) & 3) == 0) +-#define PTR_ALIGNED2_4(a,b) (((_FP_OFF(a) | _FP_OFF(b)) & 3) == 0) ++#if (LZO_ARCH_I086) ++#error "LZO_ARCH_I086 is unsupported" ++#elif (LZO_MM_PVP) ++#error "LZO_MM_PVP is unsupported" + #else +-#define PTR(a) ((lzo_ptr_t) (a)) ++#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) +@@ -414,10 +3797,10 @@ extern "C" { + + #define PTR_LT(a,b) (PTR(a) < PTR(b)) + #define PTR_GE(a,b) (PTR(a) >= PTR(b)) +-#define PTR_DIFF(a,b) ((lzo_ptrdiff_t) (PTR(a) - PTR(b))) ++#define PTR_DIFF(a,b) (PTR(a) - PTR(b)) + #define pd(a,b) ((lzo_uint) ((a)-(b))) + +-LZO_EXTERN(lzo_ptr_t) ++LZO_EXTERN(lzo_uintptr_t) + __lzo_ptr_linear(const lzo_voidp ptr); + + typedef union +@@ -432,21 +3815,28 @@ typedef union + unsigned long a_ulong; + lzo_int a_lzo_int; + lzo_uint a_lzo_uint; +- lzo_int32 a_lzo_int32; +- lzo_uint32 a_lzo_uint32; ++ lzo_xint a_lzo_xint; ++ lzo_int16_t a_lzo_int16_t; ++ lzo_uint16_t a_lzo_uint16_t; ++ lzo_int32_t a_lzo_int32_t; ++ lzo_uint32_t a_lzo_uint32_t; ++#if defined(lzo_uint64_t) ++ lzo_int64_t a_lzo_int64_t; ++ lzo_uint64_t a_lzo_uint64_t; ++#endif ++ size_t a_size_t; + ptrdiff_t a_ptrdiff_t; +- lzo_ptrdiff_t a_lzo_ptrdiff_t; +- lzo_ptr_t a_lzo_ptr_t; +- lzo_voidp a_lzo_voidp; ++ lzo_uintptr_t a_lzo_uintptr_t; + 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; ++ unsigned char * a_uchar_p; ++ const void * a_c_void_p; ++ const char * a_c_char_p; ++ const unsigned char * a_c_uchar_p; ++ lzo_voidp a_lzo_voidp; ++ lzo_bytep a_lzo_bytep; ++ const lzo_voidp a_c_lzo_voidp; ++ const lzo_bytep a_c_lzo_bytep; + } + lzo_full_align_t; + +@@ -456,36 +3846,37 @@ lzo_full_align_t; + + #endif + +-#define LZO_DETERMINISTIC ++#ifndef LZO_DETERMINISTIC ++#define LZO_DETERMINISTIC 1 ++#endif + +-#define LZO_DICT_USE_PTR +-#if defined(__LZO_DOS16) || defined(__LZO_WIN16) || defined(__LZO_STRICT_16BIT) +-# undef LZO_DICT_USE_PTR ++#ifndef LZO_DICT_USE_PTR ++#define LZO_DICT_USE_PTR 1 + #endif + +-#if defined(LZO_DICT_USE_PTR) ++#if (LZO_DICT_USE_PTR) + # define lzo_dict_t const lzo_bytep +-# define lzo_dict_p lzo_dict_t __LZO_MMODEL * ++# define lzo_dict_p lzo_dict_t * + #else + # define lzo_dict_t lzo_uint +-# define lzo_dict_p lzo_dict_t __LZO_MMODEL * ++# define lzo_dict_p lzo_dict_t * + #endif + +-#if !defined(lzo_moff_t) +-#define lzo_moff_t lzo_uint + #endif + +-#endif ++#if !defined(MINILZO_CFG_SKIP_LZO_PTR) + +-LZO_PUBLIC(lzo_ptr_t) ++LZO_PUBLIC(lzo_uintptr_t) + __lzo_ptr_linear(const lzo_voidp ptr) + { +- lzo_ptr_t p; ++ lzo_uintptr_t p; + +-#if defined(__LZO_DOS16) || defined(__LZO_WIN16) +- p = (((lzo_ptr_t)(_FP_SEG(ptr))) << (16 - __LZO_HShift)) + (_FP_OFF(ptr)); ++#if (LZO_ARCH_I086) ++#error "LZO_ARCH_I086 is unsupported" ++#elif (LZO_MM_PVP) ++#error "LZO_MM_PVP is unsupported" + #else +- p = PTR_LINEAR(ptr); ++ p = (lzo_uintptr_t) PTR_LINEAR(ptr); + #endif + + return p; +@@ -494,242 +3885,44 @@ __lzo_ptr_linear(const lzo_voidp ptr) + LZO_PUBLIC(unsigned) + __lzo_align_gap(const lzo_voidp ptr, lzo_uint size) + { +- lzo_ptr_t p, s, n; +- +- assert(size > 0); +- +- p = __lzo_ptr_linear(ptr); +- s = (lzo_ptr_t) (size - 1); +-#if 0 +- assert((size & (size - 1)) == 0); +- n = ((p + s) & ~s) - p; ++#if (__LZO_UINTPTR_T_IS_POINTER) ++#error "__LZO_UINTPTR_T_IS_POINTER is unsupported" + #else +- n = (((p + s) / size) * size) - p; ++ 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 <= s); +- ++ assert(n <= size); + return (unsigned)n; + } + +-#ifndef __LZO_UTIL_H +-#define __LZO_UTIL_H +- +-#ifndef __LZO_CONF_H +-#endif +- +-#ifdef __cplusplus +-extern "C" { +-#endif +- +-#if 1 && defined(HAVE_MEMCPY) +-#if !defined(__LZO_DOS16) && !defined(__LZO_WIN16) +- +-#define MEMCPY8_DS(dest,src,len) \ +- memcpy(dest,src,len); \ +- dest += len; \ +- src += len +- +-#endif +-#endif +- +-#if 0 && !defined(MEMCPY8_DS) +- +-#define MEMCPY8_DS(dest,src,len) \ +- { do { \ +- *dest++ = *src++; \ +- *dest++ = *src++; \ +- *dest++ = *src++; \ +- *dest++ = *src++; \ +- *dest++ = *src++; \ +- *dest++ = *src++; \ +- *dest++ = *src++; \ +- *dest++ = *src++; \ +- len -= 8; \ +- } while (len > 0); } +- +-#endif +- +-#if !defined(MEMCPY8_DS) +- +-#define MEMCPY8_DS(dest,src,len) \ +- { register lzo_uint __l = (len) / 8; \ +- do { \ +- *dest++ = *src++; \ +- *dest++ = *src++; \ +- *dest++ = *src++; \ +- *dest++ = *src++; \ +- *dest++ = *src++; \ +- *dest++ = *src++; \ +- *dest++ = *src++; \ +- *dest++ = *src++; \ +- } while (--__l > 0); } +- +-#endif +- +-#define MEMCPY_DS(dest,src,len) \ +- do *dest++ = *src++; \ +- while (--len > 0) +- +-#define MEMMOVE_DS(dest,src,len) \ +- do *dest++ = *src++; \ +- while (--len > 0) +- +-#if 0 && defined(LZO_OPTIMIZE_GNUC_i386) +- +-#define BZERO8_PTR(s,l,n) \ +-__asm__ __volatile__( \ +- "movl %0,%%eax \n" \ +- "movl %1,%%edi \n" \ +- "movl %2,%%ecx \n" \ +- "cld \n" \ +- "rep \n" \ +- "stosl %%eax,(%%edi) \n" \ +- : \ +- :"g" (0),"g" (s),"g" (n) \ +- :"eax","edi","ecx", "memory", "cc" \ +-) +- +-#elif (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMSET) +- +-#if 1 +-#define BZERO8_PTR(s,l,n) memset((s),0,(lzo_uint)(l)*(n)) +-#else +-#define BZERO8_PTR(s,l,n) memset((lzo_voidp)(s),0,(lzo_uint)(l)*(n)) +-#endif +- +-#else +- +-#define BZERO8_PTR(s,l,n) \ +- lzo_memset((lzo_voidp)(s),0,(lzo_uint)(l)*(n)) +- +-#endif +- +-#if 0 +-#if defined(__GNUC__) && defined(__i386__) +- +-unsigned char lzo_rotr8(unsigned char value, int shift); +-extern __inline__ unsigned char lzo_rotr8(unsigned char value, int shift) +-{ +- unsigned char result; +- +- __asm__ __volatile__ ("movb %b1, %b0; rorb %b2, %b0" +- : "=a"(result) : "g"(value), "c"(shift)); +- return result; +-} +- +-unsigned short lzo_rotr16(unsigned short value, int shift); +-extern __inline__ unsigned short lzo_rotr16(unsigned short value, int shift) +-{ +- unsigned short result; +- +- __asm__ __volatile__ ("movw %b1, %b0; rorw %b2, %b0" +- : "=a"(result) : "g"(value), "c"(shift)); +- return result; +-} +- +-#endif +-#endif +- +-#ifdef __cplusplus +-} +-#endif +- + #endif ++#if !defined(MINILZO_CFG_SKIP_LZO_UTIL) + +-LZO_PUBLIC(lzo_bool) +-lzo_assert(int expr) +-{ +- return (expr) ? 1 : 0; +-} +- +-/* If you use the LZO library in a product, you *must* keep this +- * copyright string in the executable of your product. +- */ +- +-const lzo_byte __lzo_copyright[] = +-#if !defined(__LZO_IN_MINLZO) +- LZO_VERSION_STRING; +-#else +- "\n\n\n" +- "LZO real-time data compression library.\n" +- "Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Markus Franz Xaver Johannes Oberhumer\n" +- "\n" +- "http://www.oberhumer.com/opensource/lzo/\n" +- "\n" +- "LZO version: v" LZO_VERSION_STRING ", " LZO_VERSION_DATE "\n" +- "LZO build date: " __DATE__ " " __TIME__ "\n\n" +- "LZO special compilation options:\n" +-#ifdef __cplusplus +- " __cplusplus\n" +-#endif +-#if defined(__PIC__) +- " __PIC__\n" +-#elif defined(__pic__) +- " __pic__\n" +-#endif +-#if (UINT_MAX < LZO_0xffffffffL) +- " 16BIT\n" +-#endif +-#if defined(__LZO_STRICT_16BIT) +- " __LZO_STRICT_16BIT\n" +-#endif +-#if (UINT_MAX > LZO_0xffffffffL) +- " UINT_MAX=" _LZO_MEXPAND(UINT_MAX) "\n" +-#endif +-#if (ULONG_MAX > LZO_0xffffffffL) +- " ULONG_MAX=" _LZO_MEXPAND(ULONG_MAX) "\n" +-#endif +-#if defined(LZO_BYTE_ORDER) +- " LZO_BYTE_ORDER=" _LZO_MEXPAND(LZO_BYTE_ORDER) "\n" +-#endif +-#if defined(LZO_UNALIGNED_OK_2) +- " LZO_UNALIGNED_OK_2\n" +-#endif +-#if defined(LZO_UNALIGNED_OK_4) +- " LZO_UNALIGNED_OK_4\n" +-#endif +-#if defined(LZO_ALIGNED_OK_4) +- " LZO_ALIGNED_OK_4\n" +-#endif +-#if defined(LZO_DICT_USE_PTR) +- " LZO_DICT_USE_PTR\n" +-#endif +-#if defined(__LZO_QUERY_COMPRESS) +- " __LZO_QUERY_COMPRESS\n" +-#endif +-#if defined(__LZO_QUERY_DECOMPRESS) +- " __LZO_QUERY_DECOMPRESS\n" +-#endif +-#if defined(__LZO_IN_MINILZO) +- " __LZO_IN_MINILZO\n" +-#endif +- "\n\n" +- "$Id: LZO " LZO_VERSION_STRING " built " __DATE__ " " __TIME__ +-#if defined(__GNUC__) && defined(__VERSION__) +- " by gcc " __VERSION__ +-#elif defined(__BORLANDC__) +- " by Borland C " _LZO_MEXPAND(__BORLANDC__) +-#elif defined(_MSC_VER) +- " by Microsoft C " _LZO_MEXPAND(_MSC_VER) +-#elif defined(__PUREC__) +- " by Pure C " _LZO_MEXPAND(__PUREC__) +-#elif defined(__SC__) +- " by Symantec C " _LZO_MEXPAND(__SC__) +-#elif defined(__TURBOC__) +- " by Turbo C " _LZO_MEXPAND(__TURBOC__) +-#elif defined(__WATCOMC__) +- " by Watcom C " _LZO_MEXPAND(__WATCOMC__) +-#endif +- " $\n" +- "$Copyright: LZO (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Markus Franz Xaver Johannes Oberhumer $\n"; ++/* 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) ++ LZO_VERSION_STRING; ++#else ++ "\r\n\n" ++ "LZO data compression library.\n" ++ "$Copyright: LZO Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer\n" ++ "\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_byte *) ++LZO_PUBLIC(const lzo_bytep) + lzo_copyright(void) + { +- return __lzo_copyright; ++ return (const lzo_bytep) __lzo_copyright; + } + + LZO_PUBLIC(unsigned) +@@ -765,619 +3958,378 @@ _lzo_version_date(void) + #define LZO_BASE 65521u + #define LZO_NMAX 5552 + +-#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); ++#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_byte *buf, lzo_uint len) ++LZO_PUBLIC(lzo_uint32_t) ++lzo_adler32(lzo_uint32_t adler, const lzo_bytep buf, lzo_uint len) + { +- lzo_uint32 s1 = adler & 0xffff; +- lzo_uint32 s2 = (adler >> 16) & 0xffff; +- int k; ++ lzo_uint32_t s1 = adler & 0xffff; ++ lzo_uint32_t s2 = (adler >> 16) & 0xffff; ++ unsigned k; + + if (buf == NULL) +- return 1; ++ return 1; + + while (len > 0) + { +- k = len < LZO_NMAX ? (int) 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; ++ 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; + } + +-LZO_PUBLIC(int) +-lzo_memcmp(const lzo_voidp s1, const lzo_voidp s2, lzo_uint len) ++#undef LZO_DO1 ++#undef LZO_DO2 ++#undef LZO_DO4 ++#undef LZO_DO8 ++#undef LZO_DO16 ++ ++#endif ++#if !defined(MINILZO_CFG_SKIP_LZO_STRING) ++#undef lzo_memcmp ++#undef lzo_memcpy ++#undef lzo_memmove ++#undef lzo_memset ++#if !defined(__LZO_MMODEL_HUGE) ++# undef LZO_HAVE_MM_HUGE_PTR ++#endif ++#define lzo_hsize_t lzo_uint ++#define lzo_hvoid_p lzo_voidp ++#define lzo_hbyte_p lzo_bytep ++#define LZOLIB_PUBLIC(r,f) LZO_PUBLIC(r) f ++#define lzo_hmemcmp lzo_memcmp ++#define lzo_hmemcpy lzo_memcpy ++#define lzo_hmemmove lzo_memmove ++#define lzo_hmemset lzo_memset ++#define __LZOLIB_HMEMCPY_CH_INCLUDED 1 ++#if !defined(LZOLIB_PUBLIC) ++# define LZOLIB_PUBLIC(r,f) r __LZOLIB_FUNCNAME(f) ++#endif ++LZOLIB_PUBLIC(int, lzo_hmemcmp) (const lzo_hvoid_p s1, const lzo_hvoid_p s2, lzo_hsize_t len) + { +-#if (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMCMP) +- return memcmp(s1,s2,len); +-#else +- const lzo_byte *p1 = (const lzo_byte *) s1; +- const lzo_byte *p2 = (const lzo_byte *) s2; +- int d; +- +- if (len > 0) do ++#if (LZO_HAVE_MM_HUGE_PTR) || !(HAVE_MEMCMP) ++ const lzo_hbyte_p p1 = LZO_STATIC_CAST(const lzo_hbyte_p, s1); ++ const lzo_hbyte_p p2 = LZO_STATIC_CAST(const lzo_hbyte_p, s2); ++ if __lzo_likely(len > 0) do + { +- d = *p1 - *p2; +- if (d != 0) +- return d; +- p1++; +- p2++; +- } +- while (--len > 0); ++ int d = *p1 - *p2; ++ if (d != 0) ++ return d; ++ p1++; p2++; ++ } while __lzo_likely(--len > 0); + return 0; ++#else ++ return memcmp(s1, s2, len); + #endif + } +- +-LZO_PUBLIC(lzo_voidp) +-lzo_memcpy(lzo_voidp dest, const lzo_voidp src, lzo_uint len) ++LZOLIB_PUBLIC(lzo_hvoid_p, lzo_hmemcpy) (lzo_hvoid_p dest, const lzo_hvoid_p src, lzo_hsize_t len) + { +-#if (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMCPY) +- return memcpy(dest,src,len); +-#else +- lzo_byte *p1 = (lzo_byte *) dest; +- const lzo_byte *p2 = (const lzo_byte *) src; +- +- if (len <= 0 || p1 == p2) +- return dest; ++#if (LZO_HAVE_MM_HUGE_PTR) || !(HAVE_MEMCPY) ++ lzo_hbyte_p p1 = LZO_STATIC_CAST(lzo_hbyte_p, dest); ++ const lzo_hbyte_p p2 = LZO_STATIC_CAST(const lzo_hbyte_p, src); ++ if (!(len > 0) || p1 == p2) ++ return dest; + do +- *p1++ = *p2++; +- while (--len > 0); ++ *p1++ = *p2++; ++ while __lzo_likely(--len > 0); + return dest; ++#else ++ return memcpy(dest, src, len); + #endif + } +- +-LZO_PUBLIC(lzo_voidp) +-lzo_memmove(lzo_voidp dest, const lzo_voidp src, lzo_uint len) ++LZOLIB_PUBLIC(lzo_hvoid_p, lzo_hmemmove) (lzo_hvoid_p dest, const lzo_hvoid_p src, lzo_hsize_t len) + { +-#if (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMMOVE) +- return memmove(dest,src,len); +-#else +- lzo_byte *p1 = (lzo_byte *) dest; +- const lzo_byte *p2 = (const lzo_byte *) src; +- +- if (len <= 0 || p1 == p2) +- return dest; +- ++#if (LZO_HAVE_MM_HUGE_PTR) || !(HAVE_MEMMOVE) ++ lzo_hbyte_p p1 = LZO_STATIC_CAST(lzo_hbyte_p, dest); ++ const lzo_hbyte_p p2 = LZO_STATIC_CAST(const lzo_hbyte_p, src); ++ if (!(len > 0) || p1 == p2) ++ return dest; + if (p1 < p2) + { +- do +- *p1++ = *p2++; +- while (--len > 0); ++ do ++ *p1++ = *p2++; ++ while __lzo_likely(--len > 0); + } + else + { +- p1 += len; +- p2 += len; +- do +- *--p1 = *--p2; +- while (--len > 0); ++ p1 += len; ++ p2 += len; ++ do ++ *--p1 = *--p2; ++ while __lzo_likely(--len > 0); + } + return dest; +-#endif +-} +- +-LZO_PUBLIC(lzo_voidp) +-lzo_memset(lzo_voidp s, int c, lzo_uint len) +-{ +-#if (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMSET) +- return memset(s,c,len); + #else +- lzo_byte *p = (lzo_byte *) s; +- +- if (len > 0) do +- *p++ = LZO_BYTE(c); +- while (--len > 0); +- return s; ++ return memmove(dest, src, len); + #endif + } +- +-#if 0 +-# define IS_SIGNED(type) (((type) (1ul << (8 * sizeof(type) - 1))) < 0) +-# define IS_UNSIGNED(type) (((type) (1ul << (8 * sizeof(type) - 1))) > 0) +-#else +-# define IS_SIGNED(type) (((type) (-1)) < ((type) 0)) +-# define IS_UNSIGNED(type) (((type) (-1)) > ((type) 0)) +-#endif +- +-#define IS_POWER_OF_2(x) (((x) & ((x) - 1)) == 0) +- +-static lzo_bool schedule_insns_bug(void); +-static lzo_bool strength_reduce_bug(int *); +- +-#if 0 || defined(LZO_DEBUG) +-#include +-static lzo_bool __lzo_assert_fail(const char *s, unsigned line) ++LZOLIB_PUBLIC(lzo_hvoid_p, lzo_hmemset) (lzo_hvoid_p s, int cc, lzo_hsize_t len) + { +-#if defined(__palmos__) +- printf("LZO assertion failed in line %u: '%s'\n",line,s); ++#if (LZO_HAVE_MM_HUGE_PTR) || !(HAVE_MEMSET) ++ lzo_hbyte_p p = LZO_STATIC_CAST(lzo_hbyte_p, s); ++ unsigned char c = LZO_ITRUNC(unsigned char, cc); ++ if __lzo_likely(len > 0) do ++ *p++ = c; ++ while __lzo_likely(--len > 0); ++ return s; + #else +- fprintf(stderr,"LZO assertion failed in line %u: '%s'\n",line,s); ++ return memset(s, cc, len); + #endif +- return 0; + } +-# define __lzo_assert(x) ((x) ? 1 : __lzo_assert_fail(#x,__LINE__)) +-#else +-# define __lzo_assert(x) ((x) ? 1 : 0) +-#endif +- +-#undef COMPILE_TIME_ASSERT +-#if 0 +-# define COMPILE_TIME_ASSERT(expr) r &= __lzo_assert(expr) +-#else +-# define COMPILE_TIME_ASSERT(expr) LZO_COMPILE_TIME_ASSERT(expr) +-#endif +- +-static lzo_bool basic_integral_check(void) +-{ +- lzo_bool r = 1; +- +- COMPILE_TIME_ASSERT(CHAR_BIT == 8); +- COMPILE_TIME_ASSERT(sizeof(char) == 1); +- COMPILE_TIME_ASSERT(sizeof(short) >= 2); +- COMPILE_TIME_ASSERT(sizeof(long) >= 4); +- COMPILE_TIME_ASSERT(sizeof(int) >= sizeof(short)); +- COMPILE_TIME_ASSERT(sizeof(long) >= sizeof(int)); +- +- COMPILE_TIME_ASSERT(sizeof(lzo_uint) == sizeof(lzo_int)); +- COMPILE_TIME_ASSERT(sizeof(lzo_uint32) == sizeof(lzo_int32)); +- +- COMPILE_TIME_ASSERT(sizeof(lzo_uint32) >= 4); +- COMPILE_TIME_ASSERT(sizeof(lzo_uint32) >= sizeof(unsigned)); +-#if defined(__LZO_STRICT_16BIT) +- COMPILE_TIME_ASSERT(sizeof(lzo_uint) == 2); +-#else +- COMPILE_TIME_ASSERT(sizeof(lzo_uint) >= 4); +- COMPILE_TIME_ASSERT(sizeof(lzo_uint) >= sizeof(unsigned)); +-#endif +- +-#if (USHRT_MAX == 65535u) +- COMPILE_TIME_ASSERT(sizeof(short) == 2); +-#elif (USHRT_MAX == LZO_0xffffffffL) +- COMPILE_TIME_ASSERT(sizeof(short) == 4); +-#elif (USHRT_MAX >= LZO_0xffffffffL) +- COMPILE_TIME_ASSERT(sizeof(short) > 4); +-#endif +-#if (UINT_MAX == 65535u) +- COMPILE_TIME_ASSERT(sizeof(int) == 2); +-#elif (UINT_MAX == LZO_0xffffffffL) +- COMPILE_TIME_ASSERT(sizeof(int) == 4); +-#elif (UINT_MAX >= LZO_0xffffffffL) +- COMPILE_TIME_ASSERT(sizeof(int) > 4); +-#endif +-#if (ULONG_MAX == 65535ul) +- COMPILE_TIME_ASSERT(sizeof(long) == 2); +-#elif (ULONG_MAX == LZO_0xffffffffL) +- COMPILE_TIME_ASSERT(sizeof(long) == 4); +-#elif (ULONG_MAX >= LZO_0xffffffffL) +- COMPILE_TIME_ASSERT(sizeof(long) > 4); ++#undef LZOLIB_PUBLIC + #endif ++#if !defined(MINILZO_CFG_SKIP_LZO_INIT) + +-#if defined(SIZEOF_UNSIGNED) +- COMPILE_TIME_ASSERT(SIZEOF_UNSIGNED == sizeof(unsigned)); +-#endif +-#if defined(SIZEOF_UNSIGNED_LONG) +- COMPILE_TIME_ASSERT(SIZEOF_UNSIGNED_LONG == sizeof(unsigned long)); +-#endif +-#if defined(SIZEOF_UNSIGNED_SHORT) +- COMPILE_TIME_ASSERT(SIZEOF_UNSIGNED_SHORT == sizeof(unsigned short)); +-#endif + #if !defined(__LZO_IN_MINILZO) +-#if defined(SIZEOF_SIZE_T) +- COMPILE_TIME_ASSERT(SIZEOF_SIZE_T == sizeof(size_t)); +-#endif +-#endif +- +- COMPILE_TIME_ASSERT(IS_UNSIGNED(unsigned char)); +- COMPILE_TIME_ASSERT(IS_UNSIGNED(unsigned short)); +- COMPILE_TIME_ASSERT(IS_UNSIGNED(unsigned)); +- COMPILE_TIME_ASSERT(IS_UNSIGNED(unsigned long)); +- COMPILE_TIME_ASSERT(IS_SIGNED(short)); +- COMPILE_TIME_ASSERT(IS_SIGNED(int)); +- COMPILE_TIME_ASSERT(IS_SIGNED(long)); +- +- COMPILE_TIME_ASSERT(IS_UNSIGNED(lzo_uint32)); +- COMPILE_TIME_ASSERT(IS_UNSIGNED(lzo_uint)); +- COMPILE_TIME_ASSERT(IS_SIGNED(lzo_int32)); +- COMPILE_TIME_ASSERT(IS_SIGNED(lzo_int)); +- +- COMPILE_TIME_ASSERT(INT_MAX == LZO_STYPE_MAX(sizeof(int))); +- COMPILE_TIME_ASSERT(UINT_MAX == LZO_UTYPE_MAX(sizeof(unsigned))); +- COMPILE_TIME_ASSERT(LONG_MAX == LZO_STYPE_MAX(sizeof(long))); +- COMPILE_TIME_ASSERT(ULONG_MAX == LZO_UTYPE_MAX(sizeof(unsigned long))); +- COMPILE_TIME_ASSERT(SHRT_MAX == LZO_STYPE_MAX(sizeof(short))); +- COMPILE_TIME_ASSERT(USHRT_MAX == LZO_UTYPE_MAX(sizeof(unsigned short))); +- COMPILE_TIME_ASSERT(LZO_UINT32_MAX == LZO_UTYPE_MAX(sizeof(lzo_uint32))); +- COMPILE_TIME_ASSERT(LZO_UINT_MAX == LZO_UTYPE_MAX(sizeof(lzo_uint))); +-#if !defined(__LZO_IN_MINILZO) +- COMPILE_TIME_ASSERT(SIZE_T_MAX == LZO_UTYPE_MAX(sizeof(size_t))); +-#endif +- +- r &= __lzo_assert(LZO_BYTE(257) == 1); +- +- return r; +-} +- +-static lzo_bool basic_ptr_check(void) +-{ +- lzo_bool r = 1; +- +- COMPILE_TIME_ASSERT(sizeof(char *) >= sizeof(int)); +- COMPILE_TIME_ASSERT(sizeof(lzo_byte *) >= sizeof(char *)); +- +- COMPILE_TIME_ASSERT(sizeof(lzo_voidp) == sizeof(lzo_byte *)); +- COMPILE_TIME_ASSERT(sizeof(lzo_voidp) == sizeof(lzo_voidpp)); +- COMPILE_TIME_ASSERT(sizeof(lzo_voidp) == sizeof(lzo_bytepp)); +- COMPILE_TIME_ASSERT(sizeof(lzo_voidp) >= sizeof(lzo_uint)); +- +- COMPILE_TIME_ASSERT(sizeof(lzo_ptr_t) == sizeof(lzo_voidp)); +- COMPILE_TIME_ASSERT(sizeof(lzo_ptr_t) == sizeof(lzo_sptr_t)); +- COMPILE_TIME_ASSERT(sizeof(lzo_ptr_t) >= sizeof(lzo_uint)); + +- COMPILE_TIME_ASSERT(sizeof(lzo_ptrdiff_t) >= 4); +- COMPILE_TIME_ASSERT(sizeof(lzo_ptrdiff_t) >= sizeof(ptrdiff_t)); ++#define LZO_WANT_ACC_CHK_CH 1 ++#undef LZOCHK_ASSERT + +- COMPILE_TIME_ASSERT(sizeof(ptrdiff_t) >= sizeof(size_t)); +- COMPILE_TIME_ASSERT(sizeof(lzo_ptrdiff_t) >= sizeof(lzo_uint)); +- +-#if defined(SIZEOF_CHAR_P) +- COMPILE_TIME_ASSERT(SIZEOF_CHAR_P == sizeof(char *)); +-#endif +-#if defined(SIZEOF_PTRDIFF_T) +- COMPILE_TIME_ASSERT(SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t)); ++ LZOCHK_ASSERT((LZO_UINT32_C(1) << (int)(8*sizeof(LZO_UINT32_C(1))-1)) > 0) ++ LZOCHK_ASSERT_IS_SIGNED_T(lzo_int) ++ LZOCHK_ASSERT_IS_UNSIGNED_T(lzo_uint) ++#if !(__LZO_UINTPTR_T_IS_POINTER) ++ LZOCHK_ASSERT_IS_UNSIGNED_T(lzo_uintptr_t) + #endif ++ LZOCHK_ASSERT(sizeof(lzo_uintptr_t) >= sizeof(lzo_voidp)) ++ LZOCHK_ASSERT_IS_UNSIGNED_T(lzo_xint) + +- COMPILE_TIME_ASSERT(IS_SIGNED(ptrdiff_t)); +- COMPILE_TIME_ASSERT(IS_UNSIGNED(size_t)); +- COMPILE_TIME_ASSERT(IS_SIGNED(lzo_ptrdiff_t)); +- COMPILE_TIME_ASSERT(IS_SIGNED(lzo_sptr_t)); +- COMPILE_TIME_ASSERT(IS_UNSIGNED(lzo_ptr_t)); +- COMPILE_TIME_ASSERT(IS_UNSIGNED(lzo_moff_t)); +- +- return r; +-} +- +-static lzo_bool ptr_check(void) +-{ +- lzo_bool r = 1; +- int i; +- char _wrkmem[10 * sizeof(lzo_byte *) + sizeof(lzo_full_align_t)]; +- lzo_bytep wrkmem; +- lzo_bytepp dict; +- unsigned char x[4 * sizeof(lzo_full_align_t)]; +- long d; +- lzo_full_align_t a; +- lzo_full_align_t u; +- +- for (i = 0; i < (int) sizeof(x); i++) +- x[i] = LZO_BYTE(i); +- +- wrkmem = LZO_PTR_ALIGN_UP((lzo_byte *)_wrkmem,sizeof(lzo_full_align_t)); +- +-#if 0 +- dict = (lzo_bytepp) wrkmem; +-#else +- +- u.a_lzo_bytep = wrkmem; dict = u.a_lzo_bytepp; + #endif ++#undef LZOCHK_ASSERT + +- d = (long) ((const lzo_bytep) dict - (const lzo_bytep) _wrkmem); +- r &= __lzo_assert(d >= 0); +- r &= __lzo_assert(d < (long) sizeof(lzo_full_align_t)); +- +- memset(&a,0,sizeof(a)); +- r &= __lzo_assert(a.a_lzo_voidp == NULL); +- +- memset(&a,0xff,sizeof(a)); +- r &= __lzo_assert(a.a_ushort == USHRT_MAX); +- r &= __lzo_assert(a.a_uint == UINT_MAX); +- r &= __lzo_assert(a.a_ulong == ULONG_MAX); +- r &= __lzo_assert(a.a_lzo_uint == LZO_UINT_MAX); +- r &= __lzo_assert(a.a_lzo_uint32 == LZO_UINT32_MAX); +- +- if (r == 1) +- { +- for (i = 0; i < 8; i++) +- r &= __lzo_assert((const lzo_voidp) (&dict[i]) == (const lzo_voidp) (&wrkmem[i * sizeof(lzo_byte *)])); +- } +- +- memset(&a,0,sizeof(a)); +- r &= __lzo_assert(a.a_char_p == NULL); +- r &= __lzo_assert(a.a_lzo_bytep == NULL); +- r &= __lzo_assert(NULL == (void *)0); +- if (r == 1) +- { +- for (i = 0; i < 10; i++) +- dict[i] = wrkmem; +- BZERO8_PTR(dict+1,sizeof(dict[0]),8); +- r &= __lzo_assert(dict[0] == wrkmem); +- for (i = 1; i < 9; i++) +- r &= __lzo_assert(dict[i] == NULL); +- r &= __lzo_assert(dict[9] == wrkmem); +- } +- +- if (r == 1) +- { +- unsigned k = 1; +- const unsigned n = (unsigned) sizeof(lzo_uint32); +- lzo_byte *p0; +- lzo_byte *p1; +- +- k += __lzo_align_gap(&x[k],n); +- p0 = (lzo_bytep) &x[k]; +-#if defined(PTR_LINEAR) +- r &= __lzo_assert((PTR_LINEAR(p0) & (n-1)) == 0); +-#else +- r &= __lzo_assert(n == 4); +- r &= __lzo_assert(PTR_ALIGNED_4(p0)); ++union lzo_config_check_union { ++ lzo_uint a[2]; ++ unsigned char b[2*LZO_MAX(8,sizeof(lzo_uint))]; ++#if defined(lzo_uint64_t) ++ lzo_uint64_t c[2]; + #endif ++}; + +- r &= __lzo_assert(k >= 1); +- p1 = (lzo_bytep) &x[1]; +- r &= __lzo_assert(PTR_GE(p0,p1)); +- +- r &= __lzo_assert(k < 1+n); +- p1 = (lzo_bytep) &x[1+n]; +- r &= __lzo_assert(PTR_LT(p0,p1)); +- +- if (r == 1) +- { +- lzo_uint32 v0, v1; + #if 0 +- v0 = * (lzo_uint32 *) &x[k]; +- v1 = * (lzo_uint32 *) &x[k+n]; ++#define u2p(ptr,off) ((lzo_voidp) (((lzo_bytep)(lzo_voidp)(ptr)) + (off))) + #else +- +- u.a_uchar_p = &x[k]; +- v0 = *u.a_lzo_uint32_p; +- u.a_uchar_p = &x[k+n]; +- v1 = *u.a_lzo_uint32_p; +-#endif +- r &= __lzo_assert(v0 > 0); +- r &= __lzo_assert(v1 > 0); +- } +- } +- +- return r; ++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; +- int i; +- union { +- lzo_uint32 a; +- unsigned short b; +- lzo_uint32 aa[4]; +- unsigned char x[4*sizeof(lzo_full_align_t)]; +- } u; +- +- COMPILE_TIME_ASSERT( (int) ((unsigned char) ((signed char) -1)) == 255); +- COMPILE_TIME_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0); +- +-#if 0 +- r &= __lzo_assert((const void *)&u == (const void *)&u.a); +- r &= __lzo_assert((const void *)&u == (const void *)&u.b); +- r &= __lzo_assert((const void *)&u == (const void *)&u.x[0]); +- r &= __lzo_assert((const void *)&u == (const void *)&u.aa[0]); +-#endif +- +- r &= basic_integral_check(); +- r &= basic_ptr_check(); +- if (r != 1) +- return LZO_E_ERROR; +- +- u.a = 0; u.b = 0; +- for (i = 0; i < (int) sizeof(u.x); i++) +- u.x[i] = LZO_BYTE(i); +- +-#if defined(LZO_BYTE_ORDER) +- if (r == 1) +- { +-# if (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN) +- lzo_uint32 a = (lzo_uint32) (u.a & LZO_0xffffffffL); +- unsigned short b = (unsigned short) (u.b & 0xffff); +- r &= __lzo_assert(a == 0x03020100L); +- r &= __lzo_assert(b == 0x0100); +-# elif (LZO_BYTE_ORDER == LZO_BIG_ENDIAN) +- lzo_uint32 a = u.a >> (8 * sizeof(u.a) - 32); +- unsigned short b = u.b >> (8 * sizeof(u.b) - 16); +- r &= __lzo_assert(a == 0x00010203L); +- r &= __lzo_assert(b == 0x0001); +-# else +-# error "invalid LZO_BYTE_ORDER" +-# endif +- } +-#endif +- +-#if defined(LZO_UNALIGNED_OK_2) +- COMPILE_TIME_ASSERT(sizeof(short) == 2); +- if (r == 1) +- { +- unsigned short b[4]; +- +- for (i = 0; i < 4; i++) +- b[i] = * (const unsigned short *) &u.x[i]; +- +-# if (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN) +- r &= __lzo_assert(b[0] == 0x0100); +- r &= __lzo_assert(b[1] == 0x0201); +- r &= __lzo_assert(b[2] == 0x0302); +- r &= __lzo_assert(b[3] == 0x0403); +-# elif (LZO_BYTE_ORDER == LZO_BIG_ENDIAN) +- r &= __lzo_assert(b[0] == 0x0001); +- r &= __lzo_assert(b[1] == 0x0102); +- r &= __lzo_assert(b[2] == 0x0203); +- r &= __lzo_assert(b[3] == 0x0304); +-# endif +- } +-#endif +- +-#if defined(LZO_UNALIGNED_OK_4) +- COMPILE_TIME_ASSERT(sizeof(lzo_uint32) == 4); +- if (r == 1) +- { +- lzo_uint32 a[4]; +- +- for (i = 0; i < 4; i++) +- a[i] = * (const lzo_uint32 *) &u.x[i]; +- +-# if (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN) +- r &= __lzo_assert(a[0] == 0x03020100L); +- r &= __lzo_assert(a[1] == 0x04030201L); +- r &= __lzo_assert(a[2] == 0x05040302L); +- r &= __lzo_assert(a[3] == 0x06050403L); +-# elif (LZO_BYTE_ORDER == LZO_BIG_ENDIAN) +- r &= __lzo_assert(a[0] == 0x00010203L); +- r &= __lzo_assert(a[1] == 0x01020304L); +- r &= __lzo_assert(a[2] == 0x02030405L); +- r &= __lzo_assert(a[3] == 0x03040506L); +-# endif +- } +-#endif +- +-#if defined(LZO_ALIGNED_OK_4) +- COMPILE_TIME_ASSERT(sizeof(lzo_uint32) == 4); +-#endif +- +- COMPILE_TIME_ASSERT(lzo_sizeof_dict_t == sizeof(lzo_dict_t)); +- +-#if defined(__LZO_IN_MINLZO) +- if (r == 1) +- { +- lzo_uint32 adler; +- adler = lzo_adler32(0, NULL, 0); +- adler = lzo_adler32(adler, lzo_copyright(), 200); +- r &= __lzo_assert(adler == 0xc76f1751L); +- } +-#endif +- +- if (r == 1) +- { +- r &= __lzo_assert(!schedule_insns_bug()); +- } +- +- if (r == 1) +- { +- static int x[3]; +- static unsigned xn = 3; +- register unsigned j; +- +- for (j = 0; j < xn; j++) +- x[j] = (int)j - 3; +- r &= __lzo_assert(!strength_reduce_bug(x)); +- } +- +- if (r == 1) +- { +- r &= ptr_check(); +- } ++#if (LZO_CC_CLANG && (LZO_CC_CLANG >= 0x030100ul && LZO_CC_CLANG < 0x030300ul)) ++# if 0 ++ volatile ++# endif ++#endif ++ union lzo_config_check_union u; ++ lzo_voidp p; ++ unsigned r = 1; ++ ++ u.a[0] = u.a[1] = 0; ++ p = u2p(&u, 0); ++ r &= ((* (lzo_bytep) p) == 0); ++#if !(LZO_CFG_NO_CONFIG_CHECK) ++#if (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 (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 ++ u.a[0] = u.a[1] = 0; ++ u.b[0] = 1; u.b[3] = 2; ++ p = u2p(&u, 1); ++ r &= UA_GET_NE16(p) == 0; ++ r &= UA_GET_LE16(p) == 0; ++ u.b[1] = 128; ++ r &= UA_GET_LE16(p) == 128; ++ u.b[2] = 129; ++ r &= UA_GET_LE16(p) == LZO_UINT16_C(0x8180); ++#if (LZO_ABI_BIG_ENDIAN) ++ r &= UA_GET_NE16(p) == LZO_UINT16_C(0x8081); ++#endif ++#if (LZO_ABI_LITTLE_ENDIAN) ++ r &= UA_GET_NE16(p) == LZO_UINT16_C(0x8180); ++#endif ++ u.a[0] = u.a[1] = 0; ++ u.b[0] = 3; u.b[5] = 4; ++ p = u2p(&u, 1); ++ r &= UA_GET_NE32(p) == 0; ++ r &= UA_GET_LE32(p) == 0; ++ u.b[1] = 128; ++ r &= UA_GET_LE32(p) == 128; ++ u.b[2] = 129; u.b[3] = 130; u.b[4] = 131; ++ r &= UA_GET_LE32(p) == LZO_UINT32_C(0x83828180); ++#if (LZO_ABI_BIG_ENDIAN) ++ r &= UA_GET_NE32(p) == LZO_UINT32_C(0x80818283); ++#endif ++#if (LZO_ABI_LITTLE_ENDIAN) ++ r &= UA_GET_NE32(p) == LZO_UINT32_C(0x83828180); ++#endif ++#if defined(UA_GET_NE64) ++ u.c[0] = u.c[1] = 0; ++ u.b[0] = 5; u.b[9] = 6; ++ p = u2p(&u, 1); ++ u.c[0] = u.c[1] = 0; ++ r &= UA_GET_NE64(p) == 0; ++#if defined(UA_GET_LE64) ++ r &= UA_GET_LE64(p) == 0; ++ u.b[1] = 128; ++ r &= UA_GET_LE64(p) == 128; ++#endif ++#endif ++#if defined(lzo_bitops_ctlz32) ++ { unsigned i = 0; lzo_uint32_t v; ++ for (v = 1; v != 0 && r == 1; v <<= 1, i++) { ++ r &= lzo_bitops_ctlz32(v) == 31 - i; ++ r &= lzo_bitops_ctlz32_func(v) == 31 - i; ++ }} ++#endif ++#if defined(lzo_bitops_ctlz64) ++ { unsigned i = 0; lzo_uint64_t v; ++ for (v = 1; v != 0 && r == 1; v <<= 1, i++) { ++ r &= lzo_bitops_ctlz64(v) == 63 - i; ++ r &= lzo_bitops_ctlz64_func(v) == 63 - i; ++ }} ++#endif ++#if defined(lzo_bitops_cttz32) ++ { unsigned i = 0; lzo_uint32_t v; ++ for (v = 1; v != 0 && r == 1; v <<= 1, i++) { ++ r &= lzo_bitops_cttz32(v) == i; ++ r &= lzo_bitops_cttz32_func(v) == i; ++ }} ++#endif ++#if defined(lzo_bitops_cttz64) ++ { unsigned i = 0; lzo_uint64_t v; ++ for (v = 1; v != 0 && r == 1; v <<= 1, i++) { ++ r &= lzo_bitops_cttz64(v) == i; ++ r &= lzo_bitops_cttz64_func(v) == i; ++ }} ++#endif ++#endif ++ LZO_UNUSED_FUNC(lzo_bitops_unused_funcs); + + return r == 1 ? LZO_E_OK : LZO_E_ERROR; + } + +-static lzo_bool schedule_insns_bug(void) +-{ +-#if defined(__LZO_CHECKER) +- return 0; +-#else +- const int clone[] = {1, 2, 0}; +- const int *q; +- q = clone; +- return (*q) ? 0 : 1; +-#endif +-} +- +-static lzo_bool strength_reduce_bug(int *x) +-{ +- return x[0] != -3 || x[1] != -2 || x[2] != -1; +-} +- +-#undef COMPILE_TIME_ASSERT +- +-int __lzo_init_done = 0; +- + LZO_PUBLIC(int) +-__lzo_init2(unsigned v, int s1, int s2, int s3, int s4, int s5, +- int s6, int s7, int s8, int s9) ++__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; + +- __lzo_init_done = 1; ++#if defined(__LZO_IN_MINILZO) ++#elif (LZO_CC_MSC && ((_MSC_VER) < 700)) ++#else ++#define LZO_WANT_ACC_CHK_CH 1 ++#undef LZOCHK_ASSERT ++#define LZOCHK_ASSERT(expr) LZO_COMPILE_TIME_ASSERT(expr) ++#endif ++#undef LZOCHK_ASSERT + + if (v == 0) +- return LZO_E_ERROR; ++ 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_compress_t)); ++ (s2 == -1 || s2 == (int) sizeof(int)) && ++ (s3 == -1 || s3 == (int) sizeof(long)) && ++ (s4 == -1 || s4 == (int) sizeof(lzo_uint32_t)) && ++ (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; ++ return LZO_E_ERROR; + + r = _lzo_config_check(); + if (r != LZO_E_OK) +- return r; ++ return r; + + return r; + } + + #if !defined(__LZO_IN_MINILZO) + +-LZO_EXTERN(int) +-__lzo_init(unsigned v,int s1,int s2,int s3,int s4,int s5,int s6,int s7); ++#if (LZO_OS_WIN16 && LZO_CC_WATCOMC) && defined(__SW_BD) + +-LZO_PUBLIC(int) +-__lzo_init(unsigned v,int s1,int s2,int s3,int s4,int s5,int s6,int s7) ++#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 + { +- if (v == 0 || v > 0x1010) +- return LZO_E_ERROR; +- return __lzo_init2(v,s1,s2,s3,s4,s5,-1,-1,s6,s7); ++ LZO_UNUSED(a); LZO_UNUSED(b); LZO_UNUSED(c); LZO_UNUSED(d); ++ return 1; + } + + #endif + +-#define do_compress _lzo1x_1_do_compress ++#endif ++ ++#endif ++ ++#define LZO1X 1 ++#define LZO_EOF_CODE 1 ++#define M2_MAX_OFFSET 0x0800 ++ ++#if !defined(MINILZO_CFG_SKIP_LZO1X_1_COMPRESS) ++ ++#if 1 && defined(UA_GET_LE32) ++#undef LZO_DICT_USE_PTR ++#define LZO_DICT_USE_PTR 0 ++#undef lzo_dict_t ++#define lzo_dict_t lzo_uint16_t ++#endif + +-#define LZO_NEED_DICT_H ++#define LZO_NEED_DICT_H 1 ++#ifndef D_BITS + #define D_BITS 14 +-#define D_INDEX1(d,p) d = DM((0x21*DX3(p,5,5,6)) >> 5) ++#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 + + #ifndef __LZO_CONFIG1X_H +-#define __LZO_CONFIG1X_H ++#define __LZO_CONFIG1X_H 1 + + #if !defined(LZO1X) && !defined(LZO1Y) && !defined(LZO1Z) +-# define LZO1X ++# define LZO1X 1 + #endif + + #if !defined(__LZO_IN_MINILZO) +-#include ++#include "lzo/lzo1x.h" + #endif + +-#define LZO_EOF_CODE ++#ifndef LZO_EOF_CODE ++#define LZO_EOF_CODE 1 ++#endif + #undef LZO_DETERMINISTIC + + #define M1_MAX_OFFSET 0x0400 +@@ -1417,7 +4369,7 @@ __lzo_init(unsigned v,int s1,int s2,int s3,int s4,int s5,int s6,int s7) + #define DL_MIN_LEN M2_MIN_LEN + + #ifndef __LZO_DICT_H +-#define __LZO_DICT_H ++#define __LZO_DICT_H 1 + + #ifdef __cplusplus + extern "C" { +@@ -1458,10 +4410,10 @@ extern "C" { + #if (D_BITS != DL_BITS + DD_BITS) + # error "D_BITS does not match" + #endif +-#if (D_BITS < 8 || D_BITS > 18) ++#if (D_BITS < 6 || D_BITS > 18) + # error "invalid D_BITS" + #endif +-#if (DL_BITS < 8 || DL_BITS > 20) ++#if (DL_BITS < 6 || DL_BITS > 20) + # error "invalid DL_BITS" + #endif + #if (DD_BITS < 0 || DD_BITS > 6) +@@ -1484,29 +4436,32 @@ extern "C" { + # error "choose a hashing strategy" + #endif + ++#undef DM ++#undef DX ++ + #if (DL_MIN_LEN == 3) + # define _DV2_A(p,shift1,shift2) \ +- (((( (lzo_uint32)((p)[0]) << shift1) ^ (p)[1]) << shift2) ^ (p)[2]) ++ (((( (lzo_xint)((p)[0]) << shift1) ^ (p)[1]) << shift2) ^ (p)[2]) + # define _DV2_B(p,shift1,shift2) \ +- (((( (lzo_uint32)((p)[2]) << shift1) ^ (p)[1]) << shift2) ^ (p)[0]) ++ (((( (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]) ++ ((_DV2_B((p)+1,shift1,shift2) << (shift3)) ^ (p)[0]) + #elif (DL_MIN_LEN == 2) + # define _DV2_A(p,shift1,shift2) \ +- (( (lzo_uint32)(p[0]) << shift1) ^ p[1]) ++ (( (lzo_xint)(p[0]) << shift1) ^ p[1]) + # define _DV2_B(p,shift1,shift2) \ +- (( (lzo_uint32)(p[1]) << shift1) ^ p[2]) ++ (( (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_uint32)((p)[2]) << (s2)) + (p)[1]) << (s1)) + (p)[0]) ++ (((((lzo_xint)((p)[2]) << (s2)) + (p)[1]) << (s1)) + (p)[0]) + #define DS2(p,s1,s2) \ +- (((((lzo_uint32)((p)[2]) << (s2)) - (p)[1]) << (s1)) - (p)[0]) ++ (((((lzo_xint)((p)[2]) << (s2)) - (p)[1]) << (s1)) - (p)[0]) + #define DX2(p,s1,s2) \ +- (((((lzo_uint32)((p)[2]) << (s2)) ^ (p)[1]) << (s1)) ^ (p)[0]) ++ (((((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]) +@@ -1517,26 +4472,26 @@ extern "C" { + # define _DINDEX(dv,p) (_DV_A((p),DL_SHIFT)) + + #elif (LZO_HASH == LZO_HASH_GZIP_INCREMENTAL) +-# define __LZO_HASH_INCREMENTAL ++# 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) +-# define __LZO_HASH_INCREMENTAL ++# define __LZO_HASH_INCREMENTAL 1 + # define DVAL_FIRST(dv,p) dv = _DV_A((p),5) + # define DVAL_NEXT(dv,p) \ +- dv ^= (lzo_uint32)(p[-1]) << (2*5); dv = (((dv) << 5) ^ p[2]) +-# define _DINDEX(dv,p) ((0x9f5f * (dv)) >> 5) ++ 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) +-# define __LZO_HASH_INCREMENTAL ++# 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_uint32)(p[2]) << (2*5))) +-# define _DINDEX(dv,p) ((0x9f5f * (dv)) >> 5) ++ 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 +@@ -1561,9 +4516,14 @@ extern "C" { + + #if !defined(DVAL_ASSERT) + #if defined(__LZO_HASH_INCREMENTAL) && !defined(NDEBUG) +-static void DVAL_ASSERT(lzo_uint32 dv, const lzo_byte *p) ++#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_uint32 df; ++ lzo_xint df; + DVAL_FIRST(df,(p)); + assert(DINDEX(dv,p) == DINDEX(df,p)); + } +@@ -1572,11 +4532,11 @@ static void DVAL_ASSERT(lzo_uint32 dv, const lzo_byte *p) + #endif + #endif + +-#if defined(LZO_DICT_USE_PTR) ++#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_uint) ((p)-(in))) ++# define DENTRY(p,in) ((lzo_dict_t) pd(p, in)) + # define GINDEX(m_pos,m_off,dict,dindex,in) m_off = dict[dindex] + #endif + +@@ -1589,40 +4549,41 @@ static void DVAL_ASSERT(lzo_uint32 dv, const lzo_byte *p) + #else + + # define UPDATE_D(dict,drun,dv,p,in) \ +- dict[ DINDEX(dv,p) + drun++ ] = DENTRY(p,in); drun &= DD_MASK ++ 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 ++ dict[ (index) + drun++ ] = DENTRY(p,in); drun &= DD_MASK + # define UPDATE_P(ptr,drun,p,in) \ +- (ptr) [ drun++ ] = DENTRY(p,in); drun &= DD_MASK ++ (ptr) [ drun++ ] = DENTRY(p,in); drun &= DD_MASK + + #endif + +-#if defined(LZO_DICT_USE_PTR) ++#if (LZO_DICT_USE_PTR) + + #define LZO_CHECK_MPOS_DET(m_pos,m_off,in,ip,max_offset) \ +- (m_pos == NULL || (m_off = (lzo_moff_t) (ip - m_pos)) > max_offset) ++ (m_pos == NULL || (m_off = pd(ip, m_pos)) > max_offset) + + #define LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,max_offset) \ +- (BOUNDS_CHECKING_OFF_IN_EXPR( \ +- (PTR_LT(m_pos,in) || \ +- (m_off = (lzo_moff_t) PTR_DIFF(ip,m_pos)) <= 0 || \ +- m_off > 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 = (lzo_moff_t) ((ip)-(in)) - m_off) > max_offset) || \ +- (m_pos = (ip) - (m_off), 0) ) ++ (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) \ +- ((lzo_moff_t) ((ip)-(in)) <= m_off || \ +- ((m_off = (lzo_moff_t) ((ip)-(in)) - m_off) > max_offset) || \ +- (m_pos = (ip) - (m_off), 0) ) ++ (pd(ip, in) <= m_off || \ ++ ((m_off = pd(ip, in) - m_off) > max_offset) || \ ++ (m_pos = (ip) - (m_off), 0) ) + + #endif + +-#if defined(LZO_DETERMINISTIC) ++#if (LZO_DETERMINISTIC) + # define LZO_CHECK_MPOS LZO_CHECK_MPOS_DET + #else + # define LZO_CHECK_MPOS LZO_CHECK_MPOS_NON_DET +@@ -1638,336 +4599,402 @@ static void DVAL_ASSERT(lzo_uint32 dv, const lzo_byte *p) + + #endif + ++#define LZO_DETERMINISTIC !(LZO_DICT_USE_PTR) ++ ++#ifndef DO_COMPRESS + #define DO_COMPRESS lzo1x_1_compress ++#endif + +-static +-lzo_uint do_compress ( const lzo_byte *in , lzo_uint in_len, +- lzo_byte *out, lzo_uintp out_len, +- lzo_voidp wrkmem ) +-{ +-#if 0 && defined(__GNUC__) && defined(__i386__) +- register const lzo_byte *ip __asm__("%esi"); +-#else +- register const lzo_byte *ip; ++#if 1 && defined(DO_COMPRESS) && !defined(do_compress) ++# define do_compress LZO_PP_ECONCAT2(DO_COMPRESS,_core) + #endif +- lzo_byte *op; +- const lzo_byte * const in_end = in + in_len; +- const lzo_byte * const ip_end = in + in_len - M2_MAX_LEN - 5; +- const lzo_byte *ii; ++ ++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) ++{ ++ 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 += 4; ++ ip += ti < 4 ? 4 - ti : 0; + for (;;) + { +-#if 0 && defined(__GNUC__) && defined(__i386__) +- register const lzo_byte *m_pos __asm__("%edi"); +-#else +- register const lzo_byte *m_pos; +-#endif +- lzo_moff_t m_off; +- lzo_uint m_len; +- 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,M4_MAX_OFFSET)) +- goto literal; ++ 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); ++ 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; ++ 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 1 && defined(LZO_UNALIGNED_OK_2) +- if (* (const lzo_ushortp) m_pos != * (const lzo_ushortp) ip) ++#if (LZO_OPT_UNALIGNED32) ++ if (UA_GET_NE32(m_pos) != UA_GET_NE32(ip)) + #else +- if (m_pos[0] != ip[0] || m_pos[1] != ip[1]) ++ if (m_pos[0] != ip[0] || m_pos[1] != ip[1] || m_pos[2] != ip[2] || m_pos[3] != ip[3]) + #endif +- { +- } +- else +- { +- if (m_pos[2] == ip[2]) +- { +-#if 0 +- if (m_off <= M2_MAX_OFFSET) +- goto match; +- if (lit <= 3) +- goto match; +- if (lit == 3) +- { +- assert(op - 2 > out); op[-2] |= LZO_BYTE(3); +- *op++ = *ii++; *op++ = *ii++; *op++ = *ii++; +- goto code_match; +- } +- if (m_pos[3] == ip[3]) +-#endif +- goto match; +- } +- else +- { +-#if 0 +-#if 0 +- if (m_off <= M1_MAX_OFFSET && lit > 0 && lit <= 3) ++ { ++literal: ++ UPDATE_I(dict,0,dindex,ip,in); ++ ip += 1 + ((ip - ii) >> 5); ++ continue; ++ } ++ UPDATE_I(dict,0,dindex,ip,in); + #else +- if (m_off <= M1_MAX_OFFSET && lit == 3) +-#endif +- { +- register lzo_uint t; +- +- t = lit; +- assert(op - 2 > out); op[-2] |= LZO_BYTE(t); +- do *op++ = *ii++; while (--t > 0); +- assert(ii == ip); +- m_off -= 1; +- *op++ = LZO_BYTE(M1_MARKER | ((m_off & 3) << 2)); +- *op++ = LZO_BYTE(m_off >> 2); +- ip += 2; +- goto match_done; +- } +-#endif +- } +- } +- ++ lzo_uint m_off; ++ lzo_uint m_len; ++ { ++ lzo_uint32_t dv; ++ lzo_uint dindex; + literal: +- UPDATE_I(dict,0,dindex,ip,in); +- ++ip; +- if (ip >= ip_end) +- break; +- continue; +- +-match: +- UPDATE_I(dict,0,dindex,ip,in); +- if (pd(ip,ii) > 0) +- { +- register lzo_uint t = pd(ip,ii); +- +- if (t <= 3) +- { +- assert(op - 2 > out); +- op[-2] |= LZO_BYTE(t); +- } +- else if (t <= 18) +- *op++ = LZO_BYTE(t - 3); +- else +- { +- register lzo_uint tt = t - 18; +- +- *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); +- ip += 3; +- if (m_pos[3] != *ip++ || m_pos[4] != *ip++ || m_pos[5] != *ip++ || +- m_pos[6] != *ip++ || m_pos[7] != *ip++ || m_pos[8] != *ip++ +-#ifdef LZO1Y +- || m_pos[ 9] != *ip++ || m_pos[10] != *ip++ || m_pos[11] != *ip++ +- || m_pos[12] != *ip++ || m_pos[13] != *ip++ || m_pos[14] != *ip++ +-#endif +- ) +- { +- --ip; +- m_len = ip - ii; +- assert(m_len >= 3); assert(m_len <= M2_MAX_LEN); +- +- if (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; +- *op++ = LZO_BYTE(M3_MARKER | (m_len - 2)); +- goto m3_m4_offset; +- } +- else ++ ip += 1 + ((ip - ii) >> 5); ++next: ++ if __lzo_unlikely(ip >= ip_end) ++ break; ++ dv = UA_GET_LE32(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_GET_LE32(m_pos)) ++ goto literal; ++ } ++#endif ++ ++ ii -= ti; ti = 0; ++ { ++ lzo_uint t = pd(ip,ii); ++ if (t != 0) ++ { ++ if (t <= 3) ++ { ++ op[-2] = LZO_BYTE(op[-2] | t); ++#if (LZO_OPT_UNALIGNED32) ++ UA_COPY4(op, ii); ++ op += t; ++#else ++ { do *op++ = *ii++; while (--t > 0); } ++#endif ++ } ++#if (LZO_OPT_UNALIGNED32) || (LZO_OPT_UNALIGNED64) ++ else if (t <= 16) ++ { ++ *op++ = LZO_BYTE(t - 3); ++ UA_COPY8(op, ii); ++ UA_COPY8(op+8, ii+8); ++ op += t; ++ } ++#endif ++ else ++ { ++ if (t <= 18) ++ *op++ = LZO_BYTE(t - 3); ++ else ++ { ++ lzo_uint tt = t - 18; ++ *op++ = 0; ++ while __lzo_unlikely(tt > 255) ++ { ++ tt -= 255; ++ UA_SET1(op, 0); ++ op++; ++ } ++ assert(tt > 0); ++ *op++ = LZO_BYTE(tt); ++ } ++#if (LZO_OPT_UNALIGNED32) || (LZO_OPT_UNALIGNED64) ++ do { ++ UA_COPY8(op, ii); ++ UA_COPY8(op+8, ii+8); ++ op += 16; ii += 16; t -= 16; ++ } while (t >= 16); if (t > 0) ++#endif ++ { do *op++ = *ii++; while (--t > 0); } ++ } ++ } ++ } ++ m_len = 4; ++ { ++#if (LZO_OPT_UNALIGNED64) ++ lzo_uint64_t v; ++ v = UA_GET_NE64(ip + m_len) ^ UA_GET_NE64(m_pos + m_len); ++ if __lzo_unlikely(v == 0) { ++ do { ++ m_len += 8; ++ v = UA_GET_NE64(ip + m_len) ^ UA_GET_NE64(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_ctlz64) ++ m_len += lzo_bitops_ctlz64(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_cttz64) ++ m_len += lzo_bitops_cttz64(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 (LZO_OPT_UNALIGNED32) ++ lzo_uint32_t v; ++ v = UA_GET_NE32(ip + m_len) ^ UA_GET_NE32(m_pos + m_len); ++ if __lzo_unlikely(v == 0) { ++ do { ++ m_len += 4; ++ v = UA_GET_NE32(ip + m_len) ^ UA_GET_NE32(m_pos + m_len); ++ if (v != 0) ++ break; ++ m_len += 4; ++ v = UA_GET_NE32(ip + m_len) ^ UA_GET_NE32(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_ctlz32) ++ m_len += lzo_bitops_ctlz32(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_cttz32) ++ m_len += lzo_bitops_cttz32(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 (ip[m_len] != m_pos[m_len]) ++ break; ++ m_len += 1; ++ if (ip[m_len] != m_pos[m_len]) ++ break; ++ m_len += 1; ++ if (ip[m_len] != m_pos[m_len]) ++ break; ++ m_len += 1; ++ if (ip[m_len] != m_pos[m_len]) ++ break; ++ m_len += 1; ++ if (ip[m_len] != m_pos[m_len]) ++ break; ++ m_len += 1; ++ if (ip[m_len] != m_pos[m_len]) ++ break; ++ m_len += 1; ++ if (ip[m_len] != m_pos[m_len]) ++ break; ++ 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) +- { +- m_off -= 0x4000; +- assert(m_off > 0); assert(m_off <= 0x7fff); +- *op++ = LZO_BYTE(M4_MARKER | +- ((m_off & 0x4000) >> 11) | (m_len - 2)); +- goto m3_m4_offset; +- } ++ *op++ = LZO_BYTE(((m_len - 1) << 5) | ((m_off & 7) << 2)); ++ *op++ = LZO_BYTE(m_off >> 3); + #elif defined(LZO1Y) +- goto m4_match; +-#endif +- } +- else +- { +- { +- const lzo_byte *end = in_end; +- const lzo_byte *m = m_pos + M2_MAX_LEN + 1; +- while (ip < end && *m == *ip) +- m++, ip++; +- m_len = (ip - ii); +- } +- assert(m_len > M2_MAX_LEN); +- +- if (m_off <= M3_MAX_OFFSET) +- { +- m_off -= 1; +- if (m_len <= 33) +- *op++ = LZO_BYTE(M3_MARKER | (m_len - 2)); +- else +- { +- m_len -= 33; +- *op++ = M3_MARKER | 0; +- goto m3_m4_len; +- } +- } +- else +- { +-#if defined(LZO1Y) +-m4_match: +-#endif +- m_off -= 0x4000; +- assert(m_off > 0); assert(m_off <= 0x7fff); +- if (m_len <= M4_MAX_LEN) +- *op++ = LZO_BYTE(M4_MARKER | +- ((m_off & 0x4000) >> 11) | (m_len - 2)); +- else +- { +- m_len -= M4_MAX_LEN; +- *op++ = LZO_BYTE(M4_MARKER | ((m_off & 0x4000) >> 11)); +-m3_m4_len: +- while (m_len > 255) +- { +- m_len -= 255; +- *op++ = 0; +- } +- assert(m_len > 0); +- *op++ = LZO_BYTE(m_len); +- } +- } +- +-m3_m4_offset: +- *op++ = LZO_BYTE((m_off & 63) << 2); +- *op++ = LZO_BYTE(m_off >> 6); +- } +- +-#if 0 +-match_done: +-#endif +- ii = ip; +- if (ip >= ip_end) +- break; ++ *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; ++ UA_SET1(op, 0); ++ op++; ++ } ++ *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; ++ UA_SET1(op, 0); ++ op++; ++ } ++ *op++ = LZO_BYTE(m_len); ++ } ++ *op++ = LZO_BYTE(m_off << 2); ++ *op++ = LZO_BYTE(m_off >> 6); ++ } ++ goto next; + } + +- *out_len = op - out; +- return pd(in_end,ii); ++ *out_len = pd(op, out); ++ return pd(in_end,ii-ti); + } + + LZO_PUBLIC(int) +-DO_COMPRESS ( const lzo_byte *in , lzo_uint in_len, +- lzo_byte *out, lzo_uintp out_len, +- lzo_voidp wrkmem ) ++DO_COMPRESS ( const lzo_bytep in , lzo_uint in_len, ++ lzo_bytep out, lzo_uintp out_len, ++ lzo_voidp wrkmem ) + { +- lzo_byte *op = out; +- lzo_uint t; +- +-#if defined(__LZO_QUERY_COMPRESS) +- if (__LZO_IS_COMPRESS_QUERY(in,in_len,out,out_len,wrkmem)) +- return __LZO_QUERY_COMPRESS(in,in_len,out,out_len,wrkmem,D_SIZE,lzo_sizeof(lzo_dict_t)); +-#endif ++ const lzo_bytep ip = in; ++ lzo_bytep op = out; ++ lzo_uint l = in_len; ++ lzo_uint t = 0; + +- if (in_len <= M2_MAX_LEN + 5) +- t = in_len; +- else ++ while (l > 20) + { +- t = do_compress(in,in_len,op,out_len,wrkmem); +- op += *out_len; ++ 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_byte *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; +- *op++ = 0; +- } +- assert(tt > 0); +- *op++ = LZO_BYTE(tt); +- } +- do *op++ = *ii++; while (--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(op[-2] | t); ++ else if (t <= 18) ++ *op++ = LZO_BYTE(t - 3); ++ else ++ { ++ lzo_uint tt = t - 18; ++ ++ *op++ = 0; ++ while (tt > 255) ++ { ++ tt -= 255; ++ UA_SET1(op, 0); ++ op++; ++ } ++ assert(tt > 0); ++ *op++ = LZO_BYTE(tt); ++ } ++ UA_COPYN(op, ii, t); ++ op += t; + } + + *op++ = M4_MARKER | 1; + *op++ = 0; + *op++ = 0; + +- *out_len = op - out; ++ *out_len = pd(op, out); + return LZO_E_OK; + } + ++#endif ++ + #undef do_compress + #undef DO_COMPRESS + #undef LZO_HASH + +-#undef LZO_TEST_DECOMPRESS_OVERRUN +-#undef LZO_TEST_DECOMPRESS_OVERRUN_INPUT +-#undef LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT +-#undef LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND ++#undef LZO_TEST_OVERRUN + #undef DO_DECOMPRESS + #define DO_DECOMPRESS lzo1x_decompress + +-#if defined(LZO_TEST_DECOMPRESS_OVERRUN) +-# if !defined(LZO_TEST_DECOMPRESS_OVERRUN_INPUT) +-# define LZO_TEST_DECOMPRESS_OVERRUN_INPUT 2 ++#if !defined(MINILZO_CFG_SKIP_LZO1X_DECOMPRESS) ++ ++#if defined(LZO_TEST_OVERRUN) ++# if !defined(LZO_TEST_OVERRUN_INPUT) ++# define LZO_TEST_OVERRUN_INPUT 2 + # endif +-# if !defined(LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT) +-# define LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT 2 ++# if !defined(LZO_TEST_OVERRUN_OUTPUT) ++# define LZO_TEST_OVERRUN_OUTPUT 2 + # endif +-# if !defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND) +-# define LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND ++# if !defined(LZO_TEST_OVERRUN_LOOKBEHIND) ++# define LZO_TEST_OVERRUN_LOOKBEHIND 1 + # endif + #endif + + #undef TEST_IP + #undef TEST_OP +-#undef TEST_LOOKBEHIND ++#undef TEST_IP_AND_TEST_OP ++#undef TEST_LB ++#undef TEST_LBO + #undef NEED_IP + #undef NEED_OP ++#undef TEST_IV ++#undef TEST_OV + #undef HAVE_TEST_IP + #undef HAVE_TEST_OP + #undef HAVE_NEED_IP +@@ -1975,31 +5002,35 @@ DO_COMPRESS ( const lzo_byte *in , lzo_uint in_len, + #undef HAVE_ANY_IP + #undef HAVE_ANY_OP + +-#if defined(LZO_TEST_DECOMPRESS_OVERRUN_INPUT) +-# if (LZO_TEST_DECOMPRESS_OVERRUN_INPUT >= 1) ++#if defined(LZO_TEST_OVERRUN_INPUT) ++# if (LZO_TEST_OVERRUN_INPUT >= 1) + # define TEST_IP (ip < ip_end) + # endif +-# if (LZO_TEST_DECOMPRESS_OVERRUN_INPUT >= 2) ++# if (LZO_TEST_OVERRUN_INPUT >= 2) + # define NEED_IP(x) \ +- if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x)) goto input_overrun ++ if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x)) goto input_overrun ++# define TEST_IV(x) if ((x) > (lzo_uint)0 - (511)) goto input_overrun + # endif + #endif + +-#if defined(LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT) +-# if (LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT >= 1) ++#if defined(LZO_TEST_OVERRUN_OUTPUT) ++# if (LZO_TEST_OVERRUN_OUTPUT >= 1) + # define TEST_OP (op <= op_end) + # endif +-# if (LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT >= 2) ++# if (LZO_TEST_OVERRUN_OUTPUT >= 2) + # undef TEST_OP + # define NEED_OP(x) \ +- if ((lzo_uint)(op_end - op) < (lzo_uint)(x)) goto output_overrun ++ if ((lzo_uint)(op_end - op) < (lzo_uint)(x)) goto output_overrun ++# define TEST_OV(x) if ((x) > (lzo_uint)0 - (511)) goto output_overrun + # endif + #endif + +-#if defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND) +-# define TEST_LOOKBEHIND(m_pos,out) if (m_pos < out) goto lookbehind_overrun ++#if defined(LZO_TEST_OVERRUN_LOOKBEHIND) ++# define TEST_LB(m_pos) if (PTR_LT(m_pos,out) || PTR_GE(m_pos,op)) goto lookbehind_overrun ++# define TEST_LBO(m_pos,o) if (PTR_LT(m_pos,out) || PTR_GE(m_pos,op-(o))) goto lookbehind_overrun + #else +-# define TEST_LOOKBEHIND(m_pos,op) ((void) 0) ++# define TEST_LB(m_pos) ((void) 0) ++# define TEST_LBO(m_pos,o) ((void) 0) + #endif + + #if !defined(LZO_EOF_CODE) && !defined(TEST_IP) +@@ -2007,64 +5038,66 @@ DO_COMPRESS ( const lzo_byte *in , lzo_uint in_len, + #endif + + #if defined(TEST_IP) +-# define HAVE_TEST_IP ++# define HAVE_TEST_IP 1 + #else + # define TEST_IP 1 + #endif + #if defined(TEST_OP) +-# define HAVE_TEST_OP ++# define HAVE_TEST_OP 1 + #else + # define TEST_OP 1 + #endif + ++#if defined(HAVE_TEST_IP) && defined(HAVE_TEST_OP) ++# define TEST_IP_AND_TEST_OP (TEST_IP && TEST_OP) ++#elif defined(HAVE_TEST_IP) ++# define TEST_IP_AND_TEST_OP TEST_IP ++#elif defined(HAVE_TEST_OP) ++# define TEST_IP_AND_TEST_OP TEST_OP ++#else ++# define TEST_IP_AND_TEST_OP 1 ++#endif ++ + #if defined(NEED_IP) +-# define HAVE_NEED_IP ++# define HAVE_NEED_IP 1 + #else + # define NEED_IP(x) ((void) 0) ++# define TEST_IV(x) ((void) 0) + #endif + #if defined(NEED_OP) +-# define HAVE_NEED_OP ++# define HAVE_NEED_OP 1 + #else + # define NEED_OP(x) ((void) 0) ++# define TEST_OV(x) ((void) 0) + #endif + + #if defined(HAVE_TEST_IP) || defined(HAVE_NEED_IP) +-# define HAVE_ANY_IP ++# define HAVE_ANY_IP 1 + #endif + #if defined(HAVE_TEST_OP) || defined(HAVE_NEED_OP) +-# define HAVE_ANY_OP +-#endif +- +-#undef __COPY4 +-#define __COPY4(dst,src) * (lzo_uint32p)(dst) = * (const lzo_uint32p)(src) +- +-#undef COPY4 +-#if defined(LZO_UNALIGNED_OK_4) +-# define COPY4(dst,src) __COPY4(dst,src) +-#elif defined(LZO_ALIGNED_OK_4) +-# define COPY4(dst,src) __COPY4((lzo_ptr_t)(dst),(lzo_ptr_t)(src)) ++# define HAVE_ANY_OP 1 + #endif + + #if defined(DO_DECOMPRESS) + LZO_PUBLIC(int) +-DO_DECOMPRESS ( const lzo_byte *in , lzo_uint in_len, +- lzo_byte *out, lzo_uintp out_len, +- lzo_voidp wrkmem ) ++DO_DECOMPRESS ( const lzo_bytep in , lzo_uint in_len, ++ lzo_bytep out, lzo_uintp out_len, ++ lzo_voidp wrkmem ) + #endif + { +- register lzo_byte *op; +- register const lzo_byte *ip; +- register lzo_uint t; ++ lzo_bytep op; ++ const lzo_bytep ip; ++ lzo_uint t; + #if defined(COPY_DICT) + lzo_uint m_off; +- const lzo_byte *dict_end; ++ const lzo_bytep dict_end; + #else +- register const lzo_byte *m_pos; ++ const lzo_bytep m_pos; + #endif + +- const lzo_byte * const ip_end = in + in_len; ++ const lzo_bytep const ip_end = in + in_len; + #if defined(HAVE_ANY_OP) +- lzo_byte * const op_end = out + *out_len; ++ lzo_bytep const op_end = out + *out_len; + #endif + #if defined(LZO1Z) + lzo_uint last_m_off = 0; +@@ -2072,25 +5105,20 @@ DO_DECOMPRESS ( const lzo_byte *in , lzo_uint in_len, + + LZO_UNUSED(wrkmem); + +-#if defined(__LZO_QUERY_DECOMPRESS) +- if (__LZO_IS_DECOMPRESS_QUERY(in,in_len,out,out_len,wrkmem)) +- return __LZO_QUERY_DECOMPRESS(in,in_len,out,out_len,wrkmem,0,0); +-#endif +- + #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; ++ 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; ++ dict_len = 0; ++ dict_end = NULL; + } + #endif + +@@ -2099,367 +5127,415 @@ DO_DECOMPRESS ( const lzo_byte *in , lzo_uint in_len, + op = out; + ip = in; + ++ NEED_IP(1); + 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; ++ t = *ip++ - 17; ++ if (t < 4) ++ goto match_next; ++ assert(t > 0); NEED_OP(t); NEED_IP(t+3); ++ do *op++ = *ip++; while (--t > 0); ++ goto first_literal_run; + } + +- while (TEST_IP && TEST_OP) ++ for (;;) + { +- t = *ip++; +- if (t >= 16) +- goto match; +- if (t == 0) +- { +- NEED_IP(1); +- while (*ip == 0) +- { +- t += 255; +- ip++; +- NEED_IP(1); +- } +- t += 15 + *ip++; +- } +- assert(t > 0); NEED_OP(t+3); NEED_IP(t+4); +-#if defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4) +-#if !defined(LZO_UNALIGNED_OK_4) +- if (PTR_ALIGNED2_4(op,ip)) +- { +-#endif +- COPY4(op,ip); +- op += 4; ip += 4; +- if (--t > 0) +- { +- if (t >= 4) +- { +- do { +- COPY4(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) +- { +- *op++ = *ip++; *op++ = *ip++; *op++ = *ip++; +- do *op++ = *ip++; while (--t > 0); +- } ++ NEED_IP(3); ++ t = *ip++; ++ if (t >= 16) ++ goto match; ++ if (t == 0) ++ { ++ while (*ip == 0) ++ { ++ t += 255; ++ ip++; ++ TEST_IV(t); ++ NEED_IP(1); ++ } ++ t += 15 + *ip++; ++ } ++ assert(t > 0); NEED_OP(t+3); NEED_IP(t+6); ++#if (LZO_OPT_UNALIGNED64) && (LZO_OPT_UNALIGNED32) ++ t += 3; ++ if (t >= 8) do ++ { ++ UA_COPY8(op,ip); ++ op += 8; ip += 8; t -= 8; ++ } while (t >= 8); ++ if (t >= 4) ++ { ++ UA_COPY4(op,ip); ++ op += 4; ip += 4; t -= 4; ++ } ++ if (t > 0) ++ { ++ *op++ = *ip++; ++ if (t > 1) { *op++ = *ip++; if (t > 2) { *op++ = *ip++; } } ++ } ++#elif (LZO_OPT_UNALIGNED32) || (LZO_ALIGNED_OK_4) ++#if !(LZO_OPT_UNALIGNED32) ++ if (PTR_ALIGNED2_4(op,ip)) ++ { ++#endif ++ UA_COPY4(op,ip); ++ op += 4; ip += 4; ++ if (--t > 0) ++ { ++ if (t >= 4) ++ { ++ do { ++ UA_COPY4(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 !(LZO_OPT_UNALIGNED32) ++ } ++ else ++#endif ++#endif ++#if !(LZO_OPT_UNALIGNED32) ++ { ++ *op++ = *ip++; *op++ = *ip++; *op++ = *ip++; ++ do *op++ = *ip++; while (--t > 0); ++ } + #endif + + first_literal_run: + +- t = *ip++; +- if (t >= 16) +- goto match; ++ 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; ++ 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); ++ m_off = (1 + M2_MAX_OFFSET) + (t >> 2) + (*ip++ << 2); + #endif +- NEED_OP(3); +- t = 3; COPY_DICT(t,m_off) ++ NEED_OP(3); ++ t = 3; COPY_DICT(t,m_off) + #else + #if defined(LZO1Z) +- t = (1 + M2_MAX_OFFSET) + (t << 6) + (*ip++ >> 2); +- m_pos = op - t; +- last_m_off = t; ++ 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; ++ m_pos = op - (1 + M2_MAX_OFFSET); ++ m_pos -= t >> 2; ++ m_pos -= *ip++ << 2; + #endif +- TEST_LOOKBEHIND(m_pos,out); NEED_OP(3); +- *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos; ++ TEST_LB(m_pos); NEED_OP(3); ++ *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos; + #endif +- goto match_done; ++ goto match_done; + +- while (TEST_IP && TEST_OP) +- { ++ for (;;) { + match: +- if (t >= 64) +- { ++ if (t >= 64) ++ { + #if defined(COPY_DICT) + #if defined(LZO1X) +- m_off = 1 + ((t >> 2) & 7) + (*ip++ << 3); +- t = (t >> 5) - 1; ++ 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; ++ 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; ++ 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 + #if defined(LZO1X) +- m_pos = op - 1; +- m_pos -= (t >> 2) & 7; +- m_pos -= *ip++ << 3; +- t = (t >> 5) - 1; ++ 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; ++ 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_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1); +- goto copy_match; +-#endif +- } +- else if (t >= 32) +- { +- t &= 31; +- if (t == 0) +- { +- NEED_IP(1); +- while (*ip == 0) +- { +- t += 255; +- ip++; +- NEED_IP(1); +- } +- t += 31 + *ip++; +- } ++ { ++ 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 ++ } ++ else if (t >= 32) ++ { ++ t &= 31; ++ if (t == 0) ++ { ++ while (*ip == 0) ++ { ++ t += 255; ++ ip++; ++ TEST_OV(t); ++ NEED_IP(1); ++ } ++ t += 31 + *ip++; ++ NEED_IP(2); ++ } + #if defined(COPY_DICT) + #if defined(LZO1Z) +- m_off = 1 + (ip[0] << 6) + (ip[1] >> 2); +- last_m_off = m_off; ++ m_off = 1 + (ip[0] << 6) + (ip[1] >> 2); ++ last_m_off = m_off; + #else +- m_off = 1 + (ip[0] >> 2) + (ip[1] << 6); ++ m_off = 1 + (ip[0] >> 2) + (ip[1] << 6); + #endif + #else + #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) && (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN) +- m_pos = op - 1; +- m_pos -= (* (const lzo_ushortp) ip) >> 2; +-#else +- m_pos = op - 1; +- m_pos -= (ip[0] >> 2) + (ip[1] << 6); +-#endif +-#endif +- ip += 2; +- } +- else if (t >= 16) +- { ++ { ++ lzo_uint off = 1 + (ip[0] << 6) + (ip[1] >> 2); ++ m_pos = op - off; ++ last_m_off = off; ++ } ++#elif (LZO_OPT_UNALIGNED16) && (LZO_ABI_LITTLE_ENDIAN) ++ m_pos = op - 1; ++ m_pos -= UA_GET_LE16(ip) >> 2; ++#else ++ m_pos = op - 1; ++ m_pos -= (ip[0] >> 2) + (ip[1] << 6); ++#endif ++#endif ++ ip += 2; ++ } ++ else if (t >= 16) ++ { + #if defined(COPY_DICT) +- m_off = (t & 8) << 11; +-#else +- m_pos = op; +- m_pos -= (t & 8) << 11; +-#endif +- t &= 7; +- if (t == 0) +- { +- NEED_IP(1); +- while (*ip == 0) +- { +- t += 255; +- ip++; +- NEED_IP(1); +- } +- t += 7 + *ip++; +- } ++ m_off = (t & 8) << 11; ++#else ++ m_pos = op; ++ m_pos -= (t & 8) << 11; ++#endif ++ t &= 7; ++ if (t == 0) ++ { ++ while (*ip == 0) ++ { ++ t += 255; ++ ip++; ++ TEST_OV(t); ++ NEED_IP(1); ++ } ++ t += 7 + *ip++; ++ NEED_IP(2); ++ } + #if defined(COPY_DICT) + #if defined(LZO1Z) +- m_off += (ip[0] << 6) + (ip[1] >> 2); ++ m_off += (ip[0] << 6) + (ip[1] >> 2); + #else +- m_off += (ip[0] >> 2) + (ip[1] << 6); ++ m_off += (ip[0] >> 2) + (ip[1] << 6); + #endif +- ip += 2; +- if (m_off == 0) +- goto eof_found; +- m_off += 0x4000; ++ ip += 2; ++ if (m_off == 0) ++ goto eof_found; ++ m_off += 0x4000; + #if defined(LZO1Z) +- last_m_off = m_off; ++ last_m_off = m_off; + #endif + #else + #if defined(LZO1Z) +- m_pos -= (ip[0] << 6) + (ip[1] >> 2); +-#elif defined(LZO_UNALIGNED_OK_2) && (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN) +- m_pos -= (* (const lzo_ushortp) ip) >> 2; ++ m_pos -= (ip[0] << 6) + (ip[1] >> 2); ++#elif (LZO_OPT_UNALIGNED16) && (LZO_ABI_LITTLE_ENDIAN) ++ m_pos -= UA_GET_LE16(ip) >> 2; + #else +- m_pos -= (ip[0] >> 2) + (ip[1] << 6); ++ m_pos -= (ip[0] >> 2) + (ip[1] << 6); + #endif +- ip += 2; +- if (m_pos == op) +- goto eof_found; +- m_pos -= 0x4000; ++ ip += 2; ++ if (m_pos == op) ++ goto eof_found; ++ m_pos -= 0x4000; + #if defined(LZO1Z) +- last_m_off = op - m_pos; ++ last_m_off = pd((const lzo_bytep)op, m_pos); + #endif + #endif +- } +- else +- { ++ } ++ else ++ { + #if defined(COPY_DICT) + #if defined(LZO1Z) +- m_off = 1 + (t << 6) + (*ip++ >> 2); +- last_m_off = m_off; ++ m_off = 1 + (t << 6) + (*ip++ >> 2); ++ last_m_off = m_off; + #else +- m_off = 1 + (t >> 2) + (*ip++ << 2); ++ m_off = 1 + (t >> 2) + (*ip++ << 2); + #endif +- NEED_OP(2); +- t = 2; COPY_DICT(t,m_off) ++ NEED_OP(2); ++ t = 2; COPY_DICT(t,m_off) + #else + #if defined(LZO1Z) +- t = 1 + (t << 6) + (*ip++ >> 2); +- m_pos = op - t; +- last_m_off = t; ++ 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; ++ m_pos = op - 1; ++ m_pos -= t >> 2; ++ m_pos -= *ip++ << 2; + #endif +- TEST_LOOKBEHIND(m_pos,out); NEED_OP(2); +- *op++ = *m_pos++; *op++ = *m_pos; ++ TEST_LB(m_pos); NEED_OP(2); ++ *op++ = *m_pos++; *op++ = *m_pos; + #endif +- goto match_done; +- } ++ goto match_done; ++ } + + #if defined(COPY_DICT) + +- NEED_OP(t+3-1); +- t += 3-1; COPY_DICT(t,m_off) ++ NEED_OP(t+3-1); ++ t += 3-1; COPY_DICT(t,m_off) + + #else + +- TEST_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1); +-#if 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); ++ TEST_LB(m_pos); assert(t > 0); NEED_OP(t+3-1); ++#if (LZO_OPT_UNALIGNED64) && (LZO_OPT_UNALIGNED32) ++ if (op - m_pos >= 8) ++ { ++ t += (3 - 1); ++ if (t >= 8) do ++ { ++ UA_COPY8(op,m_pos); ++ op += 8; m_pos += 8; t -= 8; ++ } while (t >= 8); ++ if (t >= 4) ++ { ++ UA_COPY4(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 (LZO_OPT_UNALIGNED32) || (LZO_ALIGNED_OK_4) ++#if !(LZO_OPT_UNALIGNED32) ++ if (t >= 2 * 4 - (3 - 1) && PTR_ALIGNED2_4(op,m_pos)) ++ { ++ assert((op - m_pos) >= 4); + #else +- if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4) +- { +-#endif +- COPY4(op,m_pos); +- op += 4; m_pos += 4; t -= 4 - (3 - 1); +- do { +- COPY4(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 +- { ++ if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4) ++ { ++#endif ++ UA_COPY4(op,m_pos); ++ op += 4; m_pos += 4; t -= 4 - (3 - 1); ++ do { ++ UA_COPY4(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); +- } ++ *op++ = *m_pos++; *op++ = *m_pos++; ++ do *op++ = *m_pos++; while (--t > 0); ++ } + + #endif + + match_done: + #if defined(LZO1Z) +- t = ip[-1] & 3; ++ t = ip[-1] & 3; + #else +- t = ip[-2] & 3; ++ t = ip[-2] & 3; + #endif +- if (t == 0) +- break; ++ if (t == 0) ++ break; + + match_next: +- 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) +- *out_len = op - out; +- return LZO_E_EOF_NOT_FOUND; ++ assert(t > 0); assert(t < 4); NEED_OP(t); NEED_IP(t+3); ++#if 0 ++ do *op++ = *ip++; while (--t > 0); ++#else ++ *op++ = *ip++; ++ if (t > 1) { *op++ = *ip++; if (t > 2) { *op++ = *ip++; } } + #endif ++ t = *ip++; ++ } ++ } + + eof_found: +- assert(t == 1); +- *out_len = op - out; ++ *out_len = pd(op, out); + return (ip == ip_end ? LZO_E_OK : +- (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); ++ (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); + + #if defined(HAVE_NEED_IP) + input_overrun: +- *out_len = op - out; ++ *out_len = pd(op, out); + return LZO_E_INPUT_OVERRUN; + #endif + + #if defined(HAVE_NEED_OP) + output_overrun: +- *out_len = op - out; ++ *out_len = pd(op, out); + return LZO_E_OUTPUT_OVERRUN; + #endif + +-#if defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND) ++#if defined(LZO_TEST_OVERRUN_LOOKBEHIND) + lookbehind_overrun: +- *out_len = op - out; ++ *out_len = pd(op, out); + return LZO_E_LOOKBEHIND_OVERRUN; + #endif + } + +-#define LZO_TEST_DECOMPRESS_OVERRUN ++#endif ++ ++#define LZO_TEST_OVERRUN 1 + #undef DO_DECOMPRESS + #define DO_DECOMPRESS lzo1x_decompress_safe + +-#if defined(LZO_TEST_DECOMPRESS_OVERRUN) +-# if !defined(LZO_TEST_DECOMPRESS_OVERRUN_INPUT) +-# define LZO_TEST_DECOMPRESS_OVERRUN_INPUT 2 ++#if !defined(MINILZO_CFG_SKIP_LZO1X_DECOMPRESS_SAFE) ++ ++#if defined(LZO_TEST_OVERRUN) ++# if !defined(LZO_TEST_OVERRUN_INPUT) ++# define LZO_TEST_OVERRUN_INPUT 2 + # endif +-# if !defined(LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT) +-# define LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT 2 ++# if !defined(LZO_TEST_OVERRUN_OUTPUT) ++# define LZO_TEST_OVERRUN_OUTPUT 2 + # endif +-# if !defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND) +-# define LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND ++# if !defined(LZO_TEST_OVERRUN_LOOKBEHIND) ++# define LZO_TEST_OVERRUN_LOOKBEHIND 1 + # endif + #endif + + #undef TEST_IP + #undef TEST_OP +-#undef TEST_LOOKBEHIND ++#undef TEST_IP_AND_TEST_OP ++#undef TEST_LB ++#undef TEST_LBO + #undef NEED_IP + #undef NEED_OP ++#undef TEST_IV ++#undef TEST_OV + #undef HAVE_TEST_IP + #undef HAVE_TEST_OP + #undef HAVE_NEED_IP +@@ -2467,31 +5543,35 @@ lookbehind_overrun: + #undef HAVE_ANY_IP + #undef HAVE_ANY_OP + +-#if defined(LZO_TEST_DECOMPRESS_OVERRUN_INPUT) +-# if (LZO_TEST_DECOMPRESS_OVERRUN_INPUT >= 1) ++#if defined(LZO_TEST_OVERRUN_INPUT) ++# if (LZO_TEST_OVERRUN_INPUT >= 1) + # define TEST_IP (ip < ip_end) + # endif +-# if (LZO_TEST_DECOMPRESS_OVERRUN_INPUT >= 2) ++# if (LZO_TEST_OVERRUN_INPUT >= 2) + # define NEED_IP(x) \ +- if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x)) goto input_overrun ++ if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x)) goto input_overrun ++# define TEST_IV(x) if ((x) > (lzo_uint)0 - (511)) goto input_overrun + # endif + #endif + +-#if defined(LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT) +-# if (LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT >= 1) ++#if defined(LZO_TEST_OVERRUN_OUTPUT) ++# if (LZO_TEST_OVERRUN_OUTPUT >= 1) + # define TEST_OP (op <= op_end) + # endif +-# if (LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT >= 2) ++# if (LZO_TEST_OVERRUN_OUTPUT >= 2) + # undef TEST_OP + # define NEED_OP(x) \ +- if ((lzo_uint)(op_end - op) < (lzo_uint)(x)) goto output_overrun ++ if ((lzo_uint)(op_end - op) < (lzo_uint)(x)) goto output_overrun ++# define TEST_OV(x) if ((x) > (lzo_uint)0 - (511)) goto output_overrun + # endif + #endif + +-#if defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND) +-# define TEST_LOOKBEHIND(m_pos,out) if (m_pos < out) goto lookbehind_overrun ++#if defined(LZO_TEST_OVERRUN_LOOKBEHIND) ++# define TEST_LB(m_pos) if (PTR_LT(m_pos,out) || PTR_GE(m_pos,op)) goto lookbehind_overrun ++# define TEST_LBO(m_pos,o) if (PTR_LT(m_pos,out) || PTR_GE(m_pos,op-(o))) goto lookbehind_overrun + #else +-# define TEST_LOOKBEHIND(m_pos,op) ((void) 0) ++# define TEST_LB(m_pos) ((void) 0) ++# define TEST_LBO(m_pos,o) ((void) 0) + #endif + + #if !defined(LZO_EOF_CODE) && !defined(TEST_IP) +@@ -2499,64 +5579,66 @@ lookbehind_overrun: + #endif + + #if defined(TEST_IP) +-# define HAVE_TEST_IP ++# define HAVE_TEST_IP 1 + #else + # define TEST_IP 1 + #endif + #if defined(TEST_OP) +-# define HAVE_TEST_OP ++# define HAVE_TEST_OP 1 + #else + # define TEST_OP 1 + #endif + ++#if defined(HAVE_TEST_IP) && defined(HAVE_TEST_OP) ++# define TEST_IP_AND_TEST_OP (TEST_IP && TEST_OP) ++#elif defined(HAVE_TEST_IP) ++# define TEST_IP_AND_TEST_OP TEST_IP ++#elif defined(HAVE_TEST_OP) ++# define TEST_IP_AND_TEST_OP TEST_OP ++#else ++# define TEST_IP_AND_TEST_OP 1 ++#endif ++ + #if defined(NEED_IP) +-# define HAVE_NEED_IP ++# define HAVE_NEED_IP 1 + #else + # define NEED_IP(x) ((void) 0) ++# define TEST_IV(x) ((void) 0) + #endif + #if defined(NEED_OP) +-# define HAVE_NEED_OP ++# define HAVE_NEED_OP 1 + #else + # define NEED_OP(x) ((void) 0) ++# define TEST_OV(x) ((void) 0) + #endif + + #if defined(HAVE_TEST_IP) || defined(HAVE_NEED_IP) +-# define HAVE_ANY_IP ++# define HAVE_ANY_IP 1 + #endif + #if defined(HAVE_TEST_OP) || defined(HAVE_NEED_OP) +-# define HAVE_ANY_OP +-#endif +- +-#undef __COPY4 +-#define __COPY4(dst,src) * (lzo_uint32p)(dst) = * (const lzo_uint32p)(src) +- +-#undef COPY4 +-#if defined(LZO_UNALIGNED_OK_4) +-# define COPY4(dst,src) __COPY4(dst,src) +-#elif defined(LZO_ALIGNED_OK_4) +-# define COPY4(dst,src) __COPY4((lzo_ptr_t)(dst),(lzo_ptr_t)(src)) ++# define HAVE_ANY_OP 1 + #endif + + #if defined(DO_DECOMPRESS) + LZO_PUBLIC(int) +-DO_DECOMPRESS ( const lzo_byte *in , lzo_uint in_len, +- lzo_byte *out, lzo_uintp out_len, +- lzo_voidp wrkmem ) ++DO_DECOMPRESS ( const lzo_bytep in , lzo_uint in_len, ++ lzo_bytep out, lzo_uintp out_len, ++ lzo_voidp wrkmem ) + #endif + { +- register lzo_byte *op; +- register const lzo_byte *ip; +- register lzo_uint t; ++ lzo_bytep op; ++ const lzo_bytep ip; ++ lzo_uint t; + #if defined(COPY_DICT) + lzo_uint m_off; +- const lzo_byte *dict_end; ++ const lzo_bytep dict_end; + #else +- register const lzo_byte *m_pos; ++ const lzo_bytep m_pos; + #endif + +- const lzo_byte * const ip_end = in + in_len; ++ const lzo_bytep const ip_end = in + in_len; + #if defined(HAVE_ANY_OP) +- lzo_byte * const op_end = out + *out_len; ++ lzo_bytep const op_end = out + *out_len; + #endif + #if defined(LZO1Z) + lzo_uint last_m_off = 0; +@@ -2564,25 +5646,20 @@ DO_DECOMPRESS ( const lzo_byte *in , lzo_uint in_len, + + LZO_UNUSED(wrkmem); + +-#if defined(__LZO_QUERY_DECOMPRESS) +- if (__LZO_IS_DECOMPRESS_QUERY(in,in_len,out,out_len,wrkmem)) +- return __LZO_QUERY_DECOMPRESS(in,in_len,out,out_len,wrkmem,0,0); +-#endif +- + #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; ++ 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; ++ dict_len = 0; ++ dict_end = NULL; + } + #endif + +@@ -2591,345 +5668,386 @@ DO_DECOMPRESS ( const lzo_byte *in , lzo_uint in_len, + op = out; + ip = in; + ++ NEED_IP(1); + 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; ++ t = *ip++ - 17; ++ if (t < 4) ++ goto match_next; ++ assert(t > 0); NEED_OP(t); NEED_IP(t+3); ++ do *op++ = *ip++; while (--t > 0); ++ goto first_literal_run; + } + +- while (TEST_IP && TEST_OP) ++ for (;;) + { +- t = *ip++; +- if (t >= 16) +- goto match; +- if (t == 0) +- { +- NEED_IP(1); +- while (*ip == 0) +- { +- t += 255; +- ip++; +- NEED_IP(1); +- } +- t += 15 + *ip++; +- } +- assert(t > 0); NEED_OP(t+3); NEED_IP(t+4); +-#if defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4) +-#if !defined(LZO_UNALIGNED_OK_4) +- if (PTR_ALIGNED2_4(op,ip)) +- { +-#endif +- COPY4(op,ip); +- op += 4; ip += 4; +- if (--t > 0) +- { +- if (t >= 4) +- { +- do { +- COPY4(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) +- { +- *op++ = *ip++; *op++ = *ip++; *op++ = *ip++; +- do *op++ = *ip++; while (--t > 0); +- } ++ NEED_IP(3); ++ t = *ip++; ++ if (t >= 16) ++ goto match; ++ if (t == 0) ++ { ++ while (*ip == 0) ++ { ++ t += 255; ++ ip++; ++ TEST_IV(t); ++ NEED_IP(1); ++ } ++ t += 15 + *ip++; ++ } ++ assert(t > 0); NEED_OP(t+3); NEED_IP(t+6); ++#if (LZO_OPT_UNALIGNED64) && (LZO_OPT_UNALIGNED32) ++ t += 3; ++ if (t >= 8) do ++ { ++ UA_COPY8(op,ip); ++ op += 8; ip += 8; t -= 8; ++ } while (t >= 8); ++ if (t >= 4) ++ { ++ UA_COPY4(op,ip); ++ op += 4; ip += 4; t -= 4; ++ } ++ if (t > 0) ++ { ++ *op++ = *ip++; ++ if (t > 1) { *op++ = *ip++; if (t > 2) { *op++ = *ip++; } } ++ } ++#elif (LZO_OPT_UNALIGNED32) || (LZO_ALIGNED_OK_4) ++#if !(LZO_OPT_UNALIGNED32) ++ if (PTR_ALIGNED2_4(op,ip)) ++ { ++#endif ++ UA_COPY4(op,ip); ++ op += 4; ip += 4; ++ if (--t > 0) ++ { ++ if (t >= 4) ++ { ++ do { ++ UA_COPY4(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 !(LZO_OPT_UNALIGNED32) ++ } ++ else ++#endif ++#endif ++#if !(LZO_OPT_UNALIGNED32) ++ { ++ *op++ = *ip++; *op++ = *ip++; *op++ = *ip++; ++ do *op++ = *ip++; while (--t > 0); ++ } + #endif + + first_literal_run: + +- t = *ip++; +- if (t >= 16) +- goto match; ++ 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; ++ 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); ++ m_off = (1 + M2_MAX_OFFSET) + (t >> 2) + (*ip++ << 2); + #endif +- NEED_OP(3); +- t = 3; COPY_DICT(t,m_off) ++ NEED_OP(3); ++ t = 3; COPY_DICT(t,m_off) + #else + #if defined(LZO1Z) +- t = (1 + M2_MAX_OFFSET) + (t << 6) + (*ip++ >> 2); +- m_pos = op - t; +- last_m_off = t; ++ 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; ++ m_pos = op - (1 + M2_MAX_OFFSET); ++ m_pos -= t >> 2; ++ m_pos -= *ip++ << 2; + #endif +- TEST_LOOKBEHIND(m_pos,out); NEED_OP(3); +- *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos; ++ TEST_LB(m_pos); NEED_OP(3); ++ *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos; + #endif +- goto match_done; ++ goto match_done; + +- while (TEST_IP && TEST_OP) +- { ++ for (;;) { + match: +- if (t >= 64) +- { ++ if (t >= 64) ++ { + #if defined(COPY_DICT) + #if defined(LZO1X) +- m_off = 1 + ((t >> 2) & 7) + (*ip++ << 3); +- t = (t >> 5) - 1; ++ 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; ++ 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; ++ 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 + #if defined(LZO1X) +- m_pos = op - 1; +- m_pos -= (t >> 2) & 7; +- m_pos -= *ip++ << 3; +- t = (t >> 5) - 1; ++ 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; ++ 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_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1); +- goto copy_match; +-#endif +- } +- else if (t >= 32) +- { +- t &= 31; +- if (t == 0) +- { +- NEED_IP(1); +- while (*ip == 0) +- { +- t += 255; +- ip++; +- NEED_IP(1); +- } +- t += 31 + *ip++; +- } ++ { ++ 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 ++ } ++ else if (t >= 32) ++ { ++ t &= 31; ++ if (t == 0) ++ { ++ while (*ip == 0) ++ { ++ t += 255; ++ ip++; ++ TEST_OV(t); ++ NEED_IP(1); ++ } ++ t += 31 + *ip++; ++ NEED_IP(2); ++ } + #if defined(COPY_DICT) + #if defined(LZO1Z) +- m_off = 1 + (ip[0] << 6) + (ip[1] >> 2); +- last_m_off = m_off; ++ m_off = 1 + (ip[0] << 6) + (ip[1] >> 2); ++ last_m_off = m_off; + #else +- m_off = 1 + (ip[0] >> 2) + (ip[1] << 6); ++ m_off = 1 + (ip[0] >> 2) + (ip[1] << 6); + #endif + #else + #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) && (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN) +- m_pos = op - 1; +- m_pos -= (* (const lzo_ushortp) ip) >> 2; +-#else +- m_pos = op - 1; +- m_pos -= (ip[0] >> 2) + (ip[1] << 6); +-#endif +-#endif +- ip += 2; +- } +- else if (t >= 16) +- { ++ { ++ lzo_uint off = 1 + (ip[0] << 6) + (ip[1] >> 2); ++ m_pos = op - off; ++ last_m_off = off; ++ } ++#elif (LZO_OPT_UNALIGNED16) && (LZO_ABI_LITTLE_ENDIAN) ++ m_pos = op - 1; ++ m_pos -= UA_GET_LE16(ip) >> 2; ++#else ++ m_pos = op - 1; ++ m_pos -= (ip[0] >> 2) + (ip[1] << 6); ++#endif ++#endif ++ ip += 2; ++ } ++ else if (t >= 16) ++ { + #if defined(COPY_DICT) +- m_off = (t & 8) << 11; +-#else +- m_pos = op; +- m_pos -= (t & 8) << 11; +-#endif +- t &= 7; +- if (t == 0) +- { +- NEED_IP(1); +- while (*ip == 0) +- { +- t += 255; +- ip++; +- NEED_IP(1); +- } +- t += 7 + *ip++; +- } ++ m_off = (t & 8) << 11; ++#else ++ m_pos = op; ++ m_pos -= (t & 8) << 11; ++#endif ++ t &= 7; ++ if (t == 0) ++ { ++ while (*ip == 0) ++ { ++ t += 255; ++ ip++; ++ TEST_OV(t); ++ NEED_IP(1); ++ } ++ t += 7 + *ip++; ++ NEED_IP(2); ++ } + #if defined(COPY_DICT) + #if defined(LZO1Z) +- m_off += (ip[0] << 6) + (ip[1] >> 2); ++ m_off += (ip[0] << 6) + (ip[1] >> 2); + #else +- m_off += (ip[0] >> 2) + (ip[1] << 6); ++ m_off += (ip[0] >> 2) + (ip[1] << 6); + #endif +- ip += 2; +- if (m_off == 0) +- goto eof_found; +- m_off += 0x4000; ++ ip += 2; ++ if (m_off == 0) ++ goto eof_found; ++ m_off += 0x4000; + #if defined(LZO1Z) +- last_m_off = m_off; ++ last_m_off = m_off; + #endif + #else + #if defined(LZO1Z) +- m_pos -= (ip[0] << 6) + (ip[1] >> 2); +-#elif defined(LZO_UNALIGNED_OK_2) && (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN) +- m_pos -= (* (const lzo_ushortp) ip) >> 2; ++ m_pos -= (ip[0] << 6) + (ip[1] >> 2); ++#elif (LZO_OPT_UNALIGNED16) && (LZO_ABI_LITTLE_ENDIAN) ++ m_pos -= UA_GET_LE16(ip) >> 2; + #else +- m_pos -= (ip[0] >> 2) + (ip[1] << 6); ++ m_pos -= (ip[0] >> 2) + (ip[1] << 6); + #endif +- ip += 2; +- if (m_pos == op) +- goto eof_found; +- m_pos -= 0x4000; ++ ip += 2; ++ if (m_pos == op) ++ goto eof_found; ++ m_pos -= 0x4000; + #if defined(LZO1Z) +- last_m_off = op - m_pos; ++ last_m_off = pd((const lzo_bytep)op, m_pos); + #endif + #endif +- } +- else +- { ++ } ++ else ++ { + #if defined(COPY_DICT) + #if defined(LZO1Z) +- m_off = 1 + (t << 6) + (*ip++ >> 2); +- last_m_off = m_off; ++ m_off = 1 + (t << 6) + (*ip++ >> 2); ++ last_m_off = m_off; + #else +- m_off = 1 + (t >> 2) + (*ip++ << 2); ++ m_off = 1 + (t >> 2) + (*ip++ << 2); + #endif +- NEED_OP(2); +- t = 2; COPY_DICT(t,m_off) ++ NEED_OP(2); ++ t = 2; COPY_DICT(t,m_off) + #else + #if defined(LZO1Z) +- t = 1 + (t << 6) + (*ip++ >> 2); +- m_pos = op - t; +- last_m_off = t; ++ 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; ++ m_pos = op - 1; ++ m_pos -= t >> 2; ++ m_pos -= *ip++ << 2; + #endif +- TEST_LOOKBEHIND(m_pos,out); NEED_OP(2); +- *op++ = *m_pos++; *op++ = *m_pos; ++ TEST_LB(m_pos); NEED_OP(2); ++ *op++ = *m_pos++; *op++ = *m_pos; + #endif +- goto match_done; +- } ++ goto match_done; ++ } + + #if defined(COPY_DICT) + +- NEED_OP(t+3-1); +- t += 3-1; COPY_DICT(t,m_off) ++ NEED_OP(t+3-1); ++ t += 3-1; COPY_DICT(t,m_off) + + #else + +- TEST_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1); +-#if 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); ++ TEST_LB(m_pos); assert(t > 0); NEED_OP(t+3-1); ++#if (LZO_OPT_UNALIGNED64) && (LZO_OPT_UNALIGNED32) ++ if (op - m_pos >= 8) ++ { ++ t += (3 - 1); ++ if (t >= 8) do ++ { ++ UA_COPY8(op,m_pos); ++ op += 8; m_pos += 8; t -= 8; ++ } while (t >= 8); ++ if (t >= 4) ++ { ++ UA_COPY4(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 (LZO_OPT_UNALIGNED32) || (LZO_ALIGNED_OK_4) ++#if !(LZO_OPT_UNALIGNED32) ++ if (t >= 2 * 4 - (3 - 1) && PTR_ALIGNED2_4(op,m_pos)) ++ { ++ assert((op - m_pos) >= 4); + #else +- if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4) +- { +-#endif +- COPY4(op,m_pos); +- op += 4; m_pos += 4; t -= 4 - (3 - 1); +- do { +- COPY4(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 +- { ++ if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4) ++ { ++#endif ++ UA_COPY4(op,m_pos); ++ op += 4; m_pos += 4; t -= 4 - (3 - 1); ++ do { ++ UA_COPY4(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); +- } ++ *op++ = *m_pos++; *op++ = *m_pos++; ++ do *op++ = *m_pos++; while (--t > 0); ++ } + + #endif + + match_done: + #if defined(LZO1Z) +- t = ip[-1] & 3; ++ t = ip[-1] & 3; + #else +- t = ip[-2] & 3; ++ t = ip[-2] & 3; + #endif +- if (t == 0) +- break; ++ if (t == 0) ++ break; + + match_next: +- 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) +- *out_len = op - out; +- return LZO_E_EOF_NOT_FOUND; ++ assert(t > 0); assert(t < 4); NEED_OP(t); NEED_IP(t+3); ++#if 0 ++ do *op++ = *ip++; while (--t > 0); ++#else ++ *op++ = *ip++; ++ if (t > 1) { *op++ = *ip++; if (t > 2) { *op++ = *ip++; } } + #endif ++ t = *ip++; ++ } ++ } + + eof_found: +- assert(t == 1); +- *out_len = op - out; ++ *out_len = pd(op, out); + return (ip == ip_end ? LZO_E_OK : +- (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); ++ (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); + + #if defined(HAVE_NEED_IP) + input_overrun: +- *out_len = op - out; ++ *out_len = pd(op, out); + return LZO_E_INPUT_OVERRUN; + #endif + + #if defined(HAVE_NEED_OP) + output_overrun: +- *out_len = op - out; ++ *out_len = pd(op, out); + return LZO_E_OUTPUT_OVERRUN; + #endif + +-#if defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND) ++#if defined(LZO_TEST_OVERRUN_LOOKBEHIND) + lookbehind_overrun: +- *out_len = op - out; ++ *out_len = pd(op, out); + return LZO_E_LOOKBEHIND_OVERRUN; + #endif + } + +-/***** End of minilzo.c *****/ ++#endif + ++/***** End of minilzo.c *****/ +diff --git a/lzo/minilzo.h b/lzo/minilzo.h +index e3270f9..7937454 100644 +--- a/lzo/minilzo.h ++++ b/lzo/minilzo.h +@@ -2,13 +2,7 @@ + + This file is part of the LZO real-time data compression library. + +- 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 ++ Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer + All Rights Reserved. + + The LZO library is free software; you can redistribute it and/or +@@ -24,7 +18,7 @@ + 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., +- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + Markus F.X.J. Oberhumer + +@@ -39,9 +33,9 @@ + + + #ifndef __MINILZO_H +-#define __MINILZO_H ++#define __MINILZO_H 1 + +-#define MINILZO_VERSION 0x1080 ++#define MINILZO_VERSION 0x2080 + + #ifdef __LZOCONF_H + # error "you cannot use both LZO and miniLZO" +@@ -69,26 +63,26 @@ extern "C" { + */ + + #define LZO1X_MEM_COMPRESS LZO1X_1_MEM_COMPRESS +-#define LZO1X_1_MEM_COMPRESS ((lzo_uint32) (16384L * lzo_sizeof_dict_t)) ++#define LZO1X_1_MEM_COMPRESS ((lzo_uint32_t) (16384L * lzo_sizeof_dict_t)) + #define LZO1X_MEM_DECOMPRESS (0) + + + /* compression */ + LZO_EXTERN(int) +-lzo1x_1_compress ( const lzo_byte *src, lzo_uint src_len, +- lzo_byte *dst, lzo_uintp dst_len, ++lzo1x_1_compress ( const lzo_bytep src, lzo_uint src_len, ++ lzo_bytep dst, lzo_uintp dst_len, + lzo_voidp wrkmem ); + + /* decompression */ + LZO_EXTERN(int) +-lzo1x_decompress ( const lzo_byte *src, lzo_uint src_len, +- lzo_byte *dst, lzo_uintp dst_len, ++lzo1x_decompress ( const lzo_bytep src, lzo_uint src_len, ++ lzo_bytep dst, lzo_uintp dst_len, + lzo_voidp wrkmem /* NOT USED */ ); + + /* safe decompression with overrun testing */ + LZO_EXTERN(int) +-lzo1x_decompress_safe ( const lzo_byte *src, lzo_uint src_len, +- lzo_byte *dst, lzo_uintp dst_len, ++lzo1x_decompress_safe ( const lzo_bytep src, lzo_uint src_len, ++ lzo_bytep dst, lzo_uintp dst_len, + lzo_voidp wrkmem /* NOT USED */ ); + + diff --git a/distcc.spec b/distcc.spec index 7c98206..6be06d6 100644 --- a/distcc.spec +++ b/distcc.spec @@ -6,7 +6,7 @@ Name: distcc Version: 3.2rc1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -15,6 +15,7 @@ Source0: http://distcc.googlecode.com/files/distcc-%{version}.tar.bz2 Source1: hosts.sample Source2: distccd.service #Patch0: distcc-2.18.3-avahi.patch +Patch0: distcc-minilzo-2.08.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: popt-devel @@ -51,6 +52,7 @@ This package contains the compilation server needed to use %{name}. %prep %setup -q #%%patch0 -p1 -b .avahi +%%patch0 -p1 %build @@ -158,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Wed Aug 20 2014 Andy Grover - 3.2rc1-8 +- Add patch distcc-minilzo-2.08.patch, to fix CVE-2014-4607 (BZ 1131791) + * Sat Aug 16 2014 Fedora Release Engineering - 3.2rc1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 57e841f38a4ee7fd1442f5c897591c03b960c89a Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 12 Mar 2015 14:26:04 -0500 Subject: [PATCH 20/82] Enable authentication. --- distcc.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/distcc.spec b/distcc.spec index 6be06d6..089d622 100644 --- a/distcc.spec +++ b/distcc.spec @@ -6,7 +6,7 @@ Name: distcc Version: 3.2rc1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -24,7 +24,7 @@ BuildRequires: pango-devel BuildRequires: python-devel BuildRequires: desktop-file-utils BuildRequires: avahi-devel - +BuildRequires: krb5-devel %description distcc is a program to distribute compilation of C or C++ code across @@ -56,7 +56,7 @@ This package contains the compilation server needed to use %{name}. %build -%configure --with-gnome --disable-Werror +%configure --with-gnome --disable-Werror --with-auth make %{?_smp_mflags} @@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Thu Mar 12 2015 Jon Ciesla - 3.2rc1-9 +- Enable authentication support, BZ 1201039. + * Wed Aug 20 2014 Andy Grover - 3.2rc1-8 - Add patch distcc-minilzo-2.08.patch, to fix CVE-2014-4607 (BZ 1131791) From b667099ce0e87a0b97fcf9f18824e1fff03008d1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 04:08:06 +0000 Subject: [PATCH 21/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 089d622..b547a95 100644 --- a/distcc.spec +++ b/distcc.spec @@ -6,7 +6,7 @@ Name: distcc Version: 3.2rc1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 3.2rc1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Mar 12 2015 Jon Ciesla - 3.2rc1-9 - Enable authentication support, BZ 1201039. From f5ded6c85df34bff53f89835d3d015d6a0260732 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 18:46:50 +0000 Subject: [PATCH 22/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index b547a95..ba4079f 100644 --- a/distcc.spec +++ b/distcc.spec @@ -6,7 +6,7 @@ Name: distcc Version: 3.2rc1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 3.2rc1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 3.2rc1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From e437091b05118b6d784b6f7f806f85bbfe15a44d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 06:56:16 +0000 Subject: [PATCH 23/82] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index ba4079f..cf59a22 100644 --- a/distcc.spec +++ b/distcc.spec @@ -6,7 +6,7 @@ Name: distcc Version: 3.2rc1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 3.2rc1-12 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Wed Feb 03 2016 Fedora Release Engineering - 3.2rc1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From ce333258ee99109817f231b455bf3e07fc12b6b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 08:26:10 +0000 Subject: [PATCH 24/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index cf59a22..0495017 100644 --- a/distcc.spec +++ b/distcc.spec @@ -6,7 +6,7 @@ Name: distcc Version: 3.2rc1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 3.2rc1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jul 19 2016 Fedora Release Engineering - 3.2rc1-12 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From c4e4d1614b85b34b85639142aa27260ce1db20b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 06:16:38 +0000 Subject: [PATCH 25/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 0495017..7ea11e7 100644 --- a/distcc.spec +++ b/distcc.spec @@ -6,7 +6,7 @@ Name: distcc Version: 3.2rc1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 3.2rc1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 3.2rc1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 6fafffd123ea9b8862d7468c17a15f367848689c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 19:37:40 +0000 Subject: [PATCH 26/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 7ea11e7..0c830e7 100644 --- a/distcc.spec +++ b/distcc.spec @@ -6,7 +6,7 @@ Name: distcc Version: 3.2rc1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Distributed C/C++ compilation Group: Development/Tools License: GPLv2+ @@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/include_server* %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 3.2rc1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 3.2rc1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 64735e72359bf87b5ccbbc76c57869fa92ad82d0 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 21 Dec 2017 08:49:04 -0600 Subject: [PATCH 27/82] Fix pump, c args. --- distcc.spec | 50 +++++++++++--------------------------------------- fixArgc.patch | 11 +++++++++++ 2 files changed, 22 insertions(+), 39 deletions(-) create mode 100644 fixArgc.patch diff --git a/distcc.spec b/distcc.spec index 0c830e7..9c4cf8c 100644 --- a/distcc.spec +++ b/distcc.spec @@ -1,22 +1,16 @@ %define _hardened_build 1 -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -# eval to 2.3 if python isn't yet present, workaround for no python in fc4 minimal buildroot -%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")} - Name: distcc Version: 3.2rc1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Distributed C/C++ compilation -Group: Development/Tools License: GPLv2+ URL: http://distcc.org/ Source0: http://distcc.googlecode.com/files/distcc-%{version}.tar.bz2 Source1: hosts.sample Source2: distccd.service -#Patch0: distcc-2.18.3-avahi.patch Patch0: distcc-minilzo-2.08.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: fixArgc.patch BuildRequires: popt-devel BuildRequires: libgnomeui-devel @@ -35,11 +29,8 @@ two or more times faster than a local compile. %package server Summary: Server for distributed C/C++ compilation -Group: Development/Tools License: GPLv2+ -#Requires(post): /sbin/chkconfig -#Requires(preun): /sbin/chkconfig Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -51,9 +42,8 @@ This package contains the compilation server needed to use %{name}. %prep %setup -q -#%%patch0 -p1 -b .avahi -%%patch0 -p1 - +%patch0 -p1 +%patch1 -p2 %build %configure --with-gnome --disable-Werror --with-auth @@ -61,7 +51,6 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Move desktop file to right directory @@ -75,9 +64,6 @@ install -Dm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/hosts # Install sample distccd config file install -Dm 0644 contrib/redhat/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/distccd -# Install distccd init file -#install -Dm 0755 %%{SOURCE2} $RPM_BUILD_ROOT%%{_sysconfdir}/init.d/distccd - # Install distcdd unit file mkdir -p $RPM_BUILD_ROOT%{_unitdir} install -Dm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/distccd.service @@ -114,23 +100,7 @@ fi %postun update-desktop-database &> /dev/null ||: -%triggerun -- distcc-server < 3.1-5 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply distccd -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save distccd >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del distccd >/dev/null 2>&1 || : -/bin/systemctl try-restart distccd.service >/dev/null 2>&1 || : - - -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%defattr(-,root,root,-) %doc AUTHORS doc/* NEWS README.pump TODO %doc COPYING INSTALL README survey.txt %{_bindir}/distcc @@ -139,27 +109,29 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/pump %{_mandir}/man1/distcc.* %{_mandir}/man1/distccmon* +%{_mandir}/man1/pump* +%{_mandir}/man1/include_server* %{_datadir}/%{name} %{_datadir}/applications/*.desktop %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/hosts +%{python_sitearch}/include_server* %files server -%defattr(-,root,root,-) %doc COPYING README %{_bindir}/distccd -#%%{_sysconfdir}/init.d/* %{_unitdir}/* %{_sysconfdir}/default/distcc %{_sysconfdir}/distcc/*allow* %{_mandir}/man1/distccd* -%{_mandir}/man1/include_server* -%{_mandir}/man1/pump* %config(noreplace) %{_sysconfdir}/sysconfig/distccd -%{python_sitearch}/include_server* %changelog +* Thu Dec 21 2017 Gwyn Ciesla - 3.2rc1-16 +- Patch for argument bug, BZ 1527368 +- Move required components for pump to client package, BZ 1525851 + * Wed Aug 02 2017 Fedora Release Engineering - 3.2rc1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/fixArgc.patch b/fixArgc.patch new file mode 100644 index 0000000..a8402a0 --- /dev/null +++ b/fixArgc.patch @@ -0,0 +1,11 @@ +--- distcc-3.1.orig/source/src/arg.c ++++ distcc-3.1/source/src/arg.c +@@ -515,6 +515,8 @@ + } + free(argv); + *argv_ptr = argv = new_argv; ++ i += extra_args - 1; ++ argc += extra_args - 1; + } + } + return 0; From e45764678d4a4676b25b2b50e714159f1428646e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 21 Dec 2017 09:07:50 -0600 Subject: [PATCH 28/82] Drop --verbose. --- distcc.spec | 5 ++++- distccd.service | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/distcc.spec b/distcc.spec index 9c4cf8c..524d209 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.2rc1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: http://distcc.org/ @@ -128,6 +128,9 @@ update-desktop-database &> /dev/null ||: %config(noreplace) %{_sysconfdir}/sysconfig/distccd %changelog +* Thu Dec 21 2017 Gwyn Ciesla - 3.2rc1-17 +- Drop --verbose, BZ 1523785. + * Thu Dec 21 2017 Gwyn Ciesla - 3.2rc1-16 - Patch for argument bug, BZ 1527368 - Move required components for pump to client package, BZ 1525851 diff --git a/distccd.service b/distccd.service index 2caedf9..075a07a 100644 --- a/distccd.service +++ b/distccd.service @@ -5,7 +5,7 @@ After=network.target [Service] User=nobody EnvironmentFile=-/etc/sysconfig/distccd -ExecStart=/usr/bin/distccd --verbose --no-detach --daemon $OPTIONS +ExecStart=/usr/bin/distccd --no-detach --daemon $OPTIONS [Install] WantedBy=multi-user.target From 44b53e0f79b54ba4e74dd96d99bed2ca737f3813 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 21 Dec 2017 20:50:57 +0100 Subject: [PATCH 29/82] Fix homepage and source URLs --- distcc.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/distcc.spec b/distcc.spec index 524d209..1e6ae3c 100644 --- a/distcc.spec +++ b/distcc.spec @@ -5,13 +5,16 @@ Version: 3.2rc1 Release: 17%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ -URL: http://distcc.org/ -Source0: http://distcc.googlecode.com/files/distcc-%{version}.tar.bz2 +URL: https://github.com/distcc/distcc +Source0: https://github.com/distcc/distcc/archive/v%{version}/%{name}-%{version}.tar.gz Source1: hosts.sample Source2: distccd.service Patch0: distcc-minilzo-2.08.patch Patch1: fixArgc.patch +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: libtool BuildRequires: popt-devel BuildRequires: libgnomeui-devel BuildRequires: pango-devel @@ -46,6 +49,7 @@ This package contains the compilation server needed to use %{name}. %patch1 -p2 %build +./autogen.sh %configure --with-gnome --disable-Werror --with-auth make %{?_smp_mflags} From 9fab8bf441337f10edacb8e2d3ee7a75c1a4a6bf Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 21 Dec 2017 20:51:35 +0100 Subject: [PATCH 30/82] Split gnome frontend to separate package --- distcc.spec | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/distcc.spec b/distcc.spec index 1e6ae3c..60aa805 100644 --- a/distcc.spec +++ b/distcc.spec @@ -30,6 +30,14 @@ results as a local compile, is simple to install and use, and is often two or more times faster than a local compile. +%package gnome +Summary: Gnome frontend of distcc monitoring tool +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description gnome +This package contains the Gnome frontend of the distcc monitoring tool. + + %package server Summary: Server for distributed C/C++ compilation License: GPLv2+ @@ -74,7 +82,7 @@ install -Dm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/distccd.service rm -rf $RPM_BUILD_ROOT%{_docdir}/* -%post +%post gnome update-desktop-database &> /dev/null ||: @@ -108,20 +116,24 @@ update-desktop-database &> /dev/null ||: %doc AUTHORS doc/* NEWS README.pump TODO %doc COPYING INSTALL README survey.txt %{_bindir}/distcc -%{_bindir}/distccmon* +%{_bindir}/distccmon-text %{_bindir}/lsdistcc %{_bindir}/pump %{_mandir}/man1/distcc.* %{_mandir}/man1/distccmon* %{_mandir}/man1/pump* %{_mandir}/man1/include_server* -%{_datadir}/%{name} -%{_datadir}/applications/*.desktop %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/hosts %{python_sitearch}/include_server* +%files gnome +%{_bindir}/distccmon-gnome +%{_datadir}/%{name} +%{_datadir}/applications/*.desktop + + %files server %doc COPYING README %{_bindir}/distccd From 6c75f9be5d845d18eba06241d6409b36127f00ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 06:55:47 +0000 Subject: [PATCH 31/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 60aa805..c74ea35 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.2rc1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -144,6 +144,9 @@ update-desktop-database &> /dev/null ||: %config(noreplace) %{_sysconfdir}/sysconfig/distccd %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 3.2rc1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Dec 21 2017 Gwyn Ciesla - 3.2rc1-17 - Drop --verbose, BZ 1523785. From 38ec0100b658c655ba894c66aac9a666a445462c Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Tue, 13 Mar 2018 21:48:29 +0100 Subject: [PATCH 32/82] Update Python 2 dependency declarations to new packaging standards --- distcc.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/distcc.spec b/distcc.spec index c74ea35..b8af90f 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.2rc1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -18,7 +18,7 @@ BuildRequires: libtool BuildRequires: popt-devel BuildRequires: libgnomeui-devel BuildRequires: pango-devel -BuildRequires: python-devel +BuildRequires: python2-devel BuildRequires: desktop-file-utils BuildRequires: avahi-devel BuildRequires: krb5-devel @@ -144,6 +144,10 @@ update-desktop-database &> /dev/null ||: %config(noreplace) %{_sysconfdir}/sysconfig/distccd %changelog +* Tue Mar 13 2018 Iryna Shcherbina - 3.2rc1-19 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Wed Feb 07 2018 Fedora Release Engineering - 3.2rc1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 5d08bbfa8cc53d2f88053e091569131335f98de3 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Thu, 22 Mar 2018 10:48:13 +0100 Subject: [PATCH 33/82] Upload sources for for Source0 change --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5944bf1..852d410 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ distcc-2.18.3.tar.bz2 /distcc-3.1.tar.bz2 /distcc-3.2rc1.tar.bz2 +/distcc-3.2rc1.tar.gz diff --git a/sources b/sources index 0556e33..a3bcfdf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18cd4f33f5cfc3e75675cafc568fb9cf distcc-3.2rc1.tar.bz2 +SHA512 (distcc-3.2rc1.tar.gz) = b35a6bca5e7c43cefc3c31251dd57e06547213a29c88ab4e2337b01381afa5ec3a60b0baa3c27d5010527e9f45cc6db463b32bffe807bb5d7190700d41e620e8 From 001243b9b5f342718d8e0293f9728bcdeff25bd5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 22:55:40 +0000 Subject: [PATCH 34/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index b8af90f..5973d96 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.2rc1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -144,6 +144,9 @@ update-desktop-database &> /dev/null ||: %config(noreplace) %{_sysconfdir}/sysconfig/distccd %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 3.2rc1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Mar 13 2018 Iryna Shcherbina - 3.2rc1-19 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 08e9ce265133795d460acf1f6954e8f1df3f0a26 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 30 Jul 2018 00:22:26 +0200 Subject: [PATCH 35/82] =?UTF-8?q?%{python=5Fsitearch}=20=E2=86=92=20%{pyth?= =?UTF-8?q?on2=5Fsitearch}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Igor Gnatenko --- distcc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 5973d96..9027f40 100644 --- a/distcc.spec +++ b/distcc.spec @@ -125,7 +125,7 @@ update-desktop-database &> /dev/null ||: %{_mandir}/man1/include_server* %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/hosts -%{python_sitearch}/include_server* +%{python2_sitearch}/include_server* %files gnome From 24b1d11d3a2651c4fd23eb2a4d5a81046c83be39 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 1 Aug 2018 14:25:43 -0500 Subject: [PATCH 36/82] Fix FTBFS. --- distcc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/distcc.spec b/distcc.spec index 9027f40..e4a4019 100644 --- a/distcc.spec +++ b/distcc.spec @@ -57,6 +57,7 @@ This package contains the compilation server needed to use %{name}. %patch1 -p2 %build +export PYTHON='/usr/bin/python2' ./autogen.sh %configure --with-gnome --disable-Werror --with-auth make %{?_smp_mflags} From 7ef657975930432f8d0dee2763777338cab770a6 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 29 Jan 2019 06:15:42 +0100 Subject: [PATCH 37/82] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- distcc.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/distcc.spec b/distcc.spec index e4a4019..13fd7e4 100644 --- a/distcc.spec +++ b/distcc.spec @@ -83,10 +83,6 @@ install -Dm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/distccd.service rm -rf $RPM_BUILD_ROOT%{_docdir}/* -%post gnome -update-desktop-database &> /dev/null ||: - - %post server #[ $1 -lt 2 ] && /sbin/chkconfig --add distccd ||: if [ $1 -eq 1 ] ; then @@ -109,10 +105,6 @@ if [ $1 -ge 1 ] ; then /bin/systemctl try-restart distccd.service >/dev/null 2>&1 || : fi - -%postun -update-desktop-database &> /dev/null ||: - %files %doc AUTHORS doc/* NEWS README.pump TODO %doc COPYING INSTALL README survey.txt From 9a75d95548cdedbab82e034de3845546ecca5679 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 17:17:48 +0000 Subject: [PATCH 38/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 13fd7e4..9b7ed4a 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.2rc1 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -137,6 +137,9 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/distccd %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 3.2rc1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 3.2rc1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 98e5cdde4e49c4d67cb5b6f046848b255f34cbb9 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 21 Feb 2019 09:10:22 -0600 Subject: [PATCH 39/82] Restrict to localhost by default. --- distcc.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 9b7ed4a..0e62c3d 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.2rc1 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -11,6 +11,7 @@ Source1: hosts.sample Source2: distccd.service Patch0: distcc-minilzo-2.08.patch Patch1: fixArgc.patch +Patch2: distcc-localhost.patch BuildRequires: automake BuildRequires: autoconf @@ -55,6 +56,7 @@ This package contains the compilation server needed to use %{name}. %setup -q %patch0 -p1 %patch1 -p2 +%patch2 -p0 %build export PYTHON='/usr/bin/python2' @@ -137,6 +139,9 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/distccd %changelog +* Thu Feb 21 2019 Gwyn Ciesla - 3.2rc1-22 +- Restrict to localhost by default. + * Thu Jan 31 2019 Fedora Release Engineering - 3.2rc1-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 114285433e355e582f243e201d98e40716307469 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 21 Feb 2019 09:13:18 -0600 Subject: [PATCH 40/82] Patch. --- distcc-localhost.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 distcc-localhost.patch diff --git a/distcc-localhost.patch b/distcc-localhost.patch new file mode 100644 index 0000000..c1b3c12 --- /dev/null +++ b/distcc-localhost.patch @@ -0,0 +1,11 @@ +--- contrib/redhat/sysconfig~ 2011-10-26 07:42:02.000000000 -0500 ++++ contrib/redhat/sysconfig 2019-02-21 08:55:03.921586180 -0600 +@@ -1,7 +1,7 @@ + ### See distcc(1) manual page for more information on these options. + ### + +-#OPTIONS="--nice 5 --jobs 5 --allow 10.0.0.0/24 --port 1234" ++OPTIONS="--nice 5 --jobs 5 --allow 127.0.0.0/8 --port 1234" + #USER="distcc" + + ### Set this if don't want distccd to use gcc or g++ by accident. From b1e8e3a18bdb9e6572d8341674f3d1861363b688 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 7 May 2019 11:02:51 -0500 Subject: [PATCH 41/82] Honor clients.allow. --- distcc.spec | 5 ++++- distccd.service | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/distcc.spec b/distcc.spec index 0e62c3d..6a0eb3e 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.2rc1 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -139,6 +139,9 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/distccd %changelog +* Tue May 07 2019 Gwyn Ciesla - 3.2rc1-23 +- Honor clients.allow + * Thu Feb 21 2019 Gwyn Ciesla - 3.2rc1-22 - Restrict to localhost by default. diff --git a/distccd.service b/distccd.service index 075a07a..0fe0c01 100644 --- a/distccd.service +++ b/distccd.service @@ -5,7 +5,7 @@ After=network.target [Service] User=nobody EnvironmentFile=-/etc/sysconfig/distccd -ExecStart=/usr/bin/distccd --no-detach --daemon $OPTIONS +ExecStart=/usr/bin/distccd --no-detach --daemon --whitelist=/etc/distcc/clients.allow $OPTIONS [Install] WantedBy=multi-user.target From 1d3501afd95faad4bed41c14d80df2ac1d9f6745 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 22:04:26 +0000 Subject: [PATCH 42/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 6a0eb3e..ed31a34 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.2rc1 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -139,6 +139,9 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/distccd %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 3.2rc1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue May 07 2019 Gwyn Ciesla - 3.2rc1-23 - Honor clients.allow From f5b8b452ef52ff2bfdc475822316f033514f5795 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 6 Aug 2019 11:56:36 -0500 Subject: [PATCH 43/82] 3.3.2 --- .gitignore | 1 + distcc.spec | 34 +++++++++++++++++++++++----------- sources | 2 +- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 852d410..5d7b26b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ distcc-2.18.3.tar.bz2 /distcc-3.1.tar.bz2 /distcc-3.2rc1.tar.bz2 /distcc-3.2rc1.tar.gz +/distcc-3.3.2.tar.gz diff --git a/distcc.spec b/distcc.spec index ed31a34..e375124 100644 --- a/distcc.spec +++ b/distcc.spec @@ -1,17 +1,15 @@ %define _hardened_build 1 Name: distcc -Version: 3.2rc1 -Release: 24%{?dist} +Version: 3.3.2 +Release: 1%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc Source0: https://github.com/distcc/distcc/archive/v%{version}/%{name}-%{version}.tar.gz Source1: hosts.sample Source2: distccd.service -Patch0: distcc-minilzo-2.08.patch -Patch1: fixArgc.patch -Patch2: distcc-localhost.patch +Patch0: distcc-localhost.patch BuildRequires: automake BuildRequires: autoconf @@ -19,10 +17,11 @@ BuildRequires: libtool BuildRequires: popt-devel BuildRequires: libgnomeui-devel BuildRequires: pango-devel -BuildRequires: python2-devel +BuildRequires: python3-devel BuildRequires: desktop-file-utils BuildRequires: avahi-devel BuildRequires: krb5-devel +BuildRequires: binutils-devel %description distcc is a program to distribute compilation of C or C++ code across @@ -43,6 +42,7 @@ This package contains the Gnome frontend of the distcc monitoring tool. Summary: Server for distributed C/C++ compilation License: GPLv2+ +Requires: %{name}%{?_isa} = %{version}-%{release} Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -54,12 +54,10 @@ This package contains the compilation server needed to use %{name}. %prep %setup -q -%patch0 -p1 -%patch1 -p2 -%patch2 -p0 +%patch0 -p0 %build -export PYTHON='/usr/bin/python2' +export PYTHON='/usr/bin/python3' ./autogen.sh %configure --with-gnome --disable-Werror --with-auth make %{?_smp_mflags} @@ -83,6 +81,11 @@ install -Dm 0644 contrib/redhat/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfi mkdir -p $RPM_BUILD_ROOT%{_unitdir} install -Dm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/distccd.service +# Install distcc dirs +mkdir -p $RPM_BUILD_ROOT/usr/lib/distcc +mkdir -p $RPM_BUILD_ROOT/usr/lib/gcc-cross +ln -s /usr/lib/distcc $RPM_BUILD_ROOT/usr/lib64/distcc + rm -rf $RPM_BUILD_ROOT%{_docdir}/* %post server @@ -91,6 +94,7 @@ if [ $1 -eq 1 ] ; then # Initial installation /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi +%{_sbindir}/update-distcc-symlinks %preun server #[ $1 -eq 0 ] && /sbin/chkconfig --del distccd ||: @@ -118,9 +122,10 @@ fi %{_mandir}/man1/distccmon* %{_mandir}/man1/pump* %{_mandir}/man1/include_server* +%{_mandir}/man1/lsdistcc* %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/hosts -%{python2_sitearch}/include_server* +%{python3_sitearch}/include_server* %files gnome @@ -137,8 +142,15 @@ fi %{_sysconfdir}/distcc/*allow* %{_mandir}/man1/distccd* %config(noreplace) %{_sysconfdir}/sysconfig/distccd +%{_sbindir}/update-distcc-symlinks +%dir /usr/lib/distcc +/usr/lib64/distcc +%dir /usr/lib/gcc-cross %changelog +* Tue Aug 06 2019 Gwyn Ciesla - 3.3.2-1 +- Python 3. + * Wed Jul 24 2019 Fedora Release Engineering - 3.2rc1-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index a3bcfdf..4ec02b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (distcc-3.2rc1.tar.gz) = b35a6bca5e7c43cefc3c31251dd57e06547213a29c88ab4e2337b01381afa5ec3a60b0baa3c27d5010527e9f45cc6db463b32bffe807bb5d7190700d41e620e8 +SHA512 (distcc-3.3.2.tar.gz) = eca4e47fd590a2df2a47a8a95056cb31bb547766de815c8cc0db38ad665ad0fb1c3461944c17aa2b0a9791290cec4971010f65c35d80788d856bbfb2b0f95006 From 1bad66bddc3decbf2053e50ae45d144efa39d1ad Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 6 Aug 2019 12:01:14 -0500 Subject: [PATCH 44/82] Make the dirs we need. --- distcc.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/distcc.spec b/distcc.spec index e375124..f71efae 100644 --- a/distcc.spec +++ b/distcc.spec @@ -84,6 +84,9 @@ install -Dm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/distccd.service # Install distcc dirs mkdir -p $RPM_BUILD_ROOT/usr/lib/distcc mkdir -p $RPM_BUILD_ROOT/usr/lib/gcc-cross +if [ ! -d $RPM_BUILD_ROOT/usr/lib64 ]; then + mkdir -p $RPM_BUILD_ROOT/usr/lib64 +fi ln -s /usr/lib/distcc $RPM_BUILD_ROOT/usr/lib64/distcc rm -rf $RPM_BUILD_ROOT%{_docdir}/* From 45dce5b79369a83b29ea541b20796de53d10702c Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 15 Aug 2019 08:48:01 -0500 Subject: [PATCH 45/82] 3.3.3 --- .gitignore | 1 + distcc.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5d7b26b..d4c05f5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ distcc-2.18.3.tar.bz2 /distcc-3.2rc1.tar.bz2 /distcc-3.2rc1.tar.gz /distcc-3.3.2.tar.gz +/distcc-3.3.3.tar.gz diff --git a/distcc.spec b/distcc.spec index f71efae..e3fa528 100644 --- a/distcc.spec +++ b/distcc.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: distcc -Version: 3.3.2 +Version: 3.3.3 Release: 1%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ @@ -151,6 +151,9 @@ fi %dir /usr/lib/gcc-cross %changelog +* Thu Aug 15 2019 Gwyn Ciesla - 3.3.3-1 +- 3.3.3 + * Tue Aug 06 2019 Gwyn Ciesla - 3.3.2-1 - Python 3. diff --git a/sources b/sources index 4ec02b5..9f3b8c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (distcc-3.3.2.tar.gz) = eca4e47fd590a2df2a47a8a95056cb31bb547766de815c8cc0db38ad665ad0fb1c3461944c17aa2b0a9791290cec4971010f65c35d80788d856bbfb2b0f95006 +SHA512 (distcc-3.3.3.tar.gz) = 3b673dc23734d268b073bf06b7cb8a402e45db764784eba30faccd8badfb9ff1b5836adfeccd0927dba457c9f3bff9d08af6de35ebf490f03748a758f9b38fa2 From 380e9e9b3629493cda55323f6a740d2b2717f856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:12:55 +0200 Subject: [PATCH 46/82] Rebuilt for Python 3.8 --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index e3fa528..b8229e7 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -151,6 +151,9 @@ fi %dir /usr/lib/gcc-cross %changelog +* Mon Aug 19 2019 Miro Hrončok - 3.3.3-2 +- Rebuilt for Python 3.8 + * Thu Aug 15 2019 Gwyn Ciesla - 3.3.3-1 - 3.3.3 From 6c3e3a19b9f1d0318ec973a1fe443f186e8fb556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 13:52:28 +0200 Subject: [PATCH 47/82] Rebuilt for Python 3.8.0rc1 (#1748018) --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index b8229e7..7d7a2e9 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -151,6 +151,9 @@ fi %dir /usr/lib/gcc-cross %changelog +* Thu Oct 03 2019 Miro Hrončok - 3.3.3-3 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Mon Aug 19 2019 Miro Hrončok - 3.3.3-2 - Rebuilt for Python 3.8 From 5629c7037ce4271ef182a99c488a6c0683715a34 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 15:55:49 +0000 Subject: [PATCH 48/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 7d7a2e9..51f3987 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -151,6 +151,9 @@ fi %dir /usr/lib/gcc-cross %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 3.3.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Oct 03 2019 Miro Hrončok - 3.3.3-3 - Rebuilt for Python 3.8.0rc1 (#1748018) From fbec46b66d73a63420fc4e79a649faa435a4c22d Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 29 Jan 2020 10:24:51 -0600 Subject: [PATCH 49/82] Fix FTBFS. --- distcc.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 51f3987..690803c 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -59,6 +59,7 @@ This package contains the compilation server needed to use %{name}. %build export PYTHON='/usr/bin/python3' ./autogen.sh +export CFLAGS="%{optflags} -fcommon" %configure --with-gnome --disable-Werror --with-auth make %{?_smp_mflags} @@ -151,6 +152,9 @@ fi %dir /usr/lib/gcc-cross %changelog +* Wed Jan 29 2020 Gwyn Ciesla - 3.3.3-5 +- Build with -fcommon for gcc10. + * Tue Jan 28 2020 Fedora Release Engineering - 3.3.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 7cd6bb85226fe2b0736af5bb070bfe3d5d1f0b59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:44:15 +0200 Subject: [PATCH 50/82] Rebuilt for Python 3.9 --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 690803c..428053f 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -152,6 +152,9 @@ fi %dir /usr/lib/gcc-cross %changelog +* Tue May 26 2020 Miro Hrončok - 3.3.3-6 +- Rebuilt for Python 3.9 + * Wed Jan 29 2020 Gwyn Ciesla - 3.3.3-5 - Build with -fcommon for gcc10. From 2653f0932b7cb0106976718b324d79a3331bf5e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 15:27:31 +0000 Subject: [PATCH 51/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 428053f..8c8009e 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -152,6 +152,9 @@ fi %dir /usr/lib/gcc-cross %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 3.3.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 3.3.3-6 - Rebuilt for Python 3.9 From 88d396466ce8d28f52910be6fc8ed75c9c90ff53 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 00:38:03 +0000 Subject: [PATCH 52/82] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- distcc.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 8c8009e..4325c1a 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -152,6 +152,10 @@ fi %dir /usr/lib/gcc-cross %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 3.3.3-8 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 3.3.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7125dfb54e7e68489f5c663437d2b78afa736888 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 16 Sep 2020 15:20:25 -0500 Subject: [PATCH 53/82] Move from gnome to gtk for the monitor. --- distcc.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/distcc.spec b/distcc.spec index 4325c1a..762345a 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -15,7 +15,7 @@ BuildRequires: automake BuildRequires: autoconf BuildRequires: libtool BuildRequires: popt-devel -BuildRequires: libgnomeui-devel +BuildRequires: gtk2-devel BuildRequires: pango-devel BuildRequires: python3-devel BuildRequires: desktop-file-utils @@ -60,7 +60,7 @@ This package contains the compilation server needed to use %{name}. export PYTHON='/usr/bin/python3' ./autogen.sh export CFLAGS="%{optflags} -fcommon" -%configure --with-gnome --disable-Werror --with-auth +%configure --with-gtk --disable-Werror --with-auth make %{?_smp_mflags} @@ -152,6 +152,9 @@ fi %dir /usr/lib/gcc-cross %changelog +* Wed Sep 16 2020 Gwyn Ciesla - 3.3.3-9 +- Use gtk, not gnome, for monitor. + * Sat Aug 01 2020 Fedora Release Engineering - 3.3.3-8 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 6c5416cbeae0e57b9ccdff9f665c2a7a6764d2cc Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 23 Nov 2020 14:47:26 -0600 Subject: [PATCH 54/82] Disable LTO for now. --- distcc-2.18.3-avahi.patch | 12103 ------------------------------------ distcc-minilzo-2.08.patch | 11811 ----------------------------------- distcc.spec | 41 +- 3 files changed, 16 insertions(+), 23939 deletions(-) delete mode 100644 distcc-2.18.3-avahi.patch delete mode 100644 distcc-minilzo-2.08.patch diff --git a/distcc-2.18.3-avahi.patch b/distcc-2.18.3-avahi.patch deleted file mode 100644 index 1c9a1e4..0000000 --- a/distcc-2.18.3-avahi.patch +++ /dev/null @@ -1,12103 +0,0 @@ ---- distcc-2.18.3/Makefile.in 2004-10-24 07:05:48.000000000 +0200 -+++ distcc-2.18.3.lennart/Makefile.in 2007-12-30 16:05:58.000000000 +0100 -@@ -180,6 +180,7 @@ distcc_obj = src/backoff.o \ - src/ssh.o src/state.o src/strip.o \ - src/timefile.o src/traceenv.o \ - src/where.o \ -+ @ZEROCONF_DISTCC_OBJS@ \ - $(common_obj) - - distccd_obj = src/access.o \ -@@ -187,6 +188,7 @@ distccd_obj = src/access.o \ - src/ncpus.o \ - src/prefork.o \ - src/serve.o src/setuid.o src/srvnet.o src/srvrpc.o src/state.o \ -+ @ZEROCONF_DISTCCD_OBJS@ \ - $(common_obj) @BUILD_POPT@ - - # Objects that need to be linked in to build monitors ---- distcc-2.18.3/src/distcc.c 2004-10-02 02:47:07.000000000 +0200 -+++ distcc-2.18.3.lennart/src/distcc.c 2007-12-30 13:55:27.000000000 +0100 -@@ -83,6 +83,9 @@ static void dcc_show_usage(void) - " COMPILER defaults to \"cc\"\n" - " --help explain usage and exit\n" - " --version show version and exit\n" -+" --show-hosts show host list and exit\n" -+" -j calculate the concurrency level from\n" -+" the host list.\n" - "\n" - "Environment variables:\n" - " See the manual page for a complete list.\n" -@@ -135,7 +138,46 @@ static void dcc_client_catch_signals(voi - signal(SIGHUP, &dcc_client_signalled); - } - -+static void dcc_free_hostlist(struct dcc_hostdef *list) { -+ while (list) { -+ struct dcc_hostdef *l = list; -+ list = list->next; -+ dcc_free_hostdef(l); -+ } -+} -+ -+static void dcc_show_hosts(void) { -+ struct dcc_hostdef *list, *l; -+ int nhosts; -+ -+ if (dcc_get_hostlist(&list, &nhosts) != 0) { -+ rs_log_crit("Failed to get host list"); -+ return; -+ } -+ -+ for (l = list; l; l = l->next) -+ printf("%s\n", l->hostdef_string); -+ -+ dcc_free_hostlist(list); -+} -+ -+static void dcc_concurrency_level(void) { -+ struct dcc_hostdef *list, *l; -+ int nhosts; -+ int nslots = 0; -+ -+ if (dcc_get_hostlist(&list, &nhosts) != 0) { -+ rs_log_crit("Failed to get host list"); -+ return; -+ } -+ -+ for (l = list; l; l = l->next) -+ nslots += l->n_slots; - -+ dcc_free_hostlist(list); -+ -+ printf("%i\n", nslots); -+} - - /** - * distcc client entry point. -@@ -182,6 +224,18 @@ int main(int argc, char **argv) - ret = 0; - goto out; - } -+ -+ if (!strcmp(argv[1], "--show-hosts")) { -+ dcc_show_hosts(); -+ ret = 0; -+ goto out; -+ } -+ -+ if (!strcmp(argv[1], "-j")) { -+ dcc_concurrency_level(); -+ ret = 0; -+ goto out; -+ } - - dcc_find_compiler(argv, &compiler_args); - /* compiler_args is now respectively either "cc -c hello.c" or ---- distcc-2.18.3/src/distcc.h 2004-11-21 19:36:30.000000000 +0100 -+++ distcc-2.18.3.lennart/src/distcc.h 2007-12-30 13:55:27.000000000 +0100 -@@ -112,7 +112,7 @@ int dcc_parse_hosts_env(struct dcc_hostd - int *ret_nhosts); - int dcc_parse_hosts(const char *where, const char *source_name, - struct dcc_hostdef **ret_list, -- int *ret_nhosts); -+ int *ret_nhosts, struct dcc_hostdef **ret_prev); - - /* ncpu.c */ - int dcc_ncpus(int *); -@@ -226,6 +226,7 @@ int dcc_get_tempdir(const char **); - int dcc_make_tmpnam(const char *, const char *suffix, char **); - - int dcc_mkdir(const char *path) WARN_UNUSED; -+int dcc_get_subdir(const char *name, char **path_ret) WARN_UNUSED; - int dcc_get_lock_dir(char **path_ret) WARN_UNUSED; - int dcc_get_state_dir(char **path_ret) WARN_UNUSED; - int dcc_get_top_dir(char **path_ret) WARN_UNUSED; ---- distcc-2.18.3/src/dopt.c 2004-10-24 07:05:48.000000000 +0200 -+++ distcc-2.18.3.lennart/src/dopt.c 2007-12-30 13:55:27.000000000 +0100 -@@ -93,6 +93,10 @@ enum { - opt_log_level - }; - -+#ifdef HAVE_AVAHI -+/* Flag for enabling/disabling Zeroconf using Avahi */ -+int opt_zeroconf = 0; -+#endif - - const struct poptOption options[] = { - { "allow", 'a', POPT_ARG_STRING, 0, 'a', 0, 0 }, -@@ -115,6 +119,9 @@ const struct poptOption options[] = { - { "verbose", 0, POPT_ARG_NONE, 0, 'v', 0, 0 }, - { "version", 0, POPT_ARG_NONE, 0, 'V', 0, 0 }, - { "wizard", 'W', POPT_ARG_NONE, 0, 'W', 0, 0 }, -+#ifdef HAVE_AVAHI -+ { "zeroconf", 0, POPT_ARG_NONE, &opt_zeroconf, 0, 0, 0 }, -+#endif - { 0, 0, 0, 0, 0, 0, 0 } - }; - -@@ -137,6 +144,9 @@ static void distccd_show_usage(void) - " -p, --port PORT TCP port to listen on\n" - " --listen ADDRESS IP address to listen on\n" - " -a, --allow IP[/BITS] client address access control\n" -+#ifdef HAVE_AVAHI -+" --zeroconf register via mDNS/DNS-SD\n" -+#endif - " Debug and trace:\n" - " --log-level=LEVEL set detail level for log file\n" - " levels: critical, error, warning, notice, info, debug\n" ---- distcc-2.18.3/src/dopt.h 2004-07-30 03:12:13.000000000 +0200 -+++ distcc-2.18.3.lennart/src/dopt.h 2007-12-30 13:55:27.000000000 +0100 -@@ -38,3 +38,7 @@ extern int opt_log_stderr; - extern int opt_lifetime; - extern char *opt_listen_addr; - extern int opt_niceness; -+ -+#ifdef HAVE_AVAHI -+extern int opt_zeroconf; -+#endif ---- distcc-2.18.3/src/dparent.c 2004-10-24 07:05:48.000000000 +0200 -+++ distcc-2.18.3.lennart/src/dparent.c 2007-12-30 13:55:27.000000000 +0100 -@@ -70,6 +70,7 @@ - #include "types.h" - #include "daemon.h" - #include "netutil.h" -+#include "zeroconf.h" - - static void dcc_nofork_parent(int listen_fd) NORETURN; - static void dcc_detach(void); -@@ -94,6 +95,9 @@ int dcc_standalone_server(void) - int listen_fd; - int n_cpus; - int ret; -+#ifdef HAVE_AVAHI -+ void *avahi = NULL; -+#endif - - if ((ret = dcc_socket_listen(arg_port, &listen_fd, opt_listen_addr)) != 0) - return ret; -@@ -131,6 +135,14 @@ int dcc_standalone_server(void) - /* Don't catch signals until we've detached or created a process group. */ - dcc_daemon_catch_signals(); - -+#ifdef HAVE_AVAHI -+ /* Zeroconf registration */ -+ if (opt_zeroconf) { -+ if (!(avahi = dcc_zeroconf_register((uint16_t) arg_port, n_cpus))) -+ return EXIT_CONNECT_FAILED; -+ } -+#endif -+ - /* This is called in the master daemon, whether that is detached or - * not. */ - dcc_master_pid = getpid(); -@@ -138,10 +150,21 @@ int dcc_standalone_server(void) - if (opt_no_fork) { - dcc_log_daemon_started("non-forking daemon"); - dcc_nofork_parent(listen_fd); -+ ret = 0; - } else { - dcc_log_daemon_started("preforking daemon"); -- return dcc_preforking_parent(listen_fd); -+ ret = dcc_preforking_parent(listen_fd); - } -+ -+#ifdef HAVE_AVAHI -+ /* Remove zeroconf registration */ -+ if (opt_zeroconf) { -+ if (dcc_zeroconf_unregister(avahi) != 0) -+ return EXIT_CONNECT_FAILED; -+ } -+#endif -+ -+ return ret; - } - - ---- distcc-2.18.3/src/tempfile.c 2004-07-30 03:12:14.000000000 +0200 -+++ distcc-2.18.3.lennart/src/tempfile.c 2007-12-30 13:55:27.000000000 +0100 -@@ -161,7 +161,7 @@ int dcc_get_top_dir(char **path_ret) - * Return a subdirectory of the DISTCC_DIR of the given name, making - * sure that the directory exists. - **/ --static int dcc_get_subdir(const char *name, -+int dcc_get_subdir(const char *name, - char **dir_ret) - { - int ret; ---- distcc-2.18.3/src/zeroconf.c 1970-01-01 01:00:00.000000000 +0100 -+++ distcc-2.18.3.lennart/src/zeroconf.c 2007-12-30 15:13:05.000000000 +0100 -@@ -0,0 +1,616 @@ -+#include "config.h" -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "distcc.h" -+#include "hosts.h" -+#include "zeroconf.h" -+#include "trace.h" -+#include "exitcode.h" -+ -+/* How long shall the background daemon be idle before i terminates itself? */ -+#define MAX_IDLE_TIME 20 -+ -+/* Maxium size of host file to load */ -+#define MAX_FILE_SIZE (1024*100) -+ -+/* General daemon data */ -+struct daemon_data { -+ struct host *hosts; -+ int fd; -+ int n_slots; -+ -+ AvahiClient *client; -+ AvahiServiceBrowser *browser; -+ AvahiSimplePoll *simple_poll; -+}; -+ -+/* Zeroconf service wrapper */ -+struct host { -+ struct daemon_data *daemon_data; -+ struct host *next; -+ -+ AvahiIfIndex interface; -+ AvahiProtocol protocol; -+ char *service; -+ char *domain; -+ -+ AvahiAddress address; -+ uint16_t port; -+ int n_cpus; -+ -+ AvahiServiceResolver *resolver; -+}; -+ -+/* A generic, system independant lock routine, similar to sys_lock, -+ * but more powerful: -+ * rw: if non-zero: r/w lock instead of r/o lock -+ * enable: lock or unlock -+ * block: block when locking */ -+static int generic_lock(int fd, int rw, int enable, int block) { -+#if defined(F_SETLK) -+ struct flock lockparam; -+ -+ lockparam.l_type = enable ? (rw ? F_WRLCK : F_RDLCK) : F_UNLCK; -+ lockparam.l_whence = SEEK_SET; -+ lockparam.l_start = 0; -+ lockparam.l_len = 0; /* whole file */ -+ -+ return fcntl(fd, block ? F_SETLKW : F_SETLK, &lockparam); -+#elif defined(HAVE_FLOCK) -+ return flock(fd, (enable ? (rw ? LOCK_EX : LOCK_SH) : LOCK_UN) | (block ? LOCK_NB : 0)); -+#elif defined(HAVE_LOCKF) -+ return lockf(fd, (enable ? (block ? F_LOCK : F_TLOCK) : F_ULOCK)); -+#else -+# error "No supported lock method. Please port this code." -+#endif -+} -+ -+/* Return the number of seconds, when the specified file was last -+ * read. If the atime of that file is < clip_time, use clip_time -+ * instead */ -+static time_t fd_last_used(int fd, time_t clip_time) { -+ struct stat st; -+ time_t now, ft; -+ assert(fd >= 0); -+ -+ if (fstat(fd, &st) < 0) { -+ rs_log_crit("fstat() failed: %s\n", strerror(errno)); -+ return -1; -+ } -+ -+ if ((now = time(NULL)) == (time_t) -1) { -+ rs_log_crit("time() failed: %s\n", strerror(errno)); -+ return -1; -+ } -+ -+ ft = clip_time ? (st.st_atime < clip_time ? clip_time : st.st_atime) : st.st_atime; -+ assert(ft <= now); -+ -+ return now - ft; -+} -+ -+/* Write host data to host file */ -+static int write_hosts(struct daemon_data *d) { -+ struct host *h; -+ int r = 0; -+ assert(d); -+ -+ rs_log_info("writing zeroconf data.\n"); -+ -+ if (generic_lock(d->fd, 1, 1, 1) < 0) { -+ rs_log_crit("lock failed: %s\n", strerror(errno)); -+ return -1; -+ } -+ -+ if (lseek(d->fd, 0, SEEK_SET) < 0) { -+ rs_log_crit("lseek() failed: %s\n", strerror(errno)); -+ return -1; -+ } -+ -+ if (ftruncate(d->fd, 0) < 0) { -+ rs_log_crit("ftruncate() failed: %s\n", strerror(errno)); -+ return -1; -+ } -+ -+ for (h = d->hosts; h; h = h->next) { -+ char t[256], a[AVAHI_ADDRESS_STR_MAX]; -+ -+ if (h->resolver) -+ /* Not yet fully resolved */ -+ continue; -+ -+ snprintf(t, sizeof(t), "%s:%u/%i\n", avahi_address_snprint(a, sizeof(a), &h->address), h->port, d->n_slots * h->n_cpus); -+ -+ if (dcc_writex(d->fd, t, strlen(t)) != 0) { -+ rs_log_crit("write() failed: %s\n", strerror(errno)); -+ goto finish; -+ } -+ } -+ -+ r = 0; -+ -+finish: -+ -+ generic_lock(d->fd, 1, 0, 1); -+ return r; -+ -+}; -+ -+/* Free host data */ -+static void free_host(struct host *h) { -+ assert(h); -+ -+ if (h->resolver) -+ avahi_service_resolver_free(h->resolver); -+ -+ free(h->service); -+ free(h->domain); -+ free(h); -+} -+ -+/* Remove a service from the host list */ -+static void remove_service(struct daemon_data *d, AvahiIfIndex interface, AvahiProtocol protocol, const char *name, const char *domain) { -+ struct host *h, *p = NULL; -+ assert(d); -+ -+ for (h = d->hosts; h; h = h->next) { -+ if (h->interface == interface && -+ h->protocol == protocol && -+ !strcmp(h->service, name) && -+ avahi_domain_equal(h->domain, domain)) { -+ -+ if (p) -+ p->next = h->next; -+ else -+ d->hosts = h->next; -+ -+ free_host(h); -+ -+ break; -+ } else -+ p = h; -+ } -+} -+ -+/* Called when a resolve call completes */ -+static void resolve_reply( -+ AvahiServiceResolver *UNUSED(r), -+ AvahiIfIndex UNUSED(interface), -+ AvahiProtocol UNUSED(protocol), -+ AvahiResolverEvent event, -+ const char *name, -+ const char *UNUSED(type), -+ const char *UNUSED(domain), -+ const char *UNUSED(host_name), -+ const AvahiAddress *a, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags UNUSED(flags), -+ void *userdata) { -+ -+ struct host *h = userdata; -+ -+ switch (event) { -+ -+ case AVAHI_RESOLVER_FOUND: { -+ AvahiStringList *i; -+ -+ /* Look for the number of CPUs in TXT RRs */ -+ for (i = txt; i; i = i->next) { -+ char *key, *value; -+ -+ if (avahi_string_list_get_pair(i, &key, &value, NULL) < 0) -+ continue; -+ -+ if (!strcmp(key, "cpus")) -+ if ((h->n_cpus = atoi(value)) <= 0) -+ h->n_cpus = 1; -+ -+ avahi_free(key); -+ avahi_free(value); -+ } -+ -+ h->address = *a; -+ h->port = port; -+ -+ avahi_service_resolver_free(h->resolver); -+ h->resolver = NULL; -+ -+ /* Write modified hosts file */ -+ write_hosts(h->daemon_data); -+ -+ break; -+ } -+ -+ case AVAHI_RESOLVER_FAILURE: -+ -+ rs_log_warning("Failed to resolve service '%s': %s\n", name, -+ avahi_strerror(avahi_client_errno(h->daemon_data->client))); -+ -+ free_host(h); -+ break; -+ } -+ -+} -+ -+/* Called whenever a new service is found or removed */ -+static void browse_reply( -+ AvahiServiceBrowser *UNUSED(b), -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiBrowserEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ AvahiLookupResultFlags UNUSED(flags), -+ void *userdata) { -+ -+ struct daemon_data *d = userdata; -+ assert(d); -+ -+ switch (event) { -+ case AVAHI_BROWSER_NEW: { -+ struct host *h; -+ -+ h = malloc(sizeof(struct host)); -+ assert(h); -+ -+ rs_log_info("new service: %s\n", name); -+ -+ if (!(h->resolver = avahi_service_resolver_new(d->client, -+ interface, -+ protocol, -+ name, -+ type, -+ domain, -+ AVAHI_PROTO_UNSPEC, -+ 0, -+ resolve_reply, -+ h))) { -+ rs_log_warning("Failed to create service resolver for '%s': %s\n", name, -+ avahi_strerror(avahi_client_errno(d->client))); -+ -+ free(h); -+ -+ } else { -+ -+ /* Fill in missing data */ -+ h->service = strdup(name); -+ assert(h->service); -+ h->domain = strdup(domain); -+ assert(h->domain); -+ h->daemon_data = d; -+ h->interface = interface; -+ h->protocol = protocol; -+ h->next = d->hosts; -+ h->n_cpus = 1; -+ d->hosts = h; -+ } -+ -+ break; -+ } -+ -+ case AVAHI_BROWSER_REMOVE: -+ -+ rs_log_info("Removed service: %s\n", name); -+ -+ remove_service(d, interface, protocol, name, domain); -+ write_hosts(d); -+ break; -+ -+ case AVAHI_BROWSER_FAILURE: -+ rs_log_crit("Service Browser failure '%s': %s\n", name, -+ avahi_strerror(avahi_client_errno(d->client))); -+ -+ avahi_simple_poll_quit(d->simple_poll); -+ break; -+ -+ case AVAHI_BROWSER_CACHE_EXHAUSTED: -+ case AVAHI_BROWSER_ALL_FOR_NOW: -+ ; -+ -+ } -+} -+ -+static void client_callback(AvahiClient *client, AvahiClientState state, void *userdata) { -+ struct daemon_data *d = userdata; -+ -+ switch (state) { -+ -+ case AVAHI_CLIENT_FAILURE: -+ rs_log_crit("Client failure: %s\n", avahi_strerror(avahi_client_errno(client))); -+ avahi_simple_poll_quit(d->simple_poll); -+ break; -+ -+ case AVAHI_CLIENT_S_COLLISION: -+ case AVAHI_CLIENT_S_REGISTERING: -+ case AVAHI_CLIENT_S_RUNNING: -+ case AVAHI_CLIENT_CONNECTING: -+ ; -+ } -+} -+ -+/* The main function of the background daemon */ -+static int daemon_proc(const char *host_file, const char *lock_file, int n_slots) { -+ int ret = 1; -+ int lock_fd = -1; -+ struct daemon_data d; -+ time_t clip_time; -+ int error; -+ char machine[64], version[64], stype[128]; -+ -+ rs_add_logger(rs_logger_syslog, RS_LOG_DEBUG, NULL, 0); -+ -+ /* Prepare daemon data structure */ -+ d.fd = -1; -+ d.hosts = NULL; -+ d.n_slots = n_slots; -+ d.simple_poll = NULL; -+ d.browser = NULL; -+ d.client = NULL; -+ clip_time = time(NULL); -+ -+ rs_log_info("Zeroconf daemon running.\n"); -+ -+ /* Open daemon lock file and lock it */ -+ if ((lock_fd = open(lock_file, O_RDWR|O_CREAT, 0666)) < 0) { -+ rs_log_crit("open('%s') failed: %s\n", lock_file, strerror(errno)); -+ goto finish; -+ } -+ -+ if (generic_lock(lock_fd, 1, 1, 0) < 0) { -+ /* lock failed, there's probably already another daemon running */ -+ goto finish; -+ } -+ -+ /* Open host file */ -+ if ((d.fd = open(host_file, O_RDWR|O_CREAT, 0666)) < 0) { -+ rs_log_crit("open('%s') failed: %s\n", host_file, strerror(errno)); -+ goto finish; -+ } -+ -+ /* Clear host file */ -+ write_hosts(&d); -+ -+ if (!(d.simple_poll = avahi_simple_poll_new())) { -+ rs_log_crit("Failed to create simple poll object.\n"); -+ goto finish; -+ } -+ -+ if (!(d.client = avahi_client_new( -+ avahi_simple_poll_get(d.simple_poll), -+ 0, -+ client_callback, -+ &d, -+ &error))) { -+ rs_log_crit("Failed to create Avahi client object: %s\n", avahi_strerror(error)); -+ goto finish; -+ } -+ -+ if (dcc_get_gcc_version(version, sizeof(version)) && -+ dcc_get_gcc_machine(machine, sizeof(machine))) { -+ -+ dcc_make_dnssd_subtype(stype, sizeof(stype), version, machine); -+ } else { -+ rs_log_warning("Warning, failed to get CC version and machine type.\n"); -+ -+ strncpy(stype, DCC_DNS_SERVICE_TYPE, sizeof(stype)); -+ stype[sizeof(stype)-1] = 0; -+ } -+ -+ rs_log_info("Browsing for '%s'.\n", stype); -+ -+ if (!(d.browser = avahi_service_browser_new( -+ d.client, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ stype, -+ NULL, -+ 0, -+ browse_reply, -+ &d))) { -+ rs_log_crit("Failed to create service browser object: %s\n", avahi_strerror(avahi_client_errno(d.client))); -+ goto finish; -+ } -+ -+ /* Check whether the host file has been used recently */ -+ while (fd_last_used(d.fd, clip_time) <= MAX_IDLE_TIME) { -+ -+ /* Iterate the main loop for 5s */ -+ if (avahi_simple_poll_iterate(d.simple_poll, 5000) != 0) { -+ rs_log_crit("Event loop exited abnormaly.\n"); -+ goto finish; -+ } -+ } -+ -+ /* Wer are idle */ -+ rs_log_info("Zeroconf daemon unused.\n"); -+ -+ ret = 0; -+ -+finish: -+ -+ /* Cleanup */ -+ if (lock_fd >= 0) { -+ generic_lock(lock_fd, 1, 0, 0); -+ close(lock_fd); -+ } -+ -+ if (d.fd >= 0) -+ close(d.fd); -+ -+ while (d.hosts) { -+ struct host *h = d.hosts; -+ d.hosts = d.hosts->next; -+ free_host(h); -+ } -+ -+ if (d.client) -+ avahi_client_free(d.client); -+ -+ if (d.simple_poll) -+ avahi_simple_poll_free(d.simple_poll); -+ -+ rs_log_info("zeroconf daemon ended.\n"); -+ -+ return ret; -+} -+ -+/* Return path to the zeroconf directory in ~/.distcc */ -+static int get_zeroconf_dir(char **dir_ret) { -+ static char *cached; -+ int ret; -+ -+ if (cached) { -+ *dir_ret = cached; -+ return 0; -+ } else { -+ ret = dcc_get_subdir("zeroconf", dir_ret); -+ if (ret == 0) -+ cached = *dir_ret; -+ return ret; -+ } -+} -+ -+/* Get the host list from zeroconf */ -+int dcc_zeroconf_add_hosts(struct dcc_hostdef **ret_list, int *ret_nhosts, int n_slots, struct dcc_hostdef **ret_prev) { -+ char host_file[PATH_MAX], lock_file[PATH_MAX], *s = NULL; -+ int lock_fd = -1, host_fd = -1; -+ int fork_daemon = 0; -+ int r = -1; -+ char *dir; -+ struct stat st; -+ -+ if (get_zeroconf_dir(&dir) != 0) { -+ rs_log_crit("failed to get zeroconf dir.\n"); -+ goto finish; -+ } -+ -+ snprintf(lock_file, sizeof(lock_file), "%s/lock", dir); -+ snprintf(host_file, sizeof(host_file), "%s/hosts", dir); -+ -+ /* Open lock file */ -+ if ((lock_fd = open(lock_file, O_RDWR|O_CREAT, 0666)) < 0) { -+ rs_log_crit("open('%s') failed: %s\n", lock_file, strerror(errno)); -+ goto finish; -+ } -+ -+ /* Try to lock the lock file */ -+ if (generic_lock(lock_fd, 1, 1, 0) >= 0) { -+ /* The lock succeeded => there's no daemon running yet! */ -+ fork_daemon = 1; -+ generic_lock(lock_fd, 1, 0, 0); -+ } -+ -+ close(lock_fd); -+ -+ /* Shall we fork a new daemon? */ -+ if (fork_daemon) { -+ pid_t pid; -+ -+ rs_log_info("Spawning zeroconf daemon.\n"); -+ -+ if ((pid = fork()) == -1) { -+ rs_log_crit("fork() failed: %s\n", strerror(errno)); -+ goto finish; -+ } else if (pid == 0) { -+ int fd; -+ /* Child */ -+ -+ /* Close file descriptors and replace them by /dev/null */ -+ close(0); -+ close(1); -+ close(2); -+ fd = open("/dev/null", O_RDWR); -+ assert(fd == 0); -+ fd = dup(0); -+ assert(fd == 1); -+ fd = dup(0); -+ assert(fd == 2); -+ -+#ifdef HAVE_SETSID -+ setsid(); -+#endif -+ -+ chdir("/"); -+ rs_add_logger(rs_logger_syslog, RS_LOG_DEBUG, NULL, 0); -+ _exit(daemon_proc(host_file, lock_file, n_slots)); -+ } -+ -+ /* Parent */ -+ -+ /* Wait some time for initial host gathering */ -+ usleep(1000000); /* 1000 ms */ -+ } -+ -+ /* Open host list read-only */ -+ if ((host_fd = open(host_file, O_RDONLY)) < 0) { -+ rs_log_crit("open('%s') failed: %s\n", host_file, strerror(errno)); -+ goto finish; -+ } -+ -+ /* A read lock */ -+ if (generic_lock(host_fd, 0, 1, 1) < 0) { -+ rs_log_crit("lock failed: %s\n", strerror(errno)); -+ goto finish; -+ } -+ -+ /* Get file size */ -+ if (fstat(host_fd, &st) < 0) { -+ rs_log_crit("stat() failed: %s\n", strerror(errno)); -+ goto finish; -+ } -+ -+ if (st.st_size >= MAX_FILE_SIZE) { -+ rs_log_crit("file too large.\n"); -+ goto finish; -+ } -+ -+ /* read file data */ -+ s = malloc((size_t) st.st_size+1); -+ assert(s); -+ -+ if (dcc_readx(host_fd, s, (size_t) st.st_size) != 0) { -+ rs_log_crit("failed to read from file.\n"); -+ goto finish; -+ } -+ s[st.st_size] = 0; -+ -+ /* Parse host data */ -+ if (dcc_parse_hosts(s, host_file, ret_list, ret_nhosts, ret_prev) != 0) { -+ rs_log_crit("failed to parse host file.\n"); -+ goto finish; -+ } -+ -+ r = 0; -+ -+finish: -+ if (host_fd >= 0) { -+ generic_lock(host_fd, 0, 0, 1); -+ close(host_fd); -+ } -+ -+ free(s); -+ -+ return r; -+} ---- distcc-2.18.3/src/zeroconf.h 1970-01-01 01:00:00.000000000 +0100 -+++ distcc-2.18.3.lennart/src/zeroconf.h 2007-12-30 15:09:58.000000000 +0100 -@@ -0,0 +1,18 @@ -+#ifndef foozeroconfhfoo -+#define foozeroconfhfoo -+ -+#include -+ -+int dcc_zeroconf_add_hosts(struct dcc_hostdef **re_list, int *ret_nhosts, int slots, struct dcc_hostdef **ret_prev); -+ -+void *dcc_zeroconf_register(uint16_t port, int n_cpus); -+int dcc_zeroconf_unregister(void*); -+ -+char* dcc_get_gcc_version(char *s, size_t nbytes); -+char* dcc_get_gcc_machine(char *s, size_t nbytes); -+ -+char* dcc_make_dnssd_subtype(char *stype, size_t nbytes, const char *v, const char *m); -+ -+#define DCC_DNS_SERVICE_TYPE "_distcc._tcp" -+ -+#endif ---- distcc-2.18.3/src/zeroconf-reg.c 1970-01-01 01:00:00.000000000 +0100 -+++ distcc-2.18.3.lennart/src/zeroconf-reg.c 2007-12-30 15:17:29.000000000 +0100 -@@ -0,0 +1,265 @@ -+#include "config.h" -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include "distcc.h" -+#include "zeroconf.h" -+#include "trace.h" -+#include "exitcode.h" -+ -+struct context { -+ char *name; -+ AvahiThreadedPoll *threaded_poll; -+ AvahiClient *client; -+ AvahiEntryGroup *group; -+ uint16_t port; -+ int n_cpus; -+}; -+ -+static void publish_reply(AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata); -+ -+static void register_stuff(struct context *ctx) { -+ -+ if (!ctx->group) { -+ -+ if (!(ctx->group = avahi_entry_group_new(ctx->client, publish_reply, ctx))) { -+ rs_log_crit("Failed to create entry group: %s\n", avahi_strerror(avahi_client_errno(ctx->client))); -+ goto fail; -+ } -+ -+ } -+ -+ if (avahi_entry_group_is_empty(ctx->group)) { -+ char cpus[32], machine[64] = "cc_machine=", version[64] = "cc_version=", *m, *v; -+ -+ snprintf(cpus, sizeof(cpus), "cpus=%i", ctx->n_cpus); -+ v = dcc_get_gcc_version(version+11, sizeof(version)-11); -+ m = dcc_get_gcc_machine(machine+11, sizeof(machine)-11); -+ -+ /* Register our service */ -+ -+ if (avahi_entry_group_add_service( -+ ctx->group, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, -+ ctx->name, -+ DCC_DNS_SERVICE_TYPE, -+ NULL, -+ NULL, -+ ctx->port, -+ "txtvers=1", -+ cpus, -+ "distcc="PACKAGE_VERSION, -+ "gnuhost="GNU_HOST, -+ v ? version : NULL, -+ m ? machine : NULL, -+ NULL) < 0) { -+ rs_log_crit("Failed to add service: %s\n", avahi_strerror(avahi_client_errno(ctx->client))); -+ goto fail; -+ } -+ -+ if (v && m) { -+ char stype[128]; -+ -+ dcc_make_dnssd_subtype(stype, sizeof(stype), v, m); -+ -+ if (avahi_entry_group_add_service_subtype( -+ ctx->group, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, -+ ctx->name, -+ DCC_DNS_SERVICE_TYPE, -+ NULL, -+ stype) < 0) { -+ rs_log_crit("Failed to add service: %s\n", avahi_strerror(avahi_client_errno(ctx->client))); -+ goto fail; -+ } -+ } else -+ rs_log_warning("Failed to determine CC version, not registering DNS-SD service subtype!"); -+ -+ if (avahi_entry_group_commit(ctx->group) < 0) { -+ rs_log_crit("Failed to commit entry group: %s\n", avahi_strerror(avahi_client_errno(ctx->client))); -+ goto fail; -+ } -+ -+ } -+ -+ return; -+ -+fail: -+ avahi_threaded_poll_quit(ctx->threaded_poll); -+} -+ -+/* Called when publishing of service data completes */ -+static void publish_reply(AvahiEntryGroup *UNUSED(g), AvahiEntryGroupState state, void *userdata) { -+ struct context *ctx = userdata; -+ -+ switch (state) { -+ -+ case AVAHI_ENTRY_GROUP_COLLISION: { -+ char *n; -+ -+ /* Pick a new name for our service */ -+ -+ n = avahi_alternative_service_name(ctx->name); -+ assert(n); -+ -+ avahi_free(ctx->name); -+ ctx->name = n; -+ -+ register_stuff(ctx); -+ break; -+ } -+ -+ case AVAHI_ENTRY_GROUP_FAILURE: -+ rs_log_crit("Failed to register service: %s\n", avahi_strerror(avahi_client_errno(ctx->client))); -+ avahi_threaded_poll_quit(ctx->threaded_poll); -+ break; -+ -+ case AVAHI_ENTRY_GROUP_UNCOMMITED: -+ case AVAHI_ENTRY_GROUP_REGISTERING: -+ case AVAHI_ENTRY_GROUP_ESTABLISHED: -+ ; -+ } -+} -+ -+static void client_callback(AvahiClient *client, AvahiClientState state, void *userdata) { -+ struct context *ctx = userdata; -+ -+ ctx->client = client; -+ -+ switch (state) { -+ -+ case AVAHI_CLIENT_S_RUNNING: -+ -+ register_stuff(ctx); -+ break; -+ -+ case AVAHI_CLIENT_S_COLLISION: -+ case AVAHI_CLIENT_S_REGISTERING: -+ -+ if (ctx->group) -+ avahi_entry_group_reset(ctx->group); -+ -+ break; -+ -+ case AVAHI_CLIENT_FAILURE: -+ -+ if (avahi_client_errno(client) == AVAHI_ERR_DISCONNECTED) { -+ int error; -+ -+ avahi_client_free(ctx->client); -+ ctx->client = NULL; -+ ctx->group = NULL; -+ -+ /* Reconnect to the server */ -+ -+ if (!(ctx->client = avahi_client_new( -+ avahi_threaded_poll_get(ctx->threaded_poll), -+ AVAHI_CLIENT_NO_FAIL, -+ client_callback, -+ ctx, -+ &error))) { -+ -+ rs_log_crit("Failed to contact server: %s\n", avahi_strerror(error)); -+ avahi_threaded_poll_quit(ctx->threaded_poll); -+ } -+ -+ } else { -+ rs_log_crit("Client failure: %s\n", avahi_strerror(avahi_client_errno(client))); -+ avahi_threaded_poll_quit(ctx->threaded_poll); -+ } -+ -+ break; -+ -+ case AVAHI_CLIENT_CONNECTING: -+ ; -+ } -+} -+ -+/* register a distcc service in DNS-SD/mDNS with the given port and number of CPUs */ -+void* dcc_zeroconf_register(uint16_t port, int n_cpus) { -+ struct context *ctx = NULL; -+ char service[256] = "distcc@"; -+ int error; -+ -+ ctx = malloc(sizeof(struct context)); -+ assert(ctx); -+ ctx->client = NULL; -+ ctx->group = NULL; -+ ctx->threaded_poll = NULL; -+ ctx->port = port; -+ ctx->n_cpus = n_cpus; -+ -+ /* Prepare service name */ -+ gethostname(service+7, sizeof(service)-8); -+ service[sizeof(service)-1] = 0; -+ -+ ctx->name = strdup(service); -+ assert(ctx->name); -+ -+ if (!(ctx->threaded_poll = avahi_threaded_poll_new())) { -+ rs_log_crit("Failed to create event loop object.\n"); -+ goto fail; -+ } -+ -+ if (!(ctx->client = avahi_client_new(avahi_threaded_poll_get(ctx->threaded_poll), AVAHI_CLIENT_NO_FAIL, client_callback, ctx, &error))) { -+ rs_log_crit("Failed to create client object: %s\n", avahi_strerror(avahi_client_errno(ctx->client))); -+ goto fail; -+ } -+ -+ /* Create the mDNS event handler */ -+ if (avahi_threaded_poll_start(ctx->threaded_poll) < 0) { -+ rs_log_crit("Failed to create thread.\n"); -+ goto fail; -+ } -+ -+ return ctx; -+ -+fail: -+ -+ if (ctx) -+ dcc_zeroconf_unregister(ctx); -+ -+ return NULL; -+} -+ -+/* Unregister this server from DNS-SD/mDNS */ -+int dcc_zeroconf_unregister(void *u) { -+ struct context *ctx = u; -+ -+ if (ctx->threaded_poll) -+ avahi_threaded_poll_stop(ctx->threaded_poll); -+ -+ if (ctx->client) -+ avahi_client_free(ctx->client); -+ -+ if (ctx->threaded_poll) -+ avahi_threaded_poll_free(ctx->threaded_poll); -+ -+ avahi_free(ctx->name); -+ -+ free(ctx); -+ -+ return 0; -+} ---- distcc-2.18.3/src/help.c 2004-07-30 03:12:13.000000000 +0200 -+++ distcc-2.18.3.lennart/src/help.c 2007-12-30 13:55:27.000000000 +0100 -@@ -62,6 +62,9 @@ int dcc_show_version(const char *prog) - "distcc comes with ABSOLUTELY NO WARRANTY. distcc is free software, and\n" - "you may use, modify and redistribute it under the terms of the GNU \n" - "General Public License version 2 or later.\n" -+#ifdef HAVE_AVAHI -+"\nBuilt with Zeroconf support.\n" -+#endif - "\n" - , - prog, PACKAGE_VERSION, GNU_HOST, DISTCC_DEFAULT_PORT, ---- distcc-2.18.3/src/hosts.c 2004-10-24 07:05:47.000000000 +0200 -+++ distcc-2.18.3.lennart/src/hosts.c 2007-12-30 13:55:27.000000000 +0100 -@@ -96,6 +96,10 @@ - #include "hosts.h" - #include "exitcode.h" - #include "snprintf.h" -+#ifdef HAVE_AVAHI -+#include "zeroconf.h" -+#define ZEROCONF_MAGIC "+zeroconf" -+#endif - - const int dcc_default_port = DISTCC_DEFAULT_PORT; - -@@ -134,9 +138,12 @@ int dcc_get_hostlist(struct dcc_hostdef - char *path, *top; - int ret; - -+ *ret_list = NULL; -+ *ret_nhosts = 0; -+ - if ((env = getenv("DISTCC_HOSTS")) != NULL) { - rs_trace("read hosts from environment"); -- return dcc_parse_hosts(env, "$DISTCC_HOSTS", ret_list, ret_nhosts); -+ return dcc_parse_hosts(env, "$DISTCC_HOSTS", ret_list, ret_nhosts, NULL); - } - - /* $DISTCC_DIR or ~/.distcc */ -@@ -163,7 +170,7 @@ int dcc_get_hostlist(struct dcc_hostdef - rs_trace("not reading %s: %s", path, strerror(errno)); - free(path); - } -- -+ - /* FIXME: Clearer message? */ - rs_log_warning("no hostlist is set; can't distribute work"); - -@@ -346,17 +353,19 @@ static int dcc_parse_localhost(struct dc - **/ - int dcc_parse_hosts(const char *where, const char *source_name, - struct dcc_hostdef **ret_list, -- int *ret_nhosts) -+ int *ret_nhosts, struct dcc_hostdef **ret_prev) - { - int ret; -- struct dcc_hostdef *prev, *curr; -+ struct dcc_hostdef *curr, *_prev; -+ -+ if (!ret_prev) { -+ ret_prev = &_prev; -+ _prev = NULL; -+ } - - /* TODO: Check for '/' in places where it might cause trouble with - * a lock file name. */ - -- prev = NULL; -- *ret_list = NULL; -- *ret_nhosts = 0; - /* A simple, hardcoded scanner. Some of the GNU routines might be - * useful here, but they won't work on less capable systems. - * -@@ -390,6 +399,15 @@ int dcc_parse_hosts(const char *where, c - token_start = where; - token_len = strcspn(where, " #\t\n\f\r"); - -+#ifdef HAVE_AVAHI -+ if (token_len == sizeof(ZEROCONF_MAGIC)-1 && -+ !strncmp(token_start, ZEROCONF_MAGIC, (unsigned) token_len)) { -+ if ((ret = dcc_zeroconf_add_hosts(ret_list, ret_nhosts, 4, ret_prev) != 0)) -+ return ret; -+ goto skip; -+ } -+#endif -+ - /* Allocate new list item */ - curr = calloc(1, sizeof(struct dcc_hostdef)); - if (!curr) { -@@ -404,8 +422,8 @@ int dcc_parse_hosts(const char *where, c - } - - /* Link into list */ -- if (prev) { -- prev->next = curr; -+ if (*ret_prev) { -+ (*ret_prev)->next = curr; - } else { - *ret_list = curr; /* first */ - } -@@ -434,10 +452,15 @@ int dcc_parse_hosts(const char *where, c - return ret; - } - -+ (*ret_nhosts)++; -+ *ret_prev = curr; -+ -+#ifdef HAVE_AVAHI -+ skip: -+#endif -+ - /* continue to next token if any */ - where = token_start + token_len; -- prev = curr; -- (*ret_nhosts)++; - } - - if (*ret_nhosts) { ---- distcc-2.18.3/src/io.c 2004-10-24 07:05:48.000000000 +0200 -+++ distcc-2.18.3.lennart/src/io.c 2007-12-30 13:55:27.000000000 +0100 -@@ -160,7 +160,7 @@ int dcc_readx(int fd, void *buf, size_t - return ret; - else - continue; -- } else if (r == -1 && errno == EAGAIN) { -+ } else if (r == -1 && errno == EINTR) { - continue; - } else if (r == -1) { - rs_log_error("failed to read: %s", strerror(errno)); -@@ -202,9 +202,6 @@ int dcc_writex(int fd, const void *buf, - } else if (r == -1) { - rs_log_error("failed to write: %s", strerror(errno)); - return EXIT_IO_ERROR; -- } else if (r == 0) { -- rs_log_error("unexpected eof on fd%d", fd); -- return EXIT_TRUNCATED; - } else { - buf = &((char *) buf)[r]; - len -= r; ---- distcc-2.18.3/src/hostfile.c 2004-10-24 07:05:48.000000000 +0200 -+++ distcc-2.18.3.lennart/src/hostfile.c 2007-12-30 13:55:27.000000000 +0100 -@@ -59,7 +59,7 @@ int dcc_parse_hosts_file(const char *fna - if ((ret = dcc_load_file_string(fname, &body)) != 0) - return ret; - -- ret = dcc_parse_hosts(body, fname, ret_list, ret_nhosts); -+ ret = dcc_parse_hosts(body, fname, ret_list, ret_nhosts, NULL); - - free(body); - ---- distcc-2.18.3/src/gcc-id.c 1970-01-01 01:00:00.000000000 +0100 -+++ distcc-2.18.3.lennart/src/gcc-id.c 2007-12-30 15:14:31.000000000 +0100 -@@ -0,0 +1,84 @@ -+#include "config.h" -+ -+#include -+#include -+#include -+#include -+ -+#include "distcc.h" -+#include "hosts.h" -+#include "zeroconf.h" -+#include "trace.h" -+ -+static char *strip_bad_chars(char *s) { -+ char *k; -+ -+ for (k = s; *k; k++) { -+ -+ if (*k >= 'a' && *k <= 'z') -+ continue; -+ -+ if (*k >= '0' && *k <= '9') -+ continue; -+ -+ if (*k >= 'A' && *k <= 'Z') -+ *k = tolower(*k); -+ else -+ *k = '-'; -+ } -+ -+ return s; -+} -+ -+static char* read_string_from_popen(const char *cmdline, char *s, size_t nbytes) { -+ FILE *p = NULL; -+ char *ret = NULL; -+ -+ errno = 0; -+ if (!(p = popen(cmdline, "r"))) { -+ rs_log_crit("Failed to read string from C compiler: %s\n", errno ? strerror(errno) : "failure"); -+ goto fail; -+ } -+ -+ if (!fgets(s, (int) nbytes, p)) { -+ rs_log_crit("Failed to read string from C compiler.\n"); -+ goto fail; -+ } -+ -+ s[nbytes-1] = 0; -+ s[strcspn(s, " \t\n\r")] = 0; -+ -+ ret = s; -+ -+fail: -+ -+ if (p) -+ pclose(p); -+ -+ return ret; -+} -+ -+char* dcc_get_gcc_version(char *s, size_t nbytes) { -+ return read_string_from_popen("cc -dumpversion", s, nbytes); -+} -+ -+char* dcc_get_gcc_machine(char *s, size_t nbytes) { -+ return read_string_from_popen("cc -dumpmachine", s, nbytes); -+} -+ -+char* dcc_make_dnssd_subtype(char *stype, size_t nbytes, const char *v, const char *m) { -+ char version[64], machine[64]; -+ -+ strncpy(version, v, sizeof(version)-1); -+ version[sizeof(version)-1] = 0; -+ strncpy(machine, m, sizeof(machine)-1); -+ machine[sizeof(machine)-1] = 0; -+ -+ strip_bad_chars(version); -+ strip_bad_chars(machine); -+ -+ snprintf(stype, nbytes, "_%s--%s._sub." DCC_DNS_SERVICE_TYPE, machine, version); -+ stype[nbytes-1] = 0; -+ -+ return stype; -+} ---- distcc-2.18.3/src/config.h.in 2004-11-30 12:32:54.000000000 +0100 -+++ distcc-2.18.3.lennart/src/config.h.in 2007-12-30 15:40:52.000000000 +0100 -@@ -15,6 +15,9 @@ - /* Define to 1 if you have the `asprintf' function. */ - #undef HAVE_ASPRINTF - -+/* defined if Avahi is available */ -+#undef HAVE_AVAHI -+ - /* define if vsnprintf is C99 compliant */ - #undef HAVE_C99_VSNPRINTF - ---- distcc-2.18.3/src/config.h 1970-01-01 01:00:00.000000000 +0100 -+++ distcc-2.18.3.lennart/src/config.h 2007-12-30 16:06:25.000000000 +0100 -@@ -0,0 +1,253 @@ -+/* src/config.h. Generated from config.h.in by configure. */ -+/* src/config.h.in. Generated from configure.ac by autoheader. */ -+ -+/* Use getaddrinfo(), getnameinfo(), etc */ -+#define ENABLE_RFC2553 1 -+ -+/* Your gnu-style host triple */ -+#define GNU_HOST "i486-pc-linux-gnu" -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_ALLOCA_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_ARPA_NAMESER_H 1 -+ -+/* Define to 1 if you have the `asprintf' function. */ -+#define HAVE_ASPRINTF 1 -+ -+/* defined if Avahi is available */ -+#define HAVE_AVAHI 1 -+ -+/* define if vsnprintf is C99 compliant */ -+#define HAVE_C99_VSNPRINTF 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_CTYPE_H 1 -+ -+/* Define to 1 if you have the declaration of `asprintf', and to 0 if you -+ don't. */ -+#define HAVE_DECL_ASPRINTF 1 -+ -+/* Define to 1 if you have the declaration of `snprintf', and to 0 if you -+ don't. */ -+#define HAVE_DECL_SNPRINTF 1 -+ -+/* Define to 1 if you have the declaration of `strndup', and to 0 if you -+ don't. */ -+#define HAVE_DECL_STRNDUP 1 -+ -+/* Define to 1 if you have the declaration of `vasprintf', and to 0 if you -+ don't. */ -+#define HAVE_DECL_VASPRINTF 1 -+ -+/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you -+ don't. */ -+#define HAVE_DECL_VSNPRINTF 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_FLOAT_H 1 -+ -+/* Define to 1 if you have the `flock' function. */ -+#define HAVE_FLOCK 1 -+ -+/* Define to 1 if you have the `getaddrinfo' function. */ -+#define HAVE_GETADDRINFO 1 -+ -+/* Define to 1 if you have the `getcwd' function. */ -+#define HAVE_GETCWD 1 -+ -+/* Define to 1 if you have the `geteuid' function. */ -+#define HAVE_GETEUID 1 -+ -+/* Define to 1 if you have the `getnameinfo' function. */ -+#define HAVE_GETNAMEINFO 1 -+ -+/* Define to 1 if you have the `getrusage' function. */ -+#define HAVE_GETRUSAGE 1 -+ -+/* Define to 1 if you have the `gettimeofday' function. */ -+#define HAVE_GETTIMEOFDAY 1 -+ -+/* Define to 1 if you have the `getuid' function. */ -+#define HAVE_GETUID 1 -+ -+/* Define to 1 if you have the `getwd' function. */ -+#define HAVE_GETWD 1 -+ -+/* Define to 1 if you have the `hstrerror' function. */ -+#define HAVE_HSTRERROR 1 -+ -+/* Define to 1 if you have the `inet_ntoa' function. */ -+#define HAVE_INET_NTOA 1 -+ -+/* Define to 1 if you have the `inet_ntop' function. */ -+#define HAVE_INET_NTOP 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_INTTYPES_H 1 -+ -+/* Define to 1 if the system has the type `in_addr_t'. */ -+#define HAVE_IN_ADDR_T 1 -+ -+/* Define to 1 if the system has the type `in_port_t'. */ -+#define HAVE_IN_PORT_T 1 -+ -+/* Define to 1 if you have the `lockf' function. */ -+#define HAVE_LOCKF 1 -+ -+/* Define to 1 if you have the `mcheck' function. */ -+#define HAVE_MCHECK 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_MCHECK_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_MEMORY_H 1 -+ -+/* Define to 1 if you have the `mmap' function. */ -+#define HAVE_MMAP 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_NETINET_IN_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_RESOLV_H 1 -+ -+/* Define to 1 if you have the `sendfile' function. */ -+#define HAVE_SENDFILE 1 -+ -+/* Define to 1 if you have the `setgroups' function. */ -+#define HAVE_SETGROUPS 1 -+ -+/* Define to 1 if you have the `setreuid' function. */ -+#define HAVE_SETREUID 1 -+ -+/* Define to 1 if you have the `setsid' function. */ -+#define HAVE_SETSID 1 -+ -+/* Define to 1 if you have the `setuid' function. */ -+#define HAVE_SETUID 1 -+ -+/* Define to 1 if you have the `snprintf' function. */ -+#define HAVE_SNPRINTF 1 -+ -+/* define if you have struct sockaddr_storage */ -+#define HAVE_SOCKADDR_STORAGE 1 -+ -+/* define if you have a working socketpair */ -+#define HAVE_SOCKETPAIR 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STDINT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the `strerror' function. */ -+#define HAVE_STRERROR 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STRINGS_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_STRING_H 1 -+ -+/* Define to 1 if you have the `strlcpy' function. */ -+/* #undef HAVE_STRLCPY */ -+ -+/* Define to 1 if you have the `strndup' function. */ -+#define HAVE_STRNDUP 1 -+ -+/* Define to 1 if you have the `strsignal' function. */ -+#define HAVE_STRSIGNAL 1 -+ -+/* Define to 1 if you have the header file. */ -+/* #undef HAVE_SYS_LOADAVG_H */ -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_MMAN_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_RESOURCE_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_SELECT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_SENDFILE_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_SIGNAL_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_SOCKET_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_SYS_TYPES_H 1 -+ -+/* Define to 1 if you have the header file. */ -+#define HAVE_UNISTD_H 1 -+ -+/* Define if your cpp has vararg macros */ -+#define HAVE_VARARG_MACROS -+ -+/* Define to 1 if you have the `vasprintf' function. */ -+#define HAVE_VASPRINTF 1 -+ -+/* Whether __va_copy() is available */ -+#define HAVE_VA_COPY 1 -+ -+/* Define to 1 if you have the `vsnprintf' function. */ -+#define HAVE_VSNPRINTF 1 -+ -+/* Define to 1 if you have the `wait3' function. */ -+#define HAVE_WAIT3 1 -+ -+/* Define to 1 if you have the `wait4' function. */ -+#define HAVE_WAIT4 1 -+ -+/* Define to 1 if you have the `waitpid' function. */ -+#define HAVE_WAITPID 1 -+ -+/* Define if MAP_FAILED constant not available */ -+#define MAP_FAILED (void *)-1L -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#define PACKAGE_BUGREPORT "distcc@lists.samba.org" -+ -+/* Define to the full name of this package. */ -+#define PACKAGE_NAME "distcc" -+ -+/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "distcc 2.18.3" -+ -+/* Define to the one symbol short name of this package. */ -+#define PACKAGE_TARNAME "distcc" -+ -+/* Define to the version of this package. */ -+#define PACKAGE_VERSION "2.18.3" -+ -+/* Define as the return type of signal handlers (`int' or `void'). */ -+#define RETSIGTYPE void -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#define STDC_HEADERS 1 -+ -+/* Use GNOME */ -+#define WITH_GNOME 1 -+ -+/* Use GTK+ */ -+/* #undef WITH_GTK */ -+ -+/* Define to `__inline__' or `__inline' if that's what the C compiler -+ calls it, or to nothing if 'inline' is not supported under any name. */ -+#ifndef __cplusplus -+/* #undef inline */ -+#endif -+ -+/* type to use in place of socklen_t if not defined */ -+/* #undef socklen_t */ ---- distcc-2.18.3.orig/configure 2004-11-30 12:34:40.000000000 +0100 -+++ distcc-2.18.3/configure 2008-03-04 08:39:39.000000000 +0100 -@@ -1,27 +1,56 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.59 for distcc 2.18.3. -+# Generated by GNU Autoconf 2.61 for distcc 2.18.3. - # - # Report bugs to . - # --# Copyright (C) 2003 Free Software Foundation, Inc. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. - ## --------------------- ## - ## M4sh Initialization. ## - ## --------------------- ## - --# Be Bourne compatible -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ PATH_SEPARATOR=';' -+ else -+ PATH_SEPARATOR=: -+ fi -+ rm -f conf$$.sh - fi --DUALCASE=1; export DUALCASE # for MKS sh - - # Support unset when possible. - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -@@ -31,8 +60,43 @@ - fi - - -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+as_nl=' -+' -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ - # Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done - PS1='$ ' - PS2='> ' - PS4='+ ' -@@ -46,18 +110,19 @@ - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else -- $as_unset $as_var -+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi - done - - # Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false -@@ -65,157 +130,388 @@ - - - # Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || - echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - -+# CDPATH. -+$as_unset CDPATH - --# PATH needs CR, and LINENO needs CR and PATH. --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh -+if test "x$CONFIG_SHELL" = x; then -+ if (eval ":") 2>/dev/null; then -+ as_have_required=yes -+else -+ as_have_required=no -+fi -+ -+ if test $as_have_required = yes && (eval ": -+(as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. - fi - -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi - -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi - -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0) || { (exit 1); exit 1; } -+ -+( -+ as_lineno_1=\$LINENO -+ as_lineno_2=\$LINENO -+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && -+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -+") 2> /dev/null; then -+ : -+else -+ as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -+ case $as_dir in - /*) -- if ("$as_dir/$as_base" -c ' -+ for as_base in sh bash ksh sh5; do -+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base" -+ done;; -+ esac -+done -+IFS=$as_save_IFS -+ -+ -+ for as_shell in $as_candidate_shells $SHELL; do -+ # Try only shells that exist, to save several forks. -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { ("$as_shell") 2> /dev/null <<\_ASEOF -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+: -+_ASEOF -+}; then -+ CONFIG_SHELL=$as_shell -+ as_have_required=yes -+ if { "$as_shell" 2> /dev/null <<\_ASEOF -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+: -+(as_func_return () { -+ (exit $1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = "$1" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test $exitcode = 0) || { (exit 1); exit 1; } -+ -+( - as_lineno_1=$LINENO - as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } -+ -+_ASEOF -+}; then -+ break -+fi -+ -+fi -+ -+ done -+ -+ if test "x$CONFIG_SHELL" != x; then -+ for as_var in BASH_ENV ENV -+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ done -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+fi -+ -+ -+ if test $as_have_required = no; then -+ echo This script requires a shell more modern than all the -+ echo shells that I found on your system. Please install a -+ echo modern shell, or manually run the script under such a -+ echo shell if you do have one. -+ { (exit 1); exit 1; } -+fi -+ -+ -+fi -+ -+fi -+ -+ -+ -+(eval "as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0") || { -+ echo No shell found that supports shell functions. -+ echo Please tell autoconf@gnu.org about your system, -+ echo including any error possibly output before this -+ echo message -+} -+ -+ -+ -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | - sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno - N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -+ s/-\n.*// - ' >$as_me.lineno && -- chmod +x $as_me.lineno || -+ chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" - # Exit status is that of the last command. - exit - } - - --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - - rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir -+fi - echo >conf$$.file - if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -- else -- as_ln_s='ln -s' -- fi - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -@@ -224,7 +520,28 @@ - as_mkdir_p=false - fi - --as_executable_p="test -f" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -233,39 +550,27 @@ - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH - -+exec 7<&0 &1 - - # Name of the host. - # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, - # so uname gets run too. - ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - --exec 6>&1 -- - # - # Initializations. - # - ac_default_prefix=/usr/local -+ac_clean_files= - ac_config_libobj_dir=. -+LIBOBJS= - cross_compiling=no - subdirs= - MFLAGS= - MAKEFLAGS= - SHELL=${CONFIG_SHELL-/bin/sh} - --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} -- - # Identity of this package. - PACKAGE_NAME='distcc' - PACKAGE_TARNAME='distcc' -@@ -276,42 +581,127 @@ - # Factoring default headers for most tests. - ac_includes_default="\ - #include --#if HAVE_SYS_TYPES_H -+#ifdef HAVE_SYS_TYPES_H - # include - #endif --#if HAVE_SYS_STAT_H -+#ifdef HAVE_SYS_STAT_H - # include - #endif --#if STDC_HEADERS -+#ifdef STDC_HEADERS - # include - # include - #else --# if HAVE_STDLIB_H -+# ifdef HAVE_STDLIB_H - # include - # endif - #endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H -+#ifdef HAVE_STRING_H -+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H - # include - # endif - # include - #endif --#if HAVE_STRINGS_H -+#ifdef HAVE_STRINGS_H - # include - #endif --#if HAVE_INTTYPES_H -+#ifdef HAVE_INTTYPES_H - # include --#else --# if HAVE_STDINT_H --# include --# endif - #endif --#if HAVE_UNISTD_H -+#ifdef HAVE_STDINT_H -+# include -+#endif -+#ifdef HAVE_UNISTD_H - # include - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os docdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT GNOME_PACKAGES GNOME_CFLAGS GNOME_LIBS INSTALL_GNOME SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PYTHON CPP EGREP BUILD_POPT GNOME_BIN LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL -+PATH_SEPARATOR -+PACKAGE_NAME -+PACKAGE_TARNAME -+PACKAGE_VERSION -+PACKAGE_STRING -+PACKAGE_BUGREPORT -+exec_prefix -+prefix -+program_transform_name -+bindir -+sbindir -+libexecdir -+datarootdir -+datadir -+sysconfdir -+sharedstatedir -+localstatedir -+includedir -+oldincludedir -+docdir -+infodir -+htmldir -+dvidir -+pdfdir -+psdir -+libdir -+localedir -+mandir -+DEFS -+ECHO_C -+ECHO_N -+ECHO_T -+LIBS -+build_alias -+host_alias -+target_alias -+build -+build_cpu -+build_vendor -+build_os -+host -+host_cpu -+host_vendor -+host_os -+CC -+CFLAGS -+LDFLAGS -+CPPFLAGS -+ac_ct_CC -+EXEEXT -+OBJEXT -+GNOME_PACKAGES -+GNOME_CFLAGS -+GNOME_LIBS -+INSTALL_GNOME -+SET_MAKE -+INSTALL_PROGRAM -+INSTALL_SCRIPT -+INSTALL_DATA -+PYTHON -+CPP -+GREP -+EGREP -+PKG_CONFIG -+AVAHI_CFLAGS -+AVAHI_LIBS -+ZEROCONF_DISTCC_OBJS -+ZEROCONF_DISTCCD_OBJS -+BUILD_POPT -+GNOME_BIN -+LIBOBJS -+LTLIBOBJS' - ac_subst_files='' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+PYTHON -+CPP -+PKG_CONFIG -+AVAHI_CFLAGS -+AVAHI_LIBS' -+ - - # Initialize some variables set by options. - ac_init_help= -@@ -338,34 +728,48 @@ - # and all the variables that are supposed to be based on exec_prefix - # by default will actually change. - # Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' --datadir='${prefix}/share' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' --libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' --infodir='${prefix}/info' --mandir='${prefix}/man' -+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' - - ac_prev= -+ac_dashdash= - for ac_option - do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then -- eval "$ac_prev=\$ac_option" -+ eval $ac_prev=\$ac_option - ac_prev= - continue - fi - -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ case $ac_option in -+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *) ac_optarg=yes ;; -+ esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case $ac_option in -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; -@@ -387,33 +791,45 @@ - --config-cache | -C) - cache_file=config.cache ;; - -- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; -- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -- | --da=*) -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; -+ - -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- eval "enable_$ac_feature=no" ;; -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -+ eval enable_$ac_feature=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -- esac -- eval "enable_$ac_feature='$ac_optarg'" ;; -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -+ eval enable_$ac_feature=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -440,6 +856,12 @@ - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; -@@ -464,13 +886,16 @@ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ - -localstatedir | --localstatedir | --localstatedi | --localstated \ -- | --localstate | --localstat | --localsta | --localst \ -- | --locals | --local | --loca | --loc | --lo) -+ | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -@@ -535,6 +960,16 @@ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; -@@ -587,24 +1022,20 @@ - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package| sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -- esac -- eval "with_$ac_package='$ac_optarg'" ;; -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -+ eval with_$ac_package=\$ac_optarg ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/-/_/g'` -- eval "with_$ac_package=no" ;; -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -+ eval with_$ac_package=no ;; - - --x) - # Obsolete; use --with-x. -@@ -635,8 +1066,7 @@ - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } -- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -- eval "$ac_envvar='$ac_optarg'" -+ eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) -@@ -656,27 +1086,19 @@ - { (exit 1); exit 1; }; } - fi - --# Be sure to have absolute paths. --for ac_var in exec_prefix prefix -+# Be sure to have absolute directory names. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir - do -- eval ac_val=$`echo $ac_var` -+ eval ac_val=\$$ac_var - case $ac_val in -- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -- esac --done -- --# Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { (exit 1); exit 1; }; } - done - - # There might be people who depend on the old broken behavior: `$host' -@@ -703,79 +1125,77 @@ - test "$silent" = yes && exec 6>/dev/null - - -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ { echo "$as_me: error: Working directory cannot be determined" >&2 -+ { (exit 1); exit 1; }; } -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ { echo "$as_me: error: pwd does not report name of working directory" >&2 -+ { (exit 1); exit 1; }; } -+ -+ - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes -- # Try the directory containing this script, then its parent. -- ac_confdir=`(dirname "$0") 2>/dev/null || -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$0" || - $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || - echo X"$0" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - srcdir=$ac_confdir -- if test ! -r $srcdir/$ac_unique_file; then -+ if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi - else - ac_srcdir_defaulted=no - fi --if test ! -r $srcdir/$ac_unique_file; then -- if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -+if test ! -r "$srcdir/$ac_unique_file"; then -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } -- else -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -- fi - fi --(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } --srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` --ac_env_build_alias_set=${build_alias+set} --ac_env_build_alias_value=$build_alias --ac_cv_env_build_alias_set=${build_alias+set} --ac_cv_env_build_alias_value=$build_alias --ac_env_host_alias_set=${host_alias+set} --ac_env_host_alias_value=$host_alias --ac_cv_env_host_alias_set=${host_alias+set} --ac_cv_env_host_alias_value=$host_alias --ac_env_target_alias_set=${target_alias+set} --ac_env_target_alias_value=$target_alias --ac_cv_env_target_alias_set=${target_alias+set} --ac_cv_env_target_alias_value=$target_alias --ac_env_CC_set=${CC+set} --ac_env_CC_value=$CC --ac_cv_env_CC_set=${CC+set} --ac_cv_env_CC_value=$CC --ac_env_CFLAGS_set=${CFLAGS+set} --ac_env_CFLAGS_value=$CFLAGS --ac_cv_env_CFLAGS_set=${CFLAGS+set} --ac_cv_env_CFLAGS_value=$CFLAGS --ac_env_LDFLAGS_set=${LDFLAGS+set} --ac_env_LDFLAGS_value=$LDFLAGS --ac_cv_env_LDFLAGS_set=${LDFLAGS+set} --ac_cv_env_LDFLAGS_value=$LDFLAGS --ac_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_env_CPPFLAGS_value=$CPPFLAGS --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_cv_env_CPPFLAGS_value=$CPPFLAGS --ac_env_PYTHON_set=${PYTHON+set} --ac_env_PYTHON_value=$PYTHON --ac_cv_env_PYTHON_set=${PYTHON+set} --ac_cv_env_PYTHON_value=$PYTHON --ac_env_CPP_set=${CPP+set} --ac_env_CPP_value=$CPP --ac_cv_env_CPP_set=${CPP+set} --ac_cv_env_CPP_value=$CPP -- -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done -+ - # - # Report the --help message. - # -@@ -803,9 +1223,6 @@ - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - --_ACEOF -- -- cat <<_ACEOF - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] -@@ -823,15 +1240,22 @@ - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] -- --datadir=DIR read-only architecture-independent data [PREFIX/share] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --infodir=DIR info documentation [PREFIX/info] -- --mandir=DIR man documentation [PREFIX/man] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/distcc] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -868,130 +1292,101 @@ - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory -- CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have -- headers in a nonstandard directory -+ LIBS libraries to pass to the linker, e.g. -l -+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if -+ you have headers in a nonstandard directory - PYTHON Python interpreter to use for running tests - CPP C preprocessor -+ PKG_CONFIG path to pkg-config utility -+ AVAHI_CFLAGS -+ C compiler flags for AVAHI, overriding pkg-config -+ AVAHI_LIBS linker flags for AVAHI, overriding pkg-config - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - - Report bugs to . - _ACEOF -+ac_status=$? - fi - - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. -- ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d $ac_dir || continue -+ test -d "$ac_dir" || continue - ac_builddir=. - --if test "$ac_dir" != .; then -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - -- cd $ac_dir -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_srcdir/configure.gnu; then -- echo -- $SHELL $ac_srcdir/configure.gnu --help=recursive -- elif test -f $ac_srcdir/configure; then -- echo -- $SHELL $ac_srcdir/configure --help=recursive -- elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -- echo -- $ac_configure --help -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -- fi -- cd "$ac_popdir" -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } - done - fi - --test -n "$ac_init_help" && exit 0 -+test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF - distcc configure 2.18.3 --generated by GNU Autoconf 2.59 -+generated by GNU Autoconf 2.61 - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -- exit 0 -+ exit - fi --exec 5>config.log --cat >&5 <<_ACEOF -+cat >config.log <<_ACEOF - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - - It was created by distcc $as_me 2.18.3, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ - - _ACEOF -+exec 5>>config.log - { - cat <<_ASUNAME - ## --------- ## -@@ -1010,7 +1405,7 @@ - /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` - /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` - /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` - /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` - /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` - /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -@@ -1024,6 +1419,7 @@ - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" - done -+IFS=$as_save_IFS - - } >&5 - -@@ -1045,7 +1441,6 @@ - ac_configure_args= - ac_configure_args0= - ac_configure_args1= --ac_sep= - ac_must_keep_next=false - for ac_pass in 1 2 - do -@@ -1056,7 +1451,7 @@ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -+ *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in -@@ -1078,9 +1473,7 @@ - -* ) ac_must_keep_next=true ;; - esac - fi -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- # Get rid of the leading space. -- ac_sep=" " -+ ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -@@ -1091,8 +1484,8 @@ - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there - # would cause problems or look ugly. --# WARNING: Be sure not to use single quotes in there, as some shells, --# such as our DU 5.0 friend, will then `close' the trap. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. - trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { -@@ -1105,20 +1498,34 @@ - _ASBOX - echo - # The following way of writing the cache mishandles newlines in values, --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done - (set) 2>&1 | -- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -- ;; -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( - *) -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} -+ esac | -+ sort -+) - echo - - cat <<\_ASBOX -@@ -1129,22 +1536,28 @@ - echo - for ac_var in $ac_subst_vars - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## -+## ------------------- ## -+## File substitutions. ## -+## ------------------- ## - _ASBOX - echo - for ac_var in $ac_subst_files - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi -@@ -1156,26 +1569,24 @@ - ## ----------- ## - _ASBOX - echo -- sed "/^$/d" confdefs.h | sort -+ cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 -- rm -f core *.core && -- rm -rf conftest* confdefs* conf$$* $ac_clean_files && -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -- ' 0 -+' 0 - for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal - done - ac_signal=0 - - # confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo >confdefs.h -+rm -f -r conftest* confdefs.h - - # Predefined preprocessor variables. - -@@ -1206,14 +1617,17 @@ - - # Let the site file select an alternate cache file if it wants to. - # Prefer explicitly selected file to automatically selected ones. --if test -z "$CONFIG_SITE"; then -- if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -- else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -- fi -+if test -n "$CONFIG_SITE"; then -+ set x "$CONFIG_SITE" -+elif test "x$prefix" != xNONE; then -+ set x "$prefix/share/config.site" "$prefix/etc/config.site" -+else -+ set x "$ac_default_prefix/share/config.site" \ -+ "$ac_default_prefix/etc/config.site" - fi --for ac_site_file in $CONFIG_SITE; do -+shift -+for ac_site_file -+do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 - echo "$as_me: loading site script $ac_site_file" >&6;} -@@ -1229,8 +1643,8 @@ - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 - echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in -- [\\/]* | ?:[\\/]* ) . $cache_file;; -- *) . ./$cache_file;; -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; - esac - fi - else -@@ -1242,12 +1656,11 @@ - # Check that the precious variables saved in the cache have kept the same - # value. - ac_cache_corrupted=false --for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -+for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set -- eval ac_old_val="\$ac_cv_env_${ac_var}_value" -- eval ac_new_val="\$ac_env_${ac_var}_value" -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -@@ -1272,8 +1685,7 @@ - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in -@@ -1290,12 +1702,6 @@ - { (exit 1); exit 1; }; } - fi - --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- - - - -@@ -1320,87 +1726,127 @@ - - - -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- ac_config_headers="$ac_config_headers src/config.h" -+ac_config_headers="$ac_config_headers src/config.h" - - ac_aux_dir= --for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do -- if test -f $ac_dir/install-sh; then -+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} -+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - # Make sure we can run config.sub. --$ac_config_sub sun4 >/dev/null 2>&1 || -- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 --echo "$as_me: error: cannot run $ac_config_sub" >&2;} -+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - --echo "$as_me:$LINENO: checking build system type" >&5 --echo $ECHO_N "checking build system type... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking build system type" >&5 -+echo $ECHO_N "checking build system type... $ECHO_C" >&6; } - if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_build_alias=$build_alias --test -z "$ac_cv_build_alias" && -- ac_cv_build_alias=`$ac_config_guess` --test -z "$ac_cv_build_alias" && -+ ac_build_alias=$build_alias -+test "x$ac_build_alias" = x && -+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -+test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 - echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } --ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} -+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - - fi --echo "$as_me:$LINENO: result: $ac_cv_build" >&5 --echo "${ECHO_T}$ac_cv_build" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -+echo "${ECHO_T}$ac_cv_build" >&6; } -+case $ac_cv_build in -+*-*-*) ;; -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -+echo "$as_me: error: invalid value of canonical build" >&2;} -+ { (exit 1); exit 1; }; };; -+esac - build=$ac_cv_build --build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_build -+shift -+build_cpu=$1 -+build_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+build_os=$* -+IFS=$ac_save_IFS -+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - --echo "$as_me:$LINENO: checking host system type" >&5 --echo $ECHO_N "checking host system type... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking host system type" >&5 -+echo $ECHO_N "checking host system type... $ECHO_C" >&6; } - if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_host_alias=$host_alias --test -z "$ac_cv_host_alias" && -- ac_cv_host_alias=$ac_cv_build_alias --ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} -+ if test "x$host_alias" = x; then -+ ac_cv_host=$ac_cv_build -+else -+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } -+fi - - fi --echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --echo "${ECHO_T}$ac_cv_host" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -+echo "${ECHO_T}$ac_cv_host" >&6; } -+case $ac_cv_host in -+*-*-*) ;; -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -+echo "$as_me: error: invalid value of canonical host" >&2;} -+ { (exit 1); exit 1; }; };; -+esac - host=$ac_cv_host --host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_host -+shift -+host_cpu=$1 -+host_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+host_os=$* -+IFS=$ac_save_IFS -+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - - -@@ -1417,11 +1863,11 @@ - - - --# Check whether --with-docdir or --without-docdir was given. -+# Check whether --with-docdir was given. - if test "${with_docdir+set}" = set; then -- withval="$with_docdir" -- with_docdir=$withval --fi; -+ withval=$with_docdir; with_docdir=$withval -+fi -+ - if test "x$with_docdir" = "x" ; then - docdir='${datadir}/doc/distcc' - else -@@ -1440,8 +1886,8 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1454,32 +1900,34 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1492,36 +1940,51 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - else - CC="$ac_cv_prog_CC" - fi - - if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1534,74 +1997,34 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi - -+ fi - fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1615,7 +2038,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -@@ -1626,6 +2049,7 @@ - fi - done - done -+IFS=$as_save_IFS - - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. -@@ -1643,22 +2067,23 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1671,36 +2096,38 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$CC" && break - done - fi - if test -z "$CC"; then - ac_ct_CC=$CC -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1713,29 +2140,45 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$ac_ct_CC" && break - done - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - fi - - fi -@@ -1748,21 +2191,35 @@ - { (exit 1); exit 1; }; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C compiler version" >&5 -+echo "$as_me:$LINENO: checking for C compiler version" >&5 - ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 -- (eval $ac_compiler --version &5) 2>&5 -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 -- (eval $ac_compiler -v &5) 2>&5 -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 -- (eval $ac_compiler -V &5) 2>&5 -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -@@ -1787,47 +2244,77 @@ - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } - ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 -- (eval $ac_link_default) 2>&5 -+# -+# List of possible output files, starting from the most likely. -+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -+# only as a last resort. b.out is created by i960 compilers. -+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -+# -+# The IRIX 6 linker writes into existing files which may not be -+# executable, retaining their permissions. Remove them first so a -+# subsequent execution test works. -+ac_rmfiles= -+for ac_file in $ac_files -+do -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; -+ * ) ac_rmfiles="$ac_rmfiles $ac_file";; -+ esac -+done -+rm -f $ac_rmfiles -+ -+if { (ac_try="$ac_link_default" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link_default") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- # Find the output, starting from the most likely. This scheme is --# not robust to junk in `.', hence go to wildcards (a.*) only as a last --# resort. -- --# Be careful to initialize this variable, since it used to be cached. --# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. --ac_cv_exeext= --# b.out is created by i960 compilers. --for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -+# in a Makefile. We should not override ac_cv_exeext if it was cached, -+# so that the user can short-circuit this test for compilers unknown to -+# Autoconf. -+for ac_file in $ac_files '' - do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -- ;; -- conftest.$ac_ext ) -- # This is the source file. -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) -- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool, -- # but it would be cool to find out if it's true. Does anybody -- # maintain Libtool? --akim. -- export ac_cv_exeext -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ then :; else -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ fi -+ # We set ac_cv_exeext here because the later test for it is not -+ # safe: cross compilers may not add the suffix if given an `-o' -+ # argument, so we may need to know it at that point already. -+ # Even if this section looks crufty: it has the advantage of -+ # actually working. - break;; - * ) - break;; - esac - done -+test "$ac_cv_exeext" = no && ac_cv_exeext= -+ - else -+ ac_file='' -+fi -+ -+{ echo "$as_me:$LINENO: result: $ac_file" >&5 -+echo "${ECHO_T}$ac_file" >&6; } -+if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -@@ -1839,19 +2326,21 @@ - fi - - ac_exeext=$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6 - --# Check the compiler produces executables we can run. If not, either -+# Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } - # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 - # If not cross compiling, check that we can run a simple program. - if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -1870,22 +2359,27 @@ - fi - fi - fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+{ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - - rm -f a.out a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save --# Check the compiler produces executables we can run. If not, either -+# Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6 -- --echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -+echo "${ECHO_T}$cross_compiling" >&6; } -+ -+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -@@ -1896,9 +2390,8 @@ - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext - break;; - * ) break;; - esac -@@ -1912,14 +2405,14 @@ - fi - - rm -f conftest$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -+echo "${ECHO_T}$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } - if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1939,14 +2432,20 @@ - } - _ACEOF - rm -f conftest.o conftest.obj --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -+ for ac_file in conftest.o conftest.obj conftest.*; do -+ test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -@@ -1964,12 +2463,12 @@ - - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -+echo "${ECHO_T}$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } - if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1992,49 +2491,49 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } - GCC=`test $ac_compiler_gnu = yes && echo yes` - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } - if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -2050,37 +2549,118 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cc_g=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ CFLAGS="" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ : -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_prog_cc_g=no -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then -@@ -2096,12 +2676,12 @@ - CFLAGS= - fi - fi --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -+if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_prog_cc_stdc=no -+ ac_cv_prog_cc_c89=no - ac_save_CC=$CC - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -2135,12 +2715,17 @@ - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated -- as 'x'. The following induces an error, until -std1 is added to get -+ as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something -- that's true only with -std1. */ -+ that's true only with -std. */ - int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; -@@ -2155,271 +2740,125 @@ - return 0; - } - _ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" - do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_prog_cc_stdc=$ac_arg --break -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cc_c89=$ac_arg - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext -+ -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break - done --rm -f conftest.$ac_ext conftest.$ac_objext -+rm -f conftest.$ac_ext - CC=$ac_save_CC - - fi -- --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } ;; -+ xno) -+ { echo "$as_me:$LINENO: result: unsupported" >&5 -+echo "${ECHO_T}unsupported" >&6; } ;; - *) -- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; -+ CC="$CC $ac_cv_prog_cc_c89" -+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; - esac - --# Some people use a C++ compiler to compile C. Since we use `exit', --# in C++ we need to declare it. In case someone uses the same compiler --# for both compiling C and C++ we need to have the C++ compiler decide --# the declaration of exit, since it's the most demanding environment. --cat >conftest.$ac_ext <<_ACEOF --#ifndef __cplusplus -- choke me --#endif --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- for ac_declaration in \ -- '' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+{ echo "$as_me:$LINENO: checking for socklen_t" >&5 -+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; } -+if test "${ac_cv_type_socklen_t+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_declaration --#include -+#include -+#include -+ -+typedef socklen_t ac__type_new_; - int - main () - { --exit (42); -+if ((ac__type_new_ *) 0) -+ return 0; -+if (sizeof (ac__type_new_)) -+ return 0; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_type_socklen_t=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --continue -+ ac_cv_type_socklen_t=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- --echo "$as_me:$LINENO: checking for socklen_t" >&5 --echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6 --if test "${ac_cv_type_socklen_t+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --#include -- --int --main () --{ --if ((socklen_t *) 0) -- return 0; --if (sizeof (socklen_t)) -- return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_socklen_t=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_socklen_t=no -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5 --echo "${ECHO_T}$ac_cv_type_socklen_t" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5 -+echo "${ECHO_T}$ac_cv_type_socklen_t" >&6; } - if test $ac_cv_type_socklen_t = yes; then - : - else - -- echo "$as_me:$LINENO: checking for socklen_t equivalent" >&5 --echo $ECHO_N "checking for socklen_t equivalent... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for socklen_t equivalent" >&5 -+echo $ECHO_N "checking for socklen_t equivalent... $ECHO_C" >&6; } - if test "${dcc_cv_socklen_t_equiv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2453,26 +2892,22 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - - dcc_cv_socklen_t_equiv="$t" - break -@@ -2481,8 +2916,10 @@ - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - done - -@@ -2494,8 +2931,8 @@ - - fi - -- echo "$as_me:$LINENO: result: $dcc_cv_socklen_t_equiv" >&5 --echo "${ECHO_T}$dcc_cv_socklen_t_equiv" >&6 -+ { echo "$as_me:$LINENO: result: $dcc_cv_socklen_t_equiv" >&5 -+echo "${ECHO_T}$dcc_cv_socklen_t_equiv" >&6; } - - cat >>confdefs.h <<_ACEOF - #define socklen_t $dcc_cv_socklen_t_equiv -@@ -2509,29 +2946,29 @@ - ### Checks for configure options - - --# Check whether --with-included-popt or --without-included-popt was given. -+# Check whether --with-included-popt was given. - if test "${with_included_popt+set}" = set; then -- withval="$with_included_popt" -+ withval=$with_included_popt; -+fi - --fi; - --# Check whether --enable-rfc2553 or --disable-rfc2553 was given. -+# Check whether --enable-rfc2553 was given. - if test "${enable_rfc2553+set}" = set; then -- enableval="$enable_rfc2553" -- -+ enableval=$enable_rfc2553; - cat >>confdefs.h <<\_ACEOF - #define ENABLE_RFC2553 1 - _ACEOF - --fi; -+fi -+ - - - --# Check whether --with-gnome or --without-gnome was given. -+# Check whether --with-gnome was given. - if test "${with_gnome+set}" = set; then -- withval="$with_gnome" -+ withval=$with_gnome; -+fi - --fi; - - if test x"$with_gnome" = xyes - then -@@ -2544,11 +2981,11 @@ - fi - - --# Check whether --with-gtk or --without-gtk was given. -+# Check whether --with-gtk was given. - if test "${with_gtk+set}" = set; then -- withval="$with_gtk" -+ withval=$with_gtk; -+fi - --fi; - if test x"$with_gtk" = xyes - then - GNOME_BIN=distccmon-gnome -@@ -2559,11 +2996,11 @@ - - fi - --# Check whether --enable-profile or --disable-profile was given. -+# Check whether --enable-profile was given. - if test "${enable_profile+set}" = set; then -- enableval="$enable_profile" -+ enableval=$enable_profile; -+fi - --fi; - - if test x"$enable_profile" = xyes - then -@@ -2585,12 +3022,12 @@ - - for pkg in $GNOME_PACKAGES - do -- echo "$as_me:$LINENO: checking version of $pkg" >&5 --echo $ECHO_N "checking version of $pkg... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking version of $pkg" >&5 -+echo $ECHO_N "checking version of $pkg... $ECHO_C" >&6; } - if gnomevers=`pkg-config --modversion $pkg` - then -- echo "$as_me:$LINENO: result: $gnomevers" >&5 --echo "${ECHO_T}$gnomevers" >&6 -+ { echo "$as_me:$LINENO: result: $gnomevers" >&5 -+echo "${ECHO_T}$gnomevers" >&6; } - else - { { echo "$as_me:$LINENO: error: $pkg was not found by pkg-config" >&5 - echo "$as_me: error: $pkg was not found by pkg-config" >&2;} -@@ -2601,21 +3038,21 @@ - if test x${with_gnome} = xyes -o x${with_gtk} = xyes - then - INSTALL_GNOME="install-gnome-data" -- echo "$as_me:$LINENO: checking GNOME/GTK+ cflags" >&5 --echo $ECHO_N "checking GNOME/GTK+ cflags... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking GNOME/GTK+ cflags" >&5 -+echo $ECHO_N "checking GNOME/GTK+ cflags... $ECHO_C" >&6; } - GNOME_CFLAGS="`pkg-config --cflags $GNOME_PACKAGES`" || { { echo "$as_me:$LINENO: error: failed to get cflags" >&5 - echo "$as_me: error: failed to get cflags" >&2;} - { (exit 1); exit 1; }; } -- echo "$as_me:$LINENO: result: ${GNOME_CFLAGS}" >&5 --echo "${ECHO_T}${GNOME_CFLAGS}" >&6 -+ { echo "$as_me:$LINENO: result: ${GNOME_CFLAGS}" >&5 -+echo "${ECHO_T}${GNOME_CFLAGS}" >&6; } - -- echo "$as_me:$LINENO: checking GNOME/GTK+ libraries" >&5 --echo $ECHO_N "checking GNOME/GTK+ libraries... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking GNOME/GTK+ libraries" >&5 -+echo $ECHO_N "checking GNOME/GTK+ libraries... $ECHO_C" >&6; } - GNOME_LIBS="`pkg-config --libs $GNOME_PACKAGES`" || { { echo "$as_me:$LINENO: error: failed to get libs" >&5 - echo "$as_me: error: failed to get libs" >&2;} - { (exit 1); exit 1; }; } -- echo "$as_me:$LINENO: result: ${GNOME_LIBS}" >&5 --echo "${ECHO_T}${GNOME_LIBS}" >&6 -+ { echo "$as_me:$LINENO: result: ${GNOME_LIBS}" >&5 -+echo "${ECHO_T}${GNOME_LIBS}" >&6; } - fi - - -@@ -2631,8 +3068,8 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2645,32 +3082,34 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2683,36 +3122,51 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - else - CC="$ac_cv_prog_CC" - fi - - if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2725,74 +3179,34 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi - -+ fi - fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2806,7 +3220,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -@@ -2817,6 +3231,7 @@ - fi - done - done -+IFS=$as_save_IFS - - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. -@@ -2834,22 +3249,23 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2862,36 +3278,38 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$CC" && break - done - fi - if test -z "$CC"; then - ac_ct_CC=$CC -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2904,29 +3322,45 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$ac_ct_CC" && break - done - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - fi - - fi -@@ -2939,27 +3373,41 @@ - { (exit 1); exit 1; }; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C compiler version" >&5 -+echo "$as_me:$LINENO: checking for C compiler version" >&5 - ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 -- (eval $ac_compiler --version &5) 2>&5 -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 -- (eval $ac_compiler -v &5) 2>&5 -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 -- (eval $ac_compiler -V &5) 2>&5 -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - --echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } - if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2982,49 +3430,49 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } - GCC=`test $ac_compiler_gnu = yes && echo yes` - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } - if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -3040,37 +3488,118 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cc_g=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ CFLAGS="" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ : -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_prog_cc_g=no -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then -@@ -3086,12 +3615,12 @@ - CFLAGS= - fi - fi --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -+if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_prog_cc_stdc=no -+ ac_cv_prog_cc_c89=no - ac_save_CC=$CC - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3125,12 +3654,17 @@ - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated -- as 'x'. The following induces an error, until -std1 is added to get -+ as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something -- that's true only with -std1. */ -+ that's true only with -std. */ - int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; -@@ -3145,337 +3679,152 @@ - return 0; - } - _ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" - do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_prog_cc_stdc=$ac_arg --break -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cc_c89=$ac_arg - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext -+ -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break - done --rm -f conftest.$ac_ext conftest.$ac_objext -+rm -f conftest.$ac_ext - CC=$ac_save_CC - - fi -- --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } ;; -+ xno) -+ { echo "$as_me:$LINENO: result: unsupported" >&5 -+echo "${ECHO_T}unsupported" >&6; } ;; - *) -- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; -+ CC="$CC $ac_cv_prog_cc_c89" -+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; - esac - --# Some people use a C++ compiler to compile C. Since we use `exit', --# in C++ we need to declare it. In case someone uses the same compiler --# for both compiling C and C++ we need to have the C++ compiler decide --# the declaration of exit, since it's the most demanding environment. -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+if test x"$GCC" = xyes -+then -+ CFLAGS="$CFLAGS -W -Wall -Wimplicit \ -+-Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings \ -+-Waggregate-return -Wstrict-prototypes -Wmissing-prototypes \ -+-Wnested-externs -Wconversion -Wpointer-arith -Wmissing-declarations" -+ { echo "$as_me:$LINENO: Adding gcc options: $CFLAGS" >&5 -+echo "$as_me: Adding gcc options: $CFLAGS" >&6;} -+fi -+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5 -+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } -+if test "${ac_cv_search_strerror+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_func_search_save_LIBS=$LIBS - cat >conftest.$ac_ext <<_ACEOF --#ifndef __cplusplus -- choke me -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" - #endif -+char strerror (); -+int -+main () -+{ -+return strerror (); -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+for ac_lib in '' cposix; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- for ac_declaration in \ -- '' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --#include --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_search_strerror=$ac_res - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu - --if test x"$GCC" = xyes --then -- CFLAGS="$CFLAGS -W -Wall -Wimplicit \ ---Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings \ ---Waggregate-return -Wstrict-prototypes -Wmissing-prototypes \ ---Wnested-externs -Wconversion -Wpointer-arith -Wmissing-declarations" -- { echo "$as_me:$LINENO: Adding gcc options: $CFLAGS" >&5 --echo "$as_me: Adding gcc options: $CFLAGS" >&6;} -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_strerror+set}" = set; then -+ break - fi --echo "$as_me:$LINENO: checking for library containing strerror" >&5 --echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6 -+done - if test "${ac_cv_search_strerror+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_func_search_save_LIBS=$LIBS --ac_cv_search_strerror=no --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char strerror (); --int --main () --{ --strerror (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_search_strerror="none required" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --if test "$ac_cv_search_strerror" = no; then -- for ac_lib in cposix; do -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char strerror (); --int --main () --{ --strerror (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_search_strerror="-l$ac_lib" --break -+ : - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- done -+ ac_cv_search_strerror=no - fi -+rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 --echo "${ECHO_T}$ac_cv_search_strerror" >&6 --if test "$ac_cv_search_strerror" != no; then -- test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" -+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 -+echo "${ECHO_T}$ac_cv_search_strerror" >&6; } -+ac_res=$ac_cv_search_strerror -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - fi - -@@ -3496,32 +3845,33 @@ - # there. - CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - --echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 --echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 --set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` --if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.make <<\_ACEOF -+SHELL = /bin/sh - all: -- @echo 'ac_maketemp="$(MAKE)"' -+ @echo '@@@%%%=$(MAKE)=@@@%%%' - _ACEOF - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. --eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` --if test -n "$ac_maketemp"; then -- eval ac_cv_prog_make_${ac_make}_set=yes --else -- eval ac_cv_prog_make_${ac_make}_set=no --fi -+case `${MAKE-make} -f conftest.make 2>/dev/null` in -+ *@@@%%%=?*=@@@%%%*) -+ eval ac_cv_prog_make_${ac_make}_set=yes;; -+ *) -+ eval ac_cv_prog_make_${ac_make}_set=no;; -+esac - rm -f conftest.make - fi --if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - SET_MAKE= - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" - fi - -@@ -3538,8 +3888,8 @@ - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. --echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } - if test -z "$INSTALL"; then - if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3561,7 +3911,7 @@ - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. -@@ -3580,21 +3930,22 @@ - ;; - esac - done -+IFS=$as_save_IFS - - - fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else -- # As a last resort, use the slow shell script. We don't cache a -- # path for INSTALL within a source directory, because that will -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is -- # removed, or if the path is relative. -+ # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi - fi --echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6 -+{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -+echo "${ECHO_T}$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -@@ -3614,8 +3965,8 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_PYTHON+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -3628,25 +3979,27 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_PYTHON="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - PYTHON=$ac_cv_prog_PYTHON - if test -n "$PYTHON"; then -- echo "$as_me:$LINENO: result: $PYTHON" >&5 --echo "${ECHO_T}$PYTHON" >&6 -+ { echo "$as_me:$LINENO: result: $PYTHON" >&5 -+echo "${ECHO_T}$PYTHON" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$PYTHON" && break - done - -@@ -3654,8 +4007,8 @@ - # NB: Cannot use AC_CONFIG_LIBOBJ_DIR here, because it's not present - # in autoconf 2.53. - --echo "$as_me:$LINENO: checking for inline" >&5 --echo $ECHO_N "checking for inline... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for inline" >&5 -+echo $ECHO_N "checking for inline... $ECHO_C" >&6; } - if test "${ac_cv_c_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -3675,38 +4028,37 @@ - - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_c_inline=$ac_kw; break -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_c_inline=$ac_kw - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ test "$ac_cv_c_inline" != no && break - done - - fi --echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 --echo "${ECHO_T}$ac_cv_c_inline" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 -+echo "${ECHO_T}$ac_cv_c_inline" >&6; } - - - case $ac_cv_c_inline in -@@ -3735,8 +4087,8 @@ - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu --echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -3770,24 +4122,22 @@ - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - : - else - echo "$as_me: failed program was:" >&5 -@@ -3796,9 +4146,10 @@ - # Broken: fails on valid input. - continue - fi -+ - rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3808,24 +4159,22 @@ - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else -@@ -3836,6 +4185,7 @@ - ac_preproc_ok=: - break - fi -+ - rm -f conftest.err conftest.$ac_ext - - done -@@ -3853,8 +4203,8 @@ - else - ac_cv_prog_CPP=$CPP - fi --echo "$as_me:$LINENO: result: $CPP" >&5 --echo "${ECHO_T}$CPP" >&6 -+{ echo "$as_me:$LINENO: result: $CPP" >&5 -+echo "${ECHO_T}$CPP" >&6; } - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes - do -@@ -3877,24 +4227,22 @@ - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - : - else - echo "$as_me: failed program was:" >&5 -@@ -3903,9 +4251,10 @@ - # Broken: fails on valid input. - continue - fi -+ - rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3915,24 +4264,22 @@ - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else -@@ -3943,6 +4290,7 @@ - ac_preproc_ok=: - break - fi -+ - rm -f conftest.err conftest.$ac_ext - - done -@@ -3965,80 +4313,224 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --echo "$as_me:$LINENO: checking for egrep" >&5 --echo $ECHO_N "checking for egrep... $ECHO_C" >&6 --if test "${ac_cv_prog_egrep+set}" = set; then -+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -+if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' -+ # Extract the first word of "grep ggrep" to use in msg output -+if test -z "$GREP"; then -+set dummy grep ggrep; ac_prog_name=$2 -+if test "${ac_cv_path_GREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_path_GREP_found=false -+# Loop through the user's path and test for each of PROGNAME-LIST -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in grep ggrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -+ # Check for GNU ac_path_GREP and select it if it is found. -+ # Check for GNU $ac_path_GREP -+case `"$ac_path_GREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -+*) -+ ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ echo 'GREP' >> "conftest.nl" -+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ ac_count=`expr $ac_count + 1` -+ if test $ac_count -gt ${ac_path_GREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_GREP="$ac_path_GREP" -+ ac_path_GREP_max=$ac_count - fi --fi --echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 --echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -- EGREP=$ac_cv_prog_egrep -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac - - --echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 --if test "${ac_cv_header_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --#include --#include --#include -+ $ac_path_GREP_found && break 3 -+ done -+done - --int --main () --{ -+done -+IFS=$as_save_IFS - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_header_stdc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_header_stdc=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - --if test $ac_cv_header_stdc = yes; then -- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF -+GREP="$ac_cv_path_GREP" -+if test -z "$GREP"; then -+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+else -+ ac_cv_path_GREP=$GREP -+fi -+ -+ -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -+echo "${ECHO_T}$ac_cv_path_GREP" >&6; } -+ GREP="$ac_cv_path_GREP" -+ -+ -+{ echo "$as_me:$LINENO: checking for egrep" >&5 -+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -+if test "${ac_cv_path_EGREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -+ then ac_cv_path_EGREP="$GREP -E" -+ else -+ # Extract the first word of "egrep" to use in msg output -+if test -z "$EGREP"; then -+set dummy egrep; ac_prog_name=$2 -+if test "${ac_cv_path_EGREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_path_EGREP_found=false -+# Loop through the user's path and test for each of PROGNAME-LIST -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in egrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -+ # Check for GNU ac_path_EGREP and select it if it is found. -+ # Check for GNU $ac_path_EGREP -+case `"$ac_path_EGREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -+*) -+ ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ echo 'EGREP' >> "conftest.nl" -+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ ac_count=`expr $ac_count + 1` -+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_EGREP="$ac_path_EGREP" -+ ac_path_EGREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ -+ $ac_path_EGREP_found && break 3 -+ done -+done -+ -+done -+IFS=$as_save_IFS -+ -+ -+fi -+ -+EGREP="$ac_cv_path_EGREP" -+if test -z "$EGREP"; then -+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+else -+ ac_cv_path_EGREP=$EGREP -+fi -+ -+ -+ fi -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } -+ EGREP="$ac_cv_path_EGREP" -+ -+ -+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -+if test "${ac_cv_header_stdc+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+#include -+#include -+#include -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_header_stdc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_header_stdc=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+if test $ac_cv_header_stdc = yes; then -+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -@@ -4088,6 +4580,7 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include -+#include - #if ((' ' & 0x0FF) == 0x020) - # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') - # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -@@ -4107,18 +4600,27 @@ - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); -+ return 2; -+ return 0; - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -4131,12 +4633,14 @@ - ( exit $ac_status ) - ac_cv_header_stdc=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+ -+ - fi - fi --echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --echo "${ECHO_T}$ac_cv_header_stdc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -+echo "${ECHO_T}$ac_cv_header_stdc" >&6; } - if test $ac_cv_header_stdc = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -4159,9 +4663,9 @@ - inttypes.h stdint.h unistd.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -4175,37 +4679,35 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_Header=no" -+ eval "$as_ac_Header=no" - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -@@ -4223,18 +4725,19 @@ - for ac_header in unistd.h sys/types.h sys/sendfile.h sys/signal.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4245,40 +4748,37 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4287,24 +4787,22 @@ - /* end confdefs.h. */ - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -4312,9 +4810,10 @@ - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -4338,25 +4837,24 @@ - echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX -+ ( cat <<\_ASBOX - ## ------------------------------------- ## - ## Report this to distcc@lists.samba.org ## - ## ------------------------------------- ## - _ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -4375,18 +4873,19 @@ - for ac_header in ctype.h sys/resource.h sys/socket.h sys/select.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4397,40 +4896,37 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4439,24 +4935,22 @@ - /* end confdefs.h. */ - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -4464,9 +4958,10 @@ - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -4490,25 +4985,24 @@ - echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX -+ ( cat <<\_ASBOX - ## ------------------------------------- ## - ## Report this to distcc@lists.samba.org ## - ## ------------------------------------- ## - _ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -4524,9 +5018,9 @@ - for ac_header in netinet/in.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -4543,37 +5037,35 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_Header=no" -+ eval "$as_ac_Header=no" - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -@@ -4587,9 +5079,9 @@ - for ac_header in arpa/nameser.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -4606,37 +5098,35 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_Header=no" -+ eval "$as_ac_Header=no" - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -@@ -4650,9 +5140,9 @@ - for ac_header in resolv.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -4675,37 +5165,35 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_Header=no" -+ eval "$as_ac_Header=no" - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -@@ -4724,18 +5212,19 @@ - for ac_header in float.h mcheck.h alloca.h sys/mman.h sys/loadavg.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4746,40 +5235,37 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4788,24 +5274,22 @@ - /* end confdefs.h. */ - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -4813,9 +5297,10 @@ - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -4839,25 +5324,24 @@ - echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX -+ ( cat <<\_ASBOX - ## ------------------------------------- ## - ## Report this to distcc@lists.samba.org ## - ## ------------------------------------- ## - _ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -4872,8 +5356,8 @@ - - ###################################################################### - --echo "$as_me:$LINENO: checking for in_port_t" >&5 --echo $ECHO_N "checking for in_port_t... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for in_port_t" >&5 -+echo $ECHO_N "checking for in_port_t... $ECHO_C" >&6; } - if test "${ac_cv_type_in_port_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -4898,49 +5382,47 @@ - #endif - - -+typedef in_port_t ac__type_new_; - int - main () - { --if ((in_port_t *) 0) -+if ((ac__type_new_ *) 0) - return 0; --if (sizeof (in_port_t)) -+if (sizeof (ac__type_new_)) - return 0; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_in_port_t=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_in_port_t=no -+ ac_cv_type_in_port_t=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_in_port_t" >&5 --echo "${ECHO_T}$ac_cv_type_in_port_t" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_in_port_t" >&5 -+echo "${ECHO_T}$ac_cv_type_in_port_t" >&6; } - if test $ac_cv_type_in_port_t = yes; then - - cat >>confdefs.h <<_ACEOF -@@ -4949,8 +5431,8 @@ - - - fi --echo "$as_me:$LINENO: checking for in_addr_t" >&5 --echo $ECHO_N "checking for in_addr_t... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for in_addr_t" >&5 -+echo $ECHO_N "checking for in_addr_t... $ECHO_C" >&6; } - if test "${ac_cv_type_in_addr_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -4975,49 +5457,47 @@ - #endif - - -+typedef in_addr_t ac__type_new_; - int - main () - { --if ((in_addr_t *) 0) -+if ((ac__type_new_ *) 0) - return 0; --if (sizeof (in_addr_t)) -+if (sizeof (ac__type_new_)) - return 0; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_in_addr_t=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_in_addr_t=no -+ ac_cv_type_in_addr_t=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_in_addr_t" >&5 --echo "${ECHO_T}$ac_cv_type_in_addr_t" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_in_addr_t" >&5 -+echo "${ECHO_T}$ac_cv_type_in_addr_t" >&6; } - if test $ac_cv_type_in_addr_t = yes; then - - cat >>confdefs.h <<_ACEOF -@@ -5039,13 +5519,12 @@ - # libsocket.so which has a bad implementation of gethostbyname (it - # only looks in /etc/hosts), so we only look for -lsocket if we need - # it. --echo "$as_me:$LINENO: checking for library containing gethostent" >&5 --echo $ECHO_N "checking for library containing gethostent... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for library containing gethostent" >&5 -+echo $ECHO_N "checking for library containing gethostent... $ECHO_C" >&6; } - if test "${ac_cv_search_gethostent+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_func_search_save_LIBS=$LIBS --ac_cv_search_gethostent=no - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -5053,123 +5532,165 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char gethostent (); - int - main () - { --gethostent (); -+return gethostent (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+for ac_lib in '' nsl; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_search_gethostent="none required" -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_search_gethostent=$ac_res - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --if test "$ac_cv_search_gethostent" = no; then -- for ac_lib in nsl; do -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -- cat >conftest.$ac_ext <<_ACEOF -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_gethostent+set}" = set; then -+ break -+fi -+done -+if test "${ac_cv_search_gethostent+set}" = set; then -+ : -+else -+ ac_cv_search_gethostent=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 -+echo "${ECHO_T}$ac_cv_search_gethostent" >&6; } -+ac_res=$ac_cv_search_gethostent -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ -+fi -+ -+{ echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 -+echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6; } -+if test "${ac_cv_search_setsockopt+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char gethostent (); -+char setsockopt (); - int - main () - { --gethostent (); -+return setsockopt (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+for ac_lib in '' socket; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_search_gethostent="-l$ac_lib" --break -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_search_setsockopt=$ac_res - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- done -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_setsockopt+set}" = set; then -+ break -+fi -+done -+if test "${ac_cv_search_setsockopt+set}" = set; then -+ : -+else -+ ac_cv_search_setsockopt=no - fi -+rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 --echo "${ECHO_T}$ac_cv_search_gethostent" >&6 --if test "$ac_cv_search_gethostent" != no; then -- test "$ac_cv_search_gethostent" = "none required" || LIBS="$ac_cv_search_gethostent $LIBS" -+{ echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 -+echo "${ECHO_T}$ac_cv_search_setsockopt" >&6; } -+ac_res=$ac_cv_search_setsockopt -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - fi - --echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 --echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6 --if test "${ac_cv_search_setsockopt+set}" = set; then -+{ echo "$as_me:$LINENO: checking for library containing hstrerror" >&5 -+echo $ECHO_N "checking for library containing hstrerror... $ECHO_C" >&6; } -+if test "${ac_cv_search_hstrerror+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_func_search_save_LIBS=$LIBS --ac_cv_search_setsockopt=no - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -5177,247 +5698,82 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char setsockopt (); -+char hstrerror (); - int - main () - { --setsockopt (); -+return hstrerror (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+for ac_lib in '' resolv; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_search_setsockopt="none required" -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_search_hstrerror=$ac_res - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --if test "$ac_cv_search_setsockopt" = no; then -- for ac_lib in socket; do -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char setsockopt (); --int --main () --{ --setsockopt (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_search_setsockopt="-l$ac_lib" --break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- done --fi --LIBS=$ac_func_search_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 --echo "${ECHO_T}$ac_cv_search_setsockopt" >&6 --if test "$ac_cv_search_setsockopt" != no; then -- test "$ac_cv_search_setsockopt" = "none required" || LIBS="$ac_cv_search_setsockopt $LIBS" - -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_hstrerror+set}" = set; then -+ break - fi -- --echo "$as_me:$LINENO: checking for library containing hstrerror" >&5 --echo $ECHO_N "checking for library containing hstrerror... $ECHO_C" >&6 -+done - if test "${ac_cv_search_hstrerror+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_func_search_save_LIBS=$LIBS --ac_cv_search_hstrerror=no --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char hstrerror (); --int --main () --{ --hstrerror (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_search_hstrerror="none required" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --if test "$ac_cv_search_hstrerror" = no; then -- for ac_lib in resolv; do -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char hstrerror (); --int --main () --{ --hstrerror (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_search_hstrerror="-l$ac_lib" --break -+ : - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- done -+ ac_cv_search_hstrerror=no - fi -+rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_search_hstrerror" >&5 --echo "${ECHO_T}$ac_cv_search_hstrerror" >&6 --if test "$ac_cv_search_hstrerror" != no; then -- test "$ac_cv_search_hstrerror" = "none required" || LIBS="$ac_cv_search_hstrerror $LIBS" -+{ echo "$as_me:$LINENO: result: $ac_cv_search_hstrerror" >&5 -+echo "${ECHO_T}$ac_cv_search_hstrerror" >&6; } -+ac_res=$ac_cv_search_hstrerror -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - fi - --echo "$as_me:$LINENO: checking for library containing inet_aton" >&5 --echo $ECHO_N "checking for library containing inet_aton... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for library containing inet_aton" >&5 -+echo $ECHO_N "checking for library containing inet_aton... $ECHO_C" >&6; } - if test "${ac_cv_search_inet_aton+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_func_search_save_LIBS=$LIBS --ac_cv_search_inet_aton=no - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -5425,113 +5781,73 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char inet_aton (); - int - main () - { --inet_aton (); -+return inet_aton (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+for ac_lib in '' resolv; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_search_inet_aton="none required" -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_search_inet_aton=$ac_res - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --if test "$ac_cv_search_inet_aton" = no; then -- for ac_lib in resolv; do -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char inet_aton (); --int --main () --{ --inet_aton (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_search_inet_aton="-l$ac_lib" --break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_inet_aton+set}" = set; then -+ break - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- done -+done -+if test "${ac_cv_search_inet_aton+set}" = set; then -+ : -+else -+ ac_cv_search_inet_aton=no - fi -+rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_search_inet_aton" >&5 --echo "${ECHO_T}$ac_cv_search_inet_aton" >&6 --if test "$ac_cv_search_inet_aton" != no; then -- test "$ac_cv_search_inet_aton" = "none required" || LIBS="$ac_cv_search_inet_aton $LIBS" -+{ echo "$as_me:$LINENO: result: $ac_cv_search_inet_aton" >&5 -+echo "${ECHO_T}$ac_cv_search_inet_aton" >&6; } -+ac_res=$ac_cv_search_inet_aton -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - fi - -@@ -5542,17 +5858,17 @@ - # People might have the library but not the header, in which case we - # still need to use the included copy. - if test "${ac_cv_header_popt_h+set}" = set; then -- echo "$as_me:$LINENO: checking for popt.h" >&5 --echo $ECHO_N "checking for popt.h... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for popt.h" >&5 -+echo $ECHO_N "checking for popt.h... $ECHO_C" >&6; } - if test "${ac_cv_header_popt_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5 --echo "${ECHO_T}$ac_cv_header_popt_h" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5 -+echo "${ECHO_T}$ac_cv_header_popt_h" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking popt.h usability" >&5 --echo $ECHO_N "checking popt.h usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking popt.h usability" >&5 -+echo $ECHO_N "checking popt.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -5563,40 +5879,37 @@ - #include - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking popt.h presence" >&5 --echo $ECHO_N "checking popt.h presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking popt.h presence" >&5 -+echo $ECHO_N "checking popt.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -5605,24 +5918,22 @@ - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -5630,9 +5941,10 @@ - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -5656,25 +5968,23 @@ - echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: popt.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX -+ ( cat <<\_ASBOX - ## ------------------------------------- ## - ## Report this to distcc@lists.samba.org ## - ## ------------------------------------- ## - _ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --echo "$as_me:$LINENO: checking for popt.h" >&5 --echo $ECHO_N "checking for popt.h... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for popt.h" >&5 -+echo $ECHO_N "checking for popt.h... $ECHO_C" >&6; } - if test "${ac_cv_header_popt_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_popt_h=$ac_header_preproc - fi --echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5 --echo "${ECHO_T}$ac_cv_header_popt_h" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5 -+echo "${ECHO_T}$ac_cv_header_popt_h" >&6; } - - fi - if test $ac_cv_header_popt_h = yes; then -@@ -5703,64 +6013,83 @@ - - # The following way of writing the cache mishandles newlines in values, - # but we know of no workaround that is simple, portable, and efficient. --# So, don't put newlines in cache variables' values. -+# So, we kill variables containing newlines. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done -+ - (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -- ;; -+ ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} | -+ esac | -+ sort -+) | - sed ' -+ /^ac_cv_env_/b end - t clear -- : clear -+ :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end -- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -- : end' >>confcache --if diff $cache_file confcache >/dev/null 2>&1; then :; else -- if test -w $cache_file; then -- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ test "x$cache_file" != "x/dev/null" && -+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -+echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else -- echo "not updating unwritable cache $cache_file" -+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -+echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache - --echo "$as_me:$LINENO: checking whether to use included libpopt" >&5 --echo $ECHO_N "checking whether to use included libpopt... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether to use included libpopt" >&5 -+echo $ECHO_N "checking whether to use included libpopt... $ECHO_C" >&6; } - if test x"$with_included_popt" = x"yes" - then -- echo "$as_me:$LINENO: result: $srcdir/popt" >&5 --echo "${ECHO_T}$srcdir/popt" >&6 -+ { echo "$as_me:$LINENO: result: $srcdir/popt" >&5 -+echo "${ECHO_T}$srcdir/popt" >&6; } - # popt_OBJS gets appended to distccd object list - BUILD_POPT='$(popt_OBJS)' - CPPFLAGS="$CPPFLAGS -I$srcdir/popt" - else - LIBS="$LIBS -lpopt" -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - - - ######################################################################## - # Check for types --echo "$as_me:$LINENO: checking return type of signal handlers" >&5 --echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } - if test "${ac_cv_type_signal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -5772,55 +6101,44 @@ - /* end confdefs.h. */ - #include - #include --#ifdef signal --# undef signal --#endif --#ifdef __cplusplus --extern "C" void (*signal (int, void (*)(int)))(int); --#else --void (*signal ()) (); --#endif - - int - main () - { --int i; -+return *(signal (0, 0)) (0) == 1; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_signal=void -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_type_signal=int - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_signal=int -+ ac_cv_type_signal=void - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 --echo "${ECHO_T}$ac_cv_type_signal" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -+echo "${ECHO_T}$ac_cv_type_signal" >&6; } - - cat >>confdefs.h <<_ACEOF - #define RETSIGTYPE $ac_cv_type_signal -@@ -5844,9 +6162,9 @@ - for ac_func in sendfile setsid flock lockf hstrerror strerror setuid setreuid - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -5872,67 +6190,60 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char $ac_func (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+#if defined __stub_$ac_func || defined __stub___$ac_func - choke me --#else --char (*f) () = $ac_func; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != $ac_func; -+return $ac_func (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_var=no" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -5952,9 +6263,9 @@ - for ac_func in getuid geteuid mcheck wait4 wait3 waitpid setgroups getcwd - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -5980,67 +6291,60 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char $ac_func (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+#if defined __stub_$ac_func || defined __stub___$ac_func - choke me --#else --char (*f) () = $ac_func; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != $ac_func; -+return $ac_func (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_var=no" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -6058,9 +6362,9 @@ - for ac_func in snprintf vsnprintf vasprintf asprintf getcwd getwd - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -6086,67 +6390,60 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char $ac_func (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+#if defined __stub_$ac_func || defined __stub___$ac_func - choke me --#else --char (*f) () = $ac_func; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != $ac_func; -+return $ac_func (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_var=no" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -6161,9 +6458,9 @@ - for ac_func in getrusage strsignal gettimeofday - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -6189,67 +6486,60 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char $ac_func (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+#if defined __stub_$ac_func || defined __stub___$ac_func - choke me --#else --char (*f) () = $ac_func; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != $ac_func; -+return $ac_func (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_var=no" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -6265,9 +6555,9 @@ - for ac_func in getaddrinfo getnameinfo inet_ntop inet_ntoa - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -6293,67 +6583,60 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char $ac_func (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+#if defined __stub_$ac_func || defined __stub___$ac_func - choke me --#else --char (*f) () = $ac_func; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != $ac_func; -+return $ac_func (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_var=no" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -6368,9 +6651,9 @@ - for ac_func in strndup mmap strlcpy - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -6396,67 +6679,60 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char $ac_func (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+#if defined __stub_$ac_func || defined __stub___$ac_func - choke me --#else --char (*f) () = $ac_func; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != $ac_func; -+return $ac_func (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_var=no" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -6466,8 +6742,8 @@ - done - - --echo "$as_me:$LINENO: checking whether snprintf is declared" >&5 --echo $ECHO_N "checking whether snprintf is declared... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether snprintf is declared" >&5 -+echo $ECHO_N "checking whether snprintf is declared... $ECHO_C" >&6; } - if test "${ac_cv_have_decl_snprintf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -6482,7 +6758,7 @@ - main () - { - #ifndef snprintf -- char *p = (char *) snprintf; -+ (void) snprintf; - #endif - - ; -@@ -6490,37 +6766,34 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_have_decl_snprintf=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_have_decl_snprintf=no -+ ac_cv_have_decl_snprintf=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_have_decl_snprintf" >&5 --echo "${ECHO_T}$ac_cv_have_decl_snprintf" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_snprintf" >&5 -+echo "${ECHO_T}$ac_cv_have_decl_snprintf" >&6; } - if test $ac_cv_have_decl_snprintf = yes; then - - cat >>confdefs.h <<_ACEOF -@@ -6535,8 +6808,8 @@ - - - fi --echo "$as_me:$LINENO: checking whether vsnprintf is declared" >&5 --echo $ECHO_N "checking whether vsnprintf is declared... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether vsnprintf is declared" >&5 -+echo $ECHO_N "checking whether vsnprintf is declared... $ECHO_C" >&6; } - if test "${ac_cv_have_decl_vsnprintf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -6551,7 +6824,7 @@ - main () - { - #ifndef vsnprintf -- char *p = (char *) vsnprintf; -+ (void) vsnprintf; - #endif - - ; -@@ -6559,37 +6832,34 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_have_decl_vsnprintf=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_have_decl_vsnprintf=no -+ ac_cv_have_decl_vsnprintf=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_have_decl_vsnprintf" >&5 --echo "${ECHO_T}$ac_cv_have_decl_vsnprintf" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_vsnprintf" >&5 -+echo "${ECHO_T}$ac_cv_have_decl_vsnprintf" >&6; } - if test $ac_cv_have_decl_vsnprintf = yes; then - - cat >>confdefs.h <<_ACEOF -@@ -6604,8 +6874,8 @@ - - - fi --echo "$as_me:$LINENO: checking whether vasprintf is declared" >&5 --echo $ECHO_N "checking whether vasprintf is declared... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether vasprintf is declared" >&5 -+echo $ECHO_N "checking whether vasprintf is declared... $ECHO_C" >&6; } - if test "${ac_cv_have_decl_vasprintf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -6620,7 +6890,7 @@ - main () - { - #ifndef vasprintf -- char *p = (char *) vasprintf; -+ (void) vasprintf; - #endif - - ; -@@ -6628,37 +6898,34 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_have_decl_vasprintf=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_have_decl_vasprintf=no -+ ac_cv_have_decl_vasprintf=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_have_decl_vasprintf" >&5 --echo "${ECHO_T}$ac_cv_have_decl_vasprintf" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_vasprintf" >&5 -+echo "${ECHO_T}$ac_cv_have_decl_vasprintf" >&6; } - if test $ac_cv_have_decl_vasprintf = yes; then - - cat >>confdefs.h <<_ACEOF -@@ -6673,8 +6940,8 @@ - - - fi --echo "$as_me:$LINENO: checking whether asprintf is declared" >&5 --echo $ECHO_N "checking whether asprintf is declared... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether asprintf is declared" >&5 -+echo $ECHO_N "checking whether asprintf is declared... $ECHO_C" >&6; } - if test "${ac_cv_have_decl_asprintf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -6689,7 +6956,7 @@ - main () - { - #ifndef asprintf -- char *p = (char *) asprintf; -+ (void) asprintf; - #endif - - ; -@@ -6697,37 +6964,34 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_have_decl_asprintf=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_have_decl_asprintf=no -+ ac_cv_have_decl_asprintf=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_have_decl_asprintf" >&5 --echo "${ECHO_T}$ac_cv_have_decl_asprintf" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_asprintf" >&5 -+echo "${ECHO_T}$ac_cv_have_decl_asprintf" >&6; } - if test $ac_cv_have_decl_asprintf = yes; then - - cat >>confdefs.h <<_ACEOF -@@ -6742,8 +7006,8 @@ - - - fi --echo "$as_me:$LINENO: checking whether strndup is declared" >&5 --echo $ECHO_N "checking whether strndup is declared... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether strndup is declared" >&5 -+echo $ECHO_N "checking whether strndup is declared... $ECHO_C" >&6; } - if test "${ac_cv_have_decl_strndup+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -6758,7 +7022,7 @@ - main () - { - #ifndef strndup -- char *p = (char *) strndup; -+ (void) strndup; - #endif - - ; -@@ -6766,37 +7030,34 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_have_decl_strndup=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_have_decl_strndup=no -+ ac_cv_have_decl_strndup=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_have_decl_strndup" >&5 --echo "${ECHO_T}$ac_cv_have_decl_strndup" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strndup" >&5 -+echo "${ECHO_T}$ac_cv_have_decl_strndup" >&6; } - if test $ac_cv_have_decl_strndup = yes; then - - cat >>confdefs.h <<_ACEOF -@@ -6814,8 +7075,8 @@ - - - --echo "$as_me:$LINENO: checking if mmap() supports MAP_FAILED" >&5 --echo $ECHO_N "checking if mmap() supports MAP_FAILED... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking if mmap() supports MAP_FAILED" >&5 -+echo $ECHO_N "checking if mmap() supports MAP_FAILED... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -6841,26 +7102,22 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - : - else - echo "$as_me: failed program was:" >&5 -@@ -6874,13 +7131,14 @@ - - - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: " >&5 --echo "${ECHO_T}" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: " >&5 -+echo "${ECHO_T}" >&6; } - - --echo "$as_me:$LINENO: checking for vararg macro support" >&5 --echo $ECHO_N "checking for vararg macro support... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for vararg macro support" >&5 -+echo $ECHO_N "checking for vararg macro support... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -6897,28 +7155,24 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - - cat >>confdefs.h <<\_ACEOF - #define HAVE_VARARG_MACROS -@@ -6928,13 +7182,14 @@ - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - --echo "$as_me:$LINENO: checking for __va_copy" >&5 --echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+{ echo "$as_me:$LINENO: checking for __va_copy" >&5 -+echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6; } - if test "${samba_cv_HAVE_VA_COPY+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -6956,38 +7211,36 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - samba_cv_HAVE_VA_COPY=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --samba_cv_HAVE_VA_COPY=no -+ samba_cv_HAVE_VA_COPY=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $samba_cv_HAVE_VA_COPY" >&5 --echo "${ECHO_T}$samba_cv_HAVE_VA_COPY" >&6 -+{ echo "$as_me:$LINENO: result: $samba_cv_HAVE_VA_COPY" >&5 -+echo "${ECHO_T}$samba_cv_HAVE_VA_COPY" >&6; } - if test x"$samba_cv_HAVE_VA_COPY" = x"yes"; then - - cat >>confdefs.h <<\_ACEOF -@@ -6996,8 +7249,8 @@ - - fi - --echo "$as_me:$LINENO: checking for C99 vsnprintf" >&5 --echo $ECHO_N "checking for C99 vsnprintf... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for C99 vsnprintf" >&5 -+echo $ECHO_N "checking for C99 vsnprintf... $ECHO_C" >&6; } - if test "${rsync_cv_HAVE_C99_VSNPRINTF+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -7032,13 +7285,22 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -7051,11 +7313,13 @@ - ( exit $ac_status ) - rsync_cv_HAVE_C99_VSNPRINTF=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+ -+ - fi --echo "$as_me:$LINENO: result: $rsync_cv_HAVE_C99_VSNPRINTF" >&5 --echo "${ECHO_T}$rsync_cv_HAVE_C99_VSNPRINTF" >&6 -+{ echo "$as_me:$LINENO: result: $rsync_cv_HAVE_C99_VSNPRINTF" >&5 -+echo "${ECHO_T}$rsync_cv_HAVE_C99_VSNPRINTF" >&6; } - if test x"$rsync_cv_HAVE_C99_VSNPRINTF" = x"yes"; then - - cat >>confdefs.h <<\_ACEOF -@@ -7065,8 +7329,8 @@ - fi - - --echo "$as_me:$LINENO: checking for working socketpair" >&5 --echo $ECHO_N "checking for working socketpair... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for working socketpair" >&5 -+echo $ECHO_N "checking for working socketpair... $ECHO_C" >&6; } - if test "${rsync_cv_HAVE_SOCKETPAIR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -7090,13 +7354,22 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -7109,11 +7382,13 @@ - ( exit $ac_status ) - rsync_cv_HAVE_SOCKETPAIR=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+ -+ - fi --echo "$as_me:$LINENO: result: $rsync_cv_HAVE_SOCKETPAIR" >&5 --echo "${ECHO_T}$rsync_cv_HAVE_SOCKETPAIR" >&6 -+{ echo "$as_me:$LINENO: result: $rsync_cv_HAVE_SOCKETPAIR" >&5 -+echo "${ECHO_T}$rsync_cv_HAVE_SOCKETPAIR" >&6; } - if test x"$rsync_cv_HAVE_SOCKETPAIR" = x"yes"; then - - cat >>confdefs.h <<\_ACEOF -@@ -7122,8 +7397,8 @@ - - fi - --echo "$as_me:$LINENO: checking for struct sockaddr_storage.ss_family" >&5 --echo $ECHO_N "checking for struct sockaddr_storage.ss_family... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for struct sockaddr_storage.ss_family" >&5 -+echo $ECHO_N "checking for struct sockaddr_storage.ss_family... $ECHO_C" >&6; } - if test "${ac_cv_member_struct_sockaddr_storage_ss_family+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -7146,32 +7421,28 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_member_struct_sockaddr_storage_ss_family=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -7190,39 +7461,37 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_member_struct_sockaddr_storage_ss_family=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_member_struct_sockaddr_storage_ss_family=no -+ ac_cv_member_struct_sockaddr_storage_ss_family=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage_ss_family" >&5 --echo "${ECHO_T}$ac_cv_member_struct_sockaddr_storage_ss_family" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage_ss_family" >&5 -+echo "${ECHO_T}$ac_cv_member_struct_sockaddr_storage_ss_family" >&6; } - if test $ac_cv_member_struct_sockaddr_storage_ss_family = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -7234,6 +7503,210 @@ - - - -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+fi -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG -+if test -n "$PKG_CONFIG"; then -+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -+echo "${ECHO_T}$PKG_CONFIG" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_path_PKG_CONFIG"; then -+ ac_pt_PKG_CONFIG=$PKG_CONFIG -+ # Extract the first word of "pkg-config", so it can be a program name with args. -+set dummy pkg-config; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $ac_pt_PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+fi -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -+if test -n "$ac_pt_PKG_CONFIG"; then -+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_pt_PKG_CONFIG" = x; then -+ PKG_CONFIG="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ PKG_CONFIG=$ac_pt_PKG_CONFIG -+ fi -+else -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+fi -+ -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=0.9.0 -+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ PKG_CONFIG="" -+ fi -+ -+fi -+ -+pkg_failed=no -+{ echo "$as_me:$LINENO: checking for AVAHI" >&5 -+echo $ECHO_N "checking for AVAHI... $ECHO_C" >&6; } -+ -+if test -n "$PKG_CONFIG"; then -+ if test -n "$AVAHI_CFLAGS"; then -+ pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6.5\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6.5") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags "avahi-client >= 0.6.5" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+if test -n "$PKG_CONFIG"; then -+ if test -n "$AVAHI_LIBS"; then -+ pkg_cv_AVAHI_LIBS="$AVAHI_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"avahi-client >= 0.6.5\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "avahi-client >= 0.6.5") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs "avahi-client >= 0.6.5" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ fi -+else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "avahi-client >= 0.6.5"` -+ else -+ AVAHI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "avahi-client >= 0.6.5"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$AVAHI_PKG_ERRORS" >&5 -+ -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ ZEROCONF_DISTCC_OBJS="" -+ZEROCONF_DISTCCD_OBJS="" -+elif test $pkg_failed = untried; then -+ ZEROCONF_DISTCC_OBJS="" -+ZEROCONF_DISTCCD_OBJS="" -+else -+ AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS -+ AVAHI_LIBS=$pkg_cv_AVAHI_LIBS -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_AVAHI 1 -+_ACEOF -+ -+CFLAGS="$CFLAGS $AVAHI_CFLAGS" -+LIBS="$LIBS $AVAHI_LIBS" -+ZEROCONF_DISTCC_OBJS="src/zeroconf.o src/gcc-id.o" -+ZEROCONF_DISTCCD_OBJS="src/zeroconf-reg.o src/gcc-id.o" -+fi -+ -+ -+ -+ -+ - - - -@@ -7243,7 +7716,8 @@ - #define GNU_HOST "$host" - _ACEOF - -- ac_config_files="$ac_config_files Makefile popt/.stamp-conf lzo/.stamp-conf" -+ac_config_files="$ac_config_files Makefile popt/.stamp-conf lzo/.stamp-conf" -+ - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure -@@ -7262,39 +7736,58 @@ - - # The following way of writing the cache mishandles newlines in values, - # but we know of no workaround that is simple, portable, and efficient. --# So, don't put newlines in cache variables' values. -+# So, we kill variables containing newlines. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done -+ - (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -- ;; -+ ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} | -+ esac | -+ sort -+) | - sed ' -+ /^ac_cv_env_/b end - t clear -- : clear -+ :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end -- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -- : end' >>confcache --if diff $cache_file confcache >/dev/null 2>&1; then :; else -- if test -w $cache_file; then -- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ test "x$cache_file" != "x/dev/null" && -+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -+echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else -- echo "not updating unwritable cache $cache_file" -+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -+echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache -@@ -7303,32 +7796,18 @@ - # Let make expand exec_prefix. - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and --# trailing colons and then remove the whole line if VPATH becomes empty --# (actually we leave an empty line to preserve line numbers). --if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/; --s/:*\${srcdir}:*/:/; --s/:*@srcdir@:*/:/; --s/^\([^=]*=[ ]*\):*/\1/; --s/:*$//; --s/^[^=]*=[ ]*$//; --}' --fi -- - DEFS=-DHAVE_CONFIG_H - - ac_libobjs= - ac_ltlibobjs= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. -- ac_i=`echo "$ac_i" | -- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -- # 2. Add them. -- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`echo "$ac_i" | sed "$ac_script"` -+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -+ # will be set to the directory where LIBOBJS objects are built. -+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' - done - LIBOBJS=$ac_libobjs - -@@ -7359,17 +7838,45 @@ - ## M4sh Initialization. ## - ## --------------------- ## - --# Be Bourne compatible -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ PATH_SEPARATOR=';' -+ else -+ PATH_SEPARATOR=: -+ fi -+ rm -f conf$$.sh - fi --DUALCASE=1; export DUALCASE # for MKS sh - - # Support unset when possible. - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -@@ -7379,33 +7886,69 @@ - fi - - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH --PS1='$ ' --PS2='> ' --PS4='+ ' -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+as_nl=' -+' -+IFS=" "" $as_nl" - --# NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ -+# Work around bugs in pre-3.0 UWIN ksh. -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done -+PS1='$ ' -+PS2='> ' -+PS4='+ ' -+ -+# NLS nuisances. -+for as_var in \ -+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME - do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else -- $as_unset $as_var -+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi - done - - # Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false -@@ -7413,159 +7956,120 @@ - - - # Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || - echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- -- --# PATH needs CR, and LINENO needs CR and PATH. --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -+# CDPATH. -+$as_unset CDPATH - - -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done - -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 --echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | - sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno - N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -+ s/-\n.*// - ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 --echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -+ chmod +x "$as_me.lineno" || -+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" - # Exit status is that of the last command. - exit - } - - --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - - rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir -+fi - echo >conf$$.file - if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -- else -- as_ln_s='ln -s' -- fi - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -@@ -7574,7 +8078,28 @@ - as_mkdir_p=false - fi - --as_executable_p="test -f" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -7583,31 +8108,14 @@ - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- - exec 6>&1 - --# Open the log real soon, to keep \$[0] and so on meaningful, and to -+# Save the log message, to keep $[0] and so on meaningful, and to - # report actual input values of CONFIG_FILES etc. instead of their --# values after options handling. Logging --version etc. is OK. --exec 5>>config.log --{ -- echo -- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX --## Running $as_me. ## --_ASBOX --} >&5 --cat >&5 <<_CSEOF -- -+# values after options handling. -+ac_log=" - This file was extended by distcc $as_me 2.18.3, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.61. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -7615,30 +8123,19 @@ - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - --_CSEOF --echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 --echo >&5 -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" -+ - _ACEOF - -+cat >>$CONFIG_STATUS <<_ACEOF - # Files that config.status was made for. --if test -n "$ac_config_files"; then -- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_headers"; then -- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS --fi -+config_files="$ac_config_files" -+config_headers="$ac_config_headers" - --if test -n "$ac_config_links"; then -- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_commands"; then -- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS --fi -+_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF -- - ac_cs_usage="\ - \`$as_me' instantiates files from templates according to the - current configuration. -@@ -7646,7 +8143,7 @@ - Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit -- -V, --version print version number, then exit -+ -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions -@@ -7662,19 +8159,21 @@ - $config_headers - - Report bugs to ." --_ACEOF - -+_ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - ac_cs_version="\\ - distcc config.status 2.18.3 --configured by $0, generated by GNU Autoconf 2.59, -- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.61, -+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2006 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." --srcdir=$srcdir --INSTALL="$INSTALL" -+ -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+INSTALL='$INSTALL' - _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF -@@ -7685,39 +8184,24 @@ - do - case $1 in - --*=*) -- ac_option=`expr "x$1" : 'x\([^=]*\)='` -- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; -- -*) -+ *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; -- *) # This is not an option, so the user has probably given explicit -- # arguments. -- ac_option=$1 -- ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; -- --version | --vers* | -V ) -- echo "$ac_cs_version"; exit 0 ;; -- --he | --h) -- # Conflict between --help and --header -- { { echo "$as_me:$LINENO: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -- --help | --hel | -h ) -- echo "$ac_cs_usage"; exit 0 ;; -- --debug | --d* | -d ) -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ echo "$ac_cs_version"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift -@@ -7727,18 +8211,24 @@ - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; -+ --he | --h) -+ # Conflict between --help and --header -+ { echo "$as_me: error: ambiguous option: $1 -+Try \`$0 --help' for more information." >&2 -+ { (exit 1); exit 1; }; };; -+ --help | --hel | -h ) -+ echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. -- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2;} -+ -*) { echo "$as_me: error: unrecognized option: $1 -+Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; - -- *) ac_config_targets="$ac_config_targets $1" ;; -+ *) ac_config_targets="$ac_config_targets $1" -+ ac_need_defaults=false ;; - - esac - shift -@@ -7754,31 +8244,45 @@ - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - if \$ac_cs_recheck; then -- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -+ CONFIG_SHELL=$SHELL -+ export CONFIG_SHELL -+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - fi - - _ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+ echo "$ac_log" -+} >&5 - -- -- -- -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF -+_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF -+ -+# Handling of arguments. - for ac_config_target in $ac_config_targets - do -- case "$ac_config_target" in -- # Handling of arguments. -- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; -- "popt/.stamp-conf" ) CONFIG_FILES="$CONFIG_FILES popt/.stamp-conf" ;; -- "lzo/.stamp-conf" ) CONFIG_FILES="$CONFIG_FILES lzo/.stamp-conf" ;; -- "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;; -+ case $ac_config_target in -+ "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;; -+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ "popt/.stamp-conf") CONFIG_FILES="$CONFIG_FILES popt/.stamp-conf" ;; -+ "lzo/.stamp-conf") CONFIG_FILES="$CONFIG_FILES lzo/.stamp-conf" ;; -+ - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac - done - -+ - # If the user did not use the arguments to specify the items to instantiate, - # then the envvar interface is used. Set only those that are not. - # We use the long form for the default assignment because of an extremely -@@ -7789,569 +8293,525 @@ - fi - - # Have a temporary directory for convenience. Make it in the build tree --# simply because there is no reason to put it here, and in addition, -+# simply because there is no reason against having it here, and in addition, - # creating and moving files from /tmp can sometimes cause problems. --# Create a temporary directory, and hook for its removal unless debugging. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to `$tmp'. - $debug || - { -- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -+ tmp= -+ trap 'exit_status=$? -+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -+' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 - } -- - # Create a (secure) tmp directory for tmp files. - - { -- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" - } || - { -- tmp=./confstat$$-$RANDOM -- (umask 077 && mkdir $tmp) -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") - } || - { - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } - } - --_ACEOF -- --cat >>$CONFIG_STATUS <<_ACEOF -- - # --# CONFIG_FILES section. -+# Set up the sed scripts for CONFIG_FILES section. - # - - # No need to generate the scripts if there are no CONFIG_FILES. - # This happens for instance when ./config.status config.h --if test -n "\$CONFIG_FILES"; then -- # Protect against being on the right side of a sed subst in config.status. -- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; -- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF --s,@SHELL@,$SHELL,;t t --s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t --s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t --s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t --s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t --s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t --s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t --s,@exec_prefix@,$exec_prefix,;t t --s,@prefix@,$prefix,;t t --s,@program_transform_name@,$program_transform_name,;t t --s,@bindir@,$bindir,;t t --s,@sbindir@,$sbindir,;t t --s,@libexecdir@,$libexecdir,;t t --s,@datadir@,$datadir,;t t --s,@sysconfdir@,$sysconfdir,;t t --s,@sharedstatedir@,$sharedstatedir,;t t --s,@localstatedir@,$localstatedir,;t t --s,@libdir@,$libdir,;t t --s,@includedir@,$includedir,;t t --s,@oldincludedir@,$oldincludedir,;t t --s,@infodir@,$infodir,;t t --s,@mandir@,$mandir,;t t --s,@build_alias@,$build_alias,;t t --s,@host_alias@,$host_alias,;t t --s,@target_alias@,$target_alias,;t t --s,@DEFS@,$DEFS,;t t --s,@ECHO_C@,$ECHO_C,;t t --s,@ECHO_N@,$ECHO_N,;t t --s,@ECHO_T@,$ECHO_T,;t t --s,@LIBS@,$LIBS,;t t --s,@build@,$build,;t t --s,@build_cpu@,$build_cpu,;t t --s,@build_vendor@,$build_vendor,;t t --s,@build_os@,$build_os,;t t --s,@host@,$host,;t t --s,@host_cpu@,$host_cpu,;t t --s,@host_vendor@,$host_vendor,;t t --s,@host_os@,$host_os,;t t --s,@docdir@,$docdir,;t t --s,@CC@,$CC,;t t --s,@CFLAGS@,$CFLAGS,;t t --s,@LDFLAGS@,$LDFLAGS,;t t --s,@CPPFLAGS@,$CPPFLAGS,;t t --s,@ac_ct_CC@,$ac_ct_CC,;t t --s,@EXEEXT@,$EXEEXT,;t t --s,@OBJEXT@,$OBJEXT,;t t --s,@GNOME_PACKAGES@,$GNOME_PACKAGES,;t t --s,@GNOME_CFLAGS@,$GNOME_CFLAGS,;t t --s,@GNOME_LIBS@,$GNOME_LIBS,;t t --s,@INSTALL_GNOME@,$INSTALL_GNOME,;t t --s,@SET_MAKE@,$SET_MAKE,;t t --s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t --s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t --s,@INSTALL_DATA@,$INSTALL_DATA,;t t --s,@PYTHON@,$PYTHON,;t t --s,@CPP@,$CPP,;t t --s,@EGREP@,$EGREP,;t t --s,@BUILD_POPT@,$BUILD_POPT,;t t --s,@GNOME_BIN@,$GNOME_BIN,;t t --s,@LIBOBJS@,$LIBOBJS,;t t --s,@LTLIBOBJS@,$LTLIBOBJS,;t t --CEOF -- --_ACEOF -- -- cat >>$CONFIG_STATUS <<\_ACEOF -- # Split the substitutions into bite-sized pieces for seds with -- # small command number limits, like on Digital OSF/1 and HP-UX. -- ac_max_sed_lines=48 -- ac_sed_frag=1 # Number of current file. -- ac_beg=1 # First line for current file. -- ac_end=$ac_max_sed_lines # Line after last line for current file. -- ac_more_lines=: -- ac_sed_cmds= -- while $ac_more_lines; do -- if test $ac_beg -gt 1; then -- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- else -- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- fi -- if test ! -s $tmp/subs.frag; then -- ac_more_lines=false -- else -- # The purpose of the label and of the branching condition is to -- # speed up the sed processing (if there are no `@' at all, there -- # is no need to browse any of the substitutions). -- # These are the two extra sed commands mentioned above. -- (echo ':t -- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -- else -- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -- fi -- ac_sed_frag=`expr $ac_sed_frag + 1` -- ac_beg=$ac_end -- ac_end=`expr $ac_end + $ac_max_sed_lines` -- fi -- done -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds=cat -+if test -n "$CONFIG_FILES"; then -+ -+_ACEOF -+ -+ -+ -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+SHELL!$SHELL$ac_delim -+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -+PACKAGE_NAME!$PACKAGE_NAME$ac_delim -+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -+PACKAGE_STRING!$PACKAGE_STRING$ac_delim -+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -+exec_prefix!$exec_prefix$ac_delim -+prefix!$prefix$ac_delim -+program_transform_name!$program_transform_name$ac_delim -+bindir!$bindir$ac_delim -+sbindir!$sbindir$ac_delim -+libexecdir!$libexecdir$ac_delim -+datarootdir!$datarootdir$ac_delim -+datadir!$datadir$ac_delim -+sysconfdir!$sysconfdir$ac_delim -+sharedstatedir!$sharedstatedir$ac_delim -+localstatedir!$localstatedir$ac_delim -+includedir!$includedir$ac_delim -+oldincludedir!$oldincludedir$ac_delim -+docdir!$docdir$ac_delim -+infodir!$infodir$ac_delim -+htmldir!$htmldir$ac_delim -+dvidir!$dvidir$ac_delim -+pdfdir!$pdfdir$ac_delim -+psdir!$psdir$ac_delim -+libdir!$libdir$ac_delim -+localedir!$localedir$ac_delim -+mandir!$mandir$ac_delim -+DEFS!$DEFS$ac_delim -+ECHO_C!$ECHO_C$ac_delim -+ECHO_N!$ECHO_N$ac_delim -+ECHO_T!$ECHO_T$ac_delim -+LIBS!$LIBS$ac_delim -+build_alias!$build_alias$ac_delim -+host_alias!$host_alias$ac_delim -+target_alias!$target_alias$ac_delim -+build!$build$ac_delim -+build_cpu!$build_cpu$ac_delim -+build_vendor!$build_vendor$ac_delim -+build_os!$build_os$ac_delim -+host!$host$ac_delim -+host_cpu!$host_cpu$ac_delim -+host_vendor!$host_vendor$ac_delim -+host_os!$host_os$ac_delim -+CC!$CC$ac_delim -+CFLAGS!$CFLAGS$ac_delim -+LDFLAGS!$LDFLAGS$ac_delim -+CPPFLAGS!$CPPFLAGS$ac_delim -+ac_ct_CC!$ac_ct_CC$ac_delim -+EXEEXT!$EXEEXT$ac_delim -+OBJEXT!$OBJEXT$ac_delim -+GNOME_PACKAGES!$GNOME_PACKAGES$ac_delim -+GNOME_CFLAGS!$GNOME_CFLAGS$ac_delim -+GNOME_LIBS!$GNOME_LIBS$ac_delim -+INSTALL_GNOME!$INSTALL_GNOME$ac_delim -+SET_MAKE!$SET_MAKE$ac_delim -+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -+INSTALL_DATA!$INSTALL_DATA$ac_delim -+PYTHON!$PYTHON$ac_delim -+CPP!$CPP$ac_delim -+GREP!$GREP$ac_delim -+EGREP!$EGREP$ac_delim -+PKG_CONFIG!$PKG_CONFIG$ac_delim -+AVAHI_CFLAGS!$AVAHI_CFLAGS$ac_delim -+AVAHI_LIBS!$AVAHI_LIBS$ac_delim -+ZEROCONF_DISTCC_OBJS!$ZEROCONF_DISTCC_OBJS$ac_delim -+ZEROCONF_DISTCCD_OBJS!$ZEROCONF_DISTCCD_OBJS$ac_delim -+BUILD_POPT!$BUILD_POPT$ac_delim -+GNOME_BIN!$GNOME_BIN$ac_delim -+LIBOBJS!$LIBOBJS$ac_delim -+LTLIBOBJS!$LTLIBOBJS$ac_delim -+_ACEOF -+ -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then -+ break -+ elif $ac_last_try; then -+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi --fi # test -n "$CONFIG_FILES" -+done -+ -+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -+if test -n "$ac_eof"; then -+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` -+ ac_eof=`expr $ac_eof + 1` -+fi - -+cat >>$CONFIG_STATUS <<_ACEOF -+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end - _ACEOF -+sed ' -+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -+s/^/s,@/; s/!/@,|#_!!_#|/ -+:n -+t n -+s/'"$ac_delim"'$/,g/; t -+s/$/\\/; p -+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -+' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -+:end -+s/|#_!!_#|//g -+CEOF$ac_eof -+_ACEOF -+ -+ -+# VPATH may cause trouble with some makes, so we remove $(srcdir), -+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -+# trailing colons and then remove the whole line if VPATH becomes empty -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=/{ -+s/:*\$(srcdir):*/:/ -+s/:*\${srcdir}:*/:/ -+s/:*@srcdir@:*/:/ -+s/^\([^=]*=[ ]*\):*/\1/ -+s/:*$// -+s/^[^=]*=[ ]*$// -+}' -+fi -+ - cat >>$CONFIG_STATUS <<\_ACEOF --for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -+fi # test -n "$CONFIG_FILES" -+ -+ -+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; - esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -+echo "$as_me: error: Invalid tag $ac_tag." >&2;} -+ { (exit 1); exit 1; }; };; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -+ esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift -+ -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain `:'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -+echo "$as_me: error: cannot find input file: $ac_f" >&2;} -+ { (exit 1); exit 1; }; };; -+ esac -+ ac_file_inputs="$ac_file_inputs $ac_f" -+ done - -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`(dirname "$ac_file") 2>/dev/null || -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ configure_input="Generated from "`IFS=: -+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { echo "$as_me:$LINENO: creating $ac_file" >&5 -+echo "$as_me: creating $ac_file" >&6;} -+ fi -+ -+ case $ac_tag in -+ *:-:* | *:-) cat >"$tmp/stdin";; -+ esac -+ ;; -+ esac -+ -+ ac_dir=`$as_dirname -- "$ac_file" || - $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || - echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ { as_dir="$ac_dir" -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || - $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || - echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break - done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } -- - ac_builddir=. - --if test "$ac_dir" != .; then -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; --esac - -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; -+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac -+_ACEOF - -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- configure_input= -- else -- configure_input="$ac_file. " -- fi -- configure_input=$configure_input"Generated from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -- -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- echo "$f";; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo "$f" -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo "$srcdir/$f" -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -- -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi -+cat >>$CONFIG_STATUS <<\_ACEOF -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= -+ -+case `sed -n '/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p -+' $ac_file_inputs` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF -+ ac_datarootdir_hack=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac -+_ACEOF -+ -+# Neutralize VPATH when `$srcdir' = `.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? -+cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub - $extrasub - _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF - :t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s,@configure_input@,$configure_input,;t t --s,@srcdir@,$ac_srcdir,;t t --s,@abs_srcdir@,$ac_abs_srcdir,;t t --s,@top_srcdir@,$ac_top_srcdir,;t t --s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t --s,@builddir@,$ac_builddir,;t t --s,@abs_builddir@,$ac_abs_builddir,;t t --s,@top_builddir@,$ac_top_builddir,;t t --s,@abs_top_builddir@,$ac_abs_top_builddir,;t t --s,@INSTALL@,$ac_INSTALL,;t t --" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out -- rm -f $tmp/stdin -- if test x"$ac_file" != x-; then -- mv $tmp/out $ac_file -- else -- cat $tmp/out -- rm -f $tmp/out -- fi -- --done --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -- --# --# CONFIG_HEADER section. --# -- --# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where --# NAME is the cpp macro being defined and VALUE is the value it is being given. --# --# ac_d sets the value in "#define NAME VALUE" lines. --ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' --ac_dB='[ ].*$,\1#\2' --ac_dC=' ' --ac_dD=',;t' --# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". --ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' --ac_uB='$,\1#\2define\3' --ac_uC=' ' --ac_uD=',;t' -+s&@configure_input@&$configure_input&;t t -+s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@srcdir@&$ac_srcdir&;t t -+s&@abs_srcdir@&$ac_abs_srcdir&;t t -+s&@top_srcdir@&$ac_top_srcdir&;t t -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -+s&@builddir@&$ac_builddir&;t t -+s&@abs_builddir@&$ac_abs_builddir&;t t -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+s&@INSTALL@&$ac_INSTALL&;t t -+$ac_datarootdir_hack -+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out -+ -+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&5 -+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&2;} - --for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -+ rm -f "$tmp/stdin" - case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -+ -) cat "$tmp/out"; rm -f "$tmp/out";; -+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac -+ ;; -+ :H) -+ # -+ # CONFIG_HEADER -+ # -+_ACEOF -+ -+# Transform confdefs.h into a sed script `conftest.defines', that -+# substitutes the proper values into config.h.in to produce config.h. -+rm -f conftest.defines conftest.tail -+# First, append a space to every undef/define line, to ease matching. -+echo 's/$/ /' >conftest.defines -+# Then, protect against being on the right side of a sed subst, or in -+# an unquoted here document, in config.status. If some macros were -+# called several times there might be several #defines for the same -+# symbol, which is useless. But do not sort them, since the last -+# AC_DEFINE must be honored. -+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -+# NAME is the cpp macro being defined, VALUE is the value it is being given. -+# PARAMS is the parameter list in the macro definition--in most cases, it's -+# just an empty string. -+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -+ac_dB='\\)[ (].*,\\1define\\2' -+ac_dC=' ' -+ac_dD=' ,' - -- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- # Do quote $f, to prevent DOS paths from being IFS'd. -- echo "$f";; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo "$f" -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo "$srcdir/$f" -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -- # Remove the trailing spaces. -- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in -- --_ACEOF -- --# Transform confdefs.h into two sed scripts, `conftest.defines' and --# `conftest.undefs', that substitutes the proper values into --# config.h.in to produce config.h. The first handles `#define' --# templates, and the second `#undef' templates. --# And first: Protect against being on the right side of a sed subst in --# config.status. Protect against being in an unquoted here document --# in config.status. --rm -f conftest.defines conftest.undefs --# Using a here document instead of a string reduces the quoting nightmare. --# Putting comments in sed scripts is not portable. --# --# `end' is used to avoid that the second main sed command (meant for --# 0-ary CPP macros) applies to n-ary macro definitions. --# See the Autoconf documentation for `clear'. --cat >confdef2sed.sed <<\_ACEOF --s/[\\&,]/\\&/g --s,[\\$`],\\&,g --t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp --t end --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp --: end --_ACEOF --# If some macros were called several times there might be several times --# the same #defines, which is useless. Nevertheless, we may not want to --# sort them, since we want the *last* AC-DEFINE to be honored. --uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines --sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs --rm -f confdef2sed.sed -+uniq confdefs.h | -+ sed -n ' -+ t rset -+ :rset -+ s/^[ ]*#[ ]*define[ ][ ]*// -+ t ok -+ d -+ :ok -+ s/[\\&,]/\\&/g -+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p -+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p -+ ' >>conftest.defines - --# This sed command replaces #undef with comments. This is necessary, for -+# Remove the space that was appended to ease matching. -+# Then replace #undef with comments. This is necessary, for - # example, in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. --cat >>conftest.undefs <<\_ACEOF --s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -+# (The regexp can be short, since the line contains either #define or #undef.) -+echo 's/ $// -+s,^[ #]*u.*,/* & */,' >>conftest.defines -+ -+# Break up conftest.defines: -+ac_max_sed_lines=50 -+ -+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -+# et cetera. -+ac_in='$ac_file_inputs' -+ac_out='"$tmp/out1"' -+ac_nxt='"$tmp/out2"' -+ -+while : -+do -+ # Write a here document: -+ cat >>$CONFIG_STATUS <<_ACEOF -+ # First, check the format of the line: -+ cat >"\$tmp/defines.sed" <<\\CEOF -+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -+b -+:def - _ACEOF -- --# Break up conftest.defines because some shells have a limit on the size --# of here documents, and old seds have small limits too (100 cmds). --echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS --echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS --echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS --echo ' :' >>$CONFIG_STATUS --rm -f conftest.tail --while grep . conftest.defines >/dev/null --do -- # Write a limited-size here document to $tmp/defines.sed. -- echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS -- # Speed up: don't consider the non `#define' lines. -- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS -- # Work around the forget-to-reset-the-flag bug. -- echo 't clr' >>$CONFIG_STATUS -- echo ': clr' >>$CONFIG_STATUS -- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS -+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF -- sed -f $tmp/defines.sed $tmp/in >$tmp/out -- rm -f $tmp/in -- mv $tmp/out $tmp/in --' >>$CONFIG_STATUS -- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail -+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS -+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in -+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail -+ grep . conftest.tail >/dev/null || break - rm -f conftest.defines - mv conftest.tail conftest.defines - done --rm -f conftest.defines --echo ' fi # grep' >>$CONFIG_STATUS --echo >>$CONFIG_STATUS -- --# Break up conftest.undefs because some shells have a limit on the size --# of here documents, and old seds have small limits too (100 cmds). --echo ' # Handle all the #undef templates' >>$CONFIG_STATUS --rm -f conftest.tail --while grep . conftest.undefs >/dev/null --do -- # Write a limited-size here document to $tmp/undefs.sed. -- echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS -- # Speed up: don't consider the non `#undef' -- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS -- # Work around the forget-to-reset-the-flag bug. -- echo 't clr' >>$CONFIG_STATUS -- echo ': clr' >>$CONFIG_STATUS -- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS -- echo 'CEOF -- sed -f $tmp/undefs.sed $tmp/in >$tmp/out -- rm -f $tmp/in -- mv $tmp/out $tmp/in --' >>$CONFIG_STATUS -- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail -- rm -f conftest.undefs -- mv conftest.tail conftest.undefs --done --rm -f conftest.undefs -+rm -f conftest.defines conftest.tail - -+echo "ac_result=$ac_in" >>$CONFIG_STATUS - cat >>$CONFIG_STATUS <<\_ACEOF -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- echo "/* Generated by configure. */" >$tmp/config.h -- else -- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h -- fi -- cat $tmp/in >>$tmp/config.h -- rm -f $tmp/in - if test x"$ac_file" != x-; then -- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then -+ echo "/* $configure_input */" >"$tmp/config.h" -+ cat "$ac_result" >>"$tmp/config.h" -+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 - echo "$as_me: $ac_file is unchanged" >&6;} - else -- ac_dir=`(dirname "$ac_file") 2>/dev/null || --$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -- - rm -f $ac_file -- mv $tmp/config.h $ac_file -+ mv "$tmp/config.h" $ac_file - fi - else -- cat $tmp/config.h -- rm -f $tmp/config.h -+ echo "/* $configure_input */" -+ cat "$ac_result" - fi --done --_ACEOF -+ rm -f "$tmp/out12" -+ ;; -+ -+ -+ esac -+ -+done # for ac_tag - --cat >>$CONFIG_STATUS <<\_ACEOF - - { (exit 0); exit 0; } - _ACEOF diff --git a/distcc-minilzo-2.08.patch b/distcc-minilzo-2.08.patch deleted file mode 100644 index 3a47d6b..0000000 --- a/distcc-minilzo-2.08.patch +++ /dev/null @@ -1,11811 +0,0 @@ -commit 09641d0032b54aa21e3648f3c0d718b0c6ef80d5 -Author: mandyke@gmail.com -Date: Tue Jul 29 05:42:25 2014 +0000 - - lzo: Update to 2.08 - - Fixes issue 142 - - git-svn-id: http://distcc.googlecode.com/svn/trunk@795 01de4be4-8c4a-0410-9132-4925637da917 - -diff --git a/Makefile.in b/Makefile.in -index bb309a2..b398bc8 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -118,7 +118,11 @@ dist_files = \ - - dist_dirs = m4 include_server/test_data - --dist_lzo = lzo/minilzo.c lzo/minilzo.h lzo/lzoconf.h lzo/.stamp-conf.in -+dist_lzo = lzo/minilzo.c \ -+ lzo/minilzo.h \ -+ lzo/lzoconf.h \ -+ lzo/lzodefs.h \ -+ lzo/.stamp-conf.in - - dist_contrib = contrib/distcc-absolutify \ - contrib/distcc.sh \ -diff --git a/configure.ac b/configure.ac -index 5847948..d795edc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -224,6 +224,9 @@ AC_ISC_POSIX - # variadic macros. If we can disable it, do so. - - -+# This is needed for our included version of lzo. -+CPPFLAGS="$CPPFLAGS -DMINILZO_HAVE_CONFIG_H" -+ - # This is needed for our included version of popt. - # TODO(csilvers): figure out what that above comment means, and if it's true. - CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H" -diff --git a/lzo/README.LZO b/lzo/README.LZO -new file mode 100644 -index 0000000..83e10e3 ---- /dev/null -+++ b/lzo/README.LZO -@@ -0,0 +1,123 @@ -+ -+ ============================================================================ -+ miniLZO -- mini subset of the LZO real-time data compression library -+ ============================================================================ -+ -+ Author : Markus Franz Xaver Johannes Oberhumer -+ -+ http://www.oberhumer.com/opensource/lzo/ -+ Version : 2.08 -+ Date : 29 Jun 2014 -+ -+ I've created miniLZO for projects where it is inconvenient to -+ include (or require) the full LZO source code just because you -+ want to add a little bit of data compression to your application. -+ -+ miniLZO implements the LZO1X-1 compressor and both the standard and -+ safe LZO1X decompressor. Apart from fast compression it also useful -+ for situations where you want to use pre-compressed data files (which -+ must have been compressed with LZO1X-999). -+ -+ miniLZO consists of one C source file and three header files: -+ minilzo.c -+ minilzo.h, lzoconf.h, lzodefs.h -+ -+ To use miniLZO just copy these files into your source directory, add -+ minilzo.c to your Makefile and #include minilzo.h from your program. -+ Note: you also must distribute this file ('README.LZO') with your project. -+ -+ minilzo.o compiles to about 6 KiB (using gcc or Visual C on an i386), and -+ the sources are about 30 KiB when packed with zip - so there's no more -+ excuse that your application doesn't support data compression :-) -+ -+ For more information, documentation, example programs and other support -+ files (like Makefiles and build scripts) please download the full LZO -+ package from -+ http://www.oberhumer.com/opensource/lzo/ -+ -+ Have fun, -+ Markus -+ -+ -+ P.S. minilzo.c is generated automatically from the LZO sources and -+ therefore functionality is completely identical -+ -+ -+ Appendix A: building miniLZO -+ ---------------------------- -+ miniLZO is written such a way that it should compile and run -+ out-of-the-box on most machines. -+ -+ If you are running on a very unusual architecture and lzo_init() fails then -+ you should first recompile with '-DLZO_DEBUG' to see what causes the failure. -+ The most probable case is something like 'sizeof(void *) != sizeof(size_t)'. -+ After identifying the problem you can compile by adding some defines -+ like '-DSIZEOF_VOID_P=8' to your Makefile. -+ -+ The best solution is (of course) using Autoconf - if your project uses -+ Autoconf anyway just add '-DMINILZO_HAVE_CONFIG_H' to your compiler -+ flags when compiling minilzo.c. See the LZO distribution for an example -+ how to set up configure.ac. -+ -+ -+ Appendix B: list of public functions available in miniLZO -+ --------------------------------------------------------- -+ Library initialization -+ lzo_init() -+ -+ Compression -+ lzo1x_1_compress() -+ -+ Decompression -+ lzo1x_decompress() -+ lzo1x_decompress_safe() -+ -+ Checksum functions -+ lzo_adler32() -+ -+ Version functions -+ lzo_version() -+ lzo_version_string() -+ lzo_version_date() -+ -+ Portable (but slow) string functions -+ lzo_memcmp() -+ lzo_memcpy() -+ lzo_memmove() -+ lzo_memset() -+ -+ -+ Appendix C: suggested macros for 'configure.ac' when using Autoconf -+ ------------------------------------------------------------------- -+ Checks for typedefs and structures -+ AC_CHECK_TYPE(ptrdiff_t,long) -+ AC_TYPE_SIZE_T -+ AC_CHECK_SIZEOF(short) -+ AC_CHECK_SIZEOF(int) -+ AC_CHECK_SIZEOF(long) -+ AC_CHECK_SIZEOF(long long) -+ AC_CHECK_SIZEOF(__int64) -+ AC_CHECK_SIZEOF(void *) -+ AC_CHECK_SIZEOF(size_t) -+ AC_CHECK_SIZEOF(ptrdiff_t) -+ -+ Checks for compiler characteristics -+ AC_C_CONST -+ -+ Checks for library functions -+ AC_CHECK_FUNCS(memcmp memcpy memmove memset) -+ -+ -+ Appendix D: Copyright -+ --------------------- -+ LZO and miniLZO are Copyright (C) 1996-2014 Markus Franz Xaver Oberhumer -+ All Rights Reserved. -+ -+ LZO and miniLZO are distributed under the terms of the GNU General -+ Public License (GPL). See the file COPYING. -+ -+ Special licenses for commercial and other applications which -+ are not willing to accept the GNU General Public License -+ are available by contacting the author. -+ -+ -diff --git a/lzo/lzoconf.h b/lzo/lzoconf.h -index 96db180..61be29c 100644 ---- a/lzo/lzoconf.h -+++ b/lzo/lzoconf.h -@@ -1,14 +1,8 @@ --/* lzoconf.h -- configuration for the LZO real-time data compression library -+/* lzoconf.h -- configuration of the LZO data compression library - - This file is part of the LZO real-time data compression library. - -- 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 -+ Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer - All Rights Reserved. - - The LZO library is free software; you can redistribute it and/or -@@ -24,7 +18,7 @@ - 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., -- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - Markus F.X.J. Oberhumer - -@@ -32,22 +26,19 @@ - */ - - --#ifndef __LZOCONF_H --#define __LZOCONF_H -+#ifndef __LZOCONF_H_INCLUDED -+#define __LZOCONF_H_INCLUDED 1 - --#define LZO_VERSION 0x1080 --#define LZO_VERSION_STRING "1.08" --#define LZO_VERSION_DATE "Jul 12 2002" -+#define LZO_VERSION 0x2080 -+#define LZO_VERSION_STRING "2.08" -+#define LZO_VERSION_DATE "Jun 29 2014" - - /* internal Autoconf configuration file - only used when building LZO */ - #if defined(LZO_HAVE_CONFIG_H) - # include - #endif - #include -- --#ifdef __cplusplus --extern "C" { --#endif -+#include - - - /*********************************************************************** -@@ -57,88 +48,38 @@ extern "C" { - #if !defined(CHAR_BIT) || (CHAR_BIT != 8) - # error "invalid CHAR_BIT" - #endif --#if !defined(UCHAR_MAX) || !defined(UINT_MAX) || !defined(ULONG_MAX) -+#if !defined(UCHAR_MAX) || !defined(USHRT_MAX) || !defined(UINT_MAX) || !defined(ULONG_MAX) - # error "check your compiler installation" - #endif - #if (USHRT_MAX < 1) || (UINT_MAX < 1) || (ULONG_MAX < 1) - # error "your limits.h macros are broken" - #endif - --/* workaround a cpp bug under hpux 10.20 */ --#define LZO_0xffffffffL 4294967295ul -- --#if !defined(LZO_UINT32_C) --# if (UINT_MAX < LZO_0xffffffffL) --# define LZO_UINT32_C(c) c ## UL --# else --# define LZO_UINT32_C(c) c ## U --# endif -+/* get OS and architecture defines */ -+#ifndef __LZODEFS_H_INCLUDED -+#include "lzodefs.h" - #endif - - --/*********************************************************************** --// architecture defines --************************************************************************/ -- --#if !defined(__LZO_WIN) && !defined(__LZO_DOS) && !defined(__LZO_OS2) --# if defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows) --# define __LZO_WIN --# elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32) --# define __LZO_WIN --# elif defined(__NT__) || defined(__NT_DLL__) || defined(__WINDOWS_386__) --# define __LZO_WIN --# elif defined(__DOS__) || defined(__MSDOS__) || defined(MSDOS) --# define __LZO_DOS --# elif defined(__OS2__) || defined(__OS2V2__) || defined(OS2) --# define __LZO_OS2 --# elif defined(__palmos__) --# define __LZO_PALMOS --# elif defined(__TOS__) || defined(__atarist__) --# define __LZO_TOS --# endif --#endif -- --#if (UINT_MAX < LZO_0xffffffffL) --# if defined(__LZO_WIN) --# define __LZO_WIN16 --# elif defined(__LZO_DOS) --# define __LZO_DOS16 --# elif defined(__LZO_PALMOS) --# define __LZO_PALMOS16 --# elif defined(__LZO_TOS) --# define __LZO_TOS16 --# elif defined(__C166__) --# else -- /* porting hint: for pure 16-bit architectures try compiling -- * everything with -D__LZO_STRICT_16BIT */ --# error "16-bit target not supported - contact me for porting hints" --# endif -+#ifdef __cplusplus -+extern "C" { - #endif - --#if !defined(__LZO_i386) --# if defined(__LZO_DOS) || defined(__LZO_WIN16) --# define __LZO_i386 --# elif defined(__i386__) || defined(__386__) || defined(_M_IX86) --# define __LZO_i386 --# endif --#endif - --#if defined(__LZO_STRICT_16BIT) --# if (UINT_MAX < LZO_0xffffffffL) --# include --# endif --#endif -+/*********************************************************************** -+// some core defines -+************************************************************************/ - - /* memory checkers */ - #if !defined(__LZO_CHECKER) - # if defined(__BOUNDS_CHECKING_ON) --# define __LZO_CHECKER -+# define __LZO_CHECKER 1 - # elif defined(__CHECKER__) --# define __LZO_CHECKER -+# define __LZO_CHECKER 1 - # elif defined(__INSURE__) --# define __LZO_CHECKER -+# define __LZO_CHECKER 1 - # elif defined(__PURIFY__) --# define __LZO_CHECKER -+# define __LZO_CHECKER 1 - # endif - #endif - -@@ -147,36 +88,31 @@ extern "C" { - // integral and pointer types - ************************************************************************/ - --/* Integral types with 32 bits or more */ --#if !defined(LZO_UINT32_MAX) --# if (UINT_MAX >= LZO_0xffffffffL) -- typedef unsigned int lzo_uint32; -- typedef int lzo_int32; --# define LZO_UINT32_MAX UINT_MAX --# define LZO_INT32_MAX INT_MAX --# define LZO_INT32_MIN INT_MIN --# elif (ULONG_MAX >= LZO_0xffffffffL) -- typedef unsigned long lzo_uint32; -- typedef long lzo_int32; --# define LZO_UINT32_MAX ULONG_MAX --# define LZO_INT32_MAX LONG_MAX --# define LZO_INT32_MIN LONG_MIN --# else --# error "lzo_uint32" --# endif --#endif -- --/* lzo_uint is used like size_t */ -+/* lzo_uint must match size_t */ - #if !defined(LZO_UINT_MAX) --# if (UINT_MAX >= LZO_0xffffffffL) -+# if (LZO_ABI_LLP64) -+# if (LZO_OS_WIN64) -+ typedef unsigned __int64 lzo_uint; -+ typedef __int64 lzo_int; -+# else -+ typedef lzo_ullong_t lzo_uint; -+ typedef lzo_llong_t lzo_int; -+# endif -+# define LZO_SIZEOF_LZO_UINT 8 -+# define LZO_UINT_MAX 0xffffffffffffffffull -+# define LZO_INT_MAX 9223372036854775807LL -+# define LZO_INT_MIN (-1LL - LZO_INT_MAX) -+# elif (LZO_ABI_IP32L64) /* MIPS R5900 */ - typedef unsigned int lzo_uint; - typedef int lzo_int; -+# define LZO_SIZEOF_LZO_UINT LZO_SIZEOF_INT - # define LZO_UINT_MAX UINT_MAX - # define LZO_INT_MAX INT_MAX - # define LZO_INT_MIN INT_MIN - # elif (ULONG_MAX >= LZO_0xffffffffL) - typedef unsigned long lzo_uint; - typedef long lzo_int; -+# define LZO_SIZEOF_LZO_UINT LZO_SIZEOF_LONG - # define LZO_UINT_MAX ULONG_MAX - # define LZO_INT_MAX LONG_MAX - # define LZO_INT_MIN LONG_MIN -@@ -185,73 +121,83 @@ extern "C" { - # endif - #endif - --typedef int lzo_bool; -- -- --/*********************************************************************** --// memory models --************************************************************************/ -- --/* Memory model for the public code segment. */ --#if !defined(__LZO_CMODEL) --# if defined(__LZO_DOS16) || defined(__LZO_WIN16) --# define __LZO_CMODEL __far --# elif defined(__LZO_i386) && defined(__WATCOMC__) --# define __LZO_CMODEL __near --# else --# define __LZO_CMODEL --# endif -+/* The larger type of lzo_uint and lzo_uint32_t. */ -+#if (LZO_SIZEOF_LZO_UINT >= 4) -+# define lzo_xint lzo_uint -+#else -+# define lzo_xint lzo_uint32_t - #endif - --/* Memory model for the public data segment. */ --#if !defined(__LZO_DMODEL) --# if defined(__LZO_DOS16) || defined(__LZO_WIN16) --# define __LZO_DMODEL __far --# elif defined(__LZO_i386) && defined(__WATCOMC__) --# define __LZO_DMODEL __near --# else --# define __LZO_DMODEL --# endif --#endif -+typedef int lzo_bool; - --/* Memory model that allows to access memory at offsets of lzo_uint. */ --#if !defined(__LZO_MMODEL) --# if (LZO_UINT_MAX <= UINT_MAX) --# define __LZO_MMODEL --# elif defined(__LZO_DOS16) || defined(__LZO_WIN16) --# define __LZO_MMODEL __huge --# define LZO_999_UNSUPPORTED --# elif defined(__LZO_PALMOS16) || defined(__LZO_TOS16) --# define __LZO_MMODEL --# else --# error "__LZO_MMODEL" --# endif -+/* sanity checks */ -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) == LZO_SIZEOF_LZO_UINT) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_xint) >= sizeof(lzo_uint)) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_xint) >= sizeof(lzo_uint32_t)) -+ -+#ifndef __LZO_MMODEL -+#define __LZO_MMODEL /*empty*/ - #endif - - /* no typedef here because of const-pointer issues */ --#define lzo_byte unsigned char __LZO_MMODEL - #define lzo_bytep unsigned char __LZO_MMODEL * - #define lzo_charp char __LZO_MMODEL * - #define lzo_voidp void __LZO_MMODEL * - #define lzo_shortp short __LZO_MMODEL * - #define lzo_ushortp unsigned short __LZO_MMODEL * --#define lzo_uint32p lzo_uint32 __LZO_MMODEL * --#define lzo_int32p lzo_int32 __LZO_MMODEL * --#define lzo_uintp lzo_uint __LZO_MMODEL * - #define lzo_intp lzo_int __LZO_MMODEL * -+#define lzo_uintp lzo_uint __LZO_MMODEL * -+#define lzo_xintp lzo_xint __LZO_MMODEL * - #define lzo_voidpp lzo_voidp __LZO_MMODEL * - #define lzo_bytepp lzo_bytep __LZO_MMODEL * - --#ifndef lzo_sizeof_dict_t --# define lzo_sizeof_dict_t sizeof(lzo_bytep) -+#define lzo_int8_tp lzo_int8_t __LZO_MMODEL * -+#define lzo_uint8_tp lzo_uint8_t __LZO_MMODEL * -+#define lzo_int16_tp lzo_int16_t __LZO_MMODEL * -+#define lzo_uint16_tp lzo_uint16_t __LZO_MMODEL * -+#define lzo_int32_tp lzo_int32_t __LZO_MMODEL * -+#define lzo_uint32_tp lzo_uint32_t __LZO_MMODEL * -+#if defined(lzo_int64_t) -+#define lzo_int64_tp lzo_int64_t __LZO_MMODEL * -+#define lzo_uint64_tp lzo_uint64_t __LZO_MMODEL * - #endif - -+/* Older LZO versions used to support ancient systems and memory models -+ * like 16-bit MSDOS with __huge pointers and Cray PVP, but these -+ * obsolete configurations are not supported any longer. -+ */ -+#if defined(__LZO_MMODEL_HUGE) -+#error "__LZO_MMODEL_HUGE is unsupported" -+#endif -+#if (LZO_MM_PVP) -+#error "LZO_MM_PVP is unsupported" -+#endif -+#if (LZO_SIZEOF_INT < 4) -+#error "LZO_SIZEOF_INT < 4 is unsupported" -+#endif -+#if (__LZO_UINTPTR_T_IS_POINTER) -+#error "__LZO_UINTPTR_T_IS_POINTER is unsupported" -+#endif -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(int) >= 4) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) >= 4) -+/* Strange configurations where sizeof(lzo_uint) != sizeof(size_t) should -+ * work but have not received much testing lately, so be strict here. -+ */ -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) == sizeof(size_t)) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) == sizeof(ptrdiff_t)) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint) == sizeof(lzo_uintptr_t)) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(void *) == sizeof(lzo_uintptr_t)) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(char *) == sizeof(lzo_uintptr_t)) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long *) == sizeof(lzo_uintptr_t)) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(void *) == sizeof(lzo_voidp)) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(char *) == sizeof(lzo_bytep)) -+ - - /*********************************************************************** --// calling conventions and function types -+// function types - ************************************************************************/ - --/* linkage */ -+/* name mangling */ - #if !defined(__LZO_EXTERN_C) - # ifdef __cplusplus - # define __LZO_EXTERN_C extern "C" -@@ -262,115 +208,90 @@ typedef int lzo_bool; - - /* calling convention */ - #if !defined(__LZO_CDECL) --# if defined(__LZO_DOS16) || defined(__LZO_WIN16) --# define __LZO_CDECL __LZO_CMODEL __cdecl --# elif defined(__LZO_i386) && defined(_MSC_VER) --# define __LZO_CDECL __LZO_CMODEL __cdecl --# elif defined(__LZO_i386) && defined(__WATCOMC__) --# define __LZO_CDECL __LZO_CMODEL __cdecl --# else --# define __LZO_CDECL __LZO_CMODEL --# endif --#endif --#if !defined(__LZO_ENTRY) --# define __LZO_ENTRY __LZO_CDECL -+# define __LZO_CDECL __lzo_cdecl - #endif - --/* C++ exception specification for extern "C" function types */ --#if !defined(__cplusplus) --# undef LZO_NOTHROW --# define LZO_NOTHROW --#elif !defined(LZO_NOTHROW) --# define LZO_NOTHROW -+/* DLL export information */ -+#if !defined(__LZO_EXPORT1) -+# define __LZO_EXPORT1 /*empty*/ -+#endif -+#if !defined(__LZO_EXPORT2) -+# define __LZO_EXPORT2 /*empty*/ - #endif - -+/* __cdecl calling convention for public C and assembly functions */ -+#if !defined(LZO_PUBLIC) -+# define LZO_PUBLIC(_rettype) __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_CDECL -+#endif -+#if !defined(LZO_EXTERN) -+# define LZO_EXTERN(_rettype) __LZO_EXTERN_C LZO_PUBLIC(_rettype) -+#endif -+#if !defined(LZO_PRIVATE) -+# define LZO_PRIVATE(_rettype) static _rettype __LZO_CDECL -+#endif - -+/* function types */ - typedef int --(__LZO_ENTRY *lzo_compress_t) ( const lzo_byte *src, lzo_uint src_len, -- lzo_byte *dst, lzo_uintp dst_len, -+(__LZO_CDECL *lzo_compress_t) ( const lzo_bytep src, lzo_uint src_len, -+ lzo_bytep dst, lzo_uintp dst_len, - lzo_voidp wrkmem ); - - typedef int --(__LZO_ENTRY *lzo_decompress_t) ( const lzo_byte *src, lzo_uint src_len, -- lzo_byte *dst, lzo_uintp dst_len, -+(__LZO_CDECL *lzo_decompress_t) ( const lzo_bytep src, lzo_uint src_len, -+ lzo_bytep dst, lzo_uintp dst_len, - lzo_voidp wrkmem ); - - typedef int --(__LZO_ENTRY *lzo_optimize_t) ( lzo_byte *src, lzo_uint src_len, -- lzo_byte *dst, lzo_uintp dst_len, -+(__LZO_CDECL *lzo_optimize_t) ( lzo_bytep src, lzo_uint src_len, -+ lzo_bytep dst, lzo_uintp dst_len, - lzo_voidp wrkmem ); - - typedef int --(__LZO_ENTRY *lzo_compress_dict_t)(const lzo_byte *src, lzo_uint src_len, -- lzo_byte *dst, lzo_uintp dst_len, -- lzo_voidp wrkmem, -- const lzo_byte *dict, lzo_uint dict_len ); -+(__LZO_CDECL *lzo_compress_dict_t)(const lzo_bytep src, lzo_uint src_len, -+ lzo_bytep dst, lzo_uintp dst_len, -+ lzo_voidp wrkmem, -+ const lzo_bytep dict, lzo_uint dict_len ); - - typedef int --(__LZO_ENTRY *lzo_decompress_dict_t)(const lzo_byte *src, lzo_uint src_len, -- lzo_byte *dst, lzo_uintp dst_len, -- lzo_voidp wrkmem, -- const lzo_byte *dict, lzo_uint dict_len ); -+(__LZO_CDECL *lzo_decompress_dict_t)(const lzo_bytep src, lzo_uint src_len, -+ lzo_bytep dst, lzo_uintp dst_len, -+ lzo_voidp wrkmem, -+ const lzo_bytep dict, lzo_uint dict_len ); - - --/* assembler versions always use __cdecl */ --typedef int --(__LZO_CDECL *lzo_compress_asm_t)( const lzo_byte *src, lzo_uint src_len, -- lzo_byte *dst, lzo_uintp dst_len, -- lzo_voidp wrkmem ); -+/* Callback interface. Currently only the progress indicator ("nprogress") -+ * is used, but this may change in a future release. */ - --typedef int --(__LZO_CDECL *lzo_decompress_asm_t)( const lzo_byte *src, lzo_uint src_len, -- lzo_byte *dst, lzo_uintp dst_len, -- lzo_voidp wrkmem ); -+struct lzo_callback_t; -+typedef struct lzo_callback_t lzo_callback_t; -+#define lzo_callback_p lzo_callback_t __LZO_MMODEL * - -+/* malloc & free function types */ -+typedef lzo_voidp (__LZO_CDECL *lzo_alloc_func_t) -+ (lzo_callback_p self, lzo_uint items, lzo_uint size); -+typedef void (__LZO_CDECL *lzo_free_func_t) -+ (lzo_callback_p self, lzo_voidp ptr); - - /* a progress indicator callback function */ --typedef void (__LZO_ENTRY *lzo_progress_callback_t) (lzo_uint, lzo_uint); -- -+typedef void (__LZO_CDECL *lzo_progress_func_t) -+ (lzo_callback_p, lzo_uint, lzo_uint, int); - --/*********************************************************************** --// export information --************************************************************************/ -- --/* DLL export information */ --#if !defined(__LZO_EXPORT1) --# define __LZO_EXPORT1 --#endif --#if !defined(__LZO_EXPORT2) --# define __LZO_EXPORT2 --#endif -- --/* exported calling convention for C functions */ --#if !defined(LZO_PUBLIC) --# define LZO_PUBLIC(_rettype) \ -- __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_ENTRY --#endif --#if !defined(LZO_EXTERN) --# define LZO_EXTERN(_rettype) __LZO_EXTERN_C LZO_PUBLIC(_rettype) --#endif --#if !defined(LZO_PRIVATE) --# define LZO_PRIVATE(_rettype) static _rettype __LZO_ENTRY --#endif -+struct lzo_callback_t -+{ -+ /* custom allocators (set to 0 to disable) */ -+ lzo_alloc_func_t nalloc; /* [not used right now] */ -+ lzo_free_func_t nfree; /* [not used right now] */ - --/* exported __cdecl calling convention for assembler functions */ --#if !defined(LZO_PUBLIC_CDECL) --# define LZO_PUBLIC_CDECL(_rettype) \ -- __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_CDECL --#endif --#if !defined(LZO_EXTERN_CDECL) --# define LZO_EXTERN_CDECL(_rettype) __LZO_EXTERN_C LZO_PUBLIC_CDECL(_rettype) --#endif -+ /* a progress indicator callback function (set to 0 to disable) */ -+ lzo_progress_func_t nprogress; - --/* exported global variables (LZO currently uses no static variables and -- * is fully thread safe) */ --#if !defined(LZO_PUBLIC_VAR) --# define LZO_PUBLIC_VAR(_type) \ -- __LZO_EXPORT1 _type __LZO_EXPORT2 __LZO_DMODEL --#endif --#if !defined(LZO_EXTERN_VAR) --# define LZO_EXTERN_VAR(_type) extern LZO_PUBLIC_VAR(_type) --#endif -+ /* INFO: the first parameter "self" of the nalloc/nfree/nprogress -+ * callbacks points back to this struct, so you are free to store -+ * some extra info in the following variables. */ -+ lzo_voidp user1; -+ lzo_xint user2; -+ lzo_xint user3; -+}; - - - /*********************************************************************** -@@ -383,14 +304,23 @@ typedef void (__LZO_ENTRY *lzo_progress_callback_t) (lzo_uint, lzo_uint); - */ - #define LZO_E_OK 0 - #define LZO_E_ERROR (-1) --#define LZO_E_OUT_OF_MEMORY (-2) /* not used right now */ --#define LZO_E_NOT_COMPRESSIBLE (-3) /* not used right now */ -+#define LZO_E_OUT_OF_MEMORY (-2) /* [lzo_alloc_func_t failure] */ -+#define LZO_E_NOT_COMPRESSIBLE (-3) /* [not used right now] */ - #define LZO_E_INPUT_OVERRUN (-4) - #define LZO_E_OUTPUT_OVERRUN (-5) - #define LZO_E_LOOKBEHIND_OVERRUN (-6) - #define LZO_E_EOF_NOT_FOUND (-7) - #define LZO_E_INPUT_NOT_CONSUMED (-8) -+#define LZO_E_NOT_YET_IMPLEMENTED (-9) /* [not used right now] */ -+#define LZO_E_INVALID_ARGUMENT (-10) -+#define LZO_E_INVALID_ALIGNMENT (-11) /* pointer argument is not properly aligned */ -+#define LZO_E_OUTPUT_NOT_CONSUMED (-12) -+#define LZO_E_INTERNAL_ERROR (-99) -+ - -+#ifndef lzo_sizeof_dict_t -+# define lzo_sizeof_dict_t ((unsigned)sizeof(lzo_bytep)) -+#endif - - /* lzo_init() should be the first function you call. - * Check the return code ! -@@ -398,11 +328,11 @@ typedef void (__LZO_ENTRY *lzo_progress_callback_t) (lzo_uint, lzo_uint); - * lzo_init() is a macro to allow checking that the library and the - * compiler's view of various types are consistent. - */ --#define lzo_init() __lzo_init2(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\ -- (int)sizeof(long),(int)sizeof(lzo_uint32),(int)sizeof(lzo_uint),\ -+#define lzo_init() __lzo_init_v2(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\ -+ (int)sizeof(long),(int)sizeof(lzo_uint32_t),(int)sizeof(lzo_uint),\ - (int)lzo_sizeof_dict_t,(int)sizeof(char *),(int)sizeof(lzo_voidp),\ -- (int)sizeof(lzo_compress_t)) --LZO_EXTERN(int) __lzo_init2(unsigned,int,int,int,int,int,int,int,int,int); -+ (int)sizeof(lzo_callback_t)) -+LZO_EXTERN(int) __lzo_init_v2(unsigned,int,int,int,int,int,int,int,int,int); - - /* version functions (useful for shared libraries) */ - LZO_EXTERN(unsigned) lzo_version(void); -@@ -413,34 +343,95 @@ LZO_EXTERN(const lzo_charp) _lzo_version_date(void); - - /* string functions */ - LZO_EXTERN(int) --lzo_memcmp(const lzo_voidp _s1, const lzo_voidp _s2, lzo_uint _len); -+ lzo_memcmp(const lzo_voidp a, const lzo_voidp b, lzo_uint len); - LZO_EXTERN(lzo_voidp) --lzo_memcpy(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len); -+ lzo_memcpy(lzo_voidp dst, const lzo_voidp src, lzo_uint len); - LZO_EXTERN(lzo_voidp) --lzo_memmove(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len); -+ lzo_memmove(lzo_voidp dst, const lzo_voidp src, lzo_uint len); - LZO_EXTERN(lzo_voidp) --lzo_memset(lzo_voidp _s, int _c, lzo_uint _len); -+ lzo_memset(lzo_voidp buf, int c, lzo_uint len); - - /* checksum functions */ --LZO_EXTERN(lzo_uint32) --lzo_adler32(lzo_uint32 _adler, const lzo_byte *_buf, lzo_uint _len); --LZO_EXTERN(lzo_uint32) --lzo_crc32(lzo_uint32 _c, const lzo_byte *_buf, lzo_uint _len); -+LZO_EXTERN(lzo_uint32_t) -+ lzo_adler32(lzo_uint32_t c, const lzo_bytep buf, lzo_uint len); -+LZO_EXTERN(lzo_uint32_t) -+ lzo_crc32(lzo_uint32_t c, const lzo_bytep buf, lzo_uint len); -+LZO_EXTERN(const lzo_uint32_tp) -+ lzo_get_crc32_table(void); - - /* misc. */ --LZO_EXTERN(lzo_bool) lzo_assert(int _expr); - LZO_EXTERN(int) _lzo_config_check(void); --typedef union { lzo_bytep p; lzo_uint u; } __lzo_pu_u; --typedef union { lzo_bytep p; lzo_uint32 u32; } __lzo_pu32_u; --typedef union { void *vp; lzo_bytep bp; lzo_uint32 u32; long l; } lzo_align_t; -+typedef union { -+ lzo_voidp a00; lzo_bytep a01; lzo_uint a02; lzo_xint a03; lzo_uintptr_t a04; -+ void *a05; unsigned char *a06; unsigned long a07; size_t a08; ptrdiff_t a09; -+#if defined(lzo_int64_t) -+ lzo_uint64_t a10; -+#endif -+} lzo_align_t; - --/* align a char pointer on a boundary that is a multiple of `size' */ --LZO_EXTERN(unsigned) __lzo_align_gap(const lzo_voidp _ptr, lzo_uint _size); --#define LZO_PTR_ALIGN_UP(_ptr,_size) \ -- ((_ptr) + (lzo_uint) __lzo_align_gap((const lzo_voidp)(_ptr),(lzo_uint)(_size))) -+/* align a char pointer on a boundary that is a multiple of 'size' */ -+LZO_EXTERN(unsigned) __lzo_align_gap(const lzo_voidp p, lzo_uint size); -+#define LZO_PTR_ALIGN_UP(p,size) \ -+ ((p) + (lzo_uint) __lzo_align_gap((const lzo_voidp)(p),(lzo_uint)(size))) - --/* deprecated - only for backward compatibility */ --#define LZO_ALIGN(_ptr,_size) LZO_PTR_ALIGN_UP(_ptr,_size) -+ -+/*********************************************************************** -+// deprecated macros - only for backward compatibility -+************************************************************************/ -+ -+/* deprecated - use 'lzo_bytep' instead of 'lzo_byte *' */ -+#define lzo_byte unsigned char -+/* deprecated type names */ -+#define lzo_int32 lzo_int32_t -+#define lzo_uint32 lzo_uint32_t -+#define lzo_int32p lzo_int32_t __LZO_MMODEL * -+#define lzo_uint32p lzo_uint32_t __LZO_MMODEL * -+#define LZO_INT32_MAX LZO_INT32_C(2147483647) -+#define LZO_UINT32_MAX LZO_UINT32_C(4294967295) -+#if defined(lzo_int64_t) -+#define lzo_int64 lzo_int64_t -+#define lzo_uint64 lzo_uint64_t -+#define lzo_int64p lzo_int64_t __LZO_MMODEL * -+#define lzo_uint64p lzo_uint64_t __LZO_MMODEL * -+#define LZO_INT64_MAX LZO_INT64_C(9223372036854775807) -+#define LZO_UINT64_MAX LZO_UINT64_C(18446744073709551615) -+#endif -+/* deprecated types */ -+typedef union { lzo_bytep a; lzo_uint b; } __lzo_pu_u; -+typedef union { lzo_bytep a; lzo_uint32_t b; } __lzo_pu32_u; -+ -+#if defined(LZO_CFG_COMPAT) -+ -+#define __LZOCONF_H 1 -+ -+#if defined(LZO_ARCH_I086) -+# define __LZO_i386 1 -+#elif defined(LZO_ARCH_I386) -+# define __LZO_i386 1 -+#endif -+ -+#if defined(LZO_OS_DOS16) -+# define __LZO_DOS 1 -+# define __LZO_DOS16 1 -+#elif defined(LZO_OS_DOS32) -+# define __LZO_DOS 1 -+#elif defined(LZO_OS_WIN16) -+# define __LZO_WIN 1 -+# define __LZO_WIN16 1 -+#elif defined(LZO_OS_WIN32) -+# define __LZO_WIN 1 -+#endif -+ -+#define __LZO_CMODEL /*empty*/ -+#define __LZO_DMODEL /*empty*/ -+#define __LZO_ENTRY __LZO_CDECL -+#define LZO_EXTERN_CDECL LZO_EXTERN -+#define LZO_ALIGN LZO_PTR_ALIGN_UP -+ -+#define lzo_compress_asm_t lzo_compress_t -+#define lzo_decompress_asm_t lzo_decompress_t -+ -+#endif /* LZO_CFG_COMPAT */ - - - #ifdef __cplusplus -@@ -449,3 +440,5 @@ LZO_EXTERN(unsigned) __lzo_align_gap(const lzo_voidp _ptr, lzo_uint _size); - - #endif /* already included */ - -+ -+/* vim:set ts=4 sw=4 et: */ -diff --git a/lzo/lzodefs.h b/lzo/lzodefs.h -new file mode 100644 -index 0000000..f4ae948 ---- /dev/null -+++ b/lzo/lzodefs.h -@@ -0,0 +1,2998 @@ -+/* lzodefs.h -- architecture, OS and compiler specific defines -+ -+ This file is part of the LZO real-time data compression library. -+ -+ Copyright (C) 1996-2014 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 -+ -+ http://www.oberhumer.com/opensource/lzo/ -+ */ -+ -+ -+#ifndef __LZODEFS_H_INCLUDED -+#define __LZODEFS_H_INCLUDED 1 -+ -+#if defined(__CYGWIN32__) && !defined(__CYGWIN__) -+# define __CYGWIN__ __CYGWIN32__ -+#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(LZO_CFG_NO_DISABLE_WUNDEF) -+#if defined(__ARMCC_VERSION) -+# pragma diag_suppress 193 -+#elif defined(__clang__) && defined(__clang_minor__) -+# pragma clang diagnostic ignored "-Wundef" -+#elif defined(__INTEL_COMPILER) -+# pragma warning(disable: 193) -+#elif defined(__KEIL__) && defined(__C166__) -+# pragma warning disable = 322 -+#elif defined(__GNUC__) && defined(__GNUC_MINOR__) && !defined(__PATHSCALE__) -+# if ((__GNUC__-0) >= 5 || ((__GNUC__-0) == 4 && (__GNUC_MINOR__-0) >= 2)) -+# pragma GCC diagnostic ignored "-Wundef" -+# endif -+#elif defined(_MSC_VER) && !defined(__clang__) && !defined(__INTEL_COMPILER) && !defined(__MWERKS__) -+# if ((_MSC_VER-0) >= 1300) -+# pragma warning(disable: 4668) -+# endif -+#endif -+#endif -+#if 0 && 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 !(LZO_CFG_NO_DISABLE_WCRTNONSTDC) -+#ifndef _CRT_NONSTDC_NO_DEPRECATE -+#define _CRT_NONSTDC_NO_DEPRECATE 1 -+#endif -+#ifndef _CRT_NONSTDC_NO_WARNINGS -+#define _CRT_NONSTDC_NO_WARNINGS 1 -+#endif -+#ifndef _CRT_SECURE_NO_DEPRECATE -+#define _CRT_SECURE_NO_DEPRECATE 1 -+#endif -+#ifndef _CRT_SECURE_NO_WARNINGS -+#define _CRT_SECURE_NO_WARNINGS 1 -+#endif -+#endif -+#if 0 -+#define LZO_0xffffUL 0xfffful -+#define LZO_0xffffffffUL 0xfffffffful -+#else -+#define LZO_0xffffUL 65535ul -+#define LZO_0xffffffffUL 4294967295ul -+#endif -+#define LZO_0xffffL LZO_0xffffUL -+#define LZO_0xffffffffL LZO_0xffffffffUL -+#if (LZO_0xffffL == LZO_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 defined(__COUNTER__) -+# ifndef LZO_CFG_USE_COUNTER -+# define LZO_CFG_USE_COUNTER 1 -+# endif -+#else -+# undef LZO_CFG_USE_COUNTER -+#endif -+#if (UINT_MAX == LZO_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 == LZO_0xffffL) -+# define ptrdiff_t long -+# define _PTRDIFF_T_DEFINED 1 -+#endif -+#if (UINT_MAX == LZO_0xffffL) -+# undef __LZO_RENAME_A -+# undef __LZO_RENAME_B -+# if defined(__AZTEC_C__) && defined(__DOS__) -+# define __LZO_RENAME_A 1 -+# elif defined(_MSC_VER) && defined(MSDOS) -+# if (_MSC_VER < 600) -+# define __LZO_RENAME_A 1 -+# elif (_MSC_VER < 700) -+# define __LZO_RENAME_B 1 -+# endif -+# elif defined(__TSC__) && defined(__OS2__) -+# define __LZO_RENAME_A 1 -+# elif defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0410) -+# define __LZO_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(__LZO_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(__LZO_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 __LZO_RENAME_A -+# undef __LZO_RENAME_B -+#endif -+#if (UINT_MAX == LZO_0xffffL) -+#if defined(__AZTEC_C__) && defined(__DOS__) -+# define LZO_BROKEN_CDECL_ALT_SYNTAX 1 -+#elif defined(_MSC_VER) && defined(MSDOS) -+# if (_MSC_VER < 600) -+# define LZO_BROKEN_INTEGRAL_CONSTANTS 1 -+# endif -+# if (_MSC_VER < 700) -+# define LZO_BROKEN_INTEGRAL_PROMOTION 1 -+# define LZO_BROKEN_SIZEOF 1 -+# endif -+#elif defined(__PACIFIC__) && defined(DOS) -+# define LZO_BROKEN_INTEGRAL_CONSTANTS 1 -+#elif defined(__TURBOC__) && defined(__MSDOS__) -+# if (__TURBOC__ < 0x0150) -+# define LZO_BROKEN_CDECL_ALT_SYNTAX 1 -+# define LZO_BROKEN_INTEGRAL_CONSTANTS 1 -+# define LZO_BROKEN_INTEGRAL_PROMOTION 1 -+# endif -+# if (__TURBOC__ < 0x0200) -+# define LZO_BROKEN_SIZEOF 1 -+# endif -+# if (__TURBOC__ < 0x0400) && defined(__cplusplus) -+# define LZO_BROKEN_CDECL_ALT_SYNTAX 1 -+# endif -+#elif (defined(__PUREC__) || defined(__TURBOC__)) && defined(__TOS__) -+# define LZO_BROKEN_CDECL_ALT_SYNTAX 1 -+# define LZO_BROKEN_SIZEOF 1 -+#endif -+#endif -+#if defined(__WATCOMC__) && (__WATCOMC__ < 900) -+# define LZO_BROKEN_INTEGRAL_CONSTANTS 1 -+#endif -+#if defined(_CRAY) && defined(_CRAY1) -+# define LZO_BROKEN_SIGNED_RIGHT_SHIFT 1 -+#endif -+#define LZO_PP_STRINGIZE(x) #x -+#define LZO_PP_MACRO_EXPAND(x) LZO_PP_STRINGIZE(x) -+#define LZO_PP_CONCAT0() /*empty*/ -+#define LZO_PP_CONCAT1(a) a -+#define LZO_PP_CONCAT2(a,b) a ## b -+#define LZO_PP_CONCAT3(a,b,c) a ## b ## c -+#define LZO_PP_CONCAT4(a,b,c,d) a ## b ## c ## d -+#define LZO_PP_CONCAT5(a,b,c,d,e) a ## b ## c ## d ## e -+#define LZO_PP_CONCAT6(a,b,c,d,e,f) a ## b ## c ## d ## e ## f -+#define LZO_PP_CONCAT7(a,b,c,d,e,f,g) a ## b ## c ## d ## e ## f ## g -+#define LZO_PP_ECONCAT0() LZO_PP_CONCAT0() -+#define LZO_PP_ECONCAT1(a) LZO_PP_CONCAT1(a) -+#define LZO_PP_ECONCAT2(a,b) LZO_PP_CONCAT2(a,b) -+#define LZO_PP_ECONCAT3(a,b,c) LZO_PP_CONCAT3(a,b,c) -+#define LZO_PP_ECONCAT4(a,b,c,d) LZO_PP_CONCAT4(a,b,c,d) -+#define LZO_PP_ECONCAT5(a,b,c,d,e) LZO_PP_CONCAT5(a,b,c,d,e) -+#define LZO_PP_ECONCAT6(a,b,c,d,e,f) LZO_PP_CONCAT6(a,b,c,d,e,f) -+#define LZO_PP_ECONCAT7(a,b,c,d,e,f,g) LZO_PP_CONCAT7(a,b,c,d,e,f,g) -+#define LZO_PP_EMPTY /*empty*/ -+#define LZO_PP_EMPTY0() /*empty*/ -+#define LZO_PP_EMPTY1(a) /*empty*/ -+#define LZO_PP_EMPTY2(a,b) /*empty*/ -+#define LZO_PP_EMPTY3(a,b,c) /*empty*/ -+#define LZO_PP_EMPTY4(a,b,c,d) /*empty*/ -+#define LZO_PP_EMPTY5(a,b,c,d,e) /*empty*/ -+#define LZO_PP_EMPTY6(a,b,c,d,e,f) /*empty*/ -+#define LZO_PP_EMPTY7(a,b,c,d,e,f,g) /*empty*/ -+#if 1 -+#define LZO_CPP_STRINGIZE(x) #x -+#define LZO_CPP_MACRO_EXPAND(x) LZO_CPP_STRINGIZE(x) -+#define LZO_CPP_CONCAT2(a,b) a ## b -+#define LZO_CPP_CONCAT3(a,b,c) a ## b ## c -+#define LZO_CPP_CONCAT4(a,b,c,d) a ## b ## c ## d -+#define LZO_CPP_CONCAT5(a,b,c,d,e) a ## b ## c ## d ## e -+#define LZO_CPP_CONCAT6(a,b,c,d,e,f) a ## b ## c ## d ## e ## f -+#define LZO_CPP_CONCAT7(a,b,c,d,e,f,g) a ## b ## c ## d ## e ## f ## g -+#define LZO_CPP_ECONCAT2(a,b) LZO_CPP_CONCAT2(a,b) -+#define LZO_CPP_ECONCAT3(a,b,c) LZO_CPP_CONCAT3(a,b,c) -+#define LZO_CPP_ECONCAT4(a,b,c,d) LZO_CPP_CONCAT4(a,b,c,d) -+#define LZO_CPP_ECONCAT5(a,b,c,d,e) LZO_CPP_CONCAT5(a,b,c,d,e) -+#define LZO_CPP_ECONCAT6(a,b,c,d,e,f) LZO_CPP_CONCAT6(a,b,c,d,e,f) -+#define LZO_CPP_ECONCAT7(a,b,c,d,e,f,g) LZO_CPP_CONCAT7(a,b,c,d,e,f,g) -+#endif -+#define __LZO_MASK_GEN(o,b) (((((o) << ((b)-!!(b))) - (o)) << 1) + (o)*!!(b)) -+#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 LZO_EXTERN_C extern "C" -+# define LZO_EXTERN_C_BEGIN extern "C" { -+# define LZO_EXTERN_C_END } -+#else -+# define LZO_EXTERN_C extern -+# define LZO_EXTERN_C_BEGIN /*empty*/ -+# define LZO_EXTERN_C_END /*empty*/ -+#endif -+#if !defined(__LZO_OS_OVERRIDE) -+#if (LZO_OS_FREESTANDING) -+# define LZO_INFO_OS "freestanding" -+#elif (LZO_OS_EMBEDDED) -+# define LZO_INFO_OS "embedded" -+#elif 1 && defined(__IAR_SYSTEMS_ICC__) -+# define LZO_OS_EMBEDDED 1 -+# define LZO_INFO_OS "embedded" -+#elif defined(__CYGWIN__) && defined(__GNUC__) -+# define LZO_OS_CYGWIN 1 -+# define LZO_INFO_OS "cygwin" -+#elif defined(__EMX__) && defined(__GNUC__) -+# define LZO_OS_EMX 1 -+# define LZO_INFO_OS "emx" -+#elif defined(__BEOS__) -+# define LZO_OS_BEOS 1 -+# define LZO_INFO_OS "beos" -+#elif defined(__Lynx__) -+# define LZO_OS_LYNXOS 1 -+# define LZO_INFO_OS "lynxos" -+#elif defined(__OS400__) -+# define LZO_OS_OS400 1 -+# define LZO_INFO_OS "os400" -+#elif defined(__QNX__) -+# define LZO_OS_QNX 1 -+# define LZO_INFO_OS "qnx" -+#elif defined(__BORLANDC__) && defined(__DPMI32__) && (__BORLANDC__ >= 0x0460) -+# define LZO_OS_DOS32 1 -+# define LZO_INFO_OS "dos32" -+#elif defined(__BORLANDC__) && defined(__DPMI16__) -+# define LZO_OS_DOS16 1 -+# define LZO_INFO_OS "dos16" -+#elif defined(__ZTC__) && defined(DOS386) -+# define LZO_OS_DOS32 1 -+# define LZO_INFO_OS "dos32" -+#elif defined(__OS2__) || defined(__OS2V2__) -+# if (UINT_MAX == LZO_0xffffL) -+# define LZO_OS_OS216 1 -+# define LZO_INFO_OS "os216" -+# elif (UINT_MAX == LZO_0xffffffffL) -+# define LZO_OS_OS2 1 -+# define LZO_INFO_OS "os2" -+# else -+# error "check your limits.h header" -+# endif -+#elif defined(__WIN64__) || defined(_WIN64) || defined(WIN64) -+# define LZO_OS_WIN64 1 -+# define LZO_INFO_OS "win64" -+#elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(__WINDOWS_386__) -+# define LZO_OS_WIN32 1 -+# define LZO_INFO_OS "win32" -+#elif defined(__MWERKS__) && defined(__INTEL__) -+# define LZO_OS_WIN32 1 -+# define LZO_INFO_OS "win32" -+#elif defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows) -+# if (UINT_MAX == LZO_0xffffL) -+# define LZO_OS_WIN16 1 -+# define LZO_INFO_OS "win16" -+# elif (UINT_MAX == LZO_0xffffffffL) -+# define LZO_OS_WIN32 1 -+# define LZO_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 == LZO_0xffffL) -+# define LZO_OS_DOS16 1 -+# define LZO_INFO_OS "dos16" -+# elif (UINT_MAX == LZO_0xffffffffL) -+# define LZO_OS_DOS32 1 -+# define LZO_INFO_OS "dos32" -+# else -+# error "check your limits.h header" -+# endif -+#elif defined(__WATCOMC__) -+# if defined(__NT__) && (UINT_MAX == LZO_0xffffL) -+# define LZO_OS_DOS16 1 -+# define LZO_INFO_OS "dos16" -+# elif defined(__NT__) && (__WATCOMC__ < 1100) -+# define LZO_OS_WIN32 1 -+# define LZO_INFO_OS "win32" -+# elif defined(__linux__) || defined(__LINUX__) -+# define LZO_OS_POSIX 1 -+# define LZO_INFO_OS "posix" -+# else -+# error "please specify a target using the -bt compiler option" -+# endif -+#elif defined(__palmos__) -+# define LZO_OS_PALMOS 1 -+# define LZO_INFO_OS "palmos" -+#elif defined(__TOS__) || defined(__atarist__) -+# define LZO_OS_TOS 1 -+# define LZO_INFO_OS "tos" -+#elif defined(macintosh) && !defined(__ppc__) -+# define LZO_OS_MACCLASSIC 1 -+# define LZO_INFO_OS "macclassic" -+#elif defined(__VMS) -+# define LZO_OS_VMS 1 -+# define LZO_INFO_OS "vms" -+#elif (defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__) -+# define LZO_OS_CONSOLE 1 -+# define LZO_OS_CONSOLE_PS2 1 -+# define LZO_INFO_OS "console" -+# define LZO_INFO_OS_CONSOLE "ps2" -+#elif defined(__mips__) && defined(__psp__) -+# define LZO_OS_CONSOLE 1 -+# define LZO_OS_CONSOLE_PSP 1 -+# define LZO_INFO_OS "console" -+# define LZO_INFO_OS_CONSOLE "psp" -+#else -+# define LZO_OS_POSIX 1 -+# define LZO_INFO_OS "posix" -+#endif -+#if (LZO_OS_POSIX) -+# if defined(_AIX) || defined(__AIX__) || defined(__aix__) -+# define LZO_OS_POSIX_AIX 1 -+# define LZO_INFO_OS_POSIX "aix" -+# elif defined(__FreeBSD__) -+# define LZO_OS_POSIX_FREEBSD 1 -+# define LZO_INFO_OS_POSIX "freebsd" -+# elif defined(__hpux__) || defined(__hpux) -+# define LZO_OS_POSIX_HPUX 1 -+# define LZO_INFO_OS_POSIX "hpux" -+# elif defined(__INTERIX) -+# define LZO_OS_POSIX_INTERIX 1 -+# define LZO_INFO_OS_POSIX "interix" -+# elif defined(__IRIX__) || defined(__irix__) -+# define LZO_OS_POSIX_IRIX 1 -+# define LZO_INFO_OS_POSIX "irix" -+# elif defined(__linux__) || defined(__linux) || defined(__LINUX__) -+# define LZO_OS_POSIX_LINUX 1 -+# define LZO_INFO_OS_POSIX "linux" -+# elif defined(__APPLE__) && defined(__MACH__) -+# if ((__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__-0) >= 20000) -+# define LZO_OS_POSIX_DARWIN 1040 -+# define LZO_INFO_OS_POSIX "darwin_iphone" -+# elif ((__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0) >= 1040) -+# define LZO_OS_POSIX_DARWIN __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ -+# define LZO_INFO_OS_POSIX "darwin" -+# else -+# define LZO_OS_POSIX_DARWIN 1 -+# define LZO_INFO_OS_POSIX "darwin" -+# endif -+# define LZO_OS_POSIX_MACOSX LZO_OS_POSIX_DARWIN -+# elif defined(__minix__) || defined(__minix) -+# define LZO_OS_POSIX_MINIX 1 -+# define LZO_INFO_OS_POSIX "minix" -+# elif defined(__NetBSD__) -+# define LZO_OS_POSIX_NETBSD 1 -+# define LZO_INFO_OS_POSIX "netbsd" -+# elif defined(__OpenBSD__) -+# define LZO_OS_POSIX_OPENBSD 1 -+# define LZO_INFO_OS_POSIX "openbsd" -+# elif defined(__osf__) -+# define LZO_OS_POSIX_OSF 1 -+# define LZO_INFO_OS_POSIX "osf" -+# elif defined(__solaris__) || defined(__sun) -+# if defined(__SVR4) || defined(__svr4__) -+# define LZO_OS_POSIX_SOLARIS 1 -+# define LZO_INFO_OS_POSIX "solaris" -+# else -+# define LZO_OS_POSIX_SUNOS 1 -+# define LZO_INFO_OS_POSIX "sunos" -+# endif -+# elif defined(__ultrix__) || defined(__ultrix) -+# define LZO_OS_POSIX_ULTRIX 1 -+# define LZO_INFO_OS_POSIX "ultrix" -+# elif defined(_UNICOS) -+# define LZO_OS_POSIX_UNICOS 1 -+# define LZO_INFO_OS_POSIX "unicos" -+# else -+# define LZO_OS_POSIX_UNKNOWN 1 -+# define LZO_INFO_OS_POSIX "unknown" -+# endif -+#endif -+#endif -+#if (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16) -+# if (UINT_MAX != LZO_0xffffL) -+# error "unexpected configuration - check your compiler defines" -+# endif -+# if (ULONG_MAX != LZO_0xffffffffL) -+# error "unexpected configuration - check your compiler defines" -+# endif -+#endif -+#if (LZO_OS_DOS32 || LZO_OS_OS2 || LZO_OS_WIN32 || LZO_OS_WIN64) -+# if (UINT_MAX != LZO_0xffffffffL) -+# error "unexpected configuration - check your compiler defines" -+# endif -+# if (ULONG_MAX != LZO_0xffffffffL) -+# error "unexpected configuration - check your compiler defines" -+# endif -+#endif -+#if defined(CIL) && defined(_GNUCC) && defined(__GNUC__) -+# define LZO_CC_CILLY 1 -+# define LZO_INFO_CC "Cilly" -+# if defined(__CILLY__) -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__CILLY__) -+# else -+# define LZO_INFO_CCVER "unknown" -+# endif -+#elif 0 && defined(SDCC) && defined(__VERSION__) && !defined(__GNUC__) -+# define LZO_CC_SDCC 1 -+# define LZO_INFO_CC "sdcc" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(SDCC) -+#elif defined(__PATHSCALE__) && defined(__PATHCC_PATCHLEVEL__) -+# define LZO_CC_PATHSCALE (__PATHCC__ * 0x10000L + (__PATHCC_MINOR__-0) * 0x100 + (__PATHCC_PATCHLEVEL__-0)) -+# define LZO_INFO_CC "Pathscale C" -+# define LZO_INFO_CCVER __PATHSCALE__ -+# if defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) -+# define LZO_CC_PATHSCALE_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) -+# endif -+#elif defined(__INTEL_COMPILER) && ((__INTEL_COMPILER-0) > 0) -+# define LZO_CC_INTELC __INTEL_COMPILER -+# define LZO_INFO_CC "Intel C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__INTEL_COMPILER) -+# if defined(_MSC_VER) && ((_MSC_VER-0) > 0) -+# define LZO_CC_INTELC_MSC _MSC_VER -+# elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) -+# define LZO_CC_INTELC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) -+# endif -+#elif defined(__POCC__) && defined(_WIN32) -+# define LZO_CC_PELLESC 1 -+# define LZO_INFO_CC "Pelles C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__POCC__) -+#elif defined(__ARMCC_VERSION) && defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) -+# if defined(__GNUC_PATCHLEVEL__) -+# define LZO_CC_ARMCC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) -+# else -+# define LZO_CC_ARMCC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100) -+# endif -+# define LZO_CC_ARMCC __ARMCC_VERSION -+# define LZO_INFO_CC "ARM C Compiler" -+# define LZO_INFO_CCVER __VERSION__ -+#elif defined(__clang__) && defined(__llvm__) && defined(__VERSION__) -+# if defined(__clang_major__) && defined(__clang_minor__) && defined(__clang_patchlevel__) -+# define LZO_CC_CLANG (__clang_major__ * 0x10000L + (__clang_minor__-0) * 0x100 + (__clang_patchlevel__-0)) -+# else -+# define LZO_CC_CLANG 0x010000L -+# endif -+# if defined(_MSC_VER) && ((_MSC_VER-0) > 0) -+# define LZO_CC_CLANG_MSC _MSC_VER -+# elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) -+# define LZO_CC_CLANG_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) -+# endif -+# define LZO_INFO_CC "clang" -+# define LZO_INFO_CCVER __VERSION__ -+#elif defined(__llvm__) && defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) -+# if defined(__GNUC_PATCHLEVEL__) -+# define LZO_CC_LLVM_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) -+# else -+# define LZO_CC_LLVM_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100) -+# endif -+# define LZO_CC_LLVM LZO_CC_LLVM_GNUC -+# define LZO_INFO_CC "llvm-gcc" -+# define LZO_INFO_CCVER __VERSION__ -+#elif defined(__ACK__) && defined(_ACK) -+# define LZO_CC_ACK 1 -+# define LZO_INFO_CC "Amsterdam Compiler Kit C" -+# define LZO_INFO_CCVER "unknown" -+#elif defined(__ARMCC_VERSION) && !defined(__GNUC__) -+# define LZO_CC_ARMCC __ARMCC_VERSION -+# define LZO_CC_ARMCC_ARMCC __ARMCC_VERSION -+# define LZO_INFO_CC "ARM C Compiler" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__ARMCC_VERSION) -+#elif defined(__AZTEC_C__) -+# define LZO_CC_AZTECC 1 -+# define LZO_INFO_CC "Aztec C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__AZTEC_C__) -+#elif defined(__CODEGEARC__) -+# define LZO_CC_CODEGEARC 1 -+# define LZO_INFO_CC "CodeGear C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__CODEGEARC__) -+#elif defined(__BORLANDC__) -+# define LZO_CC_BORLANDC 1 -+# define LZO_INFO_CC "Borland C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__BORLANDC__) -+#elif defined(_CRAYC) && defined(_RELEASE) -+# define LZO_CC_CRAYC 1 -+# define LZO_INFO_CC "Cray C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(_RELEASE) -+#elif defined(__DMC__) && defined(__SC__) -+# define LZO_CC_DMC 1 -+# define LZO_INFO_CC "Digital Mars C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__DMC__) -+#elif defined(__DECC) -+# define LZO_CC_DECC 1 -+# define LZO_INFO_CC "DEC C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__DECC) -+#elif (defined(__ghs) || defined(__ghs__)) && defined(__GHS_VERSION_NUMBER) && ((__GHS_VERSION_NUMBER-0) > 0) -+# define LZO_CC_GHS 1 -+# define LZO_INFO_CC "Green Hills C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__GHS_VERSION_NUMBER) -+# if defined(_MSC_VER) && ((_MSC_VER-0) > 0) -+# define LZO_CC_GHS_MSC _MSC_VER -+# elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) -+# define LZO_CC_GHS_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) -+# endif -+#elif defined(__HIGHC__) -+# define LZO_CC_HIGHC 1 -+# define LZO_INFO_CC "MetaWare High C" -+# define LZO_INFO_CCVER "unknown" -+#elif defined(__HP_aCC) && ((__HP_aCC-0) > 0) -+# define LZO_CC_HPACC __HP_aCC -+# define LZO_INFO_CC "HP aCC" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__HP_aCC) -+#elif defined(__IAR_SYSTEMS_ICC__) -+# define LZO_CC_IARC 1 -+# define LZO_INFO_CC "IAR C" -+# if defined(__VER__) -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__VER__) -+# else -+# define LZO_INFO_CCVER "unknown" -+# endif -+#elif defined(__IBMC__) && ((__IBMC__-0) > 0) -+# define LZO_CC_IBMC __IBMC__ -+# define LZO_INFO_CC "IBM C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__IBMC__) -+#elif defined(__IBMCPP__) && ((__IBMCPP__-0) > 0) -+# define LZO_CC_IBMC __IBMCPP__ -+# define LZO_INFO_CC "IBM C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__IBMCPP__) -+#elif defined(__KEIL__) && defined(__C166__) -+# define LZO_CC_KEILC 1 -+# define LZO_INFO_CC "Keil C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__C166__) -+#elif defined(__LCC__) && defined(_WIN32) && defined(__LCCOPTIMLEVEL) -+# define LZO_CC_LCCWIN32 1 -+# define LZO_INFO_CC "lcc-win32" -+# define LZO_INFO_CCVER "unknown" -+#elif defined(__LCC__) -+# define LZO_CC_LCC 1 -+# define LZO_INFO_CC "lcc" -+# if defined(__LCC_VERSION__) -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__LCC_VERSION__) -+# else -+# define LZO_INFO_CCVER "unknown" -+# endif -+#elif defined(__MWERKS__) && ((__MWERKS__-0) > 0) -+# define LZO_CC_MWERKS __MWERKS__ -+# define LZO_INFO_CC "Metrowerks C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__MWERKS__) -+#elif (defined(__NDPC__) || defined(__NDPX__)) && defined(__i386) -+# define LZO_CC_NDPC 1 -+# define LZO_INFO_CC "Microway NDP C" -+# define LZO_INFO_CCVER "unknown" -+#elif defined(__PACIFIC__) -+# define LZO_CC_PACIFICC 1 -+# define LZO_INFO_CC "Pacific C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__PACIFIC__) -+#elif defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) -+# if defined(__PGIC_PATCHLEVEL__) -+# define LZO_CC_PGI (__PGIC__ * 0x10000L + (__PGIC_MINOR__-0) * 0x100 + (__PGIC_PATCHLEVEL__-0)) -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__PGIC__) "." LZO_PP_MACRO_EXPAND(__PGIC_MINOR__) "." LZO_PP_MACRO_EXPAND(__PGIC_PATCHLEVEL__) -+# else -+# define LZO_CC_PGI (__PGIC__ * 0x10000L + (__PGIC_MINOR__-0) * 0x100) -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__PGIC__) "." LZO_PP_MACRO_EXPAND(__PGIC_MINOR__) ".0" -+# endif -+# define LZO_INFO_CC "Portland Group PGI C" -+#elif defined(__PGI) && (defined(__linux__) || defined(__WIN32__)) -+# define LZO_CC_PGI 1 -+# define LZO_INFO_CC "Portland Group PGI C" -+# define LZO_INFO_CCVER "unknown" -+#elif defined(__PUREC__) && defined(__TOS__) -+# define LZO_CC_PUREC 1 -+# define LZO_INFO_CC "Pure C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__PUREC__) -+#elif defined(__SC__) && defined(__ZTC__) -+# define LZO_CC_SYMANTECC 1 -+# define LZO_INFO_CC "Symantec C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__SC__) -+#elif defined(__SUNPRO_C) -+# define LZO_INFO_CC "SunPro C" -+# if ((__SUNPRO_C-0) > 0) -+# define LZO_CC_SUNPROC __SUNPRO_C -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__SUNPRO_C) -+# else -+# define LZO_CC_SUNPROC 1 -+# define LZO_INFO_CCVER "unknown" -+# endif -+#elif defined(__SUNPRO_CC) -+# define LZO_INFO_CC "SunPro C" -+# if ((__SUNPRO_CC-0) > 0) -+# define LZO_CC_SUNPROC __SUNPRO_CC -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__SUNPRO_CC) -+# else -+# define LZO_CC_SUNPROC 1 -+# define LZO_INFO_CCVER "unknown" -+# endif -+#elif defined(__TINYC__) -+# define LZO_CC_TINYC 1 -+# define LZO_INFO_CC "Tiny C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__TINYC__) -+#elif defined(__TSC__) -+# define LZO_CC_TOPSPEEDC 1 -+# define LZO_INFO_CC "TopSpeed C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__TSC__) -+#elif defined(__WATCOMC__) -+# define LZO_CC_WATCOMC 1 -+# define LZO_INFO_CC "Watcom C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__WATCOMC__) -+#elif defined(__TURBOC__) -+# define LZO_CC_TURBOC 1 -+# define LZO_INFO_CC "Turbo C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__TURBOC__) -+#elif defined(__ZTC__) -+# define LZO_CC_ZORTECHC 1 -+# define LZO_INFO_CC "Zortech C" -+# if ((__ZTC__-0) == 0x310) -+# define LZO_INFO_CCVER "0x310" -+# else -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__ZTC__) -+# endif -+#elif defined(__GNUC__) && defined(__VERSION__) -+# if defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__) -+# define LZO_CC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) -+# elif defined(__GNUC_MINOR__) -+# define LZO_CC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100) -+# else -+# define LZO_CC_GNUC (__GNUC__ * 0x10000L) -+# endif -+# define LZO_INFO_CC "gcc" -+# define LZO_INFO_CCVER __VERSION__ -+#elif defined(_MSC_VER) && ((_MSC_VER-0) > 0) -+# define LZO_CC_MSC _MSC_VER -+# define LZO_INFO_CC "Microsoft C" -+# if defined(_MSC_FULL_VER) -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(_MSC_VER) "." LZO_PP_MACRO_EXPAND(_MSC_FULL_VER) -+# else -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(_MSC_VER) -+# endif -+#else -+# define LZO_CC_UNKNOWN 1 -+# define LZO_INFO_CC "unknown" -+# define LZO_INFO_CCVER "unknown" -+#endif -+#if (LZO_CC_GNUC) && defined(__OPEN64__) -+# if defined(__OPENCC__) && defined(__OPENCC_MINOR__) && defined(__OPENCC_PATCHLEVEL__) -+# define LZO_CC_OPEN64 (__OPENCC__ * 0x10000L + (__OPENCC_MINOR__-0) * 0x100 + (__OPENCC_PATCHLEVEL__-0)) -+# define LZO_CC_OPEN64_GNUC LZO_CC_GNUC -+# endif -+#endif -+#if (LZO_CC_GNUC) && defined(__PCC__) -+# if defined(__PCC__) && defined(__PCC_MINOR__) && defined(__PCC_MINORMINOR__) -+# define LZO_CC_PCC (__PCC__ * 0x10000L + (__PCC_MINOR__-0) * 0x100 + (__PCC_MINORMINOR__-0)) -+# define LZO_CC_PCC_GNUC LZO_CC_GNUC -+# endif -+#endif -+#if 0 && (LZO_CC_MSC && (_MSC_VER >= 1200)) && !defined(_MSC_FULL_VER) -+# error "LZO_CC_MSC: _MSC_FULL_VER is not defined" -+#endif -+#if !defined(__LZO_ARCH_OVERRIDE) && !(LZO_ARCH_GENERIC) && defined(_CRAY) -+# if (UINT_MAX > LZO_0xffffffffL) && defined(_CRAY) -+# if defined(_CRAYMPP) || defined(_CRAYT3D) || defined(_CRAYT3E) -+# define LZO_ARCH_CRAY_MPP 1 -+# elif defined(_CRAY1) -+# define LZO_ARCH_CRAY_PVP 1 -+# endif -+# endif -+#endif -+#if !defined(__LZO_ARCH_OVERRIDE) -+#if (LZO_ARCH_GENERIC) -+# define LZO_INFO_ARCH "generic" -+#elif (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16) -+# define LZO_ARCH_I086 1 -+# define LZO_INFO_ARCH "i086" -+#elif defined(__aarch64__) -+# define LZO_ARCH_ARM64 1 -+# define LZO_INFO_ARCH "arm64" -+#elif defined(__alpha__) || defined(__alpha) || defined(_M_ALPHA) -+# define LZO_ARCH_ALPHA 1 -+# define LZO_INFO_ARCH "alpha" -+#elif (LZO_ARCH_CRAY_MPP) && (defined(_CRAYT3D) || defined(_CRAYT3E)) -+# define LZO_ARCH_ALPHA 1 -+# define LZO_INFO_ARCH "alpha" -+#elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64) -+# define LZO_ARCH_AMD64 1 -+# define LZO_INFO_ARCH "amd64" -+#elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB)) -+# define LZO_ARCH_ARM 1 -+# define LZO_ARCH_ARM_THUMB 1 -+# define LZO_INFO_ARCH "arm_thumb" -+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCARM__) -+# define LZO_ARCH_ARM 1 -+# if defined(__CPU_MODE__) && ((__CPU_MODE__-0) == 1) -+# define LZO_ARCH_ARM_THUMB 1 -+# define LZO_INFO_ARCH "arm_thumb" -+# elif defined(__CPU_MODE__) && ((__CPU_MODE__-0) == 2) -+# define LZO_INFO_ARCH "arm" -+# else -+# define LZO_INFO_ARCH "arm" -+# endif -+#elif defined(__arm__) || defined(_M_ARM) -+# define LZO_ARCH_ARM 1 -+# define LZO_INFO_ARCH "arm" -+#elif (UINT_MAX <= LZO_0xffffL) && defined(__AVR__) -+# define LZO_ARCH_AVR 1 -+# define LZO_INFO_ARCH "avr" -+#elif defined(__avr32__) || defined(__AVR32__) -+# define LZO_ARCH_AVR32 1 -+# define LZO_INFO_ARCH "avr32" -+#elif defined(__bfin__) -+# define LZO_ARCH_BLACKFIN 1 -+# define LZO_INFO_ARCH "blackfin" -+#elif (UINT_MAX == LZO_0xffffL) && defined(__C166__) -+# define LZO_ARCH_C166 1 -+# define LZO_INFO_ARCH "c166" -+#elif defined(__cris__) -+# define LZO_ARCH_CRIS 1 -+# define LZO_INFO_ARCH "cris" -+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCEZ80__) -+# define LZO_ARCH_EZ80 1 -+# define LZO_INFO_ARCH "ez80" -+#elif defined(__H8300__) || defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__) -+# define LZO_ARCH_H8300 1 -+# define LZO_INFO_ARCH "h8300" -+#elif defined(__hppa__) || defined(__hppa) -+# define LZO_ARCH_HPPA 1 -+# define LZO_INFO_ARCH "hppa" -+#elif defined(__386__) || defined(__i386__) || defined(__i386) || defined(_M_IX86) || defined(_M_I386) -+# define LZO_ARCH_I386 1 -+# define LZO_ARCH_IA32 1 -+# define LZO_INFO_ARCH "i386" -+#elif (LZO_CC_ZORTECHC && defined(__I86__)) -+# define LZO_ARCH_I386 1 -+# define LZO_ARCH_IA32 1 -+# define LZO_INFO_ARCH "i386" -+#elif (LZO_OS_DOS32 && LZO_CC_HIGHC) && defined(_I386) -+# define LZO_ARCH_I386 1 -+# define LZO_ARCH_IA32 1 -+# define LZO_INFO_ARCH "i386" -+#elif defined(__ia64__) || defined(__ia64) || defined(_M_IA64) -+# define LZO_ARCH_IA64 1 -+# define LZO_INFO_ARCH "ia64" -+#elif (UINT_MAX == LZO_0xffffL) && defined(__m32c__) -+# define LZO_ARCH_M16C 1 -+# define LZO_INFO_ARCH "m16c" -+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCM16C__) -+# define LZO_ARCH_M16C 1 -+# define LZO_INFO_ARCH "m16c" -+#elif defined(__m32r__) -+# define LZO_ARCH_M32R 1 -+# define LZO_INFO_ARCH "m32r" -+#elif (LZO_OS_TOS) || defined(__m68k__) || defined(__m68000__) || defined(__mc68000__) || defined(__mc68020__) || defined(_M_M68K) -+# define LZO_ARCH_M68K 1 -+# define LZO_INFO_ARCH "m68k" -+#elif (UINT_MAX == LZO_0xffffL) && defined(__C251__) -+# define LZO_ARCH_MCS251 1 -+# define LZO_INFO_ARCH "mcs251" -+#elif (UINT_MAX == LZO_0xffffL) && defined(__C51__) -+# define LZO_ARCH_MCS51 1 -+# define LZO_INFO_ARCH "mcs51" -+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICC8051__) -+# define LZO_ARCH_MCS51 1 -+# define LZO_INFO_ARCH "mcs51" -+#elif defined(__mips__) || defined(__mips) || defined(_MIPS_ARCH) || defined(_M_MRX000) -+# define LZO_ARCH_MIPS 1 -+# define LZO_INFO_ARCH "mips" -+#elif (UINT_MAX == LZO_0xffffL) && defined(__MSP430__) -+# define LZO_ARCH_MSP430 1 -+# define LZO_INFO_ARCH "msp430" -+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICC430__) -+# define LZO_ARCH_MSP430 1 -+# define LZO_INFO_ARCH "msp430" -+#elif defined(__powerpc__) || defined(__powerpc) || defined(__ppc__) || defined(__PPC__) || defined(_M_PPC) || defined(_ARCH_PPC) || defined(_ARCH_PWR) -+# define LZO_ARCH_POWERPC 1 -+# define LZO_INFO_ARCH "powerpc" -+#elif defined(__s390__) || defined(__s390) || defined(__s390x__) || defined(__s390x) -+# define LZO_ARCH_S390 1 -+# define LZO_INFO_ARCH "s390" -+#elif defined(__sh__) || defined(_M_SH) -+# define LZO_ARCH_SH 1 -+# define LZO_INFO_ARCH "sh" -+#elif defined(__sparc__) || defined(__sparc) || defined(__sparcv8) -+# define LZO_ARCH_SPARC 1 -+# define LZO_INFO_ARCH "sparc" -+#elif defined(__SPU__) -+# define LZO_ARCH_SPU 1 -+# define LZO_INFO_ARCH "spu" -+#elif (UINT_MAX == LZO_0xffffL) && defined(__z80) -+# define LZO_ARCH_Z80 1 -+# define LZO_INFO_ARCH "z80" -+#elif (LZO_ARCH_CRAY_PVP) -+# if defined(_CRAYSV1) -+# define LZO_ARCH_CRAY_SV1 1 -+# define LZO_INFO_ARCH "cray_sv1" -+# elif (_ADDR64) -+# define LZO_ARCH_CRAY_T90 1 -+# define LZO_INFO_ARCH "cray_t90" -+# elif (_ADDR32) -+# define LZO_ARCH_CRAY_YMP 1 -+# define LZO_INFO_ARCH "cray_ymp" -+# else -+# define LZO_ARCH_CRAY_XMP 1 -+# define LZO_INFO_ARCH "cray_xmp" -+# endif -+#else -+# define LZO_ARCH_UNKNOWN 1 -+# define LZO_INFO_ARCH "unknown" -+#endif -+#endif -+#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_DOS32 || LZO_OS_OS2) -+# error "FIXME - missing define for CPU architecture" -+#endif -+#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_WIN32) -+# error "FIXME - missing LZO_OS_WIN32 define for CPU architecture" -+#endif -+#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_WIN64) -+# error "FIXME - missing LZO_OS_WIN64 define for CPU architecture" -+#endif -+#if (LZO_OS_OS216 || LZO_OS_WIN16) -+# define LZO_ARCH_I086PM 1 -+#elif 1 && (LZO_OS_DOS16 && defined(BLX286)) -+# define LZO_ARCH_I086PM 1 -+#elif 1 && (LZO_OS_DOS16 && defined(DOSX286)) -+# define LZO_ARCH_I086PM 1 -+#elif 1 && (LZO_OS_DOS16 && LZO_CC_BORLANDC && defined(__DPMI16__)) -+# define LZO_ARCH_I086PM 1 -+#endif -+#if (LZO_ARCH_AMD64 && !LZO_ARCH_X64) -+# define LZO_ARCH_X64 1 -+#elif (!LZO_ARCH_AMD64 && LZO_ARCH_X64) && defined(__LZO_ARCH_OVERRIDE) -+# define LZO_ARCH_AMD64 1 -+#endif -+#if (LZO_ARCH_ARM64 && !LZO_ARCH_AARCH64) -+# define LZO_ARCH_AARCH64 1 -+#elif (!LZO_ARCH_ARM64 && LZO_ARCH_AARCH64) && defined(__LZO_ARCH_OVERRIDE) -+# define LZO_ARCH_ARM64 1 -+#endif -+#if (LZO_ARCH_I386 && !LZO_ARCH_X86) -+# define LZO_ARCH_X86 1 -+#elif (!LZO_ARCH_I386 && LZO_ARCH_X86) && defined(__LZO_ARCH_OVERRIDE) -+# define LZO_ARCH_I386 1 -+#endif -+#if (LZO_ARCH_AMD64 && !LZO_ARCH_X64) || (!LZO_ARCH_AMD64 && LZO_ARCH_X64) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_ARM64 && !LZO_ARCH_AARCH64) || (!LZO_ARCH_ARM64 && LZO_ARCH_AARCH64) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_I386 && !LZO_ARCH_X86) || (!LZO_ARCH_I386 && LZO_ARCH_X86) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_ARM_THUMB && !LZO_ARCH_ARM) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_ARM_THUMB1 && !LZO_ARCH_ARM_THUMB) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_ARM_THUMB2 && !LZO_ARCH_ARM_THUMB) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_ARM_THUMB1 && LZO_ARCH_ARM_THUMB2) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_I086PM && !LZO_ARCH_I086) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_I086) -+# if (UINT_MAX != LZO_0xffffL) -+# error "unexpected configuration - check your compiler defines" -+# endif -+# if (ULONG_MAX != LZO_0xffffffffL) -+# error "unexpected configuration - check your compiler defines" -+# endif -+#endif -+#if (LZO_ARCH_I386) -+# if (UINT_MAX != LZO_0xffffL) && defined(__i386_int16__) -+# error "unexpected configuration - check your compiler defines" -+# endif -+# if (UINT_MAX != LZO_0xffffffffL) && !defined(__i386_int16__) -+# error "unexpected configuration - check your compiler defines" -+# endif -+# if (ULONG_MAX != LZO_0xffffffffL) -+# error "unexpected configuration - check your compiler defines" -+# endif -+#endif -+#if (LZO_ARCH_AMD64 || LZO_ARCH_I386) -+# if !defined(LZO_TARGET_FEATURE_SSE2) -+# if defined(__SSE2__) -+# define LZO_TARGET_FEATURE_SSE2 1 -+# elif defined(_MSC_VER) && ((defined(_M_IX86_FP) && ((_M_IX86_FP)+0 >= 2)) || defined(_M_AMD64)) -+# define LZO_TARGET_FEATURE_SSE2 1 -+# endif -+# endif -+# if !defined(LZO_TARGET_FEATURE_SSSE3) -+# if (LZO_TARGET_FEATURE_SSE2) -+# if defined(__SSSE3__) -+# define LZO_TARGET_FEATURE_SSSE3 1 -+# elif defined(_MSC_VER) && defined(__AVX__) -+# define LZO_TARGET_FEATURE_SSSE3 1 -+# endif -+# endif -+# endif -+# if !defined(LZO_TARGET_FEATURE_SSE4_2) -+# if (LZO_TARGET_FEATURE_SSSE3) -+# if defined(__SSE4_2__) -+# define LZO_TARGET_FEATURE_SSE4_2 1 -+# endif -+# endif -+# endif -+# if !defined(LZO_TARGET_FEATURE_AVX) -+# if (LZO_TARGET_FEATURE_SSSE3) -+# if defined(__AVX__) -+# define LZO_TARGET_FEATURE_AVX 1 -+# endif -+# endif -+# endif -+# if !defined(LZO_TARGET_FEATURE_AVX2) -+# if (LZO_TARGET_FEATURE_AVX) -+# if defined(__AVX2__) -+# define LZO_TARGET_FEATURE_AVX2 1 -+# endif -+# endif -+# endif -+#endif -+#if (LZO_TARGET_FEATURE_SSSE3 && !(LZO_TARGET_FEATURE_SSE2)) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_TARGET_FEATURE_SSE4_2 && !(LZO_TARGET_FEATURE_SSSE3)) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_TARGET_FEATURE_AVX && !(LZO_TARGET_FEATURE_SSSE3)) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_TARGET_FEATURE_AVX2 && !(LZO_TARGET_FEATURE_AVX)) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_ARM) -+# if !defined(LZO_TARGET_FEATURE_NEON) -+# if defined(__ARM_NEON__) -+# define LZO_TARGET_FEATURE_NEON 1 -+# endif -+# endif -+#elif (LZO_ARCH_ARM64) -+# if !defined(LZO_TARGET_FEATURE_NEON) -+# if 1 -+# define LZO_TARGET_FEATURE_NEON 1 -+# endif -+# endif -+#endif -+#if 0 -+#elif !defined(__LZO_MM_OVERRIDE) -+#if (LZO_ARCH_I086) -+#if (UINT_MAX != LZO_0xffffL) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if defined(__TINY__) || defined(M_I86TM) || defined(_M_I86TM) -+# define LZO_MM_TINY 1 -+#elif defined(__HUGE__) || defined(_HUGE_) || defined(M_I86HM) || defined(_M_I86HM) -+# define LZO_MM_HUGE 1 -+#elif defined(__SMALL__) || defined(M_I86SM) || defined(_M_I86SM) || defined(SMALL_MODEL) -+# define LZO_MM_SMALL 1 -+#elif defined(__MEDIUM__) || defined(M_I86MM) || defined(_M_I86MM) -+# define LZO_MM_MEDIUM 1 -+#elif defined(__COMPACT__) || defined(M_I86CM) || defined(_M_I86CM) -+# define LZO_MM_COMPACT 1 -+#elif defined(__LARGE__) || defined(M_I86LM) || defined(_M_I86LM) || defined(LARGE_MODEL) -+# define LZO_MM_LARGE 1 -+#elif (LZO_CC_AZTECC) -+# if defined(_LARGE_CODE) && defined(_LARGE_DATA) -+# define LZO_MM_LARGE 1 -+# elif defined(_LARGE_CODE) -+# define LZO_MM_MEDIUM 1 -+# elif defined(_LARGE_DATA) -+# define LZO_MM_COMPACT 1 -+# else -+# define LZO_MM_SMALL 1 -+# endif -+#elif (LZO_CC_ZORTECHC && defined(__VCM__)) -+# define LZO_MM_LARGE 1 -+#else -+# error "unknown LZO_ARCH_I086 memory model" -+#endif -+#if (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16) -+#define LZO_HAVE_MM_HUGE_PTR 1 -+#define LZO_HAVE_MM_HUGE_ARRAY 1 -+#if (LZO_MM_TINY) -+# undef LZO_HAVE_MM_HUGE_ARRAY -+#endif -+#if (LZO_CC_AZTECC || LZO_CC_PACIFICC || LZO_CC_ZORTECHC) -+# undef LZO_HAVE_MM_HUGE_PTR -+# undef LZO_HAVE_MM_HUGE_ARRAY -+#elif (LZO_CC_DMC || LZO_CC_SYMANTECC) -+# undef LZO_HAVE_MM_HUGE_ARRAY -+#elif (LZO_CC_MSC && defined(_QC)) -+# undef LZO_HAVE_MM_HUGE_ARRAY -+# if (_MSC_VER < 600) -+# undef LZO_HAVE_MM_HUGE_PTR -+# endif -+#elif (LZO_CC_TURBOC && (__TURBOC__ < 0x0295)) -+# undef LZO_HAVE_MM_HUGE_ARRAY -+#endif -+#if (LZO_ARCH_I086PM) && !(LZO_HAVE_MM_HUGE_PTR) -+# if (LZO_OS_DOS16) -+# error "unexpected configuration - check your compiler defines" -+# elif (LZO_CC_ZORTECHC) -+# else -+# error "unexpected configuration - check your compiler defines" -+# endif -+#endif -+#ifdef __cplusplus -+extern "C" { -+#endif -+#if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0200)) -+ extern void __near __cdecl _AHSHIFT(void); -+# define LZO_MM_AHSHIFT ((unsigned) _AHSHIFT) -+#elif (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC) -+ extern void __near __cdecl _AHSHIFT(void); -+# define LZO_MM_AHSHIFT ((unsigned) _AHSHIFT) -+#elif (LZO_CC_MSC || LZO_CC_TOPSPEEDC) -+ extern void __near __cdecl _AHSHIFT(void); -+# define LZO_MM_AHSHIFT ((unsigned) _AHSHIFT) -+#elif (LZO_CC_TURBOC && (__TURBOC__ >= 0x0295)) -+ extern void __near __cdecl _AHSHIFT(void); -+# define LZO_MM_AHSHIFT ((unsigned) _AHSHIFT) -+#elif ((LZO_CC_AZTECC || LZO_CC_PACIFICC || LZO_CC_TURBOC) && LZO_OS_DOS16) -+# define LZO_MM_AHSHIFT 12 -+#elif (LZO_CC_WATCOMC) -+ extern unsigned char _HShift; -+# define LZO_MM_AHSHIFT ((unsigned) _HShift) -+#else -+# error "FIXME - implement LZO_MM_AHSHIFT" -+#endif -+#ifdef __cplusplus -+} -+#endif -+#endif -+#elif (LZO_ARCH_C166) -+#if !defined(__MODEL__) -+# error "FIXME - LZO_ARCH_C166 __MODEL__" -+#elif ((__MODEL__) == 0) -+# define LZO_MM_SMALL 1 -+#elif ((__MODEL__) == 1) -+# define LZO_MM_SMALL 1 -+#elif ((__MODEL__) == 2) -+# define LZO_MM_LARGE 1 -+#elif ((__MODEL__) == 3) -+# define LZO_MM_TINY 1 -+#elif ((__MODEL__) == 4) -+# define LZO_MM_XTINY 1 -+#elif ((__MODEL__) == 5) -+# define LZO_MM_XSMALL 1 -+#else -+# error "FIXME - LZO_ARCH_C166 __MODEL__" -+#endif -+#elif (LZO_ARCH_MCS251) -+#if !defined(__MODEL__) -+# error "FIXME - LZO_ARCH_MCS251 __MODEL__" -+#elif ((__MODEL__) == 0) -+# define LZO_MM_SMALL 1 -+#elif ((__MODEL__) == 2) -+# define LZO_MM_LARGE 1 -+#elif ((__MODEL__) == 3) -+# define LZO_MM_TINY 1 -+#elif ((__MODEL__) == 4) -+# define LZO_MM_XTINY 1 -+#elif ((__MODEL__) == 5) -+# define LZO_MM_XSMALL 1 -+#else -+# error "FIXME - LZO_ARCH_MCS251 __MODEL__" -+#endif -+#elif (LZO_ARCH_MCS51) -+#if !defined(__MODEL__) -+# error "FIXME - LZO_ARCH_MCS51 __MODEL__" -+#elif ((__MODEL__) == 1) -+# define LZO_MM_SMALL 1 -+#elif ((__MODEL__) == 2) -+# define LZO_MM_LARGE 1 -+#elif ((__MODEL__) == 3) -+# define LZO_MM_TINY 1 -+#elif ((__MODEL__) == 4) -+# define LZO_MM_XTINY 1 -+#elif ((__MODEL__) == 5) -+# define LZO_MM_XSMALL 1 -+#else -+# error "FIXME - LZO_ARCH_MCS51 __MODEL__" -+#endif -+#elif (LZO_ARCH_CRAY_PVP) -+# define LZO_MM_PVP 1 -+#else -+# define LZO_MM_FLAT 1 -+#endif -+#if (LZO_MM_COMPACT) -+# define LZO_INFO_MM "compact" -+#elif (LZO_MM_FLAT) -+# define LZO_INFO_MM "flat" -+#elif (LZO_MM_HUGE) -+# define LZO_INFO_MM "huge" -+#elif (LZO_MM_LARGE) -+# define LZO_INFO_MM "large" -+#elif (LZO_MM_MEDIUM) -+# define LZO_INFO_MM "medium" -+#elif (LZO_MM_PVP) -+# define LZO_INFO_MM "pvp" -+#elif (LZO_MM_SMALL) -+# define LZO_INFO_MM "small" -+#elif (LZO_MM_TINY) -+# define LZO_INFO_MM "tiny" -+#else -+# error "unknown memory model" -+#endif -+#endif -+#if !defined(__lzo_gnuc_extension__) -+#if (LZO_CC_GNUC >= 0x020800ul) -+# define __lzo_gnuc_extension__ __extension__ -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_gnuc_extension__ __extension__ -+#elif (LZO_CC_IBMC >= 600) -+# define __lzo_gnuc_extension__ __extension__ -+#else -+#endif -+#endif -+#if !defined(__lzo_gnuc_extension__) -+# define __lzo_gnuc_extension__ /*empty*/ -+#endif -+#if !defined(LZO_CFG_USE_NEW_STYLE_CASTS) && defined(__cplusplus) && 0 -+# if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020800ul)) -+# define LZO_CFG_USE_NEW_STYLE_CASTS 0 -+# elif (LZO_CC_INTELC && (__INTEL_COMPILER < 1200)) -+# define LZO_CFG_USE_NEW_STYLE_CASTS 0 -+# else -+# define LZO_CFG_USE_NEW_STYLE_CASTS 1 -+# endif -+#endif -+#if !defined(LZO_CFG_USE_NEW_STYLE_CASTS) -+# define LZO_CFG_USE_NEW_STYLE_CASTS 0 -+#endif -+#if !defined(__cplusplus) -+# if defined(LZO_CFG_USE_NEW_STYLE_CASTS) -+# undef LZO_CFG_USE_NEW_STYLE_CASTS -+# endif -+# define LZO_CFG_USE_NEW_STYLE_CASTS 0 -+#endif -+#if !defined(LZO_REINTERPRET_CAST) -+# if (LZO_CFG_USE_NEW_STYLE_CASTS) -+# define LZO_REINTERPRET_CAST(t,e) (reinterpret_cast (e)) -+# endif -+#endif -+#if !defined(LZO_REINTERPRET_CAST) -+# define LZO_REINTERPRET_CAST(t,e) ((t) (e)) -+#endif -+#if !defined(LZO_STATIC_CAST) -+# if (LZO_CFG_USE_NEW_STYLE_CASTS) -+# define LZO_STATIC_CAST(t,e) (static_cast (e)) -+# endif -+#endif -+#if !defined(LZO_STATIC_CAST) -+# define LZO_STATIC_CAST(t,e) ((t) (e)) -+#endif -+#if !defined(LZO_STATIC_CAST2) -+# define LZO_STATIC_CAST2(t1,t2,e) LZO_STATIC_CAST(t1, LZO_STATIC_CAST(t2, e)) -+#endif -+#if !defined(LZO_UNCONST_CAST) -+# if (LZO_CFG_USE_NEW_STYLE_CASTS) -+# define LZO_UNCONST_CAST(t,e) (const_cast (e)) -+# elif (LZO_HAVE_MM_HUGE_PTR) -+# define LZO_UNCONST_CAST(t,e) ((t) (e)) -+# elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define LZO_UNCONST_CAST(t,e) ((t) ((void *) ((lzo_uintptr_t) ((const void *) (e))))) -+# endif -+#endif -+#if !defined(LZO_UNCONST_CAST) -+# define LZO_UNCONST_CAST(t,e) ((t) ((void *) ((const void *) (e)))) -+#endif -+#if !defined(LZO_UNCONST_VOLATILE_CAST) -+# if (LZO_CFG_USE_NEW_STYLE_CASTS) -+# define LZO_UNCONST_VOLATILE_CAST(t,e) (const_cast (e)) -+# elif (LZO_HAVE_MM_HUGE_PTR) -+# define LZO_UNCONST_VOLATILE_CAST(t,e) ((t) (e)) -+# elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define LZO_UNCONST_VOLATILE_CAST(t,e) ((t) ((volatile void *) ((lzo_uintptr_t) ((volatile const void *) (e))))) -+# endif -+#endif -+#if !defined(LZO_UNCONST_VOLATILE_CAST) -+# define LZO_UNCONST_VOLATILE_CAST(t,e) ((t) ((volatile void *) ((volatile const void *) (e)))) -+#endif -+#if !defined(LZO_UNVOLATILE_CAST) -+# if (LZO_CFG_USE_NEW_STYLE_CASTS) -+# define LZO_UNVOLATILE_CAST(t,e) (const_cast (e)) -+# elif (LZO_HAVE_MM_HUGE_PTR) -+# define LZO_UNVOLATILE_CAST(t,e) ((t) (e)) -+# elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define LZO_UNVOLATILE_CAST(t,e) ((t) ((void *) ((lzo_uintptr_t) ((volatile void *) (e))))) -+# endif -+#endif -+#if !defined(LZO_UNVOLATILE_CAST) -+# define LZO_UNVOLATILE_CAST(t,e) ((t) ((void *) ((volatile void *) (e)))) -+#endif -+#if !defined(LZO_UNVOLATILE_CONST_CAST) -+# if (LZO_CFG_USE_NEW_STYLE_CASTS) -+# define LZO_UNVOLATILE_CONST_CAST(t,e) (const_cast (e)) -+# elif (LZO_HAVE_MM_HUGE_PTR) -+# define LZO_UNVOLATILE_CONST_CAST(t,e) ((t) (e)) -+# elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define LZO_UNVOLATILE_CONST_CAST(t,e) ((t) ((const void *) ((lzo_uintptr_t) ((volatile const void *) (e))))) -+# endif -+#endif -+#if !defined(LZO_UNVOLATILE_CONST_CAST) -+# define LZO_UNVOLATILE_CONST_CAST(t,e) ((t) ((const void *) ((volatile const void *) (e)))) -+#endif -+#if !defined(LZO_PCAST) -+# if (LZO_HAVE_MM_HUGE_PTR) -+# define LZO_PCAST(t,e) ((t) (e)) -+# endif -+#endif -+#if !defined(LZO_PCAST) -+# define LZO_PCAST(t,e) LZO_STATIC_CAST(t, LZO_STATIC_CAST(void *, e)) -+#endif -+#if !defined(LZO_CCAST) -+# if (LZO_HAVE_MM_HUGE_PTR) -+# define LZO_CCAST(t,e) ((t) (e)) -+# endif -+#endif -+#if !defined(LZO_CCAST) -+# define LZO_CCAST(t,e) LZO_STATIC_CAST(t, LZO_STATIC_CAST(const void *, e)) -+#endif -+#if !defined(LZO_ICONV) -+# define LZO_ICONV(t,e) LZO_STATIC_CAST(t, e) -+#endif -+#if !defined(LZO_ICAST) -+# define LZO_ICAST(t,e) LZO_STATIC_CAST(t, e) -+#endif -+#if !defined(LZO_ITRUNC) -+# define LZO_ITRUNC(t,e) LZO_STATIC_CAST(t, e) -+#endif -+#if !defined(__lzo_cte) -+# if (LZO_CC_MSC || LZO_CC_WATCOMC) -+# define __lzo_cte(e) ((void)0,(e)) -+# elif 1 -+# define __lzo_cte(e) ((void)0,(e)) -+# endif -+#endif -+#if !defined(__lzo_cte) -+# define __lzo_cte(e) (e) -+#endif -+#if !defined(LZO_BLOCK_BEGIN) -+# define LZO_BLOCK_BEGIN do { -+# define LZO_BLOCK_END } while __lzo_cte(0) -+#endif -+#if !defined(LZO_UNUSED) -+# if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600)) -+# define LZO_UNUSED(var) ((void) &var) -+# elif (LZO_CC_BORLANDC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PELLESC || LZO_CC_TURBOC) -+# define LZO_UNUSED(var) if (&var) ; else -+# elif (LZO_CC_CLANG && (LZO_CC_CLANG >= 0x030200ul)) -+# define LZO_UNUSED(var) ((void) &var) -+# elif (LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define LZO_UNUSED(var) ((void) var) -+# elif (LZO_CC_MSC && (_MSC_VER < 900)) -+# define LZO_UNUSED(var) if (&var) ; else -+# elif (LZO_CC_KEILC) -+# define LZO_UNUSED(var) {LZO_EXTERN_C int lzo_unused__[1-2*!(sizeof(var)>0)];} -+# elif (LZO_CC_PACIFICC) -+# define LZO_UNUSED(var) ((void) sizeof(var)) -+# elif (LZO_CC_WATCOMC) && defined(__cplusplus) -+# define LZO_UNUSED(var) ((void) var) -+# else -+# define LZO_UNUSED(var) ((void) &var) -+# endif -+#endif -+#if !defined(LZO_UNUSED_FUNC) -+# if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600)) -+# define LZO_UNUSED_FUNC(func) ((void) func) -+# elif (LZO_CC_BORLANDC || LZO_CC_NDPC || LZO_CC_TURBOC) -+# define LZO_UNUSED_FUNC(func) if (func) ; else -+# elif (LZO_CC_CLANG || LZO_CC_LLVM) -+# define LZO_UNUSED_FUNC(func) ((void) &func) -+# elif (LZO_CC_MSC && (_MSC_VER < 900)) -+# define LZO_UNUSED_FUNC(func) if (func) ; else -+# elif (LZO_CC_MSC) -+# define LZO_UNUSED_FUNC(func) ((void) &func) -+# elif (LZO_CC_KEILC || LZO_CC_PELLESC) -+# define LZO_UNUSED_FUNC(func) {LZO_EXTERN_C int lzo_unused_func__[1-2*!(sizeof((int)func)>0)];} -+# else -+# define LZO_UNUSED_FUNC(func) ((void) func) -+# endif -+#endif -+#if !defined(LZO_UNUSED_LABEL) -+# if (LZO_CC_CLANG >= 0x020800ul) -+# define LZO_UNUSED_LABEL(l) (__lzo_gnuc_extension__ ((void) ((const void *) &&l))) -+# elif (LZO_CC_ARMCC || LZO_CC_CLANG || LZO_CC_INTELC || LZO_CC_WATCOMC) -+# define LZO_UNUSED_LABEL(l) if __lzo_cte(0) goto l -+# else -+# define LZO_UNUSED_LABEL(l) switch (0) case 1:goto l -+# endif -+#endif -+#if !defined(LZO_DEFINE_UNINITIALIZED_VAR) -+# if 0 -+# define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init) type var -+# elif 0 && (LZO_CC_GNUC) -+# define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init) type var = var -+# else -+# define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init) type var = init -+# endif -+#endif -+#if !defined(__lzo_inline) -+#if (LZO_CC_TURBOC && (__TURBOC__ <= 0x0295)) -+#elif defined(__cplusplus) -+# define __lzo_inline inline -+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__-0 >= 199901L) -+# define __lzo_inline inline -+#elif (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0550)) -+# define __lzo_inline __inline -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CILLY || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) -+# define __lzo_inline __inline__ -+#elif (LZO_CC_DMC) -+# define __lzo_inline __inline -+#elif (LZO_CC_GHS) -+# define __lzo_inline __inline__ -+#elif (LZO_CC_IBMC >= 600) -+# define __lzo_inline __inline__ -+#elif (LZO_CC_INTELC) -+# define __lzo_inline __inline -+#elif (LZO_CC_MWERKS && (__MWERKS__ >= 0x2405)) -+# define __lzo_inline __inline -+#elif (LZO_CC_MSC && (_MSC_VER >= 900)) -+# define __lzo_inline __inline -+#elif (LZO_CC_SUNPROC >= 0x5100) -+# define __lzo_inline __inline__ -+#endif -+#endif -+#if defined(__lzo_inline) -+# ifndef __lzo_HAVE_inline -+# define __lzo_HAVE_inline 1 -+# endif -+#else -+# define __lzo_inline /*empty*/ -+#endif -+#if !defined(__lzo_forceinline) -+#if (LZO_CC_GNUC >= 0x030200ul) -+# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) -+#elif (LZO_CC_IBMC >= 700) -+# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) -+#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 450)) -+# define __lzo_forceinline __forceinline -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 800)) -+# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) -+#elif (LZO_CC_MSC && (_MSC_VER >= 1200)) -+# define __lzo_forceinline __forceinline -+#elif (LZO_CC_PGI >= 0x0d0a00ul) -+# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) -+#elif (LZO_CC_SUNPROC >= 0x5100) -+# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) -+#endif -+#endif -+#if defined(__lzo_forceinline) -+# ifndef __lzo_HAVE_forceinline -+# define __lzo_HAVE_forceinline 1 -+# endif -+#else -+# define __lzo_forceinline __lzo_inline -+#endif -+#if !defined(__lzo_noinline) -+#if 1 && (LZO_ARCH_I386) && (LZO_CC_GNUC >= 0x040000ul) && (LZO_CC_GNUC < 0x040003ul) -+# define __lzo_noinline __attribute__((__noinline__,__used__)) -+#elif (LZO_CC_GNUC >= 0x030200ul) -+# define __lzo_noinline __attribute__((__noinline__)) -+#elif (LZO_CC_IBMC >= 700) -+# define __lzo_noinline __attribute__((__noinline__)) -+#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 600)) -+# define __lzo_noinline __declspec(noinline) -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 800)) -+# define __lzo_noinline __attribute__((__noinline__)) -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_noinline __attribute__((__noinline__)) -+#elif (LZO_CC_MSC && (_MSC_VER >= 1300)) -+# define __lzo_noinline __declspec(noinline) -+#elif (LZO_CC_MWERKS && (__MWERKS__ >= 0x3200) && (LZO_OS_WIN32 || LZO_OS_WIN64)) -+# if defined(__cplusplus) -+# else -+# define __lzo_noinline __declspec(noinline) -+# endif -+#elif (LZO_CC_PGI >= 0x0d0a00ul) -+# define __lzo_noinline __attribute__((__noinline__)) -+#elif (LZO_CC_SUNPROC >= 0x5100) -+# define __lzo_noinline __attribute__((__noinline__)) -+#endif -+#endif -+#if defined(__lzo_noinline) -+# ifndef __lzo_HAVE_noinline -+# define __lzo_HAVE_noinline 1 -+# endif -+#else -+# define __lzo_noinline /*empty*/ -+#endif -+#if (__lzo_HAVE_forceinline || __lzo_HAVE_noinline) && !(__lzo_HAVE_inline) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if !defined(__lzo_static_inline) -+#if (LZO_CC_IBMC) -+# define __lzo_static_inline __lzo_gnuc_extension__ static __lzo_inline -+#endif -+#endif -+#if !defined(__lzo_static_inline) -+# define __lzo_static_inline static __lzo_inline -+#endif -+#if !defined(__lzo_static_forceinline) -+#if (LZO_CC_IBMC) -+# define __lzo_static_forceinline __lzo_gnuc_extension__ static __lzo_forceinline -+#endif -+#endif -+#if !defined(__lzo_static_forceinline) -+# define __lzo_static_forceinline static __lzo_forceinline -+#endif -+#if !defined(__lzo_static_noinline) -+#if (LZO_CC_IBMC) -+# define __lzo_static_noinline __lzo_gnuc_extension__ static __lzo_noinline -+#endif -+#endif -+#if !defined(__lzo_static_noinline) -+# define __lzo_static_noinline static __lzo_noinline -+#endif -+#if !defined(__lzo_c99_extern_inline) -+#if defined(__GNUC_GNU_INLINE__) -+# define __lzo_c99_extern_inline __lzo_inline -+#elif defined(__GNUC_STDC_INLINE__) -+# define __lzo_c99_extern_inline extern __lzo_inline -+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__-0 >= 199901L) -+# define __lzo_c99_extern_inline extern __lzo_inline -+#endif -+#if !defined(__lzo_c99_extern_inline) && (__lzo_HAVE_inline) -+# define __lzo_c99_extern_inline __lzo_inline -+#endif -+#endif -+#if defined(__lzo_c99_extern_inline) -+# ifndef __lzo_HAVE_c99_extern_inline -+# define __lzo_HAVE_c99_extern_inline 1 -+# endif -+#else -+# define __lzo_c99_extern_inline /*empty*/ -+#endif -+#if !defined(__lzo_may_alias) -+#if (LZO_CC_GNUC >= 0x030400ul) -+# define __lzo_may_alias __attribute__((__may_alias__)) -+#elif (LZO_CC_CLANG >= 0x020900ul) -+# define __lzo_may_alias __attribute__((__may_alias__)) -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 1210)) && 0 -+# define __lzo_may_alias __attribute__((__may_alias__)) -+#elif (LZO_CC_PGI >= 0x0d0a00ul) && 0 -+# define __lzo_may_alias __attribute__((__may_alias__)) -+#endif -+#endif -+#if defined(__lzo_may_alias) -+# ifndef __lzo_HAVE_may_alias -+# define __lzo_HAVE_may_alias 1 -+# endif -+#else -+# define __lzo_may_alias /*empty*/ -+#endif -+#if !defined(__lzo_noreturn) -+#if (LZO_CC_GNUC >= 0x020700ul) -+# define __lzo_noreturn __attribute__((__noreturn__)) -+#elif (LZO_CC_IBMC >= 700) -+# define __lzo_noreturn __attribute__((__noreturn__)) -+#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 450)) -+# define __lzo_noreturn __declspec(noreturn) -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 600)) -+# define __lzo_noreturn __attribute__((__noreturn__)) -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_noreturn __attribute__((__noreturn__)) -+#elif (LZO_CC_MSC && (_MSC_VER >= 1200)) -+# define __lzo_noreturn __declspec(noreturn) -+#elif (LZO_CC_PGI >= 0x0d0a00ul) -+# define __lzo_noreturn __attribute__((__noreturn__)) -+#endif -+#endif -+#if defined(__lzo_noreturn) -+# ifndef __lzo_HAVE_noreturn -+# define __lzo_HAVE_noreturn 1 -+# endif -+#else -+# define __lzo_noreturn /*empty*/ -+#endif -+#if !defined(__lzo_nothrow) -+#if (LZO_CC_GNUC >= 0x030300ul) -+# define __lzo_nothrow __attribute__((__nothrow__)) -+#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 450)) && defined(__cplusplus) -+# define __lzo_nothrow __declspec(nothrow) -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 900)) -+# define __lzo_nothrow __attribute__((__nothrow__)) -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_nothrow __attribute__((__nothrow__)) -+#elif (LZO_CC_MSC && (_MSC_VER >= 1200)) && defined(__cplusplus) -+# define __lzo_nothrow __declspec(nothrow) -+#endif -+#endif -+#if defined(__lzo_nothrow) -+# ifndef __lzo_HAVE_nothrow -+# define __lzo_HAVE_nothrow 1 -+# endif -+#else -+# define __lzo_nothrow /*empty*/ -+#endif -+#if !defined(__lzo_restrict) -+#if (LZO_CC_GNUC >= 0x030400ul) -+# define __lzo_restrict __restrict__ -+#elif (LZO_CC_IBMC >= 800) && !defined(__cplusplus) -+# define __lzo_restrict __restrict__ -+#elif (LZO_CC_IBMC >= 1210) -+# define __lzo_restrict __restrict__ -+#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 600)) -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 600)) -+# define __lzo_restrict __restrict__ -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM) -+# define __lzo_restrict __restrict__ -+#elif (LZO_CC_MSC && (_MSC_VER >= 1400)) -+# define __lzo_restrict __restrict -+#elif (LZO_CC_PGI >= 0x0d0a00ul) -+# define __lzo_restrict __restrict__ -+#endif -+#endif -+#if defined(__lzo_restrict) -+# ifndef __lzo_HAVE_restrict -+# define __lzo_HAVE_restrict 1 -+# endif -+#else -+# define __lzo_restrict /*empty*/ -+#endif -+#if !defined(__lzo_alignof) -+#if (LZO_CC_ARMCC || LZO_CC_CILLY || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) -+# define __lzo_alignof(e) __alignof__(e) -+#elif (LZO_CC_GHS) && !defined(__cplusplus) -+# define __lzo_alignof(e) __alignof__(e) -+#elif (LZO_CC_IBMC >= 600) -+# define __lzo_alignof(e) (__lzo_gnuc_extension__ __alignof__(e)) -+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 700)) -+# define __lzo_alignof(e) __alignof__(e) -+#elif (LZO_CC_MSC && (_MSC_VER >= 1300)) -+# define __lzo_alignof(e) __alignof(e) -+#elif (LZO_CC_SUNPROC >= 0x5100) -+# define __lzo_alignof(e) __alignof__(e) -+#endif -+#endif -+#if defined(__lzo_alignof) -+# ifndef __lzo_HAVE_alignof -+# define __lzo_HAVE_alignof 1 -+# endif -+#endif -+#if !defined(__lzo_struct_packed) -+#if (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020800ul)) && defined(__cplusplus) -+#elif (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020700ul)) -+#elif (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020800ul)) && defined(__cplusplus) -+#elif (LZO_CC_PCC && (LZO_CC_PCC < 0x010100ul)) -+#elif (LZO_CC_SUNPROC && (LZO_CC_SUNPROC < 0x5110)) && !defined(__cplusplus) -+#elif (LZO_CC_GNUC >= 0x030400ul) && !(LZO_CC_PCC_GNUC) && (LZO_ARCH_AMD64 || LZO_ARCH_I386) -+# define __lzo_struct_packed(s) struct s { -+# define __lzo_struct_packed_end() } __attribute__((__gcc_struct__,__packed__)); -+# define __lzo_struct_packed_ma_end() } __lzo_may_alias __attribute__((__gcc_struct__,__packed__)); -+#elif (LZO_CC_ARMCC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || (LZO_CC_PGI >= 0x0d0a00ul) || (LZO_CC_SUNPROC >= 0x5100)) -+# define __lzo_struct_packed(s) struct s { -+# define __lzo_struct_packed_end() } __attribute__((__packed__)); -+# define __lzo_struct_packed_ma_end() } __lzo_may_alias __attribute__((__packed__)); -+#elif (LZO_CC_IBMC >= 700) -+# define __lzo_struct_packed(s) __lzo_gnuc_extension__ struct s { -+# define __lzo_struct_packed_end() } __attribute__((__packed__)); -+# define __lzo_struct_packed_ma_end() } __lzo_may_alias __attribute__((__packed__)); -+#elif (LZO_CC_INTELC_MSC) || (LZO_CC_MSC && (_MSC_VER >= 1300)) -+# define __lzo_struct_packed(s) __pragma(pack(push,1)) struct s { -+# define __lzo_struct_packed_end() } __pragma(pack(pop)); -+#elif (LZO_CC_WATCOMC && (__WATCOMC__ >= 900)) -+# define __lzo_struct_packed(s) _Packed struct s { -+# define __lzo_struct_packed_end() }; -+#endif -+#endif -+#if defined(__lzo_struct_packed) && !defined(__lzo_struct_packed_ma) -+# define __lzo_struct_packed_ma(s) __lzo_struct_packed(s) -+#endif -+#if defined(__lzo_struct_packed_end) && !defined(__lzo_struct_packed_ma_end) -+# define __lzo_struct_packed_ma_end() __lzo_struct_packed_end() -+#endif -+#if !defined(__lzo_byte_struct) -+#if defined(__lzo_struct_packed) -+# define __lzo_byte_struct(s,n) __lzo_struct_packed(s) unsigned char a[n]; __lzo_struct_packed_end() -+# define __lzo_byte_struct_ma(s,n) __lzo_struct_packed_ma(s) unsigned char a[n]; __lzo_struct_packed_ma_end() -+#elif (LZO_CC_CILLY || LZO_CC_CLANG || LZO_CC_PGI || (LZO_CC_SUNPROC >= 0x5100)) -+# define __lzo_byte_struct(s,n) struct s { unsigned char a[n]; } __attribute__((__packed__)); -+# define __lzo_byte_struct_ma(s,n) struct s { unsigned char a[n]; } __lzo_may_alias __attribute__((__packed__)); -+#endif -+#endif -+#if defined(__lzo_byte_struct) && !defined(__lzo_byte_struct_ma) -+# define __lzo_byte_struct_ma(s,n) __lzo_byte_struct(s,n) -+#endif -+#if !defined(__lzo_struct_align16) && (__lzo_HAVE_alignof) -+#if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x030000ul)) -+#elif (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020800ul)) && defined(__cplusplus) -+#elif (LZO_CC_CILLY || LZO_CC_PCC) -+#elif (LZO_CC_INTELC_MSC) || (LZO_CC_MSC && (_MSC_VER >= 1300)) -+# define __lzo_struct_align16(s) struct __declspec(align(16)) s { -+# define __lzo_struct_align16_end() }; -+# define __lzo_struct_align32(s) struct __declspec(align(32)) s { -+# define __lzo_struct_align32_end() }; -+# define __lzo_struct_align64(s) struct __declspec(align(64)) s { -+# define __lzo_struct_align64_end() }; -+#elif (LZO_CC_ARMCC || LZO_CC_CLANG || LZO_CC_GNUC || (LZO_CC_IBMC >= 700) || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_struct_align16(s) struct s { -+# define __lzo_struct_align16_end() } __attribute__((__aligned__(16))); -+# define __lzo_struct_align32(s) struct s { -+# define __lzo_struct_align32_end() } __attribute__((__aligned__(32))); -+# define __lzo_struct_align64(s) struct s { -+# define __lzo_struct_align64_end() } __attribute__((__aligned__(64))); -+#endif -+#endif -+#if !defined(__lzo_union_um) -+#if (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020800ul)) && defined(__cplusplus) -+#elif (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020700ul)) -+#elif (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020800ul)) && defined(__cplusplus) -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER < 810)) -+#elif (LZO_CC_PCC && (LZO_CC_PCC < 0x010100ul)) -+#elif (LZO_CC_SUNPROC && (LZO_CC_SUNPROC < 0x5110)) && !defined(__cplusplus) -+#elif (LZO_CC_ARMCC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || (LZO_CC_PGI >= 0x0d0a00ul) || (LZO_CC_SUNPROC >= 0x5100)) -+# define __lzo_union_am(s) union s { -+# define __lzo_union_am_end() } __lzo_may_alias; -+# define __lzo_union_um(s) union s { -+# define __lzo_union_um_end() } __lzo_may_alias __attribute__((__packed__)); -+#elif (LZO_CC_IBMC >= 700) -+# define __lzo_union_am(s) __lzo_gnuc_extension__ union s { -+# define __lzo_union_am_end() } __lzo_may_alias; -+# define __lzo_union_um(s) __lzo_gnuc_extension__ union s { -+# define __lzo_union_um_end() } __lzo_may_alias __attribute__((__packed__)); -+#elif (LZO_CC_INTELC_MSC) || (LZO_CC_MSC && (_MSC_VER >= 1300)) -+# define __lzo_union_um(s) __pragma(pack(push,1)) union s { -+# define __lzo_union_um_end() } __pragma(pack(pop)); -+#elif (LZO_CC_WATCOMC && (__WATCOMC__ >= 900)) -+# define __lzo_union_um(s) _Packed union s { -+# define __lzo_union_um_end() }; -+#endif -+#endif -+#if !defined(__lzo_union_am) -+# define __lzo_union_am(s) union s { -+# define __lzo_union_am_end() }; -+#endif -+#if !defined(__lzo_constructor) -+#if (LZO_CC_GNUC >= 0x030400ul) -+# define __lzo_constructor __attribute__((__constructor__,__used__)) -+#elif (LZO_CC_GNUC >= 0x020700ul) -+# define __lzo_constructor __attribute__((__constructor__)) -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 800)) -+# define __lzo_constructor __attribute__((__constructor__,__used__)) -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_constructor __attribute__((__constructor__)) -+#endif -+#endif -+#if defined(__lzo_constructor) -+# ifndef __lzo_HAVE_constructor -+# define __lzo_HAVE_constructor 1 -+# endif -+#endif -+#if !defined(__lzo_destructor) -+#if (LZO_CC_GNUC >= 0x030400ul) -+# define __lzo_destructor __attribute__((__destructor__,__used__)) -+#elif (LZO_CC_GNUC >= 0x020700ul) -+# define __lzo_destructor __attribute__((__destructor__)) -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 800)) -+# define __lzo_destructor __attribute__((__destructor__,__used__)) -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_destructor __attribute__((__destructor__)) -+#endif -+#endif -+#if defined(__lzo_destructor) -+# ifndef __lzo_HAVE_destructor -+# define __lzo_HAVE_destructor 1 -+# endif -+#endif -+#if (__lzo_HAVE_destructor) && !(__lzo_HAVE_constructor) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if !defined(__lzo_likely) && !defined(__lzo_unlikely) -+#if (LZO_CC_GNUC >= 0x030200ul) -+# define __lzo_likely(e) (__builtin_expect(!!(e),1)) -+# define __lzo_unlikely(e) (__builtin_expect(!!(e),0)) -+#elif (LZO_CC_IBMC >= 1010) -+# define __lzo_likely(e) (__builtin_expect(!!(e),1)) -+# define __lzo_unlikely(e) (__builtin_expect(!!(e),0)) -+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 800)) -+# define __lzo_likely(e) (__builtin_expect(!!(e),1)) -+# define __lzo_unlikely(e) (__builtin_expect(!!(e),0)) -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_likely(e) (__builtin_expect(!!(e),1)) -+# define __lzo_unlikely(e) (__builtin_expect(!!(e),0)) -+#endif -+#endif -+#if defined(__lzo_likely) -+# ifndef __lzo_HAVE_likely -+# define __lzo_HAVE_likely 1 -+# endif -+#else -+# define __lzo_likely(e) (e) -+#endif -+#if defined(__lzo_unlikely) -+# ifndef __lzo_HAVE_unlikely -+# define __lzo_HAVE_unlikely 1 -+# endif -+#else -+# define __lzo_unlikely(e) (e) -+#endif -+#if !defined(__lzo_static_unused_void_func) -+# if 1 && (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || (LZO_CC_GNUC >= 0x020700ul) || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) -+# define __lzo_static_unused_void_func(f) static void __attribute__((__unused__)) f(void) -+# else -+# define __lzo_static_unused_void_func(f) static __lzo_inline void f(void) -+# endif -+#endif -+#if !defined(__lzo_loop_forever) -+# if (LZO_CC_IBMC) -+# define __lzo_loop_forever() LZO_BLOCK_BEGIN for (;;) { ; } LZO_BLOCK_END -+# else -+# define __lzo_loop_forever() do { ; } while __lzo_cte(1) -+# endif -+#endif -+#if !defined(__lzo_unreachable) -+#if (LZO_CC_CLANG && (LZO_CC_CLANG >= 0x020800ul)) -+# define __lzo_unreachable() __builtin_unreachable(); -+#elif (LZO_CC_GNUC >= 0x040500ul) -+# define __lzo_unreachable() __builtin_unreachable(); -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 1300)) && 1 -+# define __lzo_unreachable() __builtin_unreachable(); -+#endif -+#endif -+#if defined(__lzo_unreachable) -+# ifndef __lzo_HAVE_unreachable -+# define __lzo_HAVE_unreachable 1 -+# endif -+#else -+# if 0 -+# define __lzo_unreachable() ((void)0); -+# else -+# define __lzo_unreachable() __lzo_loop_forever(); -+# endif -+#endif -+#ifndef __LZO_CTA_NAME -+#if (LZO_CFG_USE_COUNTER) -+# define __LZO_CTA_NAME(a) LZO_PP_ECONCAT2(a,__COUNTER__) -+#else -+# define __LZO_CTA_NAME(a) LZO_PP_ECONCAT2(a,__LINE__) -+#endif -+#endif -+#if !defined(LZO_COMPILE_TIME_ASSERT_HEADER) -+# if (LZO_CC_AZTECC || LZO_CC_ZORTECHC) -+# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1-!(e)]; LZO_EXTERN_C_END -+# elif (LZO_CC_DMC || LZO_CC_SYMANTECC) -+# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1u-2*!(e)]; LZO_EXTERN_C_END -+# elif (LZO_CC_TURBOC && (__TURBOC__ == 0x0295)) -+# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1-!(e)]; LZO_EXTERN_C_END -+# elif (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020900ul)) && defined(__cplusplus) -+# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN int __LZO_CTA_NAME(lzo_cta_f__)(int [1-2*!(e)]); LZO_EXTERN_C_END -+# elif (LZO_CC_GNUC) && defined(__CHECKER__) && defined(__SPARSE_CHECKER__) -+# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN enum {__LZO_CTA_NAME(lzo_cta_e__)=1/!!(e)} __attribute__((__unused__)); LZO_EXTERN_C_END -+# else -+# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1-2*!(e)]; LZO_EXTERN_C_END -+# endif -+#endif -+#if !defined(LZO_COMPILE_TIME_ASSERT) -+# if (LZO_CC_AZTECC) -+# define LZO_COMPILE_TIME_ASSERT(e) {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-!(e)];} -+# elif (LZO_CC_DMC || LZO_CC_PACIFICC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC) -+# define LZO_COMPILE_TIME_ASSERT(e) switch(0) case 1:case !(e):break; -+# elif (LZO_CC_GNUC) && defined(__CHECKER__) && defined(__SPARSE_CHECKER__) -+# define LZO_COMPILE_TIME_ASSERT(e) {(void) (0/!!(e));} -+# elif (LZO_CC_GNUC >= 0x040700ul) && (LZO_CFG_USE_COUNTER) && defined(__cplusplus) -+# define LZO_COMPILE_TIME_ASSERT(e) {enum {__LZO_CTA_NAME(lzo_cta_e__)=1/!!(e)} __attribute__((__unused__));} -+# elif (LZO_CC_GNUC >= 0x040700ul) -+# define LZO_COMPILE_TIME_ASSERT(e) {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-2*!(e)] __attribute__((__unused__));} -+# elif (LZO_CC_MSC && (_MSC_VER < 900)) -+# define LZO_COMPILE_TIME_ASSERT(e) switch(0) case 1:case !(e):break; -+# elif (LZO_CC_TURBOC && (__TURBOC__ == 0x0295)) -+# define LZO_COMPILE_TIME_ASSERT(e) switch(0) case 1:case !(e):break; -+# else -+# define LZO_COMPILE_TIME_ASSERT(e) {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-2*!(e)];} -+# endif -+#endif -+LZO_COMPILE_TIME_ASSERT_HEADER(1 == 1) -+#if defined(__cplusplus) -+extern "C" { LZO_COMPILE_TIME_ASSERT_HEADER(2 == 2) } -+#endif -+LZO_COMPILE_TIME_ASSERT_HEADER(3 == 3) -+#if (LZO_ARCH_I086 || LZO_ARCH_I386) && (LZO_OS_DOS16 || LZO_OS_DOS32 || LZO_OS_OS2 || LZO_OS_OS216 || LZO_OS_WIN16 || LZO_OS_WIN32 || LZO_OS_WIN64) -+# if (LZO_CC_GNUC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PACIFICC) -+# elif (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC) -+# define __lzo_cdecl __cdecl -+# define __lzo_cdecl_atexit /*empty*/ -+# define __lzo_cdecl_main __cdecl -+# if (LZO_OS_OS2 && (LZO_CC_DMC || LZO_CC_SYMANTECC)) -+# define __lzo_cdecl_qsort __pascal -+# elif (LZO_OS_OS2 && (LZO_CC_ZORTECHC)) -+# define __lzo_cdecl_qsort _stdcall -+# else -+# define __lzo_cdecl_qsort __cdecl -+# endif -+# elif (LZO_CC_WATCOMC) -+# define __lzo_cdecl __cdecl -+# else -+# define __lzo_cdecl __cdecl -+# define __lzo_cdecl_atexit __cdecl -+# define __lzo_cdecl_main __cdecl -+# define __lzo_cdecl_qsort __cdecl -+# endif -+# if (LZO_CC_GNUC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PACIFICC || LZO_CC_WATCOMC) -+# elif (LZO_OS_OS2 && (LZO_CC_DMC || LZO_CC_SYMANTECC)) -+# define __lzo_cdecl_sighandler __pascal -+# elif (LZO_OS_OS2 && (LZO_CC_ZORTECHC)) -+# define __lzo_cdecl_sighandler _stdcall -+# elif (LZO_CC_MSC && (_MSC_VER >= 1400)) && defined(_M_CEE_PURE) -+# define __lzo_cdecl_sighandler __clrcall -+# elif (LZO_CC_MSC && (_MSC_VER >= 600 && _MSC_VER < 700)) -+# if defined(_DLL) -+# define __lzo_cdecl_sighandler _far _cdecl _loadds -+# elif defined(_MT) -+# define __lzo_cdecl_sighandler _far _cdecl -+# else -+# define __lzo_cdecl_sighandler _cdecl -+# endif -+# else -+# define __lzo_cdecl_sighandler __cdecl -+# endif -+#elif (LZO_ARCH_I386) && (LZO_CC_WATCOMC) -+# define __lzo_cdecl __cdecl -+#elif (LZO_ARCH_M68K && LZO_OS_TOS && (LZO_CC_PUREC || LZO_CC_TURBOC)) -+# define __lzo_cdecl cdecl -+#endif -+#if !defined(__lzo_cdecl) -+# define __lzo_cdecl /*empty*/ -+#endif -+#if !defined(__lzo_cdecl_atexit) -+# define __lzo_cdecl_atexit /*empty*/ -+#endif -+#if !defined(__lzo_cdecl_main) -+# define __lzo_cdecl_main /*empty*/ -+#endif -+#if !defined(__lzo_cdecl_qsort) -+# define __lzo_cdecl_qsort /*empty*/ -+#endif -+#if !defined(__lzo_cdecl_sighandler) -+# define __lzo_cdecl_sighandler /*empty*/ -+#endif -+#if !defined(__lzo_cdecl_va) -+# define __lzo_cdecl_va __lzo_cdecl -+#endif -+#if !(LZO_CFG_NO_WINDOWS_H) -+#if !defined(LZO_HAVE_WINDOWS_H) -+#if (LZO_OS_CYGWIN || (LZO_OS_EMX && defined(__RSXNT__)) || LZO_OS_WIN32 || LZO_OS_WIN64) -+# if (LZO_CC_WATCOMC && (__WATCOMC__ < 1000)) -+# elif (LZO_OS_WIN32 && LZO_CC_GNUC) && defined(__PW32__) -+# elif ((LZO_OS_CYGWIN || defined(__MINGW32__)) && (LZO_CC_GNUC && (LZO_CC_GNUC < 0x025f00ul))) -+# else -+# define LZO_HAVE_WINDOWS_H 1 -+# endif -+#endif -+#endif -+#endif -+#ifndef LZO_SIZEOF_SHORT -+#if defined(SIZEOF_SHORT) -+# define LZO_SIZEOF_SHORT (SIZEOF_SHORT) -+#elif defined(__SIZEOF_SHORT__) -+# define LZO_SIZEOF_SHORT (__SIZEOF_SHORT__) -+#endif -+#endif -+#ifndef LZO_SIZEOF_INT -+#if defined(SIZEOF_INT) -+# define LZO_SIZEOF_INT (SIZEOF_INT) -+#elif defined(__SIZEOF_INT__) -+# define LZO_SIZEOF_INT (__SIZEOF_INT__) -+#endif -+#endif -+#ifndef LZO_SIZEOF_LONG -+#if defined(SIZEOF_LONG) -+# define LZO_SIZEOF_LONG (SIZEOF_LONG) -+#elif defined(__SIZEOF_LONG__) -+# define LZO_SIZEOF_LONG (__SIZEOF_LONG__) -+#endif -+#endif -+#ifndef LZO_SIZEOF_LONG_LONG -+#if defined(SIZEOF_LONG_LONG) -+# define LZO_SIZEOF_LONG_LONG (SIZEOF_LONG_LONG) -+#elif defined(__SIZEOF_LONG_LONG__) -+# define LZO_SIZEOF_LONG_LONG (__SIZEOF_LONG_LONG__) -+#endif -+#endif -+#ifndef LZO_SIZEOF___INT16 -+#if defined(SIZEOF___INT16) -+# define LZO_SIZEOF___INT16 (SIZEOF___INT16) -+#endif -+#endif -+#ifndef LZO_SIZEOF___INT32 -+#if defined(SIZEOF___INT32) -+# define LZO_SIZEOF___INT32 (SIZEOF___INT32) -+#endif -+#endif -+#ifndef LZO_SIZEOF___INT64 -+#if defined(SIZEOF___INT64) -+# define LZO_SIZEOF___INT64 (SIZEOF___INT64) -+#endif -+#endif -+#ifndef LZO_SIZEOF_VOID_P -+#if defined(SIZEOF_VOID_P) -+# define LZO_SIZEOF_VOID_P (SIZEOF_VOID_P) -+#elif defined(__SIZEOF_POINTER__) -+# define LZO_SIZEOF_VOID_P (__SIZEOF_POINTER__) -+#endif -+#endif -+#ifndef LZO_SIZEOF_SIZE_T -+#if defined(SIZEOF_SIZE_T) -+# define LZO_SIZEOF_SIZE_T (SIZEOF_SIZE_T) -+#elif defined(__SIZEOF_SIZE_T__) -+# define LZO_SIZEOF_SIZE_T (__SIZEOF_SIZE_T__) -+#endif -+#endif -+#ifndef LZO_SIZEOF_PTRDIFF_T -+#if defined(SIZEOF_PTRDIFF_T) -+# define LZO_SIZEOF_PTRDIFF_T (SIZEOF_PTRDIFF_T) -+#elif defined(__SIZEOF_PTRDIFF_T__) -+# define LZO_SIZEOF_PTRDIFF_T (__SIZEOF_PTRDIFF_T__) -+#endif -+#endif -+#define __LZO_LSR(x,b) (((x)+0ul) >> (b)) -+#if !defined(LZO_SIZEOF_SHORT) -+# if (LZO_ARCH_CRAY_PVP) -+# define LZO_SIZEOF_SHORT 8 -+# elif (USHRT_MAX == LZO_0xffffL) -+# define LZO_SIZEOF_SHORT 2 -+# elif (__LZO_LSR(USHRT_MAX,7) == 1) -+# define LZO_SIZEOF_SHORT 1 -+# elif (__LZO_LSR(USHRT_MAX,15) == 1) -+# define LZO_SIZEOF_SHORT 2 -+# elif (__LZO_LSR(USHRT_MAX,31) == 1) -+# define LZO_SIZEOF_SHORT 4 -+# elif (__LZO_LSR(USHRT_MAX,63) == 1) -+# define LZO_SIZEOF_SHORT 8 -+# elif (__LZO_LSR(USHRT_MAX,127) == 1) -+# define LZO_SIZEOF_SHORT 16 -+# else -+# error "LZO_SIZEOF_SHORT" -+# endif -+#endif -+LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_SHORT == sizeof(short)) -+#if !defined(LZO_SIZEOF_INT) -+# if (LZO_ARCH_CRAY_PVP) -+# define LZO_SIZEOF_INT 8 -+# elif (UINT_MAX == LZO_0xffffL) -+# define LZO_SIZEOF_INT 2 -+# elif (UINT_MAX == LZO_0xffffffffL) -+# define LZO_SIZEOF_INT 4 -+# elif (__LZO_LSR(UINT_MAX,7) == 1) -+# define LZO_SIZEOF_INT 1 -+# elif (__LZO_LSR(UINT_MAX,15) == 1) -+# define LZO_SIZEOF_INT 2 -+# elif (__LZO_LSR(UINT_MAX,31) == 1) -+# define LZO_SIZEOF_INT 4 -+# elif (__LZO_LSR(UINT_MAX,63) == 1) -+# define LZO_SIZEOF_INT 8 -+# elif (__LZO_LSR(UINT_MAX,127) == 1) -+# define LZO_SIZEOF_INT 16 -+# else -+# error "LZO_SIZEOF_INT" -+# endif -+#endif -+LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_INT == sizeof(int)) -+#if !defined(LZO_SIZEOF_LONG) -+# if (ULONG_MAX == LZO_0xffffffffL) -+# define LZO_SIZEOF_LONG 4 -+# elif (__LZO_LSR(ULONG_MAX,7) == 1) -+# define LZO_SIZEOF_LONG 1 -+# elif (__LZO_LSR(ULONG_MAX,15) == 1) -+# define LZO_SIZEOF_LONG 2 -+# elif (__LZO_LSR(ULONG_MAX,31) == 1) -+# define LZO_SIZEOF_LONG 4 -+# elif (__LZO_LSR(ULONG_MAX,39) == 1) -+# define LZO_SIZEOF_LONG 5 -+# elif (__LZO_LSR(ULONG_MAX,63) == 1) -+# define LZO_SIZEOF_LONG 8 -+# elif (__LZO_LSR(ULONG_MAX,127) == 1) -+# define LZO_SIZEOF_LONG 16 -+# else -+# error "LZO_SIZEOF_LONG" -+# endif -+#endif -+LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_LONG == sizeof(long)) -+#if !defined(LZO_SIZEOF_LONG_LONG) && !defined(LZO_SIZEOF___INT64) -+#if (LZO_SIZEOF_LONG > 0 && LZO_SIZEOF_LONG < 8) -+# if defined(__LONG_MAX__) && defined(__LONG_LONG_MAX__) -+# if (LZO_CC_GNUC >= 0x030300ul) -+# if ((__LONG_MAX__-0) == (__LONG_LONG_MAX__-0)) -+# define LZO_SIZEOF_LONG_LONG LZO_SIZEOF_LONG -+# elif (__LZO_LSR(__LONG_LONG_MAX__,30) == 1) -+# define LZO_SIZEOF_LONG_LONG 4 -+# endif -+# endif -+# endif -+#endif -+#endif -+#if !defined(LZO_SIZEOF_LONG_LONG) && !defined(LZO_SIZEOF___INT64) -+#if (LZO_SIZEOF_LONG > 0 && LZO_SIZEOF_LONG < 8) -+#if (LZO_ARCH_I086 && LZO_CC_DMC) -+#elif (LZO_CC_CILLY) && defined(__GNUC__) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif ((LZO_OS_WIN32 || LZO_OS_WIN64 || defined(_WIN32)) && LZO_CC_MSC && (_MSC_VER >= 1400)) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (LZO_OS_WIN64 || defined(_WIN64)) -+# define LZO_SIZEOF___INT64 8 -+#elif (LZO_ARCH_I386 && (LZO_CC_DMC)) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (LZO_ARCH_I386 && (LZO_CC_SYMANTECC && (__SC__ >= 0x700))) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (LZO_ARCH_I386 && (LZO_CC_INTELC && defined(__linux__))) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (LZO_ARCH_I386 && (LZO_CC_MWERKS || LZO_CC_PELLESC || LZO_CC_PGI || LZO_CC_SUNPROC)) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (LZO_ARCH_I386 && (LZO_CC_INTELC || LZO_CC_MSC)) -+# define LZO_SIZEOF___INT64 8 -+#elif ((LZO_OS_WIN32 || defined(_WIN32)) && (LZO_CC_MSC)) -+# define LZO_SIZEOF___INT64 8 -+#elif (LZO_ARCH_I386 && (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0520))) -+# define LZO_SIZEOF___INT64 8 -+#elif (LZO_ARCH_I386 && (LZO_CC_WATCOMC && (__WATCOMC__ >= 1100))) -+# define LZO_SIZEOF___INT64 8 -+#elif (LZO_CC_GHS && defined(__LLONG_BIT) && ((__LLONG_BIT-0) == 64)) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (LZO_CC_WATCOMC && defined(_INTEGRAL_MAX_BITS) && ((_INTEGRAL_MAX_BITS-0) == 64)) -+# define LZO_SIZEOF___INT64 8 -+#elif (LZO_OS_OS400 || defined(__OS400__)) && defined(__LLP64_IFC__) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (defined(__vms) || defined(__VMS)) && ((__INITIAL_POINTER_SIZE-0) == 64) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (LZO_CC_SDCC) && (LZO_SIZEOF_INT == 2) -+#elif 1 && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) -+# define LZO_SIZEOF_LONG_LONG 8 -+#endif -+#endif -+#endif -+#if defined(__cplusplus) && (LZO_CC_GNUC) -+# if (LZO_CC_GNUC < 0x020800ul) -+# undef LZO_SIZEOF_LONG_LONG -+# endif -+#endif -+#if (LZO_CFG_NO_LONG_LONG) -+# undef LZO_SIZEOF_LONG_LONG -+#elif defined(__NO_LONG_LONG) -+# undef LZO_SIZEOF_LONG_LONG -+#elif defined(_NO_LONGLONG) -+# undef LZO_SIZEOF_LONG_LONG -+#endif -+#if !defined(LZO_WORDSIZE) -+#if (LZO_ARCH_ALPHA) -+# define LZO_WORDSIZE 8 -+#elif (LZO_ARCH_AMD64) -+# define LZO_WORDSIZE 8 -+#elif (LZO_ARCH_AVR) -+# define LZO_WORDSIZE 1 -+#elif (LZO_ARCH_H8300) -+# if defined(__NORMAL_MODE__) -+# define LZO_WORDSIZE 4 -+# elif defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__) -+# define LZO_WORDSIZE 4 -+# else -+# define LZO_WORDSIZE 2 -+# endif -+#elif (LZO_ARCH_I086) -+# define LZO_WORDSIZE 2 -+#elif (LZO_ARCH_IA64) -+# define LZO_WORDSIZE 8 -+#elif (LZO_ARCH_M16C) -+# define LZO_WORDSIZE 2 -+#elif (LZO_ARCH_SPU) -+# define LZO_WORDSIZE 4 -+#elif (LZO_ARCH_Z80) -+# define LZO_WORDSIZE 1 -+#elif (LZO_SIZEOF_LONG == 8) && ((defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__)) -+# define LZO_WORDSIZE 8 -+#elif (LZO_OS_OS400 || defined(__OS400__)) -+# define LZO_WORDSIZE 8 -+#elif (defined(__vms) || defined(__VMS)) && (__INITIAL_POINTER_SIZE+0 == 64) -+# define LZO_WORDSIZE 8 -+#endif -+#endif -+#if !defined(LZO_SIZEOF_VOID_P) -+#if defined(__ILP32__) || defined(__ILP32) || defined(_ILP32) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(int) == 4) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 4) -+# define LZO_SIZEOF_VOID_P 4 -+#elif defined(__ILP64__) || defined(__ILP64) || defined(_ILP64) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(int) == 8) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 8) -+# define LZO_SIZEOF_VOID_P 8 -+#elif defined(__LLP64__) || defined(__LLP64) || defined(_LLP64) || defined(_WIN64) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 4) -+# define LZO_SIZEOF_VOID_P 8 -+#elif defined(__LP64__) || defined(__LP64) || defined(_LP64) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 8) -+# define LZO_SIZEOF_VOID_P 8 -+#elif (LZO_ARCH_AVR) -+# define LZO_SIZEOF_VOID_P 2 -+#elif (LZO_ARCH_C166 || LZO_ARCH_MCS51 || LZO_ARCH_MCS251 || LZO_ARCH_MSP430) -+# define LZO_SIZEOF_VOID_P 2 -+#elif (LZO_ARCH_H8300) -+# if defined(__NORMAL_MODE__) -+# define LZO_SIZEOF_VOID_P 2 -+# elif defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__) -+# define LZO_SIZEOF_VOID_P 4 -+# else -+# define LZO_SIZEOF_VOID_P 2 -+# endif -+# if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x040000ul)) && (LZO_SIZEOF_INT == 4) -+# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_INT -+# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_INT -+# endif -+#elif (LZO_ARCH_I086) -+# if (LZO_MM_TINY || LZO_MM_SMALL || LZO_MM_MEDIUM) -+# define LZO_SIZEOF_VOID_P 2 -+# elif (LZO_MM_COMPACT || LZO_MM_LARGE || LZO_MM_HUGE) -+# define LZO_SIZEOF_VOID_P 4 -+# else -+# error "invalid LZO_ARCH_I086 memory model" -+# endif -+#elif (LZO_ARCH_M16C) -+# if defined(__m32c_cpu__) || defined(__m32cm_cpu__) -+# define LZO_SIZEOF_VOID_P 4 -+# else -+# define LZO_SIZEOF_VOID_P 2 -+# endif -+#elif (LZO_ARCH_SPU) -+# define LZO_SIZEOF_VOID_P 4 -+#elif (LZO_ARCH_Z80) -+# define LZO_SIZEOF_VOID_P 2 -+#elif (LZO_SIZEOF_LONG == 8) && ((defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__)) -+# define LZO_SIZEOF_VOID_P 4 -+#elif (LZO_OS_OS400 || defined(__OS400__)) -+# if defined(__LLP64_IFC__) -+# define LZO_SIZEOF_VOID_P 8 -+# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_LONG -+# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_LONG -+# else -+# define LZO_SIZEOF_VOID_P 16 -+# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_LONG -+# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_LONG -+# endif -+#elif (defined(__vms) || defined(__VMS)) && (__INITIAL_POINTER_SIZE+0 == 64) -+# define LZO_SIZEOF_VOID_P 8 -+# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_LONG -+# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_LONG -+#endif -+#endif -+#if !defined(LZO_SIZEOF_VOID_P) -+# define LZO_SIZEOF_VOID_P LZO_SIZEOF_LONG -+#endif -+LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_VOID_P == sizeof(void *)) -+#if !defined(LZO_SIZEOF_SIZE_T) -+#if (LZO_ARCH_I086 || LZO_ARCH_M16C) -+# define LZO_SIZEOF_SIZE_T 2 -+#endif -+#endif -+#if !defined(LZO_SIZEOF_SIZE_T) -+# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_VOID_P -+#endif -+#if defined(offsetof) -+LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_SIZE_T == sizeof(size_t)) -+#endif -+#if !defined(LZO_SIZEOF_PTRDIFF_T) -+#if (LZO_ARCH_I086) -+# if (LZO_MM_TINY || LZO_MM_SMALL || LZO_MM_MEDIUM || LZO_MM_HUGE) -+# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_VOID_P -+# elif (LZO_MM_COMPACT || LZO_MM_LARGE) -+# if (LZO_CC_BORLANDC || LZO_CC_TURBOC) -+# define LZO_SIZEOF_PTRDIFF_T 4 -+# else -+# define LZO_SIZEOF_PTRDIFF_T 2 -+# endif -+# else -+# error "invalid LZO_ARCH_I086 memory model" -+# endif -+#endif -+#endif -+#if !defined(LZO_SIZEOF_PTRDIFF_T) -+# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_SIZE_T -+#endif -+#if defined(offsetof) -+LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t)) -+#endif -+#if !defined(LZO_WORDSIZE) -+# define LZO_WORDSIZE LZO_SIZEOF_VOID_P -+#endif -+#if (LZO_ABI_NEUTRAL_ENDIAN) -+# undef LZO_ABI_BIG_ENDIAN -+# undef LZO_ABI_LITTLE_ENDIAN -+#elif !(LZO_ABI_BIG_ENDIAN) && !(LZO_ABI_LITTLE_ENDIAN) -+#if (LZO_ARCH_ALPHA) && (LZO_ARCH_CRAY_MPP) -+# define LZO_ABI_BIG_ENDIAN 1 -+#elif (LZO_ARCH_IA64) && (LZO_OS_POSIX_LINUX || LZO_OS_WIN64) -+# define LZO_ABI_LITTLE_ENDIAN 1 -+#elif (LZO_ARCH_ALPHA || LZO_ARCH_AMD64 || LZO_ARCH_BLACKFIN || LZO_ARCH_CRIS || LZO_ARCH_I086 || LZO_ARCH_I386 || LZO_ARCH_MSP430) -+# define LZO_ABI_LITTLE_ENDIAN 1 -+#elif (LZO_ARCH_AVR32 || LZO_ARCH_M68K || LZO_ARCH_S390 || LZO_ARCH_SPU) -+# define LZO_ABI_BIG_ENDIAN 1 -+#elif 1 && defined(__IAR_SYSTEMS_ICC__) && defined(__LITTLE_ENDIAN__) -+# if (__LITTLE_ENDIAN__ == 1) -+# define LZO_ABI_LITTLE_ENDIAN 1 -+# else -+# define LZO_ABI_BIG_ENDIAN 1 -+# endif -+#elif 1 && defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) -+# define LZO_ABI_BIG_ENDIAN 1 -+#elif 1 && defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__) -+# define LZO_ABI_LITTLE_ENDIAN 1 -+#elif 1 && (LZO_ARCH_ARM) && defined(__ARMEB__) && !defined(__ARMEL__) -+# define LZO_ABI_BIG_ENDIAN 1 -+#elif 1 && (LZO_ARCH_ARM) && defined(__ARMEL__) && !defined(__ARMEB__) -+# define LZO_ABI_LITTLE_ENDIAN 1 -+#elif 1 && (LZO_ARCH_ARM && LZO_CC_ARMCC_ARMCC) -+# if defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN) -+# error "unexpected configuration - check your compiler defines" -+# elif defined(__BIG_ENDIAN) -+# define LZO_ABI_BIG_ENDIAN 1 -+# else -+# define LZO_ABI_LITTLE_ENDIAN 1 -+# endif -+# define LZO_ABI_LITTLE_ENDIAN 1 -+#elif 1 && (LZO_ARCH_ARM64) && defined(__AARCH64EB__) && !defined(__AARCH64EL__) -+# define LZO_ABI_BIG_ENDIAN 1 -+#elif 1 && (LZO_ARCH_ARM64) && defined(__AARCH64EL__) && !defined(__AARCH64EB__) -+# define LZO_ABI_LITTLE_ENDIAN 1 -+#elif 1 && (LZO_ARCH_MIPS) && defined(__MIPSEB__) && !defined(__MIPSEL__) -+# define LZO_ABI_BIG_ENDIAN 1 -+#elif 1 && (LZO_ARCH_MIPS) && defined(__MIPSEL__) && !defined(__MIPSEB__) -+# define LZO_ABI_LITTLE_ENDIAN 1 -+#endif -+#endif -+#if (LZO_ABI_BIG_ENDIAN) && (LZO_ABI_LITTLE_ENDIAN) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ABI_BIG_ENDIAN) -+# define LZO_INFO_ABI_ENDIAN "be" -+#elif (LZO_ABI_LITTLE_ENDIAN) -+# define LZO_INFO_ABI_ENDIAN "le" -+#elif (LZO_ABI_NEUTRAL_ENDIAN) -+# define LZO_INFO_ABI_ENDIAN "neutral" -+#endif -+#if (LZO_SIZEOF_INT == 1 && LZO_SIZEOF_LONG == 2 && LZO_SIZEOF_VOID_P == 2) -+# define LZO_ABI_I8LP16 1 -+# define LZO_INFO_ABI_PM "i8lp16" -+#elif (LZO_SIZEOF_INT == 2 && LZO_SIZEOF_LONG == 2 && LZO_SIZEOF_VOID_P == 2) -+# define LZO_ABI_ILP16 1 -+# define LZO_INFO_ABI_PM "ilp16" -+#elif (LZO_SIZEOF_INT == 2 && LZO_SIZEOF_LONG == 4 && LZO_SIZEOF_VOID_P == 4) -+# define LZO_ABI_LP32 1 -+# define LZO_INFO_ABI_PM "lp32" -+#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 4 && LZO_SIZEOF_VOID_P == 4) -+# define LZO_ABI_ILP32 1 -+# define LZO_INFO_ABI_PM "ilp32" -+#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 4 && LZO_SIZEOF_VOID_P == 8 && LZO_SIZEOF_SIZE_T == 8) -+# define LZO_ABI_LLP64 1 -+# define LZO_INFO_ABI_PM "llp64" -+#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 8) -+# define LZO_ABI_LP64 1 -+# define LZO_INFO_ABI_PM "lp64" -+#elif (LZO_SIZEOF_INT == 8 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 8) -+# define LZO_ABI_ILP64 1 -+# define LZO_INFO_ABI_PM "ilp64" -+#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 4) -+# define LZO_ABI_IP32L64 1 -+# define LZO_INFO_ABI_PM "ip32l64" -+#endif -+#if 0 -+#elif !defined(__LZO_LIBC_OVERRIDE) -+#if (LZO_LIBC_NAKED) -+# define LZO_INFO_LIBC "naked" -+#elif (LZO_LIBC_FREESTANDING) -+# define LZO_INFO_LIBC "freestanding" -+#elif (LZO_LIBC_MOSTLY_FREESTANDING) -+# define LZO_INFO_LIBC "mfreestanding" -+#elif (LZO_LIBC_ISOC90) -+# define LZO_INFO_LIBC "isoc90" -+#elif (LZO_LIBC_ISOC99) -+# define LZO_INFO_LIBC "isoc99" -+#elif (LZO_CC_ARMCC_ARMCC) && defined(__ARMCLIB_VERSION) -+# define LZO_LIBC_ISOC90 1 -+# define LZO_INFO_LIBC "isoc90" -+#elif defined(__dietlibc__) -+# define LZO_LIBC_DIETLIBC 1 -+# define LZO_INFO_LIBC "dietlibc" -+#elif defined(_NEWLIB_VERSION) -+# define LZO_LIBC_NEWLIB 1 -+# define LZO_INFO_LIBC "newlib" -+#elif defined(__UCLIBC__) && defined(__UCLIBC_MAJOR__) && defined(__UCLIBC_MINOR__) -+# if defined(__UCLIBC_SUBLEVEL__) -+# define LZO_LIBC_UCLIBC (__UCLIBC_MAJOR__ * 0x10000L + (__UCLIBC_MINOR__-0) * 0x100 + (__UCLIBC_SUBLEVEL__-0)) -+# else -+# define LZO_LIBC_UCLIBC 0x00090bL -+# endif -+# define LZO_INFO_LIBC "uc" "libc" -+#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) -+# define LZO_LIBC_GLIBC (__GLIBC__ * 0x10000L + (__GLIBC_MINOR__-0) * 0x100) -+# define LZO_INFO_LIBC "glibc" -+#elif (LZO_CC_MWERKS) && defined(__MSL__) -+# define LZO_LIBC_MSL __MSL__ -+# define LZO_INFO_LIBC "msl" -+#elif 1 && defined(__IAR_SYSTEMS_ICC__) -+# define LZO_LIBC_ISOC90 1 -+# define LZO_INFO_LIBC "isoc90" -+#else -+# define LZO_LIBC_DEFAULT 1 -+# define LZO_INFO_LIBC "default" -+#endif -+#endif -+#if (LZO_ARCH_I386 && (LZO_OS_DOS32 || LZO_OS_WIN32) && (LZO_CC_DMC || LZO_CC_INTELC || LZO_CC_MSC || LZO_CC_PELLESC)) -+# define LZO_ASM_SYNTAX_MSC 1 -+#elif (LZO_OS_WIN64 && (LZO_CC_DMC || LZO_CC_INTELC || LZO_CC_MSC || LZO_CC_PELLESC)) -+#elif (LZO_ARCH_I386 && LZO_CC_GNUC && (LZO_CC_GNUC == 0x011f00ul)) -+#elif (LZO_ARCH_I386 && (LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_INTELC || LZO_CC_PATHSCALE)) -+# define LZO_ASM_SYNTAX_GNUC 1 -+#elif (LZO_ARCH_AMD64 && (LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_INTELC || LZO_CC_PATHSCALE)) -+# define LZO_ASM_SYNTAX_GNUC 1 -+#elif (LZO_CC_GNUC) -+# define LZO_ASM_SYNTAX_GNUC 1 -+#endif -+#if (LZO_ASM_SYNTAX_GNUC) -+#if (LZO_ARCH_I386 && LZO_CC_GNUC && (LZO_CC_GNUC < 0x020000ul)) -+# define __LZO_ASM_CLOBBER "ax" -+# define __LZO_ASM_CLOBBER_LIST_CC /*empty*/ -+# define __LZO_ASM_CLOBBER_LIST_CC_MEMORY /*empty*/ -+# define __LZO_ASM_CLOBBER_LIST_EMPTY /*empty*/ -+#elif (LZO_CC_INTELC && (__INTEL_COMPILER < 1000)) -+# define __LZO_ASM_CLOBBER "memory" -+# define __LZO_ASM_CLOBBER_LIST_CC /*empty*/ -+# define __LZO_ASM_CLOBBER_LIST_CC_MEMORY : "memory" -+# define __LZO_ASM_CLOBBER_LIST_EMPTY /*empty*/ -+#else -+# define __LZO_ASM_CLOBBER "cc", "memory" -+# define __LZO_ASM_CLOBBER_LIST_CC : "cc" -+# define __LZO_ASM_CLOBBER_LIST_CC_MEMORY : "cc", "memory" -+# define __LZO_ASM_CLOBBER_LIST_EMPTY /*empty*/ -+#endif -+#endif -+#if (LZO_ARCH_ALPHA) -+# define LZO_OPT_AVOID_UINT_INDEX 1 -+#elif (LZO_ARCH_AMD64) -+# define LZO_OPT_AVOID_INT_INDEX 1 -+# define LZO_OPT_AVOID_UINT_INDEX 1 -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED64 -+# define LZO_OPT_UNALIGNED64 1 -+# endif -+#elif (LZO_ARCH_ARM) -+# if defined(__ARM_FEATURE_UNALIGNED) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+# elif defined(__TARGET_ARCH_ARM) && ((__TARGET_ARCH_ARM+0) >= 7) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+# elif defined(__TARGET_ARCH_ARM) && ((__TARGET_ARCH_ARM+0) >= 6) && !defined(__TARGET_PROFILE_M) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+# endif -+#elif (LZO_ARCH_ARM64) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED64 -+# define LZO_OPT_UNALIGNED64 1 -+# endif -+#elif (LZO_ARCH_CRIS) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+#elif (LZO_ARCH_I386) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+#elif (LZO_ARCH_IA64) -+# define LZO_OPT_AVOID_INT_INDEX 1 -+# define LZO_OPT_AVOID_UINT_INDEX 1 -+# define LZO_OPT_PREFER_POSTINC 1 -+#elif (LZO_ARCH_M68K) -+# define LZO_OPT_PREFER_POSTINC 1 -+# define LZO_OPT_PREFER_PREDEC 1 -+# if defined(__mc68020__) && !defined(__mcoldfire__) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+# endif -+#elif (LZO_ARCH_MIPS) -+# define LZO_OPT_AVOID_UINT_INDEX 1 -+#elif (LZO_ARCH_POWERPC) -+# define LZO_OPT_PREFER_PREINC 1 -+# define LZO_OPT_PREFER_PREDEC 1 -+# if (LZO_ABI_BIG_ENDIAN) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+# if (LZO_WORDSIZE == 8) -+# ifndef LZO_OPT_UNALIGNED64 -+# define LZO_OPT_UNALIGNED64 1 -+# endif -+# endif -+# endif -+#elif (LZO_ARCH_S390) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+# if (LZO_WORDSIZE == 8) -+# ifndef LZO_OPT_UNALIGNED64 -+# define LZO_OPT_UNALIGNED64 1 -+# endif -+# endif -+#elif (LZO_ARCH_SH) -+# define LZO_OPT_PREFER_POSTINC 1 -+# define LZO_OPT_PREFER_PREDEC 1 -+#endif -+#ifndef LZO_CFG_NO_INLINE_ASM -+#if (LZO_ABI_NEUTRAL_ENDIAN) || (LZO_ARCH_GENERIC) -+# define LZO_CFG_NO_INLINE_ASM 1 -+#elif (LZO_CC_LLVM) -+# define LZO_CFG_NO_INLINE_ASM 1 -+#endif -+#endif -+#if (LZO_CFG_NO_INLINE_ASM) -+# undef LZO_ASM_SYNTAX_MSC -+# undef LZO_ASM_SYNTAX_GNUC -+# undef __LZO_ASM_CLOBBER -+# undef __LZO_ASM_CLOBBER_LIST_CC -+# undef __LZO_ASM_CLOBBER_LIST_CC_MEMORY -+# undef __LZO_ASM_CLOBBER_LIST_EMPTY -+#endif -+#ifndef LZO_CFG_NO_UNALIGNED -+#if (LZO_ABI_NEUTRAL_ENDIAN) || (LZO_ARCH_GENERIC) -+# define LZO_CFG_NO_UNALIGNED 1 -+#endif -+#endif -+#if (LZO_CFG_NO_UNALIGNED) -+# undef LZO_OPT_UNALIGNED16 -+# undef LZO_OPT_UNALIGNED32 -+# undef LZO_OPT_UNALIGNED64 -+#endif -+#if defined(__LZO_INFOSTR_MM) -+#elif (LZO_MM_FLAT) && (defined(__LZO_INFOSTR_PM) || defined(LZO_INFO_ABI_PM)) -+# define __LZO_INFOSTR_MM "" -+#elif defined(LZO_INFO_MM) -+# define __LZO_INFOSTR_MM "." LZO_INFO_MM -+#else -+# define __LZO_INFOSTR_MM "" -+#endif -+#if defined(__LZO_INFOSTR_PM) -+#elif defined(LZO_INFO_ABI_PM) -+# define __LZO_INFOSTR_PM "." LZO_INFO_ABI_PM -+#else -+# define __LZO_INFOSTR_PM "" -+#endif -+#if defined(__LZO_INFOSTR_ENDIAN) -+#elif defined(LZO_INFO_ABI_ENDIAN) -+# define __LZO_INFOSTR_ENDIAN "." LZO_INFO_ABI_ENDIAN -+#else -+# define __LZO_INFOSTR_ENDIAN "" -+#endif -+#if defined(__LZO_INFOSTR_OSNAME) -+#elif defined(LZO_INFO_OS_CONSOLE) -+# define __LZO_INFOSTR_OSNAME LZO_INFO_OS "." LZO_INFO_OS_CONSOLE -+#elif defined(LZO_INFO_OS_POSIX) -+# define __LZO_INFOSTR_OSNAME LZO_INFO_OS "." LZO_INFO_OS_POSIX -+#else -+# define __LZO_INFOSTR_OSNAME LZO_INFO_OS -+#endif -+#if defined(__LZO_INFOSTR_LIBC) -+#elif defined(LZO_INFO_LIBC) -+# define __LZO_INFOSTR_LIBC "." LZO_INFO_LIBC -+#else -+# define __LZO_INFOSTR_LIBC "" -+#endif -+#if defined(__LZO_INFOSTR_CCVER) -+#elif defined(LZO_INFO_CCVER) -+# define __LZO_INFOSTR_CCVER " " LZO_INFO_CCVER -+#else -+# define __LZO_INFOSTR_CCVER "" -+#endif -+#define LZO_INFO_STRING \ -+ LZO_INFO_ARCH __LZO_INFOSTR_MM __LZO_INFOSTR_PM __LZO_INFOSTR_ENDIAN \ -+ " " __LZO_INFOSTR_OSNAME __LZO_INFOSTR_LIBC " " LZO_INFO_CC __LZO_INFOSTR_CCVER -+#if !(LZO_CFG_SKIP_LZO_TYPES) -+#if (!(LZO_SIZEOF_SHORT+0 > 0 && LZO_SIZEOF_INT+0 > 0 && LZO_SIZEOF_LONG+0 > 0)) -+# error "missing defines for sizes" -+#endif -+#if (!(LZO_SIZEOF_PTRDIFF_T+0 > 0 && LZO_SIZEOF_SIZE_T+0 > 0 && LZO_SIZEOF_VOID_P+0 > 0)) -+# error "missing defines for sizes" -+#endif -+#if !defined(lzo_llong_t) -+#if (LZO_SIZEOF_LONG_LONG+0 > 0) -+__lzo_gnuc_extension__ typedef long long lzo_llong_t__; -+__lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__; -+# define lzo_llong_t lzo_llong_t__ -+# define lzo_ullong_t lzo_ullong_t__ -+#endif -+#endif -+#if !defined(lzo_int16e_t) -+#if (LZO_SIZEOF_LONG == 2) -+# define lzo_int16e_t long -+# define lzo_uint16e_t unsigned long -+#elif (LZO_SIZEOF_INT == 2) -+# define lzo_int16e_t int -+# define lzo_uint16e_t unsigned int -+#elif (LZO_SIZEOF_SHORT == 2) -+# define lzo_int16e_t short int -+# define lzo_uint16e_t unsigned short int -+#elif 1 && !(LZO_CFG_TYPE_NO_MODE_HI) && (LZO_CC_CLANG || (LZO_CC_GNUC >= 0x025f00ul) || LZO_CC_LLVM) -+ typedef int lzo_int16e_hi_t__ __attribute__((__mode__(__HI__))); -+ typedef unsigned int lzo_uint16e_hi_t__ __attribute__((__mode__(__HI__))); -+# define lzo_int16e_t lzo_int16e_hi_t__ -+# define lzo_uint16e_t lzo_uint16e_hi_t__ -+#elif (LZO_SIZEOF___INT16 == 2) -+# define lzo_int16e_t __int16 -+# define lzo_uint16e_t unsigned __int16 -+#else -+#endif -+#endif -+#if defined(lzo_int16e_t) -+# define LZO_SIZEOF_LZO_INT16E_T 2 -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16e_t) == 2) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16e_t) == LZO_SIZEOF_LZO_INT16E_T) -+#endif -+#if !defined(lzo_int32e_t) -+#if (LZO_SIZEOF_LONG == 4) -+# define lzo_int32e_t long int -+# define lzo_uint32e_t unsigned long int -+#elif (LZO_SIZEOF_INT == 4) -+# define lzo_int32e_t int -+# define lzo_uint32e_t unsigned int -+#elif (LZO_SIZEOF_SHORT == 4) -+# define lzo_int32e_t short int -+# define lzo_uint32e_t unsigned short int -+#elif (LZO_SIZEOF_LONG_LONG == 4) -+# define lzo_int32e_t lzo_llong_t -+# define lzo_uint32e_t lzo_ullong_t -+#elif 1 && !(LZO_CFG_TYPE_NO_MODE_SI) && (LZO_CC_CLANG || (LZO_CC_GNUC >= 0x025f00ul) || LZO_CC_LLVM) && (__INT_MAX__+0 > 2147483647L) -+ typedef int lzo_int32e_si_t__ __attribute__((__mode__(__SI__))); -+ typedef unsigned int lzo_uint32e_si_t__ __attribute__((__mode__(__SI__))); -+# define lzo_int32e_t lzo_int32e_si_t__ -+# define lzo_uint32e_t lzo_uint32e_si_t__ -+#elif 1 && !(LZO_CFG_TYPE_NO_MODE_SI) && (LZO_CC_GNUC >= 0x025f00ul) && defined(__AVR__) && (__LONG_MAX__+0 == 32767L) -+ typedef int lzo_int32e_si_t__ __attribute__((__mode__(__SI__))); -+ typedef unsigned int lzo_uint32e_si_t__ __attribute__((__mode__(__SI__))); -+# define lzo_int32e_t lzo_int32e_si_t__ -+# define lzo_uint32e_t lzo_uint32e_si_t__ -+# define LZO_INT32_C(c) (c##LL) -+# define LZO_UINT32_C(c) (c##ULL) -+#elif (LZO_SIZEOF___INT32 == 4) -+# define lzo_int32e_t __int32 -+# define lzo_uint32e_t unsigned __int32 -+#else -+#endif -+#endif -+#if defined(lzo_int32e_t) -+# define LZO_SIZEOF_LZO_INT32E_T 4 -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32e_t) == 4) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32e_t) == LZO_SIZEOF_LZO_INT32E_T) -+#endif -+#if !defined(lzo_int64e_t) -+#if (LZO_SIZEOF___INT64 == 8) -+# if (LZO_CC_BORLANDC) && !(LZO_CFG_TYPE_PREFER___INT64) -+# define LZO_CFG_TYPE_PREFER___INT64 1 -+# endif -+#endif -+#if (LZO_SIZEOF_INT == 8) && (LZO_SIZEOF_INT < LZO_SIZEOF_LONG) -+# define lzo_int64e_t int -+# define lzo_uint64e_t unsigned int -+# define LZO_SIZEOF_LZO_INT64E_T LZO_SIZEOF_INT -+#elif (LZO_SIZEOF_LONG == 8) -+# define lzo_int64e_t long int -+# define lzo_uint64e_t unsigned long int -+# define LZO_SIZEOF_LZO_INT64E_T LZO_SIZEOF_LONG -+#elif (LZO_SIZEOF_LONG_LONG == 8) && !(LZO_CFG_TYPE_PREFER___INT64) -+# define lzo_int64e_t lzo_llong_t -+# define lzo_uint64e_t lzo_ullong_t -+# if (LZO_CC_BORLANDC) -+# define LZO_INT64_C(c) ((c) + 0ll) -+# define LZO_UINT64_C(c) ((c) + 0ull) -+# elif 0 -+# define LZO_INT64_C(c) (__lzo_gnuc_extension__ (c##LL)) -+# define LZO_UINT64_C(c) (__lzo_gnuc_extension__ (c##ULL)) -+# else -+# define LZO_INT64_C(c) (c##LL) -+# define LZO_UINT64_C(c) (c##ULL) -+# endif -+# define LZO_SIZEOF_LZO_INT64E_T LZO_SIZEOF_LONG_LONG -+#elif (LZO_SIZEOF___INT64 == 8) -+# define lzo_int64e_t __int64 -+# define lzo_uint64e_t unsigned __int64 -+# if (LZO_CC_BORLANDC) -+# define LZO_INT64_C(c) ((c) + 0i64) -+# define LZO_UINT64_C(c) ((c) + 0ui64) -+# else -+# define LZO_INT64_C(c) (c##i64) -+# define LZO_UINT64_C(c) (c##ui64) -+# endif -+# define LZO_SIZEOF_LZO_INT64E_T LZO_SIZEOF___INT64 -+#else -+#endif -+#endif -+#if defined(lzo_int64e_t) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64e_t) == 8) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64e_t) == LZO_SIZEOF_LZO_INT64E_T) -+#endif -+#if !defined(lzo_int32l_t) -+#if defined(lzo_int32e_t) -+# define lzo_int32l_t lzo_int32e_t -+# define lzo_uint32l_t lzo_uint32e_t -+# define LZO_SIZEOF_LZO_INT32L_T LZO_SIZEOF_LZO_INT32E_T -+#elif (LZO_SIZEOF_INT >= 4) && (LZO_SIZEOF_INT < LZO_SIZEOF_LONG) -+# define lzo_int32l_t int -+# define lzo_uint32l_t unsigned int -+# define LZO_SIZEOF_LZO_INT32L_T LZO_SIZEOF_INT -+#elif (LZO_SIZEOF_LONG >= 4) -+# define lzo_int32l_t long int -+# define lzo_uint32l_t unsigned long int -+# define LZO_SIZEOF_LZO_INT32L_T LZO_SIZEOF_LONG -+#else -+# error "lzo_int32l_t" -+#endif -+#endif -+#if 1 -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32l_t) >= 4) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32l_t) == LZO_SIZEOF_LZO_INT32L_T) -+#endif -+#if !defined(lzo_int64l_t) -+#if defined(lzo_int64e_t) -+# define lzo_int64l_t lzo_int64e_t -+# define lzo_uint64l_t lzo_uint64e_t -+# define LZO_SIZEOF_LZO_INT64L_T LZO_SIZEOF_LZO_INT64E_T -+#else -+#endif -+#endif -+#if defined(lzo_int64l_t) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64l_t) >= 8) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64l_t) == LZO_SIZEOF_LZO_INT64L_T) -+#endif -+#if !defined(lzo_int32f_t) -+#if (LZO_SIZEOF_SIZE_T >= 8) -+# define lzo_int32f_t lzo_int64l_t -+# define lzo_uint32f_t lzo_uint64l_t -+# define LZO_SIZEOF_LZO_INT32F_T LZO_SIZEOF_LZO_INT64L_T -+#else -+# define lzo_int32f_t lzo_int32l_t -+# define lzo_uint32f_t lzo_uint32l_t -+# define LZO_SIZEOF_LZO_INT32F_T LZO_SIZEOF_LZO_INT32L_T -+#endif -+#endif -+#if 1 -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32f_t) >= 4) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32f_t) == LZO_SIZEOF_LZO_INT32F_T) -+#endif -+#if !defined(lzo_int64f_t) -+#if defined(lzo_int64l_t) -+# define lzo_int64f_t lzo_int64l_t -+# define lzo_uint64f_t lzo_uint64l_t -+# define LZO_SIZEOF_LZO_INT64F_T LZO_SIZEOF_LZO_INT64L_T -+#else -+#endif -+#endif -+#if defined(lzo_int64f_t) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64f_t) >= 8) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64f_t) == LZO_SIZEOF_LZO_INT64F_T) -+#endif -+#if !defined(lzo_intptr_t) -+#if 1 && (LZO_OS_OS400 && (LZO_SIZEOF_VOID_P == 16)) -+# define __LZO_INTPTR_T_IS_POINTER 1 -+ typedef char* lzo_intptr_t; -+ typedef char* lzo_uintptr_t; -+# define lzo_intptr_t lzo_intptr_t -+# define lzo_uintptr_t lzo_uintptr_t -+# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_VOID_P -+#elif (LZO_CC_MSC && (_MSC_VER >= 1300) && (LZO_SIZEOF_VOID_P == 4) && (LZO_SIZEOF_INT == 4)) -+ typedef __w64 int lzo_intptr_t; -+ typedef __w64 unsigned int lzo_uintptr_t; -+# define lzo_intptr_t lzo_intptr_t -+# define lzo_uintptr_t lzo_uintptr_t -+# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_INT -+#elif (LZO_SIZEOF_SHORT == LZO_SIZEOF_VOID_P) && (LZO_SIZEOF_INT > LZO_SIZEOF_VOID_P) -+# define lzo_intptr_t short -+# define lzo_uintptr_t unsigned short -+# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_SHORT -+#elif (LZO_SIZEOF_INT >= LZO_SIZEOF_VOID_P) && (LZO_SIZEOF_INT < LZO_SIZEOF_LONG) -+# define lzo_intptr_t int -+# define lzo_uintptr_t unsigned int -+# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_INT -+#elif (LZO_SIZEOF_LONG >= LZO_SIZEOF_VOID_P) -+# define lzo_intptr_t long -+# define lzo_uintptr_t unsigned long -+# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_LONG -+#elif (LZO_SIZEOF_LZO_INT64L_T >= LZO_SIZEOF_VOID_P) -+# define lzo_intptr_t lzo_int64l_t -+# define lzo_uintptr_t lzo_uint64l_t -+# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_LZO_INT64L_T -+#else -+# error "lzo_intptr_t" -+#endif -+#endif -+#if 1 -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_intptr_t) >= sizeof(void *)) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_intptr_t) == sizeof(lzo_uintptr_t)) -+#endif -+#if !defined(lzo_word_t) -+#if defined(LZO_WORDSIZE) && (LZO_WORDSIZE+0 > 0) -+#if (LZO_WORDSIZE == LZO_SIZEOF_LZO_INTPTR_T) && !(__LZO_INTPTR_T_IS_POINTER) -+# define lzo_word_t lzo_uintptr_t -+# define lzo_sword_t lzo_intptr_t -+# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_LZO_INTPTR_T -+#elif (LZO_WORDSIZE == LZO_SIZEOF_LONG) -+# define lzo_word_t unsigned long -+# define lzo_sword_t long -+# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_LONG -+#elif (LZO_WORDSIZE == LZO_SIZEOF_INT) -+# define lzo_word_t unsigned int -+# define lzo_sword_t int -+# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_INT -+#elif (LZO_WORDSIZE == LZO_SIZEOF_SHORT) -+# define lzo_word_t unsigned short -+# define lzo_sword_t short -+# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_SHORT -+#elif (LZO_WORDSIZE == 1) -+# define lzo_word_t unsigned char -+# define lzo_sword_t signed char -+# define LZO_SIZEOF_LZO_WORD_T 1 -+#elif (LZO_WORDSIZE == LZO_SIZEOF_LZO_INT64L_T) -+# define lzo_word_t lzo_uint64l_t -+# define lzo_sword_t lzo_int64l_t -+# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_LZO_INT64L_T -+#elif (LZO_ARCH_SPU) && (LZO_CC_GNUC) -+#if 0 -+ typedef unsigned lzo_word_t __attribute__((__mode__(__V16QI__))); -+ typedef int lzo_sword_t __attribute__((__mode__(__V16QI__))); -+# define lzo_word_t lzo_word_t -+# define lzo_sword_t lzo_sword_t -+# define LZO_SIZEOF_LZO_WORD_T 16 -+#endif -+#else -+# error "lzo_word_t" -+#endif -+#endif -+#endif -+#if 1 && defined(lzo_word_t) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_word_t) == LZO_WORDSIZE) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_sword_t) == LZO_WORDSIZE) -+#endif -+#if 1 -+#define lzo_int8_t signed char -+#define lzo_uint8_t unsigned char -+#define LZO_SIZEOF_LZO_INT8_T 1 -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int8_t) == 1) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int8_t) == sizeof(lzo_uint8_t)) -+#endif -+#if defined(lzo_int16e_t) -+#define lzo_int16_t lzo_int16e_t -+#define lzo_uint16_t lzo_uint16e_t -+#define LZO_SIZEOF_LZO_INT16_T LZO_SIZEOF_LZO_INT16E_T -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16_t) == 2) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16_t) == sizeof(lzo_uint16_t)) -+#endif -+#if defined(lzo_int32e_t) -+#define lzo_int32_t lzo_int32e_t -+#define lzo_uint32_t lzo_uint32e_t -+#define LZO_SIZEOF_LZO_INT32_T LZO_SIZEOF_LZO_INT32E_T -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32_t) == 4) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32_t) == sizeof(lzo_uint32_t)) -+#endif -+#if defined(lzo_int64e_t) -+#define lzo_int64_t lzo_int64e_t -+#define lzo_uint64_t lzo_uint64e_t -+#define LZO_SIZEOF_LZO_INT64_T LZO_SIZEOF_LZO_INT64E_T -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64_t) == 8) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64_t) == sizeof(lzo_uint64_t)) -+#endif -+#if 1 -+#define lzo_int_least32_t lzo_int32l_t -+#define lzo_uint_least32_t lzo_uint32l_t -+#define LZO_SIZEOF_LZO_INT_LEAST32_T LZO_SIZEOF_LZO_INT32L_T -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_least32_t) >= 4) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_least32_t) == sizeof(lzo_uint_least32_t)) -+#endif -+#if defined(lzo_int64l_t) -+#define lzo_int_least64_t lzo_int64l_t -+#define lzo_uint_least64_t lzo_uint64l_t -+#define LZO_SIZEOF_LZO_INT_LEAST64_T LZO_SIZEOF_LZO_INT64L_T -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_least64_t) >= 8) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_least64_t) == sizeof(lzo_uint_least64_t)) -+#endif -+#if 1 -+#define lzo_int_fast32_t lzo_int32f_t -+#define lzo_uint_fast32_t lzo_uint32f_t -+#define LZO_SIZEOF_LZO_INT_FAST32_T LZO_SIZEOF_LZO_INT32F_T -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast32_t) >= 4) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast32_t) == sizeof(lzo_uint_fast32_t)) -+#endif -+#if defined(lzo_int64f_t) -+#define lzo_int_fast64_t lzo_int64f_t -+#define lzo_uint_fast64_t lzo_uint64f_t -+#define LZO_SIZEOF_LZO_INT_FAST64_T LZO_SIZEOF_LZO_INT64F_T -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast64_t) >= 8) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast64_t) == sizeof(lzo_uint_fast64_t)) -+#endif -+#if !defined(LZO_INT16_C) -+# if (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_INT >= 2) -+# define LZO_INT16_C(c) ((c) + 0) -+# define LZO_UINT16_C(c) ((c) + 0U) -+# elif (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_LONG >= 2) -+# define LZO_INT16_C(c) ((c) + 0L) -+# define LZO_UINT16_C(c) ((c) + 0UL) -+# elif (LZO_SIZEOF_INT >= 2) -+# define LZO_INT16_C(c) (c) -+# define LZO_UINT16_C(c) (c##U) -+# elif (LZO_SIZEOF_LONG >= 2) -+# define LZO_INT16_C(c) (c##L) -+# define LZO_UINT16_C(c) (c##UL) -+# else -+# error "LZO_INT16_C" -+# endif -+#endif -+#if !defined(LZO_INT32_C) -+# if (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_INT >= 4) -+# define LZO_INT32_C(c) ((c) + 0) -+# define LZO_UINT32_C(c) ((c) + 0U) -+# elif (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_LONG >= 4) -+# define LZO_INT32_C(c) ((c) + 0L) -+# define LZO_UINT32_C(c) ((c) + 0UL) -+# elif (LZO_SIZEOF_INT >= 4) -+# define LZO_INT32_C(c) (c) -+# define LZO_UINT32_C(c) (c##U) -+# elif (LZO_SIZEOF_LONG >= 4) -+# define LZO_INT32_C(c) (c##L) -+# define LZO_UINT32_C(c) (c##UL) -+# elif (LZO_SIZEOF_LONG_LONG >= 4) -+# define LZO_INT32_C(c) (c##LL) -+# define LZO_UINT32_C(c) (c##ULL) -+# else -+# error "LZO_INT32_C" -+# endif -+#endif -+#if !defined(LZO_INT64_C) && defined(lzo_int64l_t) -+# if (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_INT >= 8) -+# define LZO_INT64_C(c) ((c) + 0) -+# define LZO_UINT64_C(c) ((c) + 0U) -+# elif (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_LONG >= 8) -+# define LZO_INT64_C(c) ((c) + 0L) -+# define LZO_UINT64_C(c) ((c) + 0UL) -+# elif (LZO_SIZEOF_INT >= 8) -+# define LZO_INT64_C(c) (c) -+# define LZO_UINT64_C(c) (c##U) -+# elif (LZO_SIZEOF_LONG >= 8) -+# define LZO_INT64_C(c) (c##L) -+# define LZO_UINT64_C(c) (c##UL) -+# else -+# error "LZO_INT64_C" -+# endif -+#endif -+#endif -+ -+#endif /* already included */ -+ -+/* vim:set ts=4 sw=4 et: */ -diff --git a/lzo/minilzo.c b/lzo/minilzo.c -index 85771eb..ab2be5f 100644 ---- a/lzo/minilzo.c -+++ b/lzo/minilzo.c -@@ -2,13 +2,7 @@ - - This file is part of the LZO real-time data compression library. - -- 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 -+ Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer - All Rights Reserved. - - The LZO library is free software; you can redistribute it and/or -@@ -24,7 +18,7 @@ - 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., -- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - Markus F.X.J. Oberhumer - -@@ -37,374 +31,3763 @@ - * http://www.oberhumer.com/opensource/lzo/ - */ - --#define __LZO_IN_MINILZO --#define LZO_BUILD -+#define __LZO_IN_MINILZO 1 -+ -+#if defined(LZO_CFG_FREESTANDING) -+# undef MINILZO_HAVE_CONFIG_H -+# define LZO_LIBC_FREESTANDING 1 -+# define LZO_OS_FREESTANDING 1 -+#endif - - #ifdef MINILZO_HAVE_CONFIG_H - # include - #endif -+#include -+#include -+#if defined(MINILZO_CFG_USE_INTERNAL_LZODEFS) -+ -+#ifndef __LZODEFS_H_INCLUDED -+#define __LZODEFS_H_INCLUDED 1 -+ -+#if defined(__CYGWIN32__) && !defined(__CYGWIN__) -+# define __CYGWIN__ __CYGWIN32__ -+#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(LZO_CFG_NO_DISABLE_WUNDEF) -+#if defined(__ARMCC_VERSION) -+# pragma diag_suppress 193 -+#elif defined(__clang__) && defined(__clang_minor__) -+# pragma clang diagnostic ignored "-Wundef" -+#elif defined(__INTEL_COMPILER) -+# pragma warning(disable: 193) -+#elif defined(__KEIL__) && defined(__C166__) -+# pragma warning disable = 322 -+#elif defined(__GNUC__) && defined(__GNUC_MINOR__) && !defined(__PATHSCALE__) -+# if ((__GNUC__-0) >= 5 || ((__GNUC__-0) == 4 && (__GNUC_MINOR__-0) >= 2)) -+# pragma GCC diagnostic ignored "-Wundef" -+# endif -+#elif defined(_MSC_VER) && !defined(__clang__) && !defined(__INTEL_COMPILER) && !defined(__MWERKS__) -+# if ((_MSC_VER-0) >= 1300) -+# pragma warning(disable: 4668) -+# endif -+#endif -+#endif -+#if 0 && 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 !(LZO_CFG_NO_DISABLE_WCRTNONSTDC) -+#ifndef _CRT_NONSTDC_NO_DEPRECATE -+#define _CRT_NONSTDC_NO_DEPRECATE 1 -+#endif -+#ifndef _CRT_NONSTDC_NO_WARNINGS -+#define _CRT_NONSTDC_NO_WARNINGS 1 -+#endif -+#ifndef _CRT_SECURE_NO_DEPRECATE -+#define _CRT_SECURE_NO_DEPRECATE 1 -+#endif -+#ifndef _CRT_SECURE_NO_WARNINGS -+#define _CRT_SECURE_NO_WARNINGS 1 -+#endif -+#endif -+#if 0 -+#define LZO_0xffffUL 0xfffful -+#define LZO_0xffffffffUL 0xfffffffful -+#else -+#define LZO_0xffffUL 65535ul -+#define LZO_0xffffffffUL 4294967295ul -+#endif -+#define LZO_0xffffL LZO_0xffffUL -+#define LZO_0xffffffffL LZO_0xffffffffUL -+#if (LZO_0xffffL == LZO_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 defined(__COUNTER__) -+# ifndef LZO_CFG_USE_COUNTER -+# define LZO_CFG_USE_COUNTER 1 -+# endif -+#else -+# undef LZO_CFG_USE_COUNTER -+#endif -+#if (UINT_MAX == LZO_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 == LZO_0xffffL) -+# define ptrdiff_t long -+# define _PTRDIFF_T_DEFINED 1 -+#endif -+#if (UINT_MAX == LZO_0xffffL) -+# undef __LZO_RENAME_A -+# undef __LZO_RENAME_B -+# if defined(__AZTEC_C__) && defined(__DOS__) -+# define __LZO_RENAME_A 1 -+# elif defined(_MSC_VER) && defined(MSDOS) -+# if (_MSC_VER < 600) -+# define __LZO_RENAME_A 1 -+# elif (_MSC_VER < 700) -+# define __LZO_RENAME_B 1 -+# endif -+# elif defined(__TSC__) && defined(__OS2__) -+# define __LZO_RENAME_A 1 -+# elif defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0410) -+# define __LZO_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(__LZO_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(__LZO_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 __LZO_RENAME_A -+# undef __LZO_RENAME_B -+#endif -+#if (UINT_MAX == LZO_0xffffL) -+#if defined(__AZTEC_C__) && defined(__DOS__) -+# define LZO_BROKEN_CDECL_ALT_SYNTAX 1 -+#elif defined(_MSC_VER) && defined(MSDOS) -+# if (_MSC_VER < 600) -+# define LZO_BROKEN_INTEGRAL_CONSTANTS 1 -+# endif -+# if (_MSC_VER < 700) -+# define LZO_BROKEN_INTEGRAL_PROMOTION 1 -+# define LZO_BROKEN_SIZEOF 1 -+# endif -+#elif defined(__PACIFIC__) && defined(DOS) -+# define LZO_BROKEN_INTEGRAL_CONSTANTS 1 -+#elif defined(__TURBOC__) && defined(__MSDOS__) -+# if (__TURBOC__ < 0x0150) -+# define LZO_BROKEN_CDECL_ALT_SYNTAX 1 -+# define LZO_BROKEN_INTEGRAL_CONSTANTS 1 -+# define LZO_BROKEN_INTEGRAL_PROMOTION 1 -+# endif -+# if (__TURBOC__ < 0x0200) -+# define LZO_BROKEN_SIZEOF 1 -+# endif -+# if (__TURBOC__ < 0x0400) && defined(__cplusplus) -+# define LZO_BROKEN_CDECL_ALT_SYNTAX 1 -+# endif -+#elif (defined(__PUREC__) || defined(__TURBOC__)) && defined(__TOS__) -+# define LZO_BROKEN_CDECL_ALT_SYNTAX 1 -+# define LZO_BROKEN_SIZEOF 1 -+#endif -+#endif -+#if defined(__WATCOMC__) && (__WATCOMC__ < 900) -+# define LZO_BROKEN_INTEGRAL_CONSTANTS 1 -+#endif -+#if defined(_CRAY) && defined(_CRAY1) -+# define LZO_BROKEN_SIGNED_RIGHT_SHIFT 1 -+#endif -+#define LZO_PP_STRINGIZE(x) #x -+#define LZO_PP_MACRO_EXPAND(x) LZO_PP_STRINGIZE(x) -+#define LZO_PP_CONCAT0() /*empty*/ -+#define LZO_PP_CONCAT1(a) a -+#define LZO_PP_CONCAT2(a,b) a ## b -+#define LZO_PP_CONCAT3(a,b,c) a ## b ## c -+#define LZO_PP_CONCAT4(a,b,c,d) a ## b ## c ## d -+#define LZO_PP_CONCAT5(a,b,c,d,e) a ## b ## c ## d ## e -+#define LZO_PP_CONCAT6(a,b,c,d,e,f) a ## b ## c ## d ## e ## f -+#define LZO_PP_CONCAT7(a,b,c,d,e,f,g) a ## b ## c ## d ## e ## f ## g -+#define LZO_PP_ECONCAT0() LZO_PP_CONCAT0() -+#define LZO_PP_ECONCAT1(a) LZO_PP_CONCAT1(a) -+#define LZO_PP_ECONCAT2(a,b) LZO_PP_CONCAT2(a,b) -+#define LZO_PP_ECONCAT3(a,b,c) LZO_PP_CONCAT3(a,b,c) -+#define LZO_PP_ECONCAT4(a,b,c,d) LZO_PP_CONCAT4(a,b,c,d) -+#define LZO_PP_ECONCAT5(a,b,c,d,e) LZO_PP_CONCAT5(a,b,c,d,e) -+#define LZO_PP_ECONCAT6(a,b,c,d,e,f) LZO_PP_CONCAT6(a,b,c,d,e,f) -+#define LZO_PP_ECONCAT7(a,b,c,d,e,f,g) LZO_PP_CONCAT7(a,b,c,d,e,f,g) -+#define LZO_PP_EMPTY /*empty*/ -+#define LZO_PP_EMPTY0() /*empty*/ -+#define LZO_PP_EMPTY1(a) /*empty*/ -+#define LZO_PP_EMPTY2(a,b) /*empty*/ -+#define LZO_PP_EMPTY3(a,b,c) /*empty*/ -+#define LZO_PP_EMPTY4(a,b,c,d) /*empty*/ -+#define LZO_PP_EMPTY5(a,b,c,d,e) /*empty*/ -+#define LZO_PP_EMPTY6(a,b,c,d,e,f) /*empty*/ -+#define LZO_PP_EMPTY7(a,b,c,d,e,f,g) /*empty*/ -+#if 1 -+#define LZO_CPP_STRINGIZE(x) #x -+#define LZO_CPP_MACRO_EXPAND(x) LZO_CPP_STRINGIZE(x) -+#define LZO_CPP_CONCAT2(a,b) a ## b -+#define LZO_CPP_CONCAT3(a,b,c) a ## b ## c -+#define LZO_CPP_CONCAT4(a,b,c,d) a ## b ## c ## d -+#define LZO_CPP_CONCAT5(a,b,c,d,e) a ## b ## c ## d ## e -+#define LZO_CPP_CONCAT6(a,b,c,d,e,f) a ## b ## c ## d ## e ## f -+#define LZO_CPP_CONCAT7(a,b,c,d,e,f,g) a ## b ## c ## d ## e ## f ## g -+#define LZO_CPP_ECONCAT2(a,b) LZO_CPP_CONCAT2(a,b) -+#define LZO_CPP_ECONCAT3(a,b,c) LZO_CPP_CONCAT3(a,b,c) -+#define LZO_CPP_ECONCAT4(a,b,c,d) LZO_CPP_CONCAT4(a,b,c,d) -+#define LZO_CPP_ECONCAT5(a,b,c,d,e) LZO_CPP_CONCAT5(a,b,c,d,e) -+#define LZO_CPP_ECONCAT6(a,b,c,d,e,f) LZO_CPP_CONCAT6(a,b,c,d,e,f) -+#define LZO_CPP_ECONCAT7(a,b,c,d,e,f,g) LZO_CPP_CONCAT7(a,b,c,d,e,f,g) -+#endif -+#define __LZO_MASK_GEN(o,b) (((((o) << ((b)-!!(b))) - (o)) << 1) + (o)*!!(b)) -+#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 LZO_EXTERN_C extern "C" -+# define LZO_EXTERN_C_BEGIN extern "C" { -+# define LZO_EXTERN_C_END } -+#else -+# define LZO_EXTERN_C extern -+# define LZO_EXTERN_C_BEGIN /*empty*/ -+# define LZO_EXTERN_C_END /*empty*/ -+#endif -+#if !defined(__LZO_OS_OVERRIDE) -+#if (LZO_OS_FREESTANDING) -+# define LZO_INFO_OS "freestanding" -+#elif (LZO_OS_EMBEDDED) -+# define LZO_INFO_OS "embedded" -+#elif 1 && defined(__IAR_SYSTEMS_ICC__) -+# define LZO_OS_EMBEDDED 1 -+# define LZO_INFO_OS "embedded" -+#elif defined(__CYGWIN__) && defined(__GNUC__) -+# define LZO_OS_CYGWIN 1 -+# define LZO_INFO_OS "cygwin" -+#elif defined(__EMX__) && defined(__GNUC__) -+# define LZO_OS_EMX 1 -+# define LZO_INFO_OS "emx" -+#elif defined(__BEOS__) -+# define LZO_OS_BEOS 1 -+# define LZO_INFO_OS "beos" -+#elif defined(__Lynx__) -+# define LZO_OS_LYNXOS 1 -+# define LZO_INFO_OS "lynxos" -+#elif defined(__OS400__) -+# define LZO_OS_OS400 1 -+# define LZO_INFO_OS "os400" -+#elif defined(__QNX__) -+# define LZO_OS_QNX 1 -+# define LZO_INFO_OS "qnx" -+#elif defined(__BORLANDC__) && defined(__DPMI32__) && (__BORLANDC__ >= 0x0460) -+# define LZO_OS_DOS32 1 -+# define LZO_INFO_OS "dos32" -+#elif defined(__BORLANDC__) && defined(__DPMI16__) -+# define LZO_OS_DOS16 1 -+# define LZO_INFO_OS "dos16" -+#elif defined(__ZTC__) && defined(DOS386) -+# define LZO_OS_DOS32 1 -+# define LZO_INFO_OS "dos32" -+#elif defined(__OS2__) || defined(__OS2V2__) -+# if (UINT_MAX == LZO_0xffffL) -+# define LZO_OS_OS216 1 -+# define LZO_INFO_OS "os216" -+# elif (UINT_MAX == LZO_0xffffffffL) -+# define LZO_OS_OS2 1 -+# define LZO_INFO_OS "os2" -+# else -+# error "check your limits.h header" -+# endif -+#elif defined(__WIN64__) || defined(_WIN64) || defined(WIN64) -+# define LZO_OS_WIN64 1 -+# define LZO_INFO_OS "win64" -+#elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(__WINDOWS_386__) -+# define LZO_OS_WIN32 1 -+# define LZO_INFO_OS "win32" -+#elif defined(__MWERKS__) && defined(__INTEL__) -+# define LZO_OS_WIN32 1 -+# define LZO_INFO_OS "win32" -+#elif defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows) -+# if (UINT_MAX == LZO_0xffffL) -+# define LZO_OS_WIN16 1 -+# define LZO_INFO_OS "win16" -+# elif (UINT_MAX == LZO_0xffffffffL) -+# define LZO_OS_WIN32 1 -+# define LZO_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 == LZO_0xffffL) -+# define LZO_OS_DOS16 1 -+# define LZO_INFO_OS "dos16" -+# elif (UINT_MAX == LZO_0xffffffffL) -+# define LZO_OS_DOS32 1 -+# define LZO_INFO_OS "dos32" -+# else -+# error "check your limits.h header" -+# endif -+#elif defined(__WATCOMC__) -+# if defined(__NT__) && (UINT_MAX == LZO_0xffffL) -+# define LZO_OS_DOS16 1 -+# define LZO_INFO_OS "dos16" -+# elif defined(__NT__) && (__WATCOMC__ < 1100) -+# define LZO_OS_WIN32 1 -+# define LZO_INFO_OS "win32" -+# elif defined(__linux__) || defined(__LINUX__) -+# define LZO_OS_POSIX 1 -+# define LZO_INFO_OS "posix" -+# else -+# error "please specify a target using the -bt compiler option" -+# endif -+#elif defined(__palmos__) -+# define LZO_OS_PALMOS 1 -+# define LZO_INFO_OS "palmos" -+#elif defined(__TOS__) || defined(__atarist__) -+# define LZO_OS_TOS 1 -+# define LZO_INFO_OS "tos" -+#elif defined(macintosh) && !defined(__ppc__) -+# define LZO_OS_MACCLASSIC 1 -+# define LZO_INFO_OS "macclassic" -+#elif defined(__VMS) -+# define LZO_OS_VMS 1 -+# define LZO_INFO_OS "vms" -+#elif (defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__) -+# define LZO_OS_CONSOLE 1 -+# define LZO_OS_CONSOLE_PS2 1 -+# define LZO_INFO_OS "console" -+# define LZO_INFO_OS_CONSOLE "ps2" -+#elif defined(__mips__) && defined(__psp__) -+# define LZO_OS_CONSOLE 1 -+# define LZO_OS_CONSOLE_PSP 1 -+# define LZO_INFO_OS "console" -+# define LZO_INFO_OS_CONSOLE "psp" -+#else -+# define LZO_OS_POSIX 1 -+# define LZO_INFO_OS "posix" -+#endif -+#if (LZO_OS_POSIX) -+# if defined(_AIX) || defined(__AIX__) || defined(__aix__) -+# define LZO_OS_POSIX_AIX 1 -+# define LZO_INFO_OS_POSIX "aix" -+# elif defined(__FreeBSD__) -+# define LZO_OS_POSIX_FREEBSD 1 -+# define LZO_INFO_OS_POSIX "freebsd" -+# elif defined(__hpux__) || defined(__hpux) -+# define LZO_OS_POSIX_HPUX 1 -+# define LZO_INFO_OS_POSIX "hpux" -+# elif defined(__INTERIX) -+# define LZO_OS_POSIX_INTERIX 1 -+# define LZO_INFO_OS_POSIX "interix" -+# elif defined(__IRIX__) || defined(__irix__) -+# define LZO_OS_POSIX_IRIX 1 -+# define LZO_INFO_OS_POSIX "irix" -+# elif defined(__linux__) || defined(__linux) || defined(__LINUX__) -+# define LZO_OS_POSIX_LINUX 1 -+# define LZO_INFO_OS_POSIX "linux" -+# elif defined(__APPLE__) && defined(__MACH__) -+# if ((__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__-0) >= 20000) -+# define LZO_OS_POSIX_DARWIN 1040 -+# define LZO_INFO_OS_POSIX "darwin_iphone" -+# elif ((__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0) >= 1040) -+# define LZO_OS_POSIX_DARWIN __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ -+# define LZO_INFO_OS_POSIX "darwin" -+# else -+# define LZO_OS_POSIX_DARWIN 1 -+# define LZO_INFO_OS_POSIX "darwin" -+# endif -+# define LZO_OS_POSIX_MACOSX LZO_OS_POSIX_DARWIN -+# elif defined(__minix__) || defined(__minix) -+# define LZO_OS_POSIX_MINIX 1 -+# define LZO_INFO_OS_POSIX "minix" -+# elif defined(__NetBSD__) -+# define LZO_OS_POSIX_NETBSD 1 -+# define LZO_INFO_OS_POSIX "netbsd" -+# elif defined(__OpenBSD__) -+# define LZO_OS_POSIX_OPENBSD 1 -+# define LZO_INFO_OS_POSIX "openbsd" -+# elif defined(__osf__) -+# define LZO_OS_POSIX_OSF 1 -+# define LZO_INFO_OS_POSIX "osf" -+# elif defined(__solaris__) || defined(__sun) -+# if defined(__SVR4) || defined(__svr4__) -+# define LZO_OS_POSIX_SOLARIS 1 -+# define LZO_INFO_OS_POSIX "solaris" -+# else -+# define LZO_OS_POSIX_SUNOS 1 -+# define LZO_INFO_OS_POSIX "sunos" -+# endif -+# elif defined(__ultrix__) || defined(__ultrix) -+# define LZO_OS_POSIX_ULTRIX 1 -+# define LZO_INFO_OS_POSIX "ultrix" -+# elif defined(_UNICOS) -+# define LZO_OS_POSIX_UNICOS 1 -+# define LZO_INFO_OS_POSIX "unicos" -+# else -+# define LZO_OS_POSIX_UNKNOWN 1 -+# define LZO_INFO_OS_POSIX "unknown" -+# endif -+#endif -+#endif -+#if (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16) -+# if (UINT_MAX != LZO_0xffffL) -+# error "unexpected configuration - check your compiler defines" -+# endif -+# if (ULONG_MAX != LZO_0xffffffffL) -+# error "unexpected configuration - check your compiler defines" -+# endif -+#endif -+#if (LZO_OS_DOS32 || LZO_OS_OS2 || LZO_OS_WIN32 || LZO_OS_WIN64) -+# if (UINT_MAX != LZO_0xffffffffL) -+# error "unexpected configuration - check your compiler defines" -+# endif -+# if (ULONG_MAX != LZO_0xffffffffL) -+# error "unexpected configuration - check your compiler defines" -+# endif -+#endif -+#if defined(CIL) && defined(_GNUCC) && defined(__GNUC__) -+# define LZO_CC_CILLY 1 -+# define LZO_INFO_CC "Cilly" -+# if defined(__CILLY__) -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__CILLY__) -+# else -+# define LZO_INFO_CCVER "unknown" -+# endif -+#elif 0 && defined(SDCC) && defined(__VERSION__) && !defined(__GNUC__) -+# define LZO_CC_SDCC 1 -+# define LZO_INFO_CC "sdcc" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(SDCC) -+#elif defined(__PATHSCALE__) && defined(__PATHCC_PATCHLEVEL__) -+# define LZO_CC_PATHSCALE (__PATHCC__ * 0x10000L + (__PATHCC_MINOR__-0) * 0x100 + (__PATHCC_PATCHLEVEL__-0)) -+# define LZO_INFO_CC "Pathscale C" -+# define LZO_INFO_CCVER __PATHSCALE__ -+# if defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) -+# define LZO_CC_PATHSCALE_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) -+# endif -+#elif defined(__INTEL_COMPILER) && ((__INTEL_COMPILER-0) > 0) -+# define LZO_CC_INTELC __INTEL_COMPILER -+# define LZO_INFO_CC "Intel C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__INTEL_COMPILER) -+# if defined(_MSC_VER) && ((_MSC_VER-0) > 0) -+# define LZO_CC_INTELC_MSC _MSC_VER -+# elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) -+# define LZO_CC_INTELC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) -+# endif -+#elif defined(__POCC__) && defined(_WIN32) -+# define LZO_CC_PELLESC 1 -+# define LZO_INFO_CC "Pelles C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__POCC__) -+#elif defined(__ARMCC_VERSION) && defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) -+# if defined(__GNUC_PATCHLEVEL__) -+# define LZO_CC_ARMCC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) -+# else -+# define LZO_CC_ARMCC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100) -+# endif -+# define LZO_CC_ARMCC __ARMCC_VERSION -+# define LZO_INFO_CC "ARM C Compiler" -+# define LZO_INFO_CCVER __VERSION__ -+#elif defined(__clang__) && defined(__llvm__) && defined(__VERSION__) -+# if defined(__clang_major__) && defined(__clang_minor__) && defined(__clang_patchlevel__) -+# define LZO_CC_CLANG (__clang_major__ * 0x10000L + (__clang_minor__-0) * 0x100 + (__clang_patchlevel__-0)) -+# else -+# define LZO_CC_CLANG 0x010000L -+# endif -+# if defined(_MSC_VER) && ((_MSC_VER-0) > 0) -+# define LZO_CC_CLANG_MSC _MSC_VER -+# elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) -+# define LZO_CC_CLANG_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) -+# endif -+# define LZO_INFO_CC "clang" -+# define LZO_INFO_CCVER __VERSION__ -+#elif defined(__llvm__) && defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) -+# if defined(__GNUC_PATCHLEVEL__) -+# define LZO_CC_LLVM_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) -+# else -+# define LZO_CC_LLVM_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100) -+# endif -+# define LZO_CC_LLVM LZO_CC_LLVM_GNUC -+# define LZO_INFO_CC "llvm-gcc" -+# define LZO_INFO_CCVER __VERSION__ -+#elif defined(__ACK__) && defined(_ACK) -+# define LZO_CC_ACK 1 -+# define LZO_INFO_CC "Amsterdam Compiler Kit C" -+# define LZO_INFO_CCVER "unknown" -+#elif defined(__ARMCC_VERSION) && !defined(__GNUC__) -+# define LZO_CC_ARMCC __ARMCC_VERSION -+# define LZO_CC_ARMCC_ARMCC __ARMCC_VERSION -+# define LZO_INFO_CC "ARM C Compiler" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__ARMCC_VERSION) -+#elif defined(__AZTEC_C__) -+# define LZO_CC_AZTECC 1 -+# define LZO_INFO_CC "Aztec C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__AZTEC_C__) -+#elif defined(__CODEGEARC__) -+# define LZO_CC_CODEGEARC 1 -+# define LZO_INFO_CC "CodeGear C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__CODEGEARC__) -+#elif defined(__BORLANDC__) -+# define LZO_CC_BORLANDC 1 -+# define LZO_INFO_CC "Borland C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__BORLANDC__) -+#elif defined(_CRAYC) && defined(_RELEASE) -+# define LZO_CC_CRAYC 1 -+# define LZO_INFO_CC "Cray C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(_RELEASE) -+#elif defined(__DMC__) && defined(__SC__) -+# define LZO_CC_DMC 1 -+# define LZO_INFO_CC "Digital Mars C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__DMC__) -+#elif defined(__DECC) -+# define LZO_CC_DECC 1 -+# define LZO_INFO_CC "DEC C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__DECC) -+#elif (defined(__ghs) || defined(__ghs__)) && defined(__GHS_VERSION_NUMBER) && ((__GHS_VERSION_NUMBER-0) > 0) -+# define LZO_CC_GHS 1 -+# define LZO_INFO_CC "Green Hills C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__GHS_VERSION_NUMBER) -+# if defined(_MSC_VER) && ((_MSC_VER-0) > 0) -+# define LZO_CC_GHS_MSC _MSC_VER -+# elif defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__VERSION__) -+# define LZO_CC_GHS_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) -+# endif -+#elif defined(__HIGHC__) -+# define LZO_CC_HIGHC 1 -+# define LZO_INFO_CC "MetaWare High C" -+# define LZO_INFO_CCVER "unknown" -+#elif defined(__HP_aCC) && ((__HP_aCC-0) > 0) -+# define LZO_CC_HPACC __HP_aCC -+# define LZO_INFO_CC "HP aCC" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__HP_aCC) -+#elif defined(__IAR_SYSTEMS_ICC__) -+# define LZO_CC_IARC 1 -+# define LZO_INFO_CC "IAR C" -+# if defined(__VER__) -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__VER__) -+# else -+# define LZO_INFO_CCVER "unknown" -+# endif -+#elif defined(__IBMC__) && ((__IBMC__-0) > 0) -+# define LZO_CC_IBMC __IBMC__ -+# define LZO_INFO_CC "IBM C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__IBMC__) -+#elif defined(__IBMCPP__) && ((__IBMCPP__-0) > 0) -+# define LZO_CC_IBMC __IBMCPP__ -+# define LZO_INFO_CC "IBM C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__IBMCPP__) -+#elif defined(__KEIL__) && defined(__C166__) -+# define LZO_CC_KEILC 1 -+# define LZO_INFO_CC "Keil C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__C166__) -+#elif defined(__LCC__) && defined(_WIN32) && defined(__LCCOPTIMLEVEL) -+# define LZO_CC_LCCWIN32 1 -+# define LZO_INFO_CC "lcc-win32" -+# define LZO_INFO_CCVER "unknown" -+#elif defined(__LCC__) -+# define LZO_CC_LCC 1 -+# define LZO_INFO_CC "lcc" -+# if defined(__LCC_VERSION__) -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__LCC_VERSION__) -+# else -+# define LZO_INFO_CCVER "unknown" -+# endif -+#elif defined(__MWERKS__) && ((__MWERKS__-0) > 0) -+# define LZO_CC_MWERKS __MWERKS__ -+# define LZO_INFO_CC "Metrowerks C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__MWERKS__) -+#elif (defined(__NDPC__) || defined(__NDPX__)) && defined(__i386) -+# define LZO_CC_NDPC 1 -+# define LZO_INFO_CC "Microway NDP C" -+# define LZO_INFO_CCVER "unknown" -+#elif defined(__PACIFIC__) -+# define LZO_CC_PACIFICC 1 -+# define LZO_INFO_CC "Pacific C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__PACIFIC__) -+#elif defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) -+# if defined(__PGIC_PATCHLEVEL__) -+# define LZO_CC_PGI (__PGIC__ * 0x10000L + (__PGIC_MINOR__-0) * 0x100 + (__PGIC_PATCHLEVEL__-0)) -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__PGIC__) "." LZO_PP_MACRO_EXPAND(__PGIC_MINOR__) "." LZO_PP_MACRO_EXPAND(__PGIC_PATCHLEVEL__) -+# else -+# define LZO_CC_PGI (__PGIC__ * 0x10000L + (__PGIC_MINOR__-0) * 0x100) -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__PGIC__) "." LZO_PP_MACRO_EXPAND(__PGIC_MINOR__) ".0" -+# endif -+# define LZO_INFO_CC "Portland Group PGI C" -+#elif defined(__PGI) && (defined(__linux__) || defined(__WIN32__)) -+# define LZO_CC_PGI 1 -+# define LZO_INFO_CC "Portland Group PGI C" -+# define LZO_INFO_CCVER "unknown" -+#elif defined(__PUREC__) && defined(__TOS__) -+# define LZO_CC_PUREC 1 -+# define LZO_INFO_CC "Pure C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__PUREC__) -+#elif defined(__SC__) && defined(__ZTC__) -+# define LZO_CC_SYMANTECC 1 -+# define LZO_INFO_CC "Symantec C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__SC__) -+#elif defined(__SUNPRO_C) -+# define LZO_INFO_CC "SunPro C" -+# if ((__SUNPRO_C-0) > 0) -+# define LZO_CC_SUNPROC __SUNPRO_C -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__SUNPRO_C) -+# else -+# define LZO_CC_SUNPROC 1 -+# define LZO_INFO_CCVER "unknown" -+# endif -+#elif defined(__SUNPRO_CC) -+# define LZO_INFO_CC "SunPro C" -+# if ((__SUNPRO_CC-0) > 0) -+# define LZO_CC_SUNPROC __SUNPRO_CC -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__SUNPRO_CC) -+# else -+# define LZO_CC_SUNPROC 1 -+# define LZO_INFO_CCVER "unknown" -+# endif -+#elif defined(__TINYC__) -+# define LZO_CC_TINYC 1 -+# define LZO_INFO_CC "Tiny C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__TINYC__) -+#elif defined(__TSC__) -+# define LZO_CC_TOPSPEEDC 1 -+# define LZO_INFO_CC "TopSpeed C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__TSC__) -+#elif defined(__WATCOMC__) -+# define LZO_CC_WATCOMC 1 -+# define LZO_INFO_CC "Watcom C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__WATCOMC__) -+#elif defined(__TURBOC__) -+# define LZO_CC_TURBOC 1 -+# define LZO_INFO_CC "Turbo C" -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__TURBOC__) -+#elif defined(__ZTC__) -+# define LZO_CC_ZORTECHC 1 -+# define LZO_INFO_CC "Zortech C" -+# if ((__ZTC__-0) == 0x310) -+# define LZO_INFO_CCVER "0x310" -+# else -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(__ZTC__) -+# endif -+#elif defined(__GNUC__) && defined(__VERSION__) -+# if defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__) -+# define LZO_CC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100 + (__GNUC_PATCHLEVEL__-0)) -+# elif defined(__GNUC_MINOR__) -+# define LZO_CC_GNUC (__GNUC__ * 0x10000L + (__GNUC_MINOR__-0) * 0x100) -+# else -+# define LZO_CC_GNUC (__GNUC__ * 0x10000L) -+# endif -+# define LZO_INFO_CC "gcc" -+# define LZO_INFO_CCVER __VERSION__ -+#elif defined(_MSC_VER) && ((_MSC_VER-0) > 0) -+# define LZO_CC_MSC _MSC_VER -+# define LZO_INFO_CC "Microsoft C" -+# if defined(_MSC_FULL_VER) -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(_MSC_VER) "." LZO_PP_MACRO_EXPAND(_MSC_FULL_VER) -+# else -+# define LZO_INFO_CCVER LZO_PP_MACRO_EXPAND(_MSC_VER) -+# endif -+#else -+# define LZO_CC_UNKNOWN 1 -+# define LZO_INFO_CC "unknown" -+# define LZO_INFO_CCVER "unknown" -+#endif -+#if (LZO_CC_GNUC) && defined(__OPEN64__) -+# if defined(__OPENCC__) && defined(__OPENCC_MINOR__) && defined(__OPENCC_PATCHLEVEL__) -+# define LZO_CC_OPEN64 (__OPENCC__ * 0x10000L + (__OPENCC_MINOR__-0) * 0x100 + (__OPENCC_PATCHLEVEL__-0)) -+# define LZO_CC_OPEN64_GNUC LZO_CC_GNUC -+# endif -+#endif -+#if (LZO_CC_GNUC) && defined(__PCC__) -+# if defined(__PCC__) && defined(__PCC_MINOR__) && defined(__PCC_MINORMINOR__) -+# define LZO_CC_PCC (__PCC__ * 0x10000L + (__PCC_MINOR__-0) * 0x100 + (__PCC_MINORMINOR__-0)) -+# define LZO_CC_PCC_GNUC LZO_CC_GNUC -+# endif -+#endif -+#if 0 && (LZO_CC_MSC && (_MSC_VER >= 1200)) && !defined(_MSC_FULL_VER) -+# error "LZO_CC_MSC: _MSC_FULL_VER is not defined" -+#endif -+#if !defined(__LZO_ARCH_OVERRIDE) && !(LZO_ARCH_GENERIC) && defined(_CRAY) -+# if (UINT_MAX > LZO_0xffffffffL) && defined(_CRAY) -+# if defined(_CRAYMPP) || defined(_CRAYT3D) || defined(_CRAYT3E) -+# define LZO_ARCH_CRAY_MPP 1 -+# elif defined(_CRAY1) -+# define LZO_ARCH_CRAY_PVP 1 -+# endif -+# endif -+#endif -+#if !defined(__LZO_ARCH_OVERRIDE) -+#if (LZO_ARCH_GENERIC) -+# define LZO_INFO_ARCH "generic" -+#elif (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16) -+# define LZO_ARCH_I086 1 -+# define LZO_INFO_ARCH "i086" -+#elif defined(__aarch64__) -+# define LZO_ARCH_ARM64 1 -+# define LZO_INFO_ARCH "arm64" -+#elif defined(__alpha__) || defined(__alpha) || defined(_M_ALPHA) -+# define LZO_ARCH_ALPHA 1 -+# define LZO_INFO_ARCH "alpha" -+#elif (LZO_ARCH_CRAY_MPP) && (defined(_CRAYT3D) || defined(_CRAYT3E)) -+# define LZO_ARCH_ALPHA 1 -+# define LZO_INFO_ARCH "alpha" -+#elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64) -+# define LZO_ARCH_AMD64 1 -+# define LZO_INFO_ARCH "amd64" -+#elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB)) -+# define LZO_ARCH_ARM 1 -+# define LZO_ARCH_ARM_THUMB 1 -+# define LZO_INFO_ARCH "arm_thumb" -+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCARM__) -+# define LZO_ARCH_ARM 1 -+# if defined(__CPU_MODE__) && ((__CPU_MODE__-0) == 1) -+# define LZO_ARCH_ARM_THUMB 1 -+# define LZO_INFO_ARCH "arm_thumb" -+# elif defined(__CPU_MODE__) && ((__CPU_MODE__-0) == 2) -+# define LZO_INFO_ARCH "arm" -+# else -+# define LZO_INFO_ARCH "arm" -+# endif -+#elif defined(__arm__) || defined(_M_ARM) -+# define LZO_ARCH_ARM 1 -+# define LZO_INFO_ARCH "arm" -+#elif (UINT_MAX <= LZO_0xffffL) && defined(__AVR__) -+# define LZO_ARCH_AVR 1 -+# define LZO_INFO_ARCH "avr" -+#elif defined(__avr32__) || defined(__AVR32__) -+# define LZO_ARCH_AVR32 1 -+# define LZO_INFO_ARCH "avr32" -+#elif defined(__bfin__) -+# define LZO_ARCH_BLACKFIN 1 -+# define LZO_INFO_ARCH "blackfin" -+#elif (UINT_MAX == LZO_0xffffL) && defined(__C166__) -+# define LZO_ARCH_C166 1 -+# define LZO_INFO_ARCH "c166" -+#elif defined(__cris__) -+# define LZO_ARCH_CRIS 1 -+# define LZO_INFO_ARCH "cris" -+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCEZ80__) -+# define LZO_ARCH_EZ80 1 -+# define LZO_INFO_ARCH "ez80" -+#elif defined(__H8300__) || defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__) -+# define LZO_ARCH_H8300 1 -+# define LZO_INFO_ARCH "h8300" -+#elif defined(__hppa__) || defined(__hppa) -+# define LZO_ARCH_HPPA 1 -+# define LZO_INFO_ARCH "hppa" -+#elif defined(__386__) || defined(__i386__) || defined(__i386) || defined(_M_IX86) || defined(_M_I386) -+# define LZO_ARCH_I386 1 -+# define LZO_ARCH_IA32 1 -+# define LZO_INFO_ARCH "i386" -+#elif (LZO_CC_ZORTECHC && defined(__I86__)) -+# define LZO_ARCH_I386 1 -+# define LZO_ARCH_IA32 1 -+# define LZO_INFO_ARCH "i386" -+#elif (LZO_OS_DOS32 && LZO_CC_HIGHC) && defined(_I386) -+# define LZO_ARCH_I386 1 -+# define LZO_ARCH_IA32 1 -+# define LZO_INFO_ARCH "i386" -+#elif defined(__ia64__) || defined(__ia64) || defined(_M_IA64) -+# define LZO_ARCH_IA64 1 -+# define LZO_INFO_ARCH "ia64" -+#elif (UINT_MAX == LZO_0xffffL) && defined(__m32c__) -+# define LZO_ARCH_M16C 1 -+# define LZO_INFO_ARCH "m16c" -+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICCM16C__) -+# define LZO_ARCH_M16C 1 -+# define LZO_INFO_ARCH "m16c" -+#elif defined(__m32r__) -+# define LZO_ARCH_M32R 1 -+# define LZO_INFO_ARCH "m32r" -+#elif (LZO_OS_TOS) || defined(__m68k__) || defined(__m68000__) || defined(__mc68000__) || defined(__mc68020__) || defined(_M_M68K) -+# define LZO_ARCH_M68K 1 -+# define LZO_INFO_ARCH "m68k" -+#elif (UINT_MAX == LZO_0xffffL) && defined(__C251__) -+# define LZO_ARCH_MCS251 1 -+# define LZO_INFO_ARCH "mcs251" -+#elif (UINT_MAX == LZO_0xffffL) && defined(__C51__) -+# define LZO_ARCH_MCS51 1 -+# define LZO_INFO_ARCH "mcs51" -+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICC8051__) -+# define LZO_ARCH_MCS51 1 -+# define LZO_INFO_ARCH "mcs51" -+#elif defined(__mips__) || defined(__mips) || defined(_MIPS_ARCH) || defined(_M_MRX000) -+# define LZO_ARCH_MIPS 1 -+# define LZO_INFO_ARCH "mips" -+#elif (UINT_MAX == LZO_0xffffL) && defined(__MSP430__) -+# define LZO_ARCH_MSP430 1 -+# define LZO_INFO_ARCH "msp430" -+#elif defined(__IAR_SYSTEMS_ICC__) && defined(__ICC430__) -+# define LZO_ARCH_MSP430 1 -+# define LZO_INFO_ARCH "msp430" -+#elif defined(__powerpc__) || defined(__powerpc) || defined(__ppc__) || defined(__PPC__) || defined(_M_PPC) || defined(_ARCH_PPC) || defined(_ARCH_PWR) -+# define LZO_ARCH_POWERPC 1 -+# define LZO_INFO_ARCH "powerpc" -+#elif defined(__s390__) || defined(__s390) || defined(__s390x__) || defined(__s390x) -+# define LZO_ARCH_S390 1 -+# define LZO_INFO_ARCH "s390" -+#elif defined(__sh__) || defined(_M_SH) -+# define LZO_ARCH_SH 1 -+# define LZO_INFO_ARCH "sh" -+#elif defined(__sparc__) || defined(__sparc) || defined(__sparcv8) -+# define LZO_ARCH_SPARC 1 -+# define LZO_INFO_ARCH "sparc" -+#elif defined(__SPU__) -+# define LZO_ARCH_SPU 1 -+# define LZO_INFO_ARCH "spu" -+#elif (UINT_MAX == LZO_0xffffL) && defined(__z80) -+# define LZO_ARCH_Z80 1 -+# define LZO_INFO_ARCH "z80" -+#elif (LZO_ARCH_CRAY_PVP) -+# if defined(_CRAYSV1) -+# define LZO_ARCH_CRAY_SV1 1 -+# define LZO_INFO_ARCH "cray_sv1" -+# elif (_ADDR64) -+# define LZO_ARCH_CRAY_T90 1 -+# define LZO_INFO_ARCH "cray_t90" -+# elif (_ADDR32) -+# define LZO_ARCH_CRAY_YMP 1 -+# define LZO_INFO_ARCH "cray_ymp" -+# else -+# define LZO_ARCH_CRAY_XMP 1 -+# define LZO_INFO_ARCH "cray_xmp" -+# endif -+#else -+# define LZO_ARCH_UNKNOWN 1 -+# define LZO_INFO_ARCH "unknown" -+#endif -+#endif -+#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_DOS32 || LZO_OS_OS2) -+# error "FIXME - missing define for CPU architecture" -+#endif -+#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_WIN32) -+# error "FIXME - missing LZO_OS_WIN32 define for CPU architecture" -+#endif -+#if 1 && (LZO_ARCH_UNKNOWN) && (LZO_OS_WIN64) -+# error "FIXME - missing LZO_OS_WIN64 define for CPU architecture" -+#endif -+#if (LZO_OS_OS216 || LZO_OS_WIN16) -+# define LZO_ARCH_I086PM 1 -+#elif 1 && (LZO_OS_DOS16 && defined(BLX286)) -+# define LZO_ARCH_I086PM 1 -+#elif 1 && (LZO_OS_DOS16 && defined(DOSX286)) -+# define LZO_ARCH_I086PM 1 -+#elif 1 && (LZO_OS_DOS16 && LZO_CC_BORLANDC && defined(__DPMI16__)) -+# define LZO_ARCH_I086PM 1 -+#endif -+#if (LZO_ARCH_AMD64 && !LZO_ARCH_X64) -+# define LZO_ARCH_X64 1 -+#elif (!LZO_ARCH_AMD64 && LZO_ARCH_X64) && defined(__LZO_ARCH_OVERRIDE) -+# define LZO_ARCH_AMD64 1 -+#endif -+#if (LZO_ARCH_ARM64 && !LZO_ARCH_AARCH64) -+# define LZO_ARCH_AARCH64 1 -+#elif (!LZO_ARCH_ARM64 && LZO_ARCH_AARCH64) && defined(__LZO_ARCH_OVERRIDE) -+# define LZO_ARCH_ARM64 1 -+#endif -+#if (LZO_ARCH_I386 && !LZO_ARCH_X86) -+# define LZO_ARCH_X86 1 -+#elif (!LZO_ARCH_I386 && LZO_ARCH_X86) && defined(__LZO_ARCH_OVERRIDE) -+# define LZO_ARCH_I386 1 -+#endif -+#if (LZO_ARCH_AMD64 && !LZO_ARCH_X64) || (!LZO_ARCH_AMD64 && LZO_ARCH_X64) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_ARM64 && !LZO_ARCH_AARCH64) || (!LZO_ARCH_ARM64 && LZO_ARCH_AARCH64) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_I386 && !LZO_ARCH_X86) || (!LZO_ARCH_I386 && LZO_ARCH_X86) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_ARM_THUMB && !LZO_ARCH_ARM) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_ARM_THUMB1 && !LZO_ARCH_ARM_THUMB) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_ARM_THUMB2 && !LZO_ARCH_ARM_THUMB) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_ARM_THUMB1 && LZO_ARCH_ARM_THUMB2) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_I086PM && !LZO_ARCH_I086) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_I086) -+# if (UINT_MAX != LZO_0xffffL) -+# error "unexpected configuration - check your compiler defines" -+# endif -+# if (ULONG_MAX != LZO_0xffffffffL) -+# error "unexpected configuration - check your compiler defines" -+# endif -+#endif -+#if (LZO_ARCH_I386) -+# if (UINT_MAX != LZO_0xffffL) && defined(__i386_int16__) -+# error "unexpected configuration - check your compiler defines" -+# endif -+# if (UINT_MAX != LZO_0xffffffffL) && !defined(__i386_int16__) -+# error "unexpected configuration - check your compiler defines" -+# endif -+# if (ULONG_MAX != LZO_0xffffffffL) -+# error "unexpected configuration - check your compiler defines" -+# endif -+#endif -+#if (LZO_ARCH_AMD64 || LZO_ARCH_I386) -+# if !defined(LZO_TARGET_FEATURE_SSE2) -+# if defined(__SSE2__) -+# define LZO_TARGET_FEATURE_SSE2 1 -+# elif defined(_MSC_VER) && ((defined(_M_IX86_FP) && ((_M_IX86_FP)+0 >= 2)) || defined(_M_AMD64)) -+# define LZO_TARGET_FEATURE_SSE2 1 -+# endif -+# endif -+# if !defined(LZO_TARGET_FEATURE_SSSE3) -+# if (LZO_TARGET_FEATURE_SSE2) -+# if defined(__SSSE3__) -+# define LZO_TARGET_FEATURE_SSSE3 1 -+# elif defined(_MSC_VER) && defined(__AVX__) -+# define LZO_TARGET_FEATURE_SSSE3 1 -+# endif -+# endif -+# endif -+# if !defined(LZO_TARGET_FEATURE_SSE4_2) -+# if (LZO_TARGET_FEATURE_SSSE3) -+# if defined(__SSE4_2__) -+# define LZO_TARGET_FEATURE_SSE4_2 1 -+# endif -+# endif -+# endif -+# if !defined(LZO_TARGET_FEATURE_AVX) -+# if (LZO_TARGET_FEATURE_SSSE3) -+# if defined(__AVX__) -+# define LZO_TARGET_FEATURE_AVX 1 -+# endif -+# endif -+# endif -+# if !defined(LZO_TARGET_FEATURE_AVX2) -+# if (LZO_TARGET_FEATURE_AVX) -+# if defined(__AVX2__) -+# define LZO_TARGET_FEATURE_AVX2 1 -+# endif -+# endif -+# endif -+#endif -+#if (LZO_TARGET_FEATURE_SSSE3 && !(LZO_TARGET_FEATURE_SSE2)) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_TARGET_FEATURE_SSE4_2 && !(LZO_TARGET_FEATURE_SSSE3)) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_TARGET_FEATURE_AVX && !(LZO_TARGET_FEATURE_SSSE3)) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_TARGET_FEATURE_AVX2 && !(LZO_TARGET_FEATURE_AVX)) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ARCH_ARM) -+# if !defined(LZO_TARGET_FEATURE_NEON) -+# if defined(__ARM_NEON__) -+# define LZO_TARGET_FEATURE_NEON 1 -+# endif -+# endif -+#elif (LZO_ARCH_ARM64) -+# if !defined(LZO_TARGET_FEATURE_NEON) -+# if 1 -+# define LZO_TARGET_FEATURE_NEON 1 -+# endif -+# endif -+#endif -+#if 0 -+#elif !defined(__LZO_MM_OVERRIDE) -+#if (LZO_ARCH_I086) -+#if (UINT_MAX != LZO_0xffffL) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if defined(__TINY__) || defined(M_I86TM) || defined(_M_I86TM) -+# define LZO_MM_TINY 1 -+#elif defined(__HUGE__) || defined(_HUGE_) || defined(M_I86HM) || defined(_M_I86HM) -+# define LZO_MM_HUGE 1 -+#elif defined(__SMALL__) || defined(M_I86SM) || defined(_M_I86SM) || defined(SMALL_MODEL) -+# define LZO_MM_SMALL 1 -+#elif defined(__MEDIUM__) || defined(M_I86MM) || defined(_M_I86MM) -+# define LZO_MM_MEDIUM 1 -+#elif defined(__COMPACT__) || defined(M_I86CM) || defined(_M_I86CM) -+# define LZO_MM_COMPACT 1 -+#elif defined(__LARGE__) || defined(M_I86LM) || defined(_M_I86LM) || defined(LARGE_MODEL) -+# define LZO_MM_LARGE 1 -+#elif (LZO_CC_AZTECC) -+# if defined(_LARGE_CODE) && defined(_LARGE_DATA) -+# define LZO_MM_LARGE 1 -+# elif defined(_LARGE_CODE) -+# define LZO_MM_MEDIUM 1 -+# elif defined(_LARGE_DATA) -+# define LZO_MM_COMPACT 1 -+# else -+# define LZO_MM_SMALL 1 -+# endif -+#elif (LZO_CC_ZORTECHC && defined(__VCM__)) -+# define LZO_MM_LARGE 1 -+#else -+# error "unknown LZO_ARCH_I086 memory model" -+#endif -+#if (LZO_OS_DOS16 || LZO_OS_OS216 || LZO_OS_WIN16) -+#define LZO_HAVE_MM_HUGE_PTR 1 -+#define LZO_HAVE_MM_HUGE_ARRAY 1 -+#if (LZO_MM_TINY) -+# undef LZO_HAVE_MM_HUGE_ARRAY -+#endif -+#if (LZO_CC_AZTECC || LZO_CC_PACIFICC || LZO_CC_ZORTECHC) -+# undef LZO_HAVE_MM_HUGE_PTR -+# undef LZO_HAVE_MM_HUGE_ARRAY -+#elif (LZO_CC_DMC || LZO_CC_SYMANTECC) -+# undef LZO_HAVE_MM_HUGE_ARRAY -+#elif (LZO_CC_MSC && defined(_QC)) -+# undef LZO_HAVE_MM_HUGE_ARRAY -+# if (_MSC_VER < 600) -+# undef LZO_HAVE_MM_HUGE_PTR -+# endif -+#elif (LZO_CC_TURBOC && (__TURBOC__ < 0x0295)) -+# undef LZO_HAVE_MM_HUGE_ARRAY -+#endif -+#if (LZO_ARCH_I086PM) && !(LZO_HAVE_MM_HUGE_PTR) -+# if (LZO_OS_DOS16) -+# error "unexpected configuration - check your compiler defines" -+# elif (LZO_CC_ZORTECHC) -+# else -+# error "unexpected configuration - check your compiler defines" -+# endif -+#endif -+#ifdef __cplusplus -+extern "C" { -+#endif -+#if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0200)) -+ extern void __near __cdecl _AHSHIFT(void); -+# define LZO_MM_AHSHIFT ((unsigned) _AHSHIFT) -+#elif (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC) -+ extern void __near __cdecl _AHSHIFT(void); -+# define LZO_MM_AHSHIFT ((unsigned) _AHSHIFT) -+#elif (LZO_CC_MSC || LZO_CC_TOPSPEEDC) -+ extern void __near __cdecl _AHSHIFT(void); -+# define LZO_MM_AHSHIFT ((unsigned) _AHSHIFT) -+#elif (LZO_CC_TURBOC && (__TURBOC__ >= 0x0295)) -+ extern void __near __cdecl _AHSHIFT(void); -+# define LZO_MM_AHSHIFT ((unsigned) _AHSHIFT) -+#elif ((LZO_CC_AZTECC || LZO_CC_PACIFICC || LZO_CC_TURBOC) && LZO_OS_DOS16) -+# define LZO_MM_AHSHIFT 12 -+#elif (LZO_CC_WATCOMC) -+ extern unsigned char _HShift; -+# define LZO_MM_AHSHIFT ((unsigned) _HShift) -+#else -+# error "FIXME - implement LZO_MM_AHSHIFT" -+#endif -+#ifdef __cplusplus -+} -+#endif -+#endif -+#elif (LZO_ARCH_C166) -+#if !defined(__MODEL__) -+# error "FIXME - LZO_ARCH_C166 __MODEL__" -+#elif ((__MODEL__) == 0) -+# define LZO_MM_SMALL 1 -+#elif ((__MODEL__) == 1) -+# define LZO_MM_SMALL 1 -+#elif ((__MODEL__) == 2) -+# define LZO_MM_LARGE 1 -+#elif ((__MODEL__) == 3) -+# define LZO_MM_TINY 1 -+#elif ((__MODEL__) == 4) -+# define LZO_MM_XTINY 1 -+#elif ((__MODEL__) == 5) -+# define LZO_MM_XSMALL 1 -+#else -+# error "FIXME - LZO_ARCH_C166 __MODEL__" -+#endif -+#elif (LZO_ARCH_MCS251) -+#if !defined(__MODEL__) -+# error "FIXME - LZO_ARCH_MCS251 __MODEL__" -+#elif ((__MODEL__) == 0) -+# define LZO_MM_SMALL 1 -+#elif ((__MODEL__) == 2) -+# define LZO_MM_LARGE 1 -+#elif ((__MODEL__) == 3) -+# define LZO_MM_TINY 1 -+#elif ((__MODEL__) == 4) -+# define LZO_MM_XTINY 1 -+#elif ((__MODEL__) == 5) -+# define LZO_MM_XSMALL 1 -+#else -+# error "FIXME - LZO_ARCH_MCS251 __MODEL__" -+#endif -+#elif (LZO_ARCH_MCS51) -+#if !defined(__MODEL__) -+# error "FIXME - LZO_ARCH_MCS51 __MODEL__" -+#elif ((__MODEL__) == 1) -+# define LZO_MM_SMALL 1 -+#elif ((__MODEL__) == 2) -+# define LZO_MM_LARGE 1 -+#elif ((__MODEL__) == 3) -+# define LZO_MM_TINY 1 -+#elif ((__MODEL__) == 4) -+# define LZO_MM_XTINY 1 -+#elif ((__MODEL__) == 5) -+# define LZO_MM_XSMALL 1 -+#else -+# error "FIXME - LZO_ARCH_MCS51 __MODEL__" -+#endif -+#elif (LZO_ARCH_CRAY_PVP) -+# define LZO_MM_PVP 1 -+#else -+# define LZO_MM_FLAT 1 -+#endif -+#if (LZO_MM_COMPACT) -+# define LZO_INFO_MM "compact" -+#elif (LZO_MM_FLAT) -+# define LZO_INFO_MM "flat" -+#elif (LZO_MM_HUGE) -+# define LZO_INFO_MM "huge" -+#elif (LZO_MM_LARGE) -+# define LZO_INFO_MM "large" -+#elif (LZO_MM_MEDIUM) -+# define LZO_INFO_MM "medium" -+#elif (LZO_MM_PVP) -+# define LZO_INFO_MM "pvp" -+#elif (LZO_MM_SMALL) -+# define LZO_INFO_MM "small" -+#elif (LZO_MM_TINY) -+# define LZO_INFO_MM "tiny" -+#else -+# error "unknown memory model" -+#endif -+#endif -+#if !defined(__lzo_gnuc_extension__) -+#if (LZO_CC_GNUC >= 0x020800ul) -+# define __lzo_gnuc_extension__ __extension__ -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_gnuc_extension__ __extension__ -+#elif (LZO_CC_IBMC >= 600) -+# define __lzo_gnuc_extension__ __extension__ -+#else -+#endif -+#endif -+#if !defined(__lzo_gnuc_extension__) -+# define __lzo_gnuc_extension__ /*empty*/ -+#endif -+#if !defined(LZO_CFG_USE_NEW_STYLE_CASTS) && defined(__cplusplus) && 0 -+# if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020800ul)) -+# define LZO_CFG_USE_NEW_STYLE_CASTS 0 -+# elif (LZO_CC_INTELC && (__INTEL_COMPILER < 1200)) -+# define LZO_CFG_USE_NEW_STYLE_CASTS 0 -+# else -+# define LZO_CFG_USE_NEW_STYLE_CASTS 1 -+# endif -+#endif -+#if !defined(LZO_CFG_USE_NEW_STYLE_CASTS) -+# define LZO_CFG_USE_NEW_STYLE_CASTS 0 -+#endif -+#if !defined(__cplusplus) -+# if defined(LZO_CFG_USE_NEW_STYLE_CASTS) -+# undef LZO_CFG_USE_NEW_STYLE_CASTS -+# endif -+# define LZO_CFG_USE_NEW_STYLE_CASTS 0 -+#endif -+#if !defined(LZO_REINTERPRET_CAST) -+# if (LZO_CFG_USE_NEW_STYLE_CASTS) -+# define LZO_REINTERPRET_CAST(t,e) (reinterpret_cast (e)) -+# endif -+#endif -+#if !defined(LZO_REINTERPRET_CAST) -+# define LZO_REINTERPRET_CAST(t,e) ((t) (e)) -+#endif -+#if !defined(LZO_STATIC_CAST) -+# if (LZO_CFG_USE_NEW_STYLE_CASTS) -+# define LZO_STATIC_CAST(t,e) (static_cast (e)) -+# endif -+#endif -+#if !defined(LZO_STATIC_CAST) -+# define LZO_STATIC_CAST(t,e) ((t) (e)) -+#endif -+#if !defined(LZO_STATIC_CAST2) -+# define LZO_STATIC_CAST2(t1,t2,e) LZO_STATIC_CAST(t1, LZO_STATIC_CAST(t2, e)) -+#endif -+#if !defined(LZO_UNCONST_CAST) -+# if (LZO_CFG_USE_NEW_STYLE_CASTS) -+# define LZO_UNCONST_CAST(t,e) (const_cast (e)) -+# elif (LZO_HAVE_MM_HUGE_PTR) -+# define LZO_UNCONST_CAST(t,e) ((t) (e)) -+# elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define LZO_UNCONST_CAST(t,e) ((t) ((void *) ((lzo_uintptr_t) ((const void *) (e))))) -+# endif -+#endif -+#if !defined(LZO_UNCONST_CAST) -+# define LZO_UNCONST_CAST(t,e) ((t) ((void *) ((const void *) (e)))) -+#endif -+#if !defined(LZO_UNCONST_VOLATILE_CAST) -+# if (LZO_CFG_USE_NEW_STYLE_CASTS) -+# define LZO_UNCONST_VOLATILE_CAST(t,e) (const_cast (e)) -+# elif (LZO_HAVE_MM_HUGE_PTR) -+# define LZO_UNCONST_VOLATILE_CAST(t,e) ((t) (e)) -+# elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define LZO_UNCONST_VOLATILE_CAST(t,e) ((t) ((volatile void *) ((lzo_uintptr_t) ((volatile const void *) (e))))) -+# endif -+#endif -+#if !defined(LZO_UNCONST_VOLATILE_CAST) -+# define LZO_UNCONST_VOLATILE_CAST(t,e) ((t) ((volatile void *) ((volatile const void *) (e)))) -+#endif -+#if !defined(LZO_UNVOLATILE_CAST) -+# if (LZO_CFG_USE_NEW_STYLE_CASTS) -+# define LZO_UNVOLATILE_CAST(t,e) (const_cast (e)) -+# elif (LZO_HAVE_MM_HUGE_PTR) -+# define LZO_UNVOLATILE_CAST(t,e) ((t) (e)) -+# elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define LZO_UNVOLATILE_CAST(t,e) ((t) ((void *) ((lzo_uintptr_t) ((volatile void *) (e))))) -+# endif -+#endif -+#if !defined(LZO_UNVOLATILE_CAST) -+# define LZO_UNVOLATILE_CAST(t,e) ((t) ((void *) ((volatile void *) (e)))) -+#endif -+#if !defined(LZO_UNVOLATILE_CONST_CAST) -+# if (LZO_CFG_USE_NEW_STYLE_CASTS) -+# define LZO_UNVOLATILE_CONST_CAST(t,e) (const_cast (e)) -+# elif (LZO_HAVE_MM_HUGE_PTR) -+# define LZO_UNVOLATILE_CONST_CAST(t,e) ((t) (e)) -+# elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define LZO_UNVOLATILE_CONST_CAST(t,e) ((t) ((const void *) ((lzo_uintptr_t) ((volatile const void *) (e))))) -+# endif -+#endif -+#if !defined(LZO_UNVOLATILE_CONST_CAST) -+# define LZO_UNVOLATILE_CONST_CAST(t,e) ((t) ((const void *) ((volatile const void *) (e)))) -+#endif -+#if !defined(LZO_PCAST) -+# if (LZO_HAVE_MM_HUGE_PTR) -+# define LZO_PCAST(t,e) ((t) (e)) -+# endif -+#endif -+#if !defined(LZO_PCAST) -+# define LZO_PCAST(t,e) LZO_STATIC_CAST(t, LZO_STATIC_CAST(void *, e)) -+#endif -+#if !defined(LZO_CCAST) -+# if (LZO_HAVE_MM_HUGE_PTR) -+# define LZO_CCAST(t,e) ((t) (e)) -+# endif -+#endif -+#if !defined(LZO_CCAST) -+# define LZO_CCAST(t,e) LZO_STATIC_CAST(t, LZO_STATIC_CAST(const void *, e)) -+#endif -+#if !defined(LZO_ICONV) -+# define LZO_ICONV(t,e) LZO_STATIC_CAST(t, e) -+#endif -+#if !defined(LZO_ICAST) -+# define LZO_ICAST(t,e) LZO_STATIC_CAST(t, e) -+#endif -+#if !defined(LZO_ITRUNC) -+# define LZO_ITRUNC(t,e) LZO_STATIC_CAST(t, e) -+#endif -+#if !defined(__lzo_cte) -+# if (LZO_CC_MSC || LZO_CC_WATCOMC) -+# define __lzo_cte(e) ((void)0,(e)) -+# elif 1 -+# define __lzo_cte(e) ((void)0,(e)) -+# endif -+#endif -+#if !defined(__lzo_cte) -+# define __lzo_cte(e) (e) -+#endif -+#if !defined(LZO_BLOCK_BEGIN) -+# define LZO_BLOCK_BEGIN do { -+# define LZO_BLOCK_END } while __lzo_cte(0) -+#endif -+#if !defined(LZO_UNUSED) -+# if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600)) -+# define LZO_UNUSED(var) ((void) &var) -+# elif (LZO_CC_BORLANDC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PELLESC || LZO_CC_TURBOC) -+# define LZO_UNUSED(var) if (&var) ; else -+# elif (LZO_CC_CLANG && (LZO_CC_CLANG >= 0x030200ul)) -+# define LZO_UNUSED(var) ((void) &var) -+# elif (LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define LZO_UNUSED(var) ((void) var) -+# elif (LZO_CC_MSC && (_MSC_VER < 900)) -+# define LZO_UNUSED(var) if (&var) ; else -+# elif (LZO_CC_KEILC) -+# define LZO_UNUSED(var) {LZO_EXTERN_C int lzo_unused__[1-2*!(sizeof(var)>0)];} -+# elif (LZO_CC_PACIFICC) -+# define LZO_UNUSED(var) ((void) sizeof(var)) -+# elif (LZO_CC_WATCOMC) && defined(__cplusplus) -+# define LZO_UNUSED(var) ((void) var) -+# else -+# define LZO_UNUSED(var) ((void) &var) -+# endif -+#endif -+#if !defined(LZO_UNUSED_FUNC) -+# if (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0600)) -+# define LZO_UNUSED_FUNC(func) ((void) func) -+# elif (LZO_CC_BORLANDC || LZO_CC_NDPC || LZO_CC_TURBOC) -+# define LZO_UNUSED_FUNC(func) if (func) ; else -+# elif (LZO_CC_CLANG || LZO_CC_LLVM) -+# define LZO_UNUSED_FUNC(func) ((void) &func) -+# elif (LZO_CC_MSC && (_MSC_VER < 900)) -+# define LZO_UNUSED_FUNC(func) if (func) ; else -+# elif (LZO_CC_MSC) -+# define LZO_UNUSED_FUNC(func) ((void) &func) -+# elif (LZO_CC_KEILC || LZO_CC_PELLESC) -+# define LZO_UNUSED_FUNC(func) {LZO_EXTERN_C int lzo_unused_func__[1-2*!(sizeof((int)func)>0)];} -+# else -+# define LZO_UNUSED_FUNC(func) ((void) func) -+# endif -+#endif -+#if !defined(LZO_UNUSED_LABEL) -+# if (LZO_CC_CLANG >= 0x020800ul) -+# define LZO_UNUSED_LABEL(l) (__lzo_gnuc_extension__ ((void) ((const void *) &&l))) -+# elif (LZO_CC_ARMCC || LZO_CC_CLANG || LZO_CC_INTELC || LZO_CC_WATCOMC) -+# define LZO_UNUSED_LABEL(l) if __lzo_cte(0) goto l -+# else -+# define LZO_UNUSED_LABEL(l) switch (0) case 1:goto l -+# endif -+#endif -+#if !defined(LZO_DEFINE_UNINITIALIZED_VAR) -+# if 0 -+# define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init) type var -+# elif 0 && (LZO_CC_GNUC) -+# define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init) type var = var -+# else -+# define LZO_DEFINE_UNINITIALIZED_VAR(type,var,init) type var = init -+# endif -+#endif -+#if !defined(__lzo_inline) -+#if (LZO_CC_TURBOC && (__TURBOC__ <= 0x0295)) -+#elif defined(__cplusplus) -+# define __lzo_inline inline -+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__-0 >= 199901L) -+# define __lzo_inline inline -+#elif (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0550)) -+# define __lzo_inline __inline -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CILLY || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) -+# define __lzo_inline __inline__ -+#elif (LZO_CC_DMC) -+# define __lzo_inline __inline -+#elif (LZO_CC_GHS) -+# define __lzo_inline __inline__ -+#elif (LZO_CC_IBMC >= 600) -+# define __lzo_inline __inline__ -+#elif (LZO_CC_INTELC) -+# define __lzo_inline __inline -+#elif (LZO_CC_MWERKS && (__MWERKS__ >= 0x2405)) -+# define __lzo_inline __inline -+#elif (LZO_CC_MSC && (_MSC_VER >= 900)) -+# define __lzo_inline __inline -+#elif (LZO_CC_SUNPROC >= 0x5100) -+# define __lzo_inline __inline__ -+#endif -+#endif -+#if defined(__lzo_inline) -+# ifndef __lzo_HAVE_inline -+# define __lzo_HAVE_inline 1 -+# endif -+#else -+# define __lzo_inline /*empty*/ -+#endif -+#if !defined(__lzo_forceinline) -+#if (LZO_CC_GNUC >= 0x030200ul) -+# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) -+#elif (LZO_CC_IBMC >= 700) -+# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) -+#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 450)) -+# define __lzo_forceinline __forceinline -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 800)) -+# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) -+#elif (LZO_CC_MSC && (_MSC_VER >= 1200)) -+# define __lzo_forceinline __forceinline -+#elif (LZO_CC_PGI >= 0x0d0a00ul) -+# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) -+#elif (LZO_CC_SUNPROC >= 0x5100) -+# define __lzo_forceinline __inline__ __attribute__((__always_inline__)) -+#endif -+#endif -+#if defined(__lzo_forceinline) -+# ifndef __lzo_HAVE_forceinline -+# define __lzo_HAVE_forceinline 1 -+# endif -+#else -+# define __lzo_forceinline __lzo_inline -+#endif -+#if !defined(__lzo_noinline) -+#if 1 && (LZO_ARCH_I386) && (LZO_CC_GNUC >= 0x040000ul) && (LZO_CC_GNUC < 0x040003ul) -+# define __lzo_noinline __attribute__((__noinline__,__used__)) -+#elif (LZO_CC_GNUC >= 0x030200ul) -+# define __lzo_noinline __attribute__((__noinline__)) -+#elif (LZO_CC_IBMC >= 700) -+# define __lzo_noinline __attribute__((__noinline__)) -+#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 600)) -+# define __lzo_noinline __declspec(noinline) -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 800)) -+# define __lzo_noinline __attribute__((__noinline__)) -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_noinline __attribute__((__noinline__)) -+#elif (LZO_CC_MSC && (_MSC_VER >= 1300)) -+# define __lzo_noinline __declspec(noinline) -+#elif (LZO_CC_MWERKS && (__MWERKS__ >= 0x3200) && (LZO_OS_WIN32 || LZO_OS_WIN64)) -+# if defined(__cplusplus) -+# else -+# define __lzo_noinline __declspec(noinline) -+# endif -+#elif (LZO_CC_PGI >= 0x0d0a00ul) -+# define __lzo_noinline __attribute__((__noinline__)) -+#elif (LZO_CC_SUNPROC >= 0x5100) -+# define __lzo_noinline __attribute__((__noinline__)) -+#endif -+#endif -+#if defined(__lzo_noinline) -+# ifndef __lzo_HAVE_noinline -+# define __lzo_HAVE_noinline 1 -+# endif -+#else -+# define __lzo_noinline /*empty*/ -+#endif -+#if (__lzo_HAVE_forceinline || __lzo_HAVE_noinline) && !(__lzo_HAVE_inline) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if !defined(__lzo_static_inline) -+#if (LZO_CC_IBMC) -+# define __lzo_static_inline __lzo_gnuc_extension__ static __lzo_inline -+#endif -+#endif -+#if !defined(__lzo_static_inline) -+# define __lzo_static_inline static __lzo_inline -+#endif -+#if !defined(__lzo_static_forceinline) -+#if (LZO_CC_IBMC) -+# define __lzo_static_forceinline __lzo_gnuc_extension__ static __lzo_forceinline -+#endif -+#endif -+#if !defined(__lzo_static_forceinline) -+# define __lzo_static_forceinline static __lzo_forceinline -+#endif -+#if !defined(__lzo_static_noinline) -+#if (LZO_CC_IBMC) -+# define __lzo_static_noinline __lzo_gnuc_extension__ static __lzo_noinline -+#endif -+#endif -+#if !defined(__lzo_static_noinline) -+# define __lzo_static_noinline static __lzo_noinline -+#endif -+#if !defined(__lzo_c99_extern_inline) -+#if defined(__GNUC_GNU_INLINE__) -+# define __lzo_c99_extern_inline __lzo_inline -+#elif defined(__GNUC_STDC_INLINE__) -+# define __lzo_c99_extern_inline extern __lzo_inline -+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__-0 >= 199901L) -+# define __lzo_c99_extern_inline extern __lzo_inline -+#endif -+#if !defined(__lzo_c99_extern_inline) && (__lzo_HAVE_inline) -+# define __lzo_c99_extern_inline __lzo_inline -+#endif -+#endif -+#if defined(__lzo_c99_extern_inline) -+# ifndef __lzo_HAVE_c99_extern_inline -+# define __lzo_HAVE_c99_extern_inline 1 -+# endif -+#else -+# define __lzo_c99_extern_inline /*empty*/ -+#endif -+#if !defined(__lzo_may_alias) -+#if (LZO_CC_GNUC >= 0x030400ul) -+# define __lzo_may_alias __attribute__((__may_alias__)) -+#elif (LZO_CC_CLANG >= 0x020900ul) -+# define __lzo_may_alias __attribute__((__may_alias__)) -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 1210)) && 0 -+# define __lzo_may_alias __attribute__((__may_alias__)) -+#elif (LZO_CC_PGI >= 0x0d0a00ul) && 0 -+# define __lzo_may_alias __attribute__((__may_alias__)) -+#endif -+#endif -+#if defined(__lzo_may_alias) -+# ifndef __lzo_HAVE_may_alias -+# define __lzo_HAVE_may_alias 1 -+# endif -+#else -+# define __lzo_may_alias /*empty*/ -+#endif -+#if !defined(__lzo_noreturn) -+#if (LZO_CC_GNUC >= 0x020700ul) -+# define __lzo_noreturn __attribute__((__noreturn__)) -+#elif (LZO_CC_IBMC >= 700) -+# define __lzo_noreturn __attribute__((__noreturn__)) -+#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 450)) -+# define __lzo_noreturn __declspec(noreturn) -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 600)) -+# define __lzo_noreturn __attribute__((__noreturn__)) -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_noreturn __attribute__((__noreturn__)) -+#elif (LZO_CC_MSC && (_MSC_VER >= 1200)) -+# define __lzo_noreturn __declspec(noreturn) -+#elif (LZO_CC_PGI >= 0x0d0a00ul) -+# define __lzo_noreturn __attribute__((__noreturn__)) -+#endif -+#endif -+#if defined(__lzo_noreturn) -+# ifndef __lzo_HAVE_noreturn -+# define __lzo_HAVE_noreturn 1 -+# endif -+#else -+# define __lzo_noreturn /*empty*/ -+#endif -+#if !defined(__lzo_nothrow) -+#if (LZO_CC_GNUC >= 0x030300ul) -+# define __lzo_nothrow __attribute__((__nothrow__)) -+#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 450)) && defined(__cplusplus) -+# define __lzo_nothrow __declspec(nothrow) -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 900)) -+# define __lzo_nothrow __attribute__((__nothrow__)) -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_nothrow __attribute__((__nothrow__)) -+#elif (LZO_CC_MSC && (_MSC_VER >= 1200)) && defined(__cplusplus) -+# define __lzo_nothrow __declspec(nothrow) -+#endif -+#endif -+#if defined(__lzo_nothrow) -+# ifndef __lzo_HAVE_nothrow -+# define __lzo_HAVE_nothrow 1 -+# endif -+#else -+# define __lzo_nothrow /*empty*/ -+#endif -+#if !defined(__lzo_restrict) -+#if (LZO_CC_GNUC >= 0x030400ul) -+# define __lzo_restrict __restrict__ -+#elif (LZO_CC_IBMC >= 800) && !defined(__cplusplus) -+# define __lzo_restrict __restrict__ -+#elif (LZO_CC_IBMC >= 1210) -+# define __lzo_restrict __restrict__ -+#elif (LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 600)) -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 600)) -+# define __lzo_restrict __restrict__ -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM) -+# define __lzo_restrict __restrict__ -+#elif (LZO_CC_MSC && (_MSC_VER >= 1400)) -+# define __lzo_restrict __restrict -+#elif (LZO_CC_PGI >= 0x0d0a00ul) -+# define __lzo_restrict __restrict__ -+#endif -+#endif -+#if defined(__lzo_restrict) -+# ifndef __lzo_HAVE_restrict -+# define __lzo_HAVE_restrict 1 -+# endif -+#else -+# define __lzo_restrict /*empty*/ -+#endif -+#if !defined(__lzo_alignof) -+#if (LZO_CC_ARMCC || LZO_CC_CILLY || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) -+# define __lzo_alignof(e) __alignof__(e) -+#elif (LZO_CC_GHS) && !defined(__cplusplus) -+# define __lzo_alignof(e) __alignof__(e) -+#elif (LZO_CC_IBMC >= 600) -+# define __lzo_alignof(e) (__lzo_gnuc_extension__ __alignof__(e)) -+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 700)) -+# define __lzo_alignof(e) __alignof__(e) -+#elif (LZO_CC_MSC && (_MSC_VER >= 1300)) -+# define __lzo_alignof(e) __alignof(e) -+#elif (LZO_CC_SUNPROC >= 0x5100) -+# define __lzo_alignof(e) __alignof__(e) -+#endif -+#endif -+#if defined(__lzo_alignof) -+# ifndef __lzo_HAVE_alignof -+# define __lzo_HAVE_alignof 1 -+# endif -+#endif -+#if !defined(__lzo_struct_packed) -+#if (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020800ul)) && defined(__cplusplus) -+#elif (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020700ul)) -+#elif (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020800ul)) && defined(__cplusplus) -+#elif (LZO_CC_PCC && (LZO_CC_PCC < 0x010100ul)) -+#elif (LZO_CC_SUNPROC && (LZO_CC_SUNPROC < 0x5110)) && !defined(__cplusplus) -+#elif (LZO_CC_GNUC >= 0x030400ul) && !(LZO_CC_PCC_GNUC) && (LZO_ARCH_AMD64 || LZO_ARCH_I386) -+# define __lzo_struct_packed(s) struct s { -+# define __lzo_struct_packed_end() } __attribute__((__gcc_struct__,__packed__)); -+# define __lzo_struct_packed_ma_end() } __lzo_may_alias __attribute__((__gcc_struct__,__packed__)); -+#elif (LZO_CC_ARMCC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || (LZO_CC_PGI >= 0x0d0a00ul) || (LZO_CC_SUNPROC >= 0x5100)) -+# define __lzo_struct_packed(s) struct s { -+# define __lzo_struct_packed_end() } __attribute__((__packed__)); -+# define __lzo_struct_packed_ma_end() } __lzo_may_alias __attribute__((__packed__)); -+#elif (LZO_CC_IBMC >= 700) -+# define __lzo_struct_packed(s) __lzo_gnuc_extension__ struct s { -+# define __lzo_struct_packed_end() } __attribute__((__packed__)); -+# define __lzo_struct_packed_ma_end() } __lzo_may_alias __attribute__((__packed__)); -+#elif (LZO_CC_INTELC_MSC) || (LZO_CC_MSC && (_MSC_VER >= 1300)) -+# define __lzo_struct_packed(s) __pragma(pack(push,1)) struct s { -+# define __lzo_struct_packed_end() } __pragma(pack(pop)); -+#elif (LZO_CC_WATCOMC && (__WATCOMC__ >= 900)) -+# define __lzo_struct_packed(s) _Packed struct s { -+# define __lzo_struct_packed_end() }; -+#endif -+#endif -+#if defined(__lzo_struct_packed) && !defined(__lzo_struct_packed_ma) -+# define __lzo_struct_packed_ma(s) __lzo_struct_packed(s) -+#endif -+#if defined(__lzo_struct_packed_end) && !defined(__lzo_struct_packed_ma_end) -+# define __lzo_struct_packed_ma_end() __lzo_struct_packed_end() -+#endif -+#if !defined(__lzo_byte_struct) -+#if defined(__lzo_struct_packed) -+# define __lzo_byte_struct(s,n) __lzo_struct_packed(s) unsigned char a[n]; __lzo_struct_packed_end() -+# define __lzo_byte_struct_ma(s,n) __lzo_struct_packed_ma(s) unsigned char a[n]; __lzo_struct_packed_ma_end() -+#elif (LZO_CC_CILLY || LZO_CC_CLANG || LZO_CC_PGI || (LZO_CC_SUNPROC >= 0x5100)) -+# define __lzo_byte_struct(s,n) struct s { unsigned char a[n]; } __attribute__((__packed__)); -+# define __lzo_byte_struct_ma(s,n) struct s { unsigned char a[n]; } __lzo_may_alias __attribute__((__packed__)); -+#endif -+#endif -+#if defined(__lzo_byte_struct) && !defined(__lzo_byte_struct_ma) -+# define __lzo_byte_struct_ma(s,n) __lzo_byte_struct(s,n) -+#endif -+#if !defined(__lzo_struct_align16) && (__lzo_HAVE_alignof) -+#if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x030000ul)) -+#elif (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020800ul)) && defined(__cplusplus) -+#elif (LZO_CC_CILLY || LZO_CC_PCC) -+#elif (LZO_CC_INTELC_MSC) || (LZO_CC_MSC && (_MSC_VER >= 1300)) -+# define __lzo_struct_align16(s) struct __declspec(align(16)) s { -+# define __lzo_struct_align16_end() }; -+# define __lzo_struct_align32(s) struct __declspec(align(32)) s { -+# define __lzo_struct_align32_end() }; -+# define __lzo_struct_align64(s) struct __declspec(align(64)) s { -+# define __lzo_struct_align64_end() }; -+#elif (LZO_CC_ARMCC || LZO_CC_CLANG || LZO_CC_GNUC || (LZO_CC_IBMC >= 700) || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_struct_align16(s) struct s { -+# define __lzo_struct_align16_end() } __attribute__((__aligned__(16))); -+# define __lzo_struct_align32(s) struct s { -+# define __lzo_struct_align32_end() } __attribute__((__aligned__(32))); -+# define __lzo_struct_align64(s) struct s { -+# define __lzo_struct_align64_end() } __attribute__((__aligned__(64))); -+#endif -+#endif -+#if !defined(__lzo_union_um) -+#if (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020800ul)) && defined(__cplusplus) -+#elif (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020700ul)) -+#elif (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020800ul)) && defined(__cplusplus) -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER < 810)) -+#elif (LZO_CC_PCC && (LZO_CC_PCC < 0x010100ul)) -+#elif (LZO_CC_SUNPROC && (LZO_CC_SUNPROC < 0x5110)) && !defined(__cplusplus) -+#elif (LZO_CC_ARMCC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || (LZO_CC_PGI >= 0x0d0a00ul) || (LZO_CC_SUNPROC >= 0x5100)) -+# define __lzo_union_am(s) union s { -+# define __lzo_union_am_end() } __lzo_may_alias; -+# define __lzo_union_um(s) union s { -+# define __lzo_union_um_end() } __lzo_may_alias __attribute__((__packed__)); -+#elif (LZO_CC_IBMC >= 700) -+# define __lzo_union_am(s) __lzo_gnuc_extension__ union s { -+# define __lzo_union_am_end() } __lzo_may_alias; -+# define __lzo_union_um(s) __lzo_gnuc_extension__ union s { -+# define __lzo_union_um_end() } __lzo_may_alias __attribute__((__packed__)); -+#elif (LZO_CC_INTELC_MSC) || (LZO_CC_MSC && (_MSC_VER >= 1300)) -+# define __lzo_union_um(s) __pragma(pack(push,1)) union s { -+# define __lzo_union_um_end() } __pragma(pack(pop)); -+#elif (LZO_CC_WATCOMC && (__WATCOMC__ >= 900)) -+# define __lzo_union_um(s) _Packed union s { -+# define __lzo_union_um_end() }; -+#endif -+#endif -+#if !defined(__lzo_union_am) -+# define __lzo_union_am(s) union s { -+# define __lzo_union_am_end() }; -+#endif -+#if !defined(__lzo_constructor) -+#if (LZO_CC_GNUC >= 0x030400ul) -+# define __lzo_constructor __attribute__((__constructor__,__used__)) -+#elif (LZO_CC_GNUC >= 0x020700ul) -+# define __lzo_constructor __attribute__((__constructor__)) -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 800)) -+# define __lzo_constructor __attribute__((__constructor__,__used__)) -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_constructor __attribute__((__constructor__)) -+#endif -+#endif -+#if defined(__lzo_constructor) -+# ifndef __lzo_HAVE_constructor -+# define __lzo_HAVE_constructor 1 -+# endif -+#endif -+#if !defined(__lzo_destructor) -+#if (LZO_CC_GNUC >= 0x030400ul) -+# define __lzo_destructor __attribute__((__destructor__,__used__)) -+#elif (LZO_CC_GNUC >= 0x020700ul) -+# define __lzo_destructor __attribute__((__destructor__)) -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 800)) -+# define __lzo_destructor __attribute__((__destructor__,__used__)) -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_destructor __attribute__((__destructor__)) -+#endif -+#endif -+#if defined(__lzo_destructor) -+# ifndef __lzo_HAVE_destructor -+# define __lzo_HAVE_destructor 1 -+# endif -+#endif -+#if (__lzo_HAVE_destructor) && !(__lzo_HAVE_constructor) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if !defined(__lzo_likely) && !defined(__lzo_unlikely) -+#if (LZO_CC_GNUC >= 0x030200ul) -+# define __lzo_likely(e) (__builtin_expect(!!(e),1)) -+# define __lzo_unlikely(e) (__builtin_expect(!!(e),0)) -+#elif (LZO_CC_IBMC >= 1010) -+# define __lzo_likely(e) (__builtin_expect(!!(e),1)) -+# define __lzo_unlikely(e) (__builtin_expect(!!(e),0)) -+#elif (LZO_CC_INTELC && (__INTEL_COMPILER >= 800)) -+# define __lzo_likely(e) (__builtin_expect(!!(e),1)) -+# define __lzo_unlikely(e) (__builtin_expect(!!(e),0)) -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define __lzo_likely(e) (__builtin_expect(!!(e),1)) -+# define __lzo_unlikely(e) (__builtin_expect(!!(e),0)) -+#endif -+#endif -+#if defined(__lzo_likely) -+# ifndef __lzo_HAVE_likely -+# define __lzo_HAVE_likely 1 -+# endif -+#else -+# define __lzo_likely(e) (e) -+#endif -+#if defined(__lzo_unlikely) -+# ifndef __lzo_HAVE_unlikely -+# define __lzo_HAVE_unlikely 1 -+# endif -+#else -+# define __lzo_unlikely(e) (e) -+#endif -+#if !defined(__lzo_static_unused_void_func) -+# if 1 && (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || (LZO_CC_GNUC >= 0x020700ul) || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) -+# define __lzo_static_unused_void_func(f) static void __attribute__((__unused__)) f(void) -+# else -+# define __lzo_static_unused_void_func(f) static __lzo_inline void f(void) -+# endif -+#endif -+#if !defined(__lzo_loop_forever) -+# if (LZO_CC_IBMC) -+# define __lzo_loop_forever() LZO_BLOCK_BEGIN for (;;) { ; } LZO_BLOCK_END -+# else -+# define __lzo_loop_forever() do { ; } while __lzo_cte(1) -+# endif -+#endif -+#if !defined(__lzo_unreachable) -+#if (LZO_CC_CLANG && (LZO_CC_CLANG >= 0x020800ul)) -+# define __lzo_unreachable() __builtin_unreachable(); -+#elif (LZO_CC_GNUC >= 0x040500ul) -+# define __lzo_unreachable() __builtin_unreachable(); -+#elif (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 1300)) && 1 -+# define __lzo_unreachable() __builtin_unreachable(); -+#endif -+#endif -+#if defined(__lzo_unreachable) -+# ifndef __lzo_HAVE_unreachable -+# define __lzo_HAVE_unreachable 1 -+# endif -+#else -+# if 0 -+# define __lzo_unreachable() ((void)0); -+# else -+# define __lzo_unreachable() __lzo_loop_forever(); -+# endif -+#endif -+#ifndef __LZO_CTA_NAME -+#if (LZO_CFG_USE_COUNTER) -+# define __LZO_CTA_NAME(a) LZO_PP_ECONCAT2(a,__COUNTER__) -+#else -+# define __LZO_CTA_NAME(a) LZO_PP_ECONCAT2(a,__LINE__) -+#endif -+#endif -+#if !defined(LZO_COMPILE_TIME_ASSERT_HEADER) -+# if (LZO_CC_AZTECC || LZO_CC_ZORTECHC) -+# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1-!(e)]; LZO_EXTERN_C_END -+# elif (LZO_CC_DMC || LZO_CC_SYMANTECC) -+# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1u-2*!(e)]; LZO_EXTERN_C_END -+# elif (LZO_CC_TURBOC && (__TURBOC__ == 0x0295)) -+# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1-!(e)]; LZO_EXTERN_C_END -+# elif (LZO_CC_CLANG && (LZO_CC_CLANG < 0x020900ul)) && defined(__cplusplus) -+# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN int __LZO_CTA_NAME(lzo_cta_f__)(int [1-2*!(e)]); LZO_EXTERN_C_END -+# elif (LZO_CC_GNUC) && defined(__CHECKER__) && defined(__SPARSE_CHECKER__) -+# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN enum {__LZO_CTA_NAME(lzo_cta_e__)=1/!!(e)} __attribute__((__unused__)); LZO_EXTERN_C_END -+# else -+# define LZO_COMPILE_TIME_ASSERT_HEADER(e) LZO_EXTERN_C_BEGIN extern int __LZO_CTA_NAME(lzo_cta__)[1-2*!(e)]; LZO_EXTERN_C_END -+# endif -+#endif -+#if !defined(LZO_COMPILE_TIME_ASSERT) -+# if (LZO_CC_AZTECC) -+# define LZO_COMPILE_TIME_ASSERT(e) {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-!(e)];} -+# elif (LZO_CC_DMC || LZO_CC_PACIFICC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC) -+# define LZO_COMPILE_TIME_ASSERT(e) switch(0) case 1:case !(e):break; -+# elif (LZO_CC_GNUC) && defined(__CHECKER__) && defined(__SPARSE_CHECKER__) -+# define LZO_COMPILE_TIME_ASSERT(e) {(void) (0/!!(e));} -+# elif (LZO_CC_GNUC >= 0x040700ul) && (LZO_CFG_USE_COUNTER) && defined(__cplusplus) -+# define LZO_COMPILE_TIME_ASSERT(e) {enum {__LZO_CTA_NAME(lzo_cta_e__)=1/!!(e)} __attribute__((__unused__));} -+# elif (LZO_CC_GNUC >= 0x040700ul) -+# define LZO_COMPILE_TIME_ASSERT(e) {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-2*!(e)] __attribute__((__unused__));} -+# elif (LZO_CC_MSC && (_MSC_VER < 900)) -+# define LZO_COMPILE_TIME_ASSERT(e) switch(0) case 1:case !(e):break; -+# elif (LZO_CC_TURBOC && (__TURBOC__ == 0x0295)) -+# define LZO_COMPILE_TIME_ASSERT(e) switch(0) case 1:case !(e):break; -+# else -+# define LZO_COMPILE_TIME_ASSERT(e) {typedef int __LZO_CTA_NAME(lzo_cta_t__)[1-2*!(e)];} -+# endif -+#endif -+LZO_COMPILE_TIME_ASSERT_HEADER(1 == 1) -+#if defined(__cplusplus) -+extern "C" { LZO_COMPILE_TIME_ASSERT_HEADER(2 == 2) } -+#endif -+LZO_COMPILE_TIME_ASSERT_HEADER(3 == 3) -+#if (LZO_ARCH_I086 || LZO_ARCH_I386) && (LZO_OS_DOS16 || LZO_OS_DOS32 || LZO_OS_OS2 || LZO_OS_OS216 || LZO_OS_WIN16 || LZO_OS_WIN32 || LZO_OS_WIN64) -+# if (LZO_CC_GNUC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PACIFICC) -+# elif (LZO_CC_DMC || LZO_CC_SYMANTECC || LZO_CC_ZORTECHC) -+# define __lzo_cdecl __cdecl -+# define __lzo_cdecl_atexit /*empty*/ -+# define __lzo_cdecl_main __cdecl -+# if (LZO_OS_OS2 && (LZO_CC_DMC || LZO_CC_SYMANTECC)) -+# define __lzo_cdecl_qsort __pascal -+# elif (LZO_OS_OS2 && (LZO_CC_ZORTECHC)) -+# define __lzo_cdecl_qsort _stdcall -+# else -+# define __lzo_cdecl_qsort __cdecl -+# endif -+# elif (LZO_CC_WATCOMC) -+# define __lzo_cdecl __cdecl -+# else -+# define __lzo_cdecl __cdecl -+# define __lzo_cdecl_atexit __cdecl -+# define __lzo_cdecl_main __cdecl -+# define __lzo_cdecl_qsort __cdecl -+# endif -+# if (LZO_CC_GNUC || LZO_CC_HIGHC || LZO_CC_NDPC || LZO_CC_PACIFICC || LZO_CC_WATCOMC) -+# elif (LZO_OS_OS2 && (LZO_CC_DMC || LZO_CC_SYMANTECC)) -+# define __lzo_cdecl_sighandler __pascal -+# elif (LZO_OS_OS2 && (LZO_CC_ZORTECHC)) -+# define __lzo_cdecl_sighandler _stdcall -+# elif (LZO_CC_MSC && (_MSC_VER >= 1400)) && defined(_M_CEE_PURE) -+# define __lzo_cdecl_sighandler __clrcall -+# elif (LZO_CC_MSC && (_MSC_VER >= 600 && _MSC_VER < 700)) -+# if defined(_DLL) -+# define __lzo_cdecl_sighandler _far _cdecl _loadds -+# elif defined(_MT) -+# define __lzo_cdecl_sighandler _far _cdecl -+# else -+# define __lzo_cdecl_sighandler _cdecl -+# endif -+# else -+# define __lzo_cdecl_sighandler __cdecl -+# endif -+#elif (LZO_ARCH_I386) && (LZO_CC_WATCOMC) -+# define __lzo_cdecl __cdecl -+#elif (LZO_ARCH_M68K && LZO_OS_TOS && (LZO_CC_PUREC || LZO_CC_TURBOC)) -+# define __lzo_cdecl cdecl -+#endif -+#if !defined(__lzo_cdecl) -+# define __lzo_cdecl /*empty*/ -+#endif -+#if !defined(__lzo_cdecl_atexit) -+# define __lzo_cdecl_atexit /*empty*/ -+#endif -+#if !defined(__lzo_cdecl_main) -+# define __lzo_cdecl_main /*empty*/ -+#endif -+#if !defined(__lzo_cdecl_qsort) -+# define __lzo_cdecl_qsort /*empty*/ -+#endif -+#if !defined(__lzo_cdecl_sighandler) -+# define __lzo_cdecl_sighandler /*empty*/ -+#endif -+#if !defined(__lzo_cdecl_va) -+# define __lzo_cdecl_va __lzo_cdecl -+#endif -+#if !(LZO_CFG_NO_WINDOWS_H) -+#if !defined(LZO_HAVE_WINDOWS_H) -+#if (LZO_OS_CYGWIN || (LZO_OS_EMX && defined(__RSXNT__)) || LZO_OS_WIN32 || LZO_OS_WIN64) -+# if (LZO_CC_WATCOMC && (__WATCOMC__ < 1000)) -+# elif (LZO_OS_WIN32 && LZO_CC_GNUC) && defined(__PW32__) -+# elif ((LZO_OS_CYGWIN || defined(__MINGW32__)) && (LZO_CC_GNUC && (LZO_CC_GNUC < 0x025f00ul))) -+# else -+# define LZO_HAVE_WINDOWS_H 1 -+# endif -+#endif -+#endif -+#endif -+#ifndef LZO_SIZEOF_SHORT -+#if defined(SIZEOF_SHORT) -+# define LZO_SIZEOF_SHORT (SIZEOF_SHORT) -+#elif defined(__SIZEOF_SHORT__) -+# define LZO_SIZEOF_SHORT (__SIZEOF_SHORT__) -+#endif -+#endif -+#ifndef LZO_SIZEOF_INT -+#if defined(SIZEOF_INT) -+# define LZO_SIZEOF_INT (SIZEOF_INT) -+#elif defined(__SIZEOF_INT__) -+# define LZO_SIZEOF_INT (__SIZEOF_INT__) -+#endif -+#endif -+#ifndef LZO_SIZEOF_LONG -+#if defined(SIZEOF_LONG) -+# define LZO_SIZEOF_LONG (SIZEOF_LONG) -+#elif defined(__SIZEOF_LONG__) -+# define LZO_SIZEOF_LONG (__SIZEOF_LONG__) -+#endif -+#endif -+#ifndef LZO_SIZEOF_LONG_LONG -+#if defined(SIZEOF_LONG_LONG) -+# define LZO_SIZEOF_LONG_LONG (SIZEOF_LONG_LONG) -+#elif defined(__SIZEOF_LONG_LONG__) -+# define LZO_SIZEOF_LONG_LONG (__SIZEOF_LONG_LONG__) -+#endif -+#endif -+#ifndef LZO_SIZEOF___INT16 -+#if defined(SIZEOF___INT16) -+# define LZO_SIZEOF___INT16 (SIZEOF___INT16) -+#endif -+#endif -+#ifndef LZO_SIZEOF___INT32 -+#if defined(SIZEOF___INT32) -+# define LZO_SIZEOF___INT32 (SIZEOF___INT32) -+#endif -+#endif -+#ifndef LZO_SIZEOF___INT64 -+#if defined(SIZEOF___INT64) -+# define LZO_SIZEOF___INT64 (SIZEOF___INT64) -+#endif -+#endif -+#ifndef LZO_SIZEOF_VOID_P -+#if defined(SIZEOF_VOID_P) -+# define LZO_SIZEOF_VOID_P (SIZEOF_VOID_P) -+#elif defined(__SIZEOF_POINTER__) -+# define LZO_SIZEOF_VOID_P (__SIZEOF_POINTER__) -+#endif -+#endif -+#ifndef LZO_SIZEOF_SIZE_T -+#if defined(SIZEOF_SIZE_T) -+# define LZO_SIZEOF_SIZE_T (SIZEOF_SIZE_T) -+#elif defined(__SIZEOF_SIZE_T__) -+# define LZO_SIZEOF_SIZE_T (__SIZEOF_SIZE_T__) -+#endif -+#endif -+#ifndef LZO_SIZEOF_PTRDIFF_T -+#if defined(SIZEOF_PTRDIFF_T) -+# define LZO_SIZEOF_PTRDIFF_T (SIZEOF_PTRDIFF_T) -+#elif defined(__SIZEOF_PTRDIFF_T__) -+# define LZO_SIZEOF_PTRDIFF_T (__SIZEOF_PTRDIFF_T__) -+#endif -+#endif -+#define __LZO_LSR(x,b) (((x)+0ul) >> (b)) -+#if !defined(LZO_SIZEOF_SHORT) -+# if (LZO_ARCH_CRAY_PVP) -+# define LZO_SIZEOF_SHORT 8 -+# elif (USHRT_MAX == LZO_0xffffL) -+# define LZO_SIZEOF_SHORT 2 -+# elif (__LZO_LSR(USHRT_MAX,7) == 1) -+# define LZO_SIZEOF_SHORT 1 -+# elif (__LZO_LSR(USHRT_MAX,15) == 1) -+# define LZO_SIZEOF_SHORT 2 -+# elif (__LZO_LSR(USHRT_MAX,31) == 1) -+# define LZO_SIZEOF_SHORT 4 -+# elif (__LZO_LSR(USHRT_MAX,63) == 1) -+# define LZO_SIZEOF_SHORT 8 -+# elif (__LZO_LSR(USHRT_MAX,127) == 1) -+# define LZO_SIZEOF_SHORT 16 -+# else -+# error "LZO_SIZEOF_SHORT" -+# endif -+#endif -+LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_SHORT == sizeof(short)) -+#if !defined(LZO_SIZEOF_INT) -+# if (LZO_ARCH_CRAY_PVP) -+# define LZO_SIZEOF_INT 8 -+# elif (UINT_MAX == LZO_0xffffL) -+# define LZO_SIZEOF_INT 2 -+# elif (UINT_MAX == LZO_0xffffffffL) -+# define LZO_SIZEOF_INT 4 -+# elif (__LZO_LSR(UINT_MAX,7) == 1) -+# define LZO_SIZEOF_INT 1 -+# elif (__LZO_LSR(UINT_MAX,15) == 1) -+# define LZO_SIZEOF_INT 2 -+# elif (__LZO_LSR(UINT_MAX,31) == 1) -+# define LZO_SIZEOF_INT 4 -+# elif (__LZO_LSR(UINT_MAX,63) == 1) -+# define LZO_SIZEOF_INT 8 -+# elif (__LZO_LSR(UINT_MAX,127) == 1) -+# define LZO_SIZEOF_INT 16 -+# else -+# error "LZO_SIZEOF_INT" -+# endif -+#endif -+LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_INT == sizeof(int)) -+#if !defined(LZO_SIZEOF_LONG) -+# if (ULONG_MAX == LZO_0xffffffffL) -+# define LZO_SIZEOF_LONG 4 -+# elif (__LZO_LSR(ULONG_MAX,7) == 1) -+# define LZO_SIZEOF_LONG 1 -+# elif (__LZO_LSR(ULONG_MAX,15) == 1) -+# define LZO_SIZEOF_LONG 2 -+# elif (__LZO_LSR(ULONG_MAX,31) == 1) -+# define LZO_SIZEOF_LONG 4 -+# elif (__LZO_LSR(ULONG_MAX,39) == 1) -+# define LZO_SIZEOF_LONG 5 -+# elif (__LZO_LSR(ULONG_MAX,63) == 1) -+# define LZO_SIZEOF_LONG 8 -+# elif (__LZO_LSR(ULONG_MAX,127) == 1) -+# define LZO_SIZEOF_LONG 16 -+# else -+# error "LZO_SIZEOF_LONG" -+# endif -+#endif -+LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_LONG == sizeof(long)) -+#if !defined(LZO_SIZEOF_LONG_LONG) && !defined(LZO_SIZEOF___INT64) -+#if (LZO_SIZEOF_LONG > 0 && LZO_SIZEOF_LONG < 8) -+# if defined(__LONG_MAX__) && defined(__LONG_LONG_MAX__) -+# if (LZO_CC_GNUC >= 0x030300ul) -+# if ((__LONG_MAX__-0) == (__LONG_LONG_MAX__-0)) -+# define LZO_SIZEOF_LONG_LONG LZO_SIZEOF_LONG -+# elif (__LZO_LSR(__LONG_LONG_MAX__,30) == 1) -+# define LZO_SIZEOF_LONG_LONG 4 -+# endif -+# endif -+# endif -+#endif -+#endif -+#if !defined(LZO_SIZEOF_LONG_LONG) && !defined(LZO_SIZEOF___INT64) -+#if (LZO_SIZEOF_LONG > 0 && LZO_SIZEOF_LONG < 8) -+#if (LZO_ARCH_I086 && LZO_CC_DMC) -+#elif (LZO_CC_CILLY) && defined(__GNUC__) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif ((LZO_OS_WIN32 || LZO_OS_WIN64 || defined(_WIN32)) && LZO_CC_MSC && (_MSC_VER >= 1400)) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (LZO_OS_WIN64 || defined(_WIN64)) -+# define LZO_SIZEOF___INT64 8 -+#elif (LZO_ARCH_I386 && (LZO_CC_DMC)) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (LZO_ARCH_I386 && (LZO_CC_SYMANTECC && (__SC__ >= 0x700))) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (LZO_ARCH_I386 && (LZO_CC_INTELC && defined(__linux__))) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (LZO_ARCH_I386 && (LZO_CC_MWERKS || LZO_CC_PELLESC || LZO_CC_PGI || LZO_CC_SUNPROC)) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (LZO_ARCH_I386 && (LZO_CC_INTELC || LZO_CC_MSC)) -+# define LZO_SIZEOF___INT64 8 -+#elif ((LZO_OS_WIN32 || defined(_WIN32)) && (LZO_CC_MSC)) -+# define LZO_SIZEOF___INT64 8 -+#elif (LZO_ARCH_I386 && (LZO_CC_BORLANDC && (__BORLANDC__ >= 0x0520))) -+# define LZO_SIZEOF___INT64 8 -+#elif (LZO_ARCH_I386 && (LZO_CC_WATCOMC && (__WATCOMC__ >= 1100))) -+# define LZO_SIZEOF___INT64 8 -+#elif (LZO_CC_GHS && defined(__LLONG_BIT) && ((__LLONG_BIT-0) == 64)) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (LZO_CC_WATCOMC && defined(_INTEGRAL_MAX_BITS) && ((_INTEGRAL_MAX_BITS-0) == 64)) -+# define LZO_SIZEOF___INT64 8 -+#elif (LZO_OS_OS400 || defined(__OS400__)) && defined(__LLP64_IFC__) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (defined(__vms) || defined(__VMS)) && ((__INITIAL_POINTER_SIZE-0) == 64) -+# define LZO_SIZEOF_LONG_LONG 8 -+#elif (LZO_CC_SDCC) && (LZO_SIZEOF_INT == 2) -+#elif 1 && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) -+# define LZO_SIZEOF_LONG_LONG 8 -+#endif -+#endif -+#endif -+#if defined(__cplusplus) && (LZO_CC_GNUC) -+# if (LZO_CC_GNUC < 0x020800ul) -+# undef LZO_SIZEOF_LONG_LONG -+# endif -+#endif -+#if (LZO_CFG_NO_LONG_LONG) -+# undef LZO_SIZEOF_LONG_LONG -+#elif defined(__NO_LONG_LONG) -+# undef LZO_SIZEOF_LONG_LONG -+#elif defined(_NO_LONGLONG) -+# undef LZO_SIZEOF_LONG_LONG -+#endif -+#if !defined(LZO_WORDSIZE) -+#if (LZO_ARCH_ALPHA) -+# define LZO_WORDSIZE 8 -+#elif (LZO_ARCH_AMD64) -+# define LZO_WORDSIZE 8 -+#elif (LZO_ARCH_AVR) -+# define LZO_WORDSIZE 1 -+#elif (LZO_ARCH_H8300) -+# if defined(__NORMAL_MODE__) -+# define LZO_WORDSIZE 4 -+# elif defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__) -+# define LZO_WORDSIZE 4 -+# else -+# define LZO_WORDSIZE 2 -+# endif -+#elif (LZO_ARCH_I086) -+# define LZO_WORDSIZE 2 -+#elif (LZO_ARCH_IA64) -+# define LZO_WORDSIZE 8 -+#elif (LZO_ARCH_M16C) -+# define LZO_WORDSIZE 2 -+#elif (LZO_ARCH_SPU) -+# define LZO_WORDSIZE 4 -+#elif (LZO_ARCH_Z80) -+# define LZO_WORDSIZE 1 -+#elif (LZO_SIZEOF_LONG == 8) && ((defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__)) -+# define LZO_WORDSIZE 8 -+#elif (LZO_OS_OS400 || defined(__OS400__)) -+# define LZO_WORDSIZE 8 -+#elif (defined(__vms) || defined(__VMS)) && (__INITIAL_POINTER_SIZE+0 == 64) -+# define LZO_WORDSIZE 8 -+#endif -+#endif -+#if !defined(LZO_SIZEOF_VOID_P) -+#if defined(__ILP32__) || defined(__ILP32) || defined(_ILP32) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(int) == 4) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 4) -+# define LZO_SIZEOF_VOID_P 4 -+#elif defined(__ILP64__) || defined(__ILP64) || defined(_ILP64) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(int) == 8) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 8) -+# define LZO_SIZEOF_VOID_P 8 -+#elif defined(__LLP64__) || defined(__LLP64) || defined(_LLP64) || defined(_WIN64) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 4) -+# define LZO_SIZEOF_VOID_P 8 -+#elif defined(__LP64__) || defined(__LP64) || defined(_LP64) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 8) -+# define LZO_SIZEOF_VOID_P 8 -+#elif (LZO_ARCH_AVR) -+# define LZO_SIZEOF_VOID_P 2 -+#elif (LZO_ARCH_C166 || LZO_ARCH_MCS51 || LZO_ARCH_MCS251 || LZO_ARCH_MSP430) -+# define LZO_SIZEOF_VOID_P 2 -+#elif (LZO_ARCH_H8300) -+# if defined(__NORMAL_MODE__) -+# define LZO_SIZEOF_VOID_P 2 -+# elif defined(__H8300H__) || defined(__H8300S__) || defined(__H8300SX__) -+# define LZO_SIZEOF_VOID_P 4 -+# else -+# define LZO_SIZEOF_VOID_P 2 -+# endif -+# if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x040000ul)) && (LZO_SIZEOF_INT == 4) -+# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_INT -+# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_INT -+# endif -+#elif (LZO_ARCH_I086) -+# if (LZO_MM_TINY || LZO_MM_SMALL || LZO_MM_MEDIUM) -+# define LZO_SIZEOF_VOID_P 2 -+# elif (LZO_MM_COMPACT || LZO_MM_LARGE || LZO_MM_HUGE) -+# define LZO_SIZEOF_VOID_P 4 -+# else -+# error "invalid LZO_ARCH_I086 memory model" -+# endif -+#elif (LZO_ARCH_M16C) -+# if defined(__m32c_cpu__) || defined(__m32cm_cpu__) -+# define LZO_SIZEOF_VOID_P 4 -+# else -+# define LZO_SIZEOF_VOID_P 2 -+# endif -+#elif (LZO_ARCH_SPU) -+# define LZO_SIZEOF_VOID_P 4 -+#elif (LZO_ARCH_Z80) -+# define LZO_SIZEOF_VOID_P 2 -+#elif (LZO_SIZEOF_LONG == 8) && ((defined(__mips__) && defined(__R5900__)) || defined(__MIPS_PSX2__)) -+# define LZO_SIZEOF_VOID_P 4 -+#elif (LZO_OS_OS400 || defined(__OS400__)) -+# if defined(__LLP64_IFC__) -+# define LZO_SIZEOF_VOID_P 8 -+# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_LONG -+# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_LONG -+# else -+# define LZO_SIZEOF_VOID_P 16 -+# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_LONG -+# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_LONG -+# endif -+#elif (defined(__vms) || defined(__VMS)) && (__INITIAL_POINTER_SIZE+0 == 64) -+# define LZO_SIZEOF_VOID_P 8 -+# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_LONG -+# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_LONG -+#endif -+#endif -+#if !defined(LZO_SIZEOF_VOID_P) -+# define LZO_SIZEOF_VOID_P LZO_SIZEOF_LONG -+#endif -+LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_VOID_P == sizeof(void *)) -+#if !defined(LZO_SIZEOF_SIZE_T) -+#if (LZO_ARCH_I086 || LZO_ARCH_M16C) -+# define LZO_SIZEOF_SIZE_T 2 -+#endif -+#endif -+#if !defined(LZO_SIZEOF_SIZE_T) -+# define LZO_SIZEOF_SIZE_T LZO_SIZEOF_VOID_P -+#endif -+#if defined(offsetof) -+LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_SIZE_T == sizeof(size_t)) -+#endif -+#if !defined(LZO_SIZEOF_PTRDIFF_T) -+#if (LZO_ARCH_I086) -+# if (LZO_MM_TINY || LZO_MM_SMALL || LZO_MM_MEDIUM || LZO_MM_HUGE) -+# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_VOID_P -+# elif (LZO_MM_COMPACT || LZO_MM_LARGE) -+# if (LZO_CC_BORLANDC || LZO_CC_TURBOC) -+# define LZO_SIZEOF_PTRDIFF_T 4 -+# else -+# define LZO_SIZEOF_PTRDIFF_T 2 -+# endif -+# else -+# error "invalid LZO_ARCH_I086 memory model" -+# endif -+#endif -+#endif -+#if !defined(LZO_SIZEOF_PTRDIFF_T) -+# define LZO_SIZEOF_PTRDIFF_T LZO_SIZEOF_SIZE_T -+#endif -+#if defined(offsetof) -+LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t)) -+#endif -+#if !defined(LZO_WORDSIZE) -+# define LZO_WORDSIZE LZO_SIZEOF_VOID_P -+#endif -+#if (LZO_ABI_NEUTRAL_ENDIAN) -+# undef LZO_ABI_BIG_ENDIAN -+# undef LZO_ABI_LITTLE_ENDIAN -+#elif !(LZO_ABI_BIG_ENDIAN) && !(LZO_ABI_LITTLE_ENDIAN) -+#if (LZO_ARCH_ALPHA) && (LZO_ARCH_CRAY_MPP) -+# define LZO_ABI_BIG_ENDIAN 1 -+#elif (LZO_ARCH_IA64) && (LZO_OS_POSIX_LINUX || LZO_OS_WIN64) -+# define LZO_ABI_LITTLE_ENDIAN 1 -+#elif (LZO_ARCH_ALPHA || LZO_ARCH_AMD64 || LZO_ARCH_BLACKFIN || LZO_ARCH_CRIS || LZO_ARCH_I086 || LZO_ARCH_I386 || LZO_ARCH_MSP430) -+# define LZO_ABI_LITTLE_ENDIAN 1 -+#elif (LZO_ARCH_AVR32 || LZO_ARCH_M68K || LZO_ARCH_S390 || LZO_ARCH_SPU) -+# define LZO_ABI_BIG_ENDIAN 1 -+#elif 1 && defined(__IAR_SYSTEMS_ICC__) && defined(__LITTLE_ENDIAN__) -+# if (__LITTLE_ENDIAN__ == 1) -+# define LZO_ABI_LITTLE_ENDIAN 1 -+# else -+# define LZO_ABI_BIG_ENDIAN 1 -+# endif -+#elif 1 && defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) -+# define LZO_ABI_BIG_ENDIAN 1 -+#elif 1 && defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__) -+# define LZO_ABI_LITTLE_ENDIAN 1 -+#elif 1 && (LZO_ARCH_ARM) && defined(__ARMEB__) && !defined(__ARMEL__) -+# define LZO_ABI_BIG_ENDIAN 1 -+#elif 1 && (LZO_ARCH_ARM) && defined(__ARMEL__) && !defined(__ARMEB__) -+# define LZO_ABI_LITTLE_ENDIAN 1 -+#elif 1 && (LZO_ARCH_ARM && LZO_CC_ARMCC_ARMCC) -+# if defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN) -+# error "unexpected configuration - check your compiler defines" -+# elif defined(__BIG_ENDIAN) -+# define LZO_ABI_BIG_ENDIAN 1 -+# else -+# define LZO_ABI_LITTLE_ENDIAN 1 -+# endif -+# define LZO_ABI_LITTLE_ENDIAN 1 -+#elif 1 && (LZO_ARCH_ARM64) && defined(__AARCH64EB__) && !defined(__AARCH64EL__) -+# define LZO_ABI_BIG_ENDIAN 1 -+#elif 1 && (LZO_ARCH_ARM64) && defined(__AARCH64EL__) && !defined(__AARCH64EB__) -+# define LZO_ABI_LITTLE_ENDIAN 1 -+#elif 1 && (LZO_ARCH_MIPS) && defined(__MIPSEB__) && !defined(__MIPSEL__) -+# define LZO_ABI_BIG_ENDIAN 1 -+#elif 1 && (LZO_ARCH_MIPS) && defined(__MIPSEL__) && !defined(__MIPSEB__) -+# define LZO_ABI_LITTLE_ENDIAN 1 -+#endif -+#endif -+#if (LZO_ABI_BIG_ENDIAN) && (LZO_ABI_LITTLE_ENDIAN) -+# error "unexpected configuration - check your compiler defines" -+#endif -+#if (LZO_ABI_BIG_ENDIAN) -+# define LZO_INFO_ABI_ENDIAN "be" -+#elif (LZO_ABI_LITTLE_ENDIAN) -+# define LZO_INFO_ABI_ENDIAN "le" -+#elif (LZO_ABI_NEUTRAL_ENDIAN) -+# define LZO_INFO_ABI_ENDIAN "neutral" -+#endif -+#if (LZO_SIZEOF_INT == 1 && LZO_SIZEOF_LONG == 2 && LZO_SIZEOF_VOID_P == 2) -+# define LZO_ABI_I8LP16 1 -+# define LZO_INFO_ABI_PM "i8lp16" -+#elif (LZO_SIZEOF_INT == 2 && LZO_SIZEOF_LONG == 2 && LZO_SIZEOF_VOID_P == 2) -+# define LZO_ABI_ILP16 1 -+# define LZO_INFO_ABI_PM "ilp16" -+#elif (LZO_SIZEOF_INT == 2 && LZO_SIZEOF_LONG == 4 && LZO_SIZEOF_VOID_P == 4) -+# define LZO_ABI_LP32 1 -+# define LZO_INFO_ABI_PM "lp32" -+#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 4 && LZO_SIZEOF_VOID_P == 4) -+# define LZO_ABI_ILP32 1 -+# define LZO_INFO_ABI_PM "ilp32" -+#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 4 && LZO_SIZEOF_VOID_P == 8 && LZO_SIZEOF_SIZE_T == 8) -+# define LZO_ABI_LLP64 1 -+# define LZO_INFO_ABI_PM "llp64" -+#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 8) -+# define LZO_ABI_LP64 1 -+# define LZO_INFO_ABI_PM "lp64" -+#elif (LZO_SIZEOF_INT == 8 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 8) -+# define LZO_ABI_ILP64 1 -+# define LZO_INFO_ABI_PM "ilp64" -+#elif (LZO_SIZEOF_INT == 4 && LZO_SIZEOF_LONG == 8 && LZO_SIZEOF_VOID_P == 4) -+# define LZO_ABI_IP32L64 1 -+# define LZO_INFO_ABI_PM "ip32l64" -+#endif -+#if 0 -+#elif !defined(__LZO_LIBC_OVERRIDE) -+#if (LZO_LIBC_NAKED) -+# define LZO_INFO_LIBC "naked" -+#elif (LZO_LIBC_FREESTANDING) -+# define LZO_INFO_LIBC "freestanding" -+#elif (LZO_LIBC_MOSTLY_FREESTANDING) -+# define LZO_INFO_LIBC "mfreestanding" -+#elif (LZO_LIBC_ISOC90) -+# define LZO_INFO_LIBC "isoc90" -+#elif (LZO_LIBC_ISOC99) -+# define LZO_INFO_LIBC "isoc99" -+#elif (LZO_CC_ARMCC_ARMCC) && defined(__ARMCLIB_VERSION) -+# define LZO_LIBC_ISOC90 1 -+# define LZO_INFO_LIBC "isoc90" -+#elif defined(__dietlibc__) -+# define LZO_LIBC_DIETLIBC 1 -+# define LZO_INFO_LIBC "dietlibc" -+#elif defined(_NEWLIB_VERSION) -+# define LZO_LIBC_NEWLIB 1 -+# define LZO_INFO_LIBC "newlib" -+#elif defined(__UCLIBC__) && defined(__UCLIBC_MAJOR__) && defined(__UCLIBC_MINOR__) -+# if defined(__UCLIBC_SUBLEVEL__) -+# define LZO_LIBC_UCLIBC (__UCLIBC_MAJOR__ * 0x10000L + (__UCLIBC_MINOR__-0) * 0x100 + (__UCLIBC_SUBLEVEL__-0)) -+# else -+# define LZO_LIBC_UCLIBC 0x00090bL -+# endif -+# define LZO_INFO_LIBC "uc" "libc" -+#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) -+# define LZO_LIBC_GLIBC (__GLIBC__ * 0x10000L + (__GLIBC_MINOR__-0) * 0x100) -+# define LZO_INFO_LIBC "glibc" -+#elif (LZO_CC_MWERKS) && defined(__MSL__) -+# define LZO_LIBC_MSL __MSL__ -+# define LZO_INFO_LIBC "msl" -+#elif 1 && defined(__IAR_SYSTEMS_ICC__) -+# define LZO_LIBC_ISOC90 1 -+# define LZO_INFO_LIBC "isoc90" -+#else -+# define LZO_LIBC_DEFAULT 1 -+# define LZO_INFO_LIBC "default" -+#endif -+#endif -+#if (LZO_ARCH_I386 && (LZO_OS_DOS32 || LZO_OS_WIN32) && (LZO_CC_DMC || LZO_CC_INTELC || LZO_CC_MSC || LZO_CC_PELLESC)) -+# define LZO_ASM_SYNTAX_MSC 1 -+#elif (LZO_OS_WIN64 && (LZO_CC_DMC || LZO_CC_INTELC || LZO_CC_MSC || LZO_CC_PELLESC)) -+#elif (LZO_ARCH_I386 && LZO_CC_GNUC && (LZO_CC_GNUC == 0x011f00ul)) -+#elif (LZO_ARCH_I386 && (LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_INTELC || LZO_CC_PATHSCALE)) -+# define LZO_ASM_SYNTAX_GNUC 1 -+#elif (LZO_ARCH_AMD64 && (LZO_CC_CLANG || LZO_CC_GNUC || LZO_CC_INTELC || LZO_CC_PATHSCALE)) -+# define LZO_ASM_SYNTAX_GNUC 1 -+#elif (LZO_CC_GNUC) -+# define LZO_ASM_SYNTAX_GNUC 1 -+#endif -+#if (LZO_ASM_SYNTAX_GNUC) -+#if (LZO_ARCH_I386 && LZO_CC_GNUC && (LZO_CC_GNUC < 0x020000ul)) -+# define __LZO_ASM_CLOBBER "ax" -+# define __LZO_ASM_CLOBBER_LIST_CC /*empty*/ -+# define __LZO_ASM_CLOBBER_LIST_CC_MEMORY /*empty*/ -+# define __LZO_ASM_CLOBBER_LIST_EMPTY /*empty*/ -+#elif (LZO_CC_INTELC && (__INTEL_COMPILER < 1000)) -+# define __LZO_ASM_CLOBBER "memory" -+# define __LZO_ASM_CLOBBER_LIST_CC /*empty*/ -+# define __LZO_ASM_CLOBBER_LIST_CC_MEMORY : "memory" -+# define __LZO_ASM_CLOBBER_LIST_EMPTY /*empty*/ -+#else -+# define __LZO_ASM_CLOBBER "cc", "memory" -+# define __LZO_ASM_CLOBBER_LIST_CC : "cc" -+# define __LZO_ASM_CLOBBER_LIST_CC_MEMORY : "cc", "memory" -+# define __LZO_ASM_CLOBBER_LIST_EMPTY /*empty*/ -+#endif -+#endif -+#if (LZO_ARCH_ALPHA) -+# define LZO_OPT_AVOID_UINT_INDEX 1 -+#elif (LZO_ARCH_AMD64) -+# define LZO_OPT_AVOID_INT_INDEX 1 -+# define LZO_OPT_AVOID_UINT_INDEX 1 -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED64 -+# define LZO_OPT_UNALIGNED64 1 -+# endif -+#elif (LZO_ARCH_ARM) -+# if defined(__ARM_FEATURE_UNALIGNED) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+# elif defined(__TARGET_ARCH_ARM) && ((__TARGET_ARCH_ARM+0) >= 7) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+# elif defined(__TARGET_ARCH_ARM) && ((__TARGET_ARCH_ARM+0) >= 6) && !defined(__TARGET_PROFILE_M) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+# endif -+#elif (LZO_ARCH_ARM64) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED64 -+# define LZO_OPT_UNALIGNED64 1 -+# endif -+#elif (LZO_ARCH_CRIS) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+#elif (LZO_ARCH_I386) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+#elif (LZO_ARCH_IA64) -+# define LZO_OPT_AVOID_INT_INDEX 1 -+# define LZO_OPT_AVOID_UINT_INDEX 1 -+# define LZO_OPT_PREFER_POSTINC 1 -+#elif (LZO_ARCH_M68K) -+# define LZO_OPT_PREFER_POSTINC 1 -+# define LZO_OPT_PREFER_PREDEC 1 -+# if defined(__mc68020__) && !defined(__mcoldfire__) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+# endif -+#elif (LZO_ARCH_MIPS) -+# define LZO_OPT_AVOID_UINT_INDEX 1 -+#elif (LZO_ARCH_POWERPC) -+# define LZO_OPT_PREFER_PREINC 1 -+# define LZO_OPT_PREFER_PREDEC 1 -+# if (LZO_ABI_BIG_ENDIAN) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+# if (LZO_WORDSIZE == 8) -+# ifndef LZO_OPT_UNALIGNED64 -+# define LZO_OPT_UNALIGNED64 1 -+# endif -+# endif -+# endif -+#elif (LZO_ARCH_S390) -+# ifndef LZO_OPT_UNALIGNED16 -+# define LZO_OPT_UNALIGNED16 1 -+# endif -+# ifndef LZO_OPT_UNALIGNED32 -+# define LZO_OPT_UNALIGNED32 1 -+# endif -+# if (LZO_WORDSIZE == 8) -+# ifndef LZO_OPT_UNALIGNED64 -+# define LZO_OPT_UNALIGNED64 1 -+# endif -+# endif -+#elif (LZO_ARCH_SH) -+# define LZO_OPT_PREFER_POSTINC 1 -+# define LZO_OPT_PREFER_PREDEC 1 -+#endif -+#ifndef LZO_CFG_NO_INLINE_ASM -+#if (LZO_ABI_NEUTRAL_ENDIAN) || (LZO_ARCH_GENERIC) -+# define LZO_CFG_NO_INLINE_ASM 1 -+#elif (LZO_CC_LLVM) -+# define LZO_CFG_NO_INLINE_ASM 1 -+#endif -+#endif -+#if (LZO_CFG_NO_INLINE_ASM) -+# undef LZO_ASM_SYNTAX_MSC -+# undef LZO_ASM_SYNTAX_GNUC -+# undef __LZO_ASM_CLOBBER -+# undef __LZO_ASM_CLOBBER_LIST_CC -+# undef __LZO_ASM_CLOBBER_LIST_CC_MEMORY -+# undef __LZO_ASM_CLOBBER_LIST_EMPTY -+#endif -+#ifndef LZO_CFG_NO_UNALIGNED -+#if (LZO_ABI_NEUTRAL_ENDIAN) || (LZO_ARCH_GENERIC) -+# define LZO_CFG_NO_UNALIGNED 1 -+#endif -+#endif -+#if (LZO_CFG_NO_UNALIGNED) -+# undef LZO_OPT_UNALIGNED16 -+# undef LZO_OPT_UNALIGNED32 -+# undef LZO_OPT_UNALIGNED64 -+#endif -+#if defined(__LZO_INFOSTR_MM) -+#elif (LZO_MM_FLAT) && (defined(__LZO_INFOSTR_PM) || defined(LZO_INFO_ABI_PM)) -+# define __LZO_INFOSTR_MM "" -+#elif defined(LZO_INFO_MM) -+# define __LZO_INFOSTR_MM "." LZO_INFO_MM -+#else -+# define __LZO_INFOSTR_MM "" -+#endif -+#if defined(__LZO_INFOSTR_PM) -+#elif defined(LZO_INFO_ABI_PM) -+# define __LZO_INFOSTR_PM "." LZO_INFO_ABI_PM -+#else -+# define __LZO_INFOSTR_PM "" -+#endif -+#if defined(__LZO_INFOSTR_ENDIAN) -+#elif defined(LZO_INFO_ABI_ENDIAN) -+# define __LZO_INFOSTR_ENDIAN "." LZO_INFO_ABI_ENDIAN -+#else -+# define __LZO_INFOSTR_ENDIAN "" -+#endif -+#if defined(__LZO_INFOSTR_OSNAME) -+#elif defined(LZO_INFO_OS_CONSOLE) -+# define __LZO_INFOSTR_OSNAME LZO_INFO_OS "." LZO_INFO_OS_CONSOLE -+#elif defined(LZO_INFO_OS_POSIX) -+# define __LZO_INFOSTR_OSNAME LZO_INFO_OS "." LZO_INFO_OS_POSIX -+#else -+# define __LZO_INFOSTR_OSNAME LZO_INFO_OS -+#endif -+#if defined(__LZO_INFOSTR_LIBC) -+#elif defined(LZO_INFO_LIBC) -+# define __LZO_INFOSTR_LIBC "." LZO_INFO_LIBC -+#else -+# define __LZO_INFOSTR_LIBC "" -+#endif -+#if defined(__LZO_INFOSTR_CCVER) -+#elif defined(LZO_INFO_CCVER) -+# define __LZO_INFOSTR_CCVER " " LZO_INFO_CCVER -+#else -+# define __LZO_INFOSTR_CCVER "" -+#endif -+#define LZO_INFO_STRING \ -+ LZO_INFO_ARCH __LZO_INFOSTR_MM __LZO_INFOSTR_PM __LZO_INFOSTR_ENDIAN \ -+ " " __LZO_INFOSTR_OSNAME __LZO_INFOSTR_LIBC " " LZO_INFO_CC __LZO_INFOSTR_CCVER -+#if !(LZO_CFG_SKIP_LZO_TYPES) -+#if (!(LZO_SIZEOF_SHORT+0 > 0 && LZO_SIZEOF_INT+0 > 0 && LZO_SIZEOF_LONG+0 > 0)) -+# error "missing defines for sizes" -+#endif -+#if (!(LZO_SIZEOF_PTRDIFF_T+0 > 0 && LZO_SIZEOF_SIZE_T+0 > 0 && LZO_SIZEOF_VOID_P+0 > 0)) -+# error "missing defines for sizes" -+#endif -+#if !defined(lzo_llong_t) -+#if (LZO_SIZEOF_LONG_LONG+0 > 0) -+__lzo_gnuc_extension__ typedef long long lzo_llong_t__; -+__lzo_gnuc_extension__ typedef unsigned long long lzo_ullong_t__; -+# define lzo_llong_t lzo_llong_t__ -+# define lzo_ullong_t lzo_ullong_t__ -+#endif -+#endif -+#if !defined(lzo_int16e_t) -+#if (LZO_SIZEOF_LONG == 2) -+# define lzo_int16e_t long -+# define lzo_uint16e_t unsigned long -+#elif (LZO_SIZEOF_INT == 2) -+# define lzo_int16e_t int -+# define lzo_uint16e_t unsigned int -+#elif (LZO_SIZEOF_SHORT == 2) -+# define lzo_int16e_t short int -+# define lzo_uint16e_t unsigned short int -+#elif 1 && !(LZO_CFG_TYPE_NO_MODE_HI) && (LZO_CC_CLANG || (LZO_CC_GNUC >= 0x025f00ul) || LZO_CC_LLVM) -+ typedef int lzo_int16e_hi_t__ __attribute__((__mode__(__HI__))); -+ typedef unsigned int lzo_uint16e_hi_t__ __attribute__((__mode__(__HI__))); -+# define lzo_int16e_t lzo_int16e_hi_t__ -+# define lzo_uint16e_t lzo_uint16e_hi_t__ -+#elif (LZO_SIZEOF___INT16 == 2) -+# define lzo_int16e_t __int16 -+# define lzo_uint16e_t unsigned __int16 -+#else -+#endif -+#endif -+#if defined(lzo_int16e_t) -+# define LZO_SIZEOF_LZO_INT16E_T 2 -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16e_t) == 2) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16e_t) == LZO_SIZEOF_LZO_INT16E_T) -+#endif -+#if !defined(lzo_int32e_t) -+#if (LZO_SIZEOF_LONG == 4) -+# define lzo_int32e_t long int -+# define lzo_uint32e_t unsigned long int -+#elif (LZO_SIZEOF_INT == 4) -+# define lzo_int32e_t int -+# define lzo_uint32e_t unsigned int -+#elif (LZO_SIZEOF_SHORT == 4) -+# define lzo_int32e_t short int -+# define lzo_uint32e_t unsigned short int -+#elif (LZO_SIZEOF_LONG_LONG == 4) -+# define lzo_int32e_t lzo_llong_t -+# define lzo_uint32e_t lzo_ullong_t -+#elif 1 && !(LZO_CFG_TYPE_NO_MODE_SI) && (LZO_CC_CLANG || (LZO_CC_GNUC >= 0x025f00ul) || LZO_CC_LLVM) && (__INT_MAX__+0 > 2147483647L) -+ typedef int lzo_int32e_si_t__ __attribute__((__mode__(__SI__))); -+ typedef unsigned int lzo_uint32e_si_t__ __attribute__((__mode__(__SI__))); -+# define lzo_int32e_t lzo_int32e_si_t__ -+# define lzo_uint32e_t lzo_uint32e_si_t__ -+#elif 1 && !(LZO_CFG_TYPE_NO_MODE_SI) && (LZO_CC_GNUC >= 0x025f00ul) && defined(__AVR__) && (__LONG_MAX__+0 == 32767L) -+ typedef int lzo_int32e_si_t__ __attribute__((__mode__(__SI__))); -+ typedef unsigned int lzo_uint32e_si_t__ __attribute__((__mode__(__SI__))); -+# define lzo_int32e_t lzo_int32e_si_t__ -+# define lzo_uint32e_t lzo_uint32e_si_t__ -+# define LZO_INT32_C(c) (c##LL) -+# define LZO_UINT32_C(c) (c##ULL) -+#elif (LZO_SIZEOF___INT32 == 4) -+# define lzo_int32e_t __int32 -+# define lzo_uint32e_t unsigned __int32 -+#else -+#endif -+#endif -+#if defined(lzo_int32e_t) -+# define LZO_SIZEOF_LZO_INT32E_T 4 -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32e_t) == 4) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32e_t) == LZO_SIZEOF_LZO_INT32E_T) -+#endif -+#if !defined(lzo_int64e_t) -+#if (LZO_SIZEOF___INT64 == 8) -+# if (LZO_CC_BORLANDC) && !(LZO_CFG_TYPE_PREFER___INT64) -+# define LZO_CFG_TYPE_PREFER___INT64 1 -+# endif -+#endif -+#if (LZO_SIZEOF_INT == 8) && (LZO_SIZEOF_INT < LZO_SIZEOF_LONG) -+# define lzo_int64e_t int -+# define lzo_uint64e_t unsigned int -+# define LZO_SIZEOF_LZO_INT64E_T LZO_SIZEOF_INT -+#elif (LZO_SIZEOF_LONG == 8) -+# define lzo_int64e_t long int -+# define lzo_uint64e_t unsigned long int -+# define LZO_SIZEOF_LZO_INT64E_T LZO_SIZEOF_LONG -+#elif (LZO_SIZEOF_LONG_LONG == 8) && !(LZO_CFG_TYPE_PREFER___INT64) -+# define lzo_int64e_t lzo_llong_t -+# define lzo_uint64e_t lzo_ullong_t -+# if (LZO_CC_BORLANDC) -+# define LZO_INT64_C(c) ((c) + 0ll) -+# define LZO_UINT64_C(c) ((c) + 0ull) -+# elif 0 -+# define LZO_INT64_C(c) (__lzo_gnuc_extension__ (c##LL)) -+# define LZO_UINT64_C(c) (__lzo_gnuc_extension__ (c##ULL)) -+# else -+# define LZO_INT64_C(c) (c##LL) -+# define LZO_UINT64_C(c) (c##ULL) -+# endif -+# define LZO_SIZEOF_LZO_INT64E_T LZO_SIZEOF_LONG_LONG -+#elif (LZO_SIZEOF___INT64 == 8) -+# define lzo_int64e_t __int64 -+# define lzo_uint64e_t unsigned __int64 -+# if (LZO_CC_BORLANDC) -+# define LZO_INT64_C(c) ((c) + 0i64) -+# define LZO_UINT64_C(c) ((c) + 0ui64) -+# else -+# define LZO_INT64_C(c) (c##i64) -+# define LZO_UINT64_C(c) (c##ui64) -+# endif -+# define LZO_SIZEOF_LZO_INT64E_T LZO_SIZEOF___INT64 -+#else -+#endif -+#endif -+#if defined(lzo_int64e_t) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64e_t) == 8) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64e_t) == LZO_SIZEOF_LZO_INT64E_T) -+#endif -+#if !defined(lzo_int32l_t) -+#if defined(lzo_int32e_t) -+# define lzo_int32l_t lzo_int32e_t -+# define lzo_uint32l_t lzo_uint32e_t -+# define LZO_SIZEOF_LZO_INT32L_T LZO_SIZEOF_LZO_INT32E_T -+#elif (LZO_SIZEOF_INT >= 4) && (LZO_SIZEOF_INT < LZO_SIZEOF_LONG) -+# define lzo_int32l_t int -+# define lzo_uint32l_t unsigned int -+# define LZO_SIZEOF_LZO_INT32L_T LZO_SIZEOF_INT -+#elif (LZO_SIZEOF_LONG >= 4) -+# define lzo_int32l_t long int -+# define lzo_uint32l_t unsigned long int -+# define LZO_SIZEOF_LZO_INT32L_T LZO_SIZEOF_LONG -+#else -+# error "lzo_int32l_t" -+#endif -+#endif -+#if 1 -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32l_t) >= 4) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32l_t) == LZO_SIZEOF_LZO_INT32L_T) -+#endif -+#if !defined(lzo_int64l_t) -+#if defined(lzo_int64e_t) -+# define lzo_int64l_t lzo_int64e_t -+# define lzo_uint64l_t lzo_uint64e_t -+# define LZO_SIZEOF_LZO_INT64L_T LZO_SIZEOF_LZO_INT64E_T -+#else -+#endif -+#endif -+#if defined(lzo_int64l_t) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64l_t) >= 8) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64l_t) == LZO_SIZEOF_LZO_INT64L_T) -+#endif -+#if !defined(lzo_int32f_t) -+#if (LZO_SIZEOF_SIZE_T >= 8) -+# define lzo_int32f_t lzo_int64l_t -+# define lzo_uint32f_t lzo_uint64l_t -+# define LZO_SIZEOF_LZO_INT32F_T LZO_SIZEOF_LZO_INT64L_T -+#else -+# define lzo_int32f_t lzo_int32l_t -+# define lzo_uint32f_t lzo_uint32l_t -+# define LZO_SIZEOF_LZO_INT32F_T LZO_SIZEOF_LZO_INT32L_T -+#endif -+#endif -+#if 1 -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32f_t) >= 4) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32f_t) == LZO_SIZEOF_LZO_INT32F_T) -+#endif -+#if !defined(lzo_int64f_t) -+#if defined(lzo_int64l_t) -+# define lzo_int64f_t lzo_int64l_t -+# define lzo_uint64f_t lzo_uint64l_t -+# define LZO_SIZEOF_LZO_INT64F_T LZO_SIZEOF_LZO_INT64L_T -+#else -+#endif -+#endif -+#if defined(lzo_int64f_t) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64f_t) >= 8) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64f_t) == LZO_SIZEOF_LZO_INT64F_T) -+#endif -+#if !defined(lzo_intptr_t) -+#if 1 && (LZO_OS_OS400 && (LZO_SIZEOF_VOID_P == 16)) -+# define __LZO_INTPTR_T_IS_POINTER 1 -+ typedef char* lzo_intptr_t; -+ typedef char* lzo_uintptr_t; -+# define lzo_intptr_t lzo_intptr_t -+# define lzo_uintptr_t lzo_uintptr_t -+# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_VOID_P -+#elif (LZO_CC_MSC && (_MSC_VER >= 1300) && (LZO_SIZEOF_VOID_P == 4) && (LZO_SIZEOF_INT == 4)) -+ typedef __w64 int lzo_intptr_t; -+ typedef __w64 unsigned int lzo_uintptr_t; -+# define lzo_intptr_t lzo_intptr_t -+# define lzo_uintptr_t lzo_uintptr_t -+# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_INT -+#elif (LZO_SIZEOF_SHORT == LZO_SIZEOF_VOID_P) && (LZO_SIZEOF_INT > LZO_SIZEOF_VOID_P) -+# define lzo_intptr_t short -+# define lzo_uintptr_t unsigned short -+# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_SHORT -+#elif (LZO_SIZEOF_INT >= LZO_SIZEOF_VOID_P) && (LZO_SIZEOF_INT < LZO_SIZEOF_LONG) -+# define lzo_intptr_t int -+# define lzo_uintptr_t unsigned int -+# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_INT -+#elif (LZO_SIZEOF_LONG >= LZO_SIZEOF_VOID_P) -+# define lzo_intptr_t long -+# define lzo_uintptr_t unsigned long -+# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_LONG -+#elif (LZO_SIZEOF_LZO_INT64L_T >= LZO_SIZEOF_VOID_P) -+# define lzo_intptr_t lzo_int64l_t -+# define lzo_uintptr_t lzo_uint64l_t -+# define LZO_SIZEOF_LZO_INTPTR_T LZO_SIZEOF_LZO_INT64L_T -+#else -+# error "lzo_intptr_t" -+#endif -+#endif -+#if 1 -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_intptr_t) >= sizeof(void *)) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_intptr_t) == sizeof(lzo_uintptr_t)) -+#endif -+#if !defined(lzo_word_t) -+#if defined(LZO_WORDSIZE) && (LZO_WORDSIZE+0 > 0) -+#if (LZO_WORDSIZE == LZO_SIZEOF_LZO_INTPTR_T) && !(__LZO_INTPTR_T_IS_POINTER) -+# define lzo_word_t lzo_uintptr_t -+# define lzo_sword_t lzo_intptr_t -+# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_LZO_INTPTR_T -+#elif (LZO_WORDSIZE == LZO_SIZEOF_LONG) -+# define lzo_word_t unsigned long -+# define lzo_sword_t long -+# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_LONG -+#elif (LZO_WORDSIZE == LZO_SIZEOF_INT) -+# define lzo_word_t unsigned int -+# define lzo_sword_t int -+# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_INT -+#elif (LZO_WORDSIZE == LZO_SIZEOF_SHORT) -+# define lzo_word_t unsigned short -+# define lzo_sword_t short -+# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_SHORT -+#elif (LZO_WORDSIZE == 1) -+# define lzo_word_t unsigned char -+# define lzo_sword_t signed char -+# define LZO_SIZEOF_LZO_WORD_T 1 -+#elif (LZO_WORDSIZE == LZO_SIZEOF_LZO_INT64L_T) -+# define lzo_word_t lzo_uint64l_t -+# define lzo_sword_t lzo_int64l_t -+# define LZO_SIZEOF_LZO_WORD_T LZO_SIZEOF_LZO_INT64L_T -+#elif (LZO_ARCH_SPU) && (LZO_CC_GNUC) -+#if 0 -+ typedef unsigned lzo_word_t __attribute__((__mode__(__V16QI__))); -+ typedef int lzo_sword_t __attribute__((__mode__(__V16QI__))); -+# define lzo_word_t lzo_word_t -+# define lzo_sword_t lzo_sword_t -+# define LZO_SIZEOF_LZO_WORD_T 16 -+#endif -+#else -+# error "lzo_word_t" -+#endif -+#endif -+#endif -+#if 1 && defined(lzo_word_t) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_word_t) == LZO_WORDSIZE) -+ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_sword_t) == LZO_WORDSIZE) -+#endif -+#if 1 -+#define lzo_int8_t signed char -+#define lzo_uint8_t unsigned char -+#define LZO_SIZEOF_LZO_INT8_T 1 -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int8_t) == 1) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int8_t) == sizeof(lzo_uint8_t)) -+#endif -+#if defined(lzo_int16e_t) -+#define lzo_int16_t lzo_int16e_t -+#define lzo_uint16_t lzo_uint16e_t -+#define LZO_SIZEOF_LZO_INT16_T LZO_SIZEOF_LZO_INT16E_T -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16_t) == 2) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16_t) == sizeof(lzo_uint16_t)) -+#endif -+#if defined(lzo_int32e_t) -+#define lzo_int32_t lzo_int32e_t -+#define lzo_uint32_t lzo_uint32e_t -+#define LZO_SIZEOF_LZO_INT32_T LZO_SIZEOF_LZO_INT32E_T -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32_t) == 4) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32_t) == sizeof(lzo_uint32_t)) -+#endif -+#if defined(lzo_int64e_t) -+#define lzo_int64_t lzo_int64e_t -+#define lzo_uint64_t lzo_uint64e_t -+#define LZO_SIZEOF_LZO_INT64_T LZO_SIZEOF_LZO_INT64E_T -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64_t) == 8) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64_t) == sizeof(lzo_uint64_t)) -+#endif -+#if 1 -+#define lzo_int_least32_t lzo_int32l_t -+#define lzo_uint_least32_t lzo_uint32l_t -+#define LZO_SIZEOF_LZO_INT_LEAST32_T LZO_SIZEOF_LZO_INT32L_T -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_least32_t) >= 4) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_least32_t) == sizeof(lzo_uint_least32_t)) -+#endif -+#if defined(lzo_int64l_t) -+#define lzo_int_least64_t lzo_int64l_t -+#define lzo_uint_least64_t lzo_uint64l_t -+#define LZO_SIZEOF_LZO_INT_LEAST64_T LZO_SIZEOF_LZO_INT64L_T -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_least64_t) >= 8) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_least64_t) == sizeof(lzo_uint_least64_t)) -+#endif -+#if 1 -+#define lzo_int_fast32_t lzo_int32f_t -+#define lzo_uint_fast32_t lzo_uint32f_t -+#define LZO_SIZEOF_LZO_INT_FAST32_T LZO_SIZEOF_LZO_INT32F_T -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast32_t) >= 4) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast32_t) == sizeof(lzo_uint_fast32_t)) -+#endif -+#if defined(lzo_int64f_t) -+#define lzo_int_fast64_t lzo_int64f_t -+#define lzo_uint_fast64_t lzo_uint64f_t -+#define LZO_SIZEOF_LZO_INT_FAST64_T LZO_SIZEOF_LZO_INT64F_T -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast64_t) >= 8) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast64_t) == sizeof(lzo_uint_fast64_t)) -+#endif -+#if !defined(LZO_INT16_C) -+# if (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_INT >= 2) -+# define LZO_INT16_C(c) ((c) + 0) -+# define LZO_UINT16_C(c) ((c) + 0U) -+# elif (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_LONG >= 2) -+# define LZO_INT16_C(c) ((c) + 0L) -+# define LZO_UINT16_C(c) ((c) + 0UL) -+# elif (LZO_SIZEOF_INT >= 2) -+# define LZO_INT16_C(c) (c) -+# define LZO_UINT16_C(c) (c##U) -+# elif (LZO_SIZEOF_LONG >= 2) -+# define LZO_INT16_C(c) (c##L) -+# define LZO_UINT16_C(c) (c##UL) -+# else -+# error "LZO_INT16_C" -+# endif -+#endif -+#if !defined(LZO_INT32_C) -+# if (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_INT >= 4) -+# define LZO_INT32_C(c) ((c) + 0) -+# define LZO_UINT32_C(c) ((c) + 0U) -+# elif (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_LONG >= 4) -+# define LZO_INT32_C(c) ((c) + 0L) -+# define LZO_UINT32_C(c) ((c) + 0UL) -+# elif (LZO_SIZEOF_INT >= 4) -+# define LZO_INT32_C(c) (c) -+# define LZO_UINT32_C(c) (c##U) -+# elif (LZO_SIZEOF_LONG >= 4) -+# define LZO_INT32_C(c) (c##L) -+# define LZO_UINT32_C(c) (c##UL) -+# elif (LZO_SIZEOF_LONG_LONG >= 4) -+# define LZO_INT32_C(c) (c##LL) -+# define LZO_UINT32_C(c) (c##ULL) -+# else -+# error "LZO_INT32_C" -+# endif -+#endif -+#if !defined(LZO_INT64_C) && defined(lzo_int64l_t) -+# if (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_INT >= 8) -+# define LZO_INT64_C(c) ((c) + 0) -+# define LZO_UINT64_C(c) ((c) + 0U) -+# elif (LZO_BROKEN_INTEGRAL_CONSTANTS) && (LZO_SIZEOF_LONG >= 8) -+# define LZO_INT64_C(c) ((c) + 0L) -+# define LZO_UINT64_C(c) ((c) + 0UL) -+# elif (LZO_SIZEOF_INT >= 8) -+# define LZO_INT64_C(c) (c) -+# define LZO_UINT64_C(c) (c##U) -+# elif (LZO_SIZEOF_LONG >= 8) -+# define LZO_INT64_C(c) (c##L) -+# define LZO_UINT64_C(c) (c##UL) -+# else -+# error "LZO_INT64_C" -+# endif -+#endif -+#endif -+ -+#endif -+ -+#endif -+ -+#undef LZO_HAVE_CONFIG_H -+#include "minilzo.h" -+ -+#if !defined(MINILZO_VERSION) || (MINILZO_VERSION != 0x2080) -+# error "version mismatch in miniLZO source files" -+#endif -+ -+#ifdef MINILZO_HAVE_CONFIG_H -+# define LZO_HAVE_CONFIG_H 1 -+#endif -+ -+#ifndef __LZO_CONF_H -+#define __LZO_CONF_H 1 -+ -+#if !defined(__LZO_IN_MINILZO) -+#if defined(LZO_CFG_FREESTANDING) && (LZO_CFG_FREESTANDING) -+# define LZO_LIBC_FREESTANDING 1 -+# define LZO_OS_FREESTANDING 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" -+#if defined(LZO_CFG_EXTRA_CONFIG_HEADER2) -+# include LZO_CFG_EXTRA_CONFIG_HEADER2 -+#endif -+#endif -+ -+#if (LZO_VERSION < 0x2080) || !defined(__LZOCONF_H_INCLUDED) -+# error "version mismatch" -+#endif -+ -+#if (LZO_CC_MSC && (_MSC_VER >= 1000 && _MSC_VER < 1100)) -+# pragma warning(disable: 4702) -+#endif -+#if (LZO_CC_MSC && (_MSC_VER >= 1000)) -+# pragma warning(disable: 4127 4701) -+# pragma warning(disable: 4514 4710 4711) -+#endif -+#if (LZO_CC_MSC && (_MSC_VER >= 1300)) -+# pragma warning(disable: 4820) -+#endif -+#if (LZO_CC_MSC && (_MSC_VER >= 1800)) -+# pragma warning(disable: 4746) -+#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 defined(__LZO_IN_MINILZO) || (LZO_CFG_FREESTANDING) -+#elif 1 -+# include -+#else -+# define LZO_WANT_ACC_INCD_H 1 -+#endif -+#if defined(LZO_HAVE_CONFIG_H) -+# define LZO_CFG_NO_CONFIG_HEADER 1 -+#endif -+ -+#if 1 && !defined(LZO_CFG_FREESTANDING) -+#if 1 && !defined(HAVE_STRING_H) -+#define HAVE_STRING_H 1 -+#endif -+#if 1 && !defined(HAVE_MEMCMP) -+#define HAVE_MEMCMP 1 -+#endif -+#if 1 && !defined(HAVE_MEMCPY) -+#define HAVE_MEMCPY 1 -+#endif -+#if 1 && !defined(HAVE_MEMMOVE) -+#define HAVE_MEMMOVE 1 -+#endif -+#if 1 && !defined(HAVE_MEMSET) -+#define HAVE_MEMSET 1 -+#endif -+#endif -+ -+#if 1 && defined(HAVE_STRING_H) -+#include -+#endif -+ -+#if 1 || defined(lzo_int8_t) || defined(lzo_uint8_t) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int8_t) == 1) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint8_t) == 1) -+#endif -+#if 1 || defined(lzo_int16_t) || defined(lzo_uint16_t) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int16_t) == 2) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint16_t) == 2) -+#endif -+#if 1 || defined(lzo_int32_t) || defined(lzo_uint32_t) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int32_t) == 4) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint32_t) == 4) -+#endif -+#if defined(lzo_int64_t) || defined(lzo_uint64_t) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int64_t) == 8) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint64_t) == 8) -+#endif -+ -+#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) -+#else -+# 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) -+#else -+# 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) -+#else -+# 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) -+#else -+# 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 -+#endif -+ -+#if 0 && defined(__BOUNDS_CHECKING_ON) -+# include -+#else -+# define BOUNDS_CHECKING_OFF_DURING(stmt) stmt -+# define BOUNDS_CHECKING_OFF_IN_EXPR(expr) (expr) -+#endif -+ -+#if (LZO_CFG_PGO) -+# undef __lzo_likely -+# undef __lzo_unlikely -+# define __lzo_likely(e) (e) -+# define __lzo_unlikely(e) (e) -+#endif -+ -+#undef _ -+#undef __ -+#undef ___ -+#undef ____ -+#undef _p0 -+#undef _p1 -+#undef _p2 -+#undef _p3 -+#undef _p4 -+#undef _s0 -+#undef _s1 -+#undef _s2 -+#undef _s3 -+#undef _s4 -+#undef _ww -+ -+#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)))) -+ -+#define LZO_SIZE(bits) (1u << (bits)) -+#define LZO_MASK(bits) (LZO_SIZE(bits) - 1) -+ -+#define LZO_USIZE(bits) ((lzo_uint) 1 << (bits)) -+#define LZO_UMASK(bits) (LZO_USIZE(bits) - 1) -+ -+#if !defined(DMUL) -+#if 0 -+ -+# define DMUL(a,b) ((lzo_xint) ((lzo_uint32_t)(a) * (lzo_uint32_t)(b))) -+#else -+# define DMUL(a,b) ((lzo_xint) ((a) * (b))) -+#endif -+#endif -+ -+#ifndef __LZO_FUNC_H -+#define __LZO_FUNC_H 1 -+ -+#if !defined(LZO_BITOPS_USE_ASM_BITSCAN) && !defined(LZO_BITOPS_USE_GNUC_BITSCAN) && !defined(LZO_BITOPS_USE_MSC_BITSCAN) -+#if 1 && (LZO_ARCH_AMD64) && (LZO_CC_GNUC && (LZO_CC_GNUC < 0x040000ul)) && (LZO_ASM_SYNTAX_GNUC) -+#define LZO_BITOPS_USE_ASM_BITSCAN 1 -+#elif (LZO_CC_CLANG || (LZO_CC_GNUC >= 0x030400ul) || (LZO_CC_INTELC_GNUC && (__INTEL_COMPILER >= 1000)) || (LZO_CC_LLVM && (!defined(__llvm_tools_version__) || (__llvm_tools_version__+0 >= 0x010500ul)))) -+#define LZO_BITOPS_USE_GNUC_BITSCAN 1 -+#elif (LZO_OS_WIN32 || LZO_OS_WIN64) && ((LZO_CC_INTELC_MSC && (__INTEL_COMPILER >= 1010)) || (LZO_CC_MSC && (_MSC_VER >= 1400))) -+#define LZO_BITOPS_USE_MSC_BITSCAN 1 -+#if (LZO_CC_MSC) && (LZO_ARCH_AMD64 || LZO_ARCH_I386) -+#include -+#endif -+#if (LZO_CC_MSC) && (LZO_ARCH_AMD64 || LZO_ARCH_I386) -+#pragma intrinsic(_BitScanReverse) -+#pragma intrinsic(_BitScanForward) -+#endif -+#if (LZO_CC_MSC) && (LZO_ARCH_AMD64) -+#pragma intrinsic(_BitScanReverse64) -+#pragma intrinsic(_BitScanForward64) -+#endif -+#endif -+#endif -+ -+__lzo_static_forceinline unsigned lzo_bitops_ctlz32_func(lzo_uint32_t v) -+{ -+#if (LZO_BITOPS_USE_MSC_BITSCAN) && (LZO_ARCH_AMD64 || LZO_ARCH_I386) -+ unsigned long r; (void) _BitScanReverse(&r, v); return (unsigned) r ^ 31; -+#define lzo_bitops_ctlz32(v) lzo_bitops_ctlz32_func(v) -+#elif (LZO_BITOPS_USE_ASM_BITSCAN) && (LZO_ARCH_AMD64 || LZO_ARCH_I386) && (LZO_ASM_SYNTAX_GNUC) -+ lzo_uint32_t r; -+ __asm__("bsr %1,%0" : "=r" (r) : "rm" (v) __LZO_ASM_CLOBBER_LIST_CC); -+ return (unsigned) r ^ 31; -+#define lzo_bitops_ctlz32(v) lzo_bitops_ctlz32_func(v) -+#elif (LZO_BITOPS_USE_GNUC_BITSCAN) && (LZO_SIZEOF_INT == 4) -+ unsigned r; r = (unsigned) __builtin_clz(v); return r; -+#define lzo_bitops_ctlz32(v) ((unsigned) __builtin_clz(v)) -+#else -+ LZO_UNUSED(v); return 0; -+#endif -+} -+ -+#if defined(lzo_uint64_t) -+__lzo_static_forceinline unsigned lzo_bitops_ctlz64_func(lzo_uint64_t v) -+{ -+#if (LZO_BITOPS_USE_MSC_BITSCAN) && (LZO_ARCH_AMD64) -+ unsigned long r; (void) _BitScanReverse64(&r, v); return (unsigned) r ^ 63; -+#define lzo_bitops_ctlz64(v) lzo_bitops_ctlz64_func(v) -+#elif (LZO_BITOPS_USE_ASM_BITSCAN) && (LZO_ARCH_AMD64) && (LZO_ASM_SYNTAX_GNUC) -+ lzo_uint64_t r; -+ __asm__("bsr %1,%0" : "=r" (r) : "rm" (v) __LZO_ASM_CLOBBER_LIST_CC); -+ return (unsigned) r ^ 63; -+#define lzo_bitops_ctlz64(v) lzo_bitops_ctlz64_func(v) -+#elif (LZO_BITOPS_USE_GNUC_BITSCAN) && (LZO_SIZEOF_LONG == 8) && (LZO_WORDSIZE >= 8) -+ unsigned r; r = (unsigned) __builtin_clzl(v); return r; -+#define lzo_bitops_ctlz64(v) ((unsigned) __builtin_clzl(v)) -+#elif (LZO_BITOPS_USE_GNUC_BITSCAN) && (LZO_SIZEOF_LONG_LONG == 8) && (LZO_WORDSIZE >= 8) -+ unsigned r; r = (unsigned) __builtin_clzll(v); return r; -+#define lzo_bitops_ctlz64(v) ((unsigned) __builtin_clzll(v)) -+#else -+ LZO_UNUSED(v); return 0; -+#endif -+} -+#endif -+ -+__lzo_static_forceinline unsigned lzo_bitops_cttz32_func(lzo_uint32_t v) -+{ -+#if (LZO_BITOPS_USE_MSC_BITSCAN) && (LZO_ARCH_AMD64 || LZO_ARCH_I386) -+ unsigned long r; (void) _BitScanForward(&r, v); return (unsigned) r; -+#define lzo_bitops_cttz32(v) lzo_bitops_cttz32_func(v) -+#elif (LZO_BITOPS_USE_ASM_BITSCAN) && (LZO_ARCH_AMD64 || LZO_ARCH_I386) && (LZO_ASM_SYNTAX_GNUC) -+ lzo_uint32_t r; -+ __asm__("bsf %1,%0" : "=r" (r) : "rm" (v) __LZO_ASM_CLOBBER_LIST_CC); -+ return (unsigned) r; -+#define lzo_bitops_cttz32(v) lzo_bitops_cttz32_func(v) -+#elif (LZO_BITOPS_USE_GNUC_BITSCAN) && (LZO_SIZEOF_INT >= 4) -+ unsigned r; r = (unsigned) __builtin_ctz(v); return r; -+#define lzo_bitops_cttz32(v) ((unsigned) __builtin_ctz(v)) -+#else -+ LZO_UNUSED(v); return 0; -+#endif -+} -+ -+#if defined(lzo_uint64_t) -+__lzo_static_forceinline unsigned lzo_bitops_cttz64_func(lzo_uint64_t v) -+{ -+#if (LZO_BITOPS_USE_MSC_BITSCAN) && (LZO_ARCH_AMD64) -+ unsigned long r; (void) _BitScanForward64(&r, v); return (unsigned) r; -+#define lzo_bitops_cttz64(v) lzo_bitops_cttz64_func(v) -+#elif (LZO_BITOPS_USE_ASM_BITSCAN) && (LZO_ARCH_AMD64) && (LZO_ASM_SYNTAX_GNUC) -+ lzo_uint64_t r; -+ __asm__("bsf %1,%0" : "=r" (r) : "rm" (v) __LZO_ASM_CLOBBER_LIST_CC); -+ return (unsigned) r; -+#define lzo_bitops_cttz64(v) lzo_bitops_cttz64_func(v) -+#elif (LZO_BITOPS_USE_GNUC_BITSCAN) && (LZO_SIZEOF_LONG >= 8) && (LZO_WORDSIZE >= 8) -+ unsigned r; r = (unsigned) __builtin_ctzl(v); return r; -+#define lzo_bitops_cttz64(v) ((unsigned) __builtin_ctzl(v)) -+#elif (LZO_BITOPS_USE_GNUC_BITSCAN) && (LZO_SIZEOF_LONG_LONG >= 8) && (LZO_WORDSIZE >= 8) -+ unsigned r; r = (unsigned) __builtin_ctzll(v); return r; -+#define lzo_bitops_cttz64(v) ((unsigned) __builtin_ctzll(v)) -+#else -+ LZO_UNUSED(v); return 0; -+#endif -+} -+#endif -+ -+#if 1 && (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || (LZO_CC_GNUC >= 0x020700ul) || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) -+static void __attribute__((__unused__)) -+#else -+__lzo_static_forceinline void -+#endif -+lzo_bitops_unused_funcs(void) -+{ -+ LZO_UNUSED_FUNC(lzo_bitops_ctlz32_func); -+ LZO_UNUSED_FUNC(lzo_bitops_cttz32_func); -+#if defined(lzo_uint64_t) -+ LZO_UNUSED_FUNC(lzo_bitops_ctlz64_func); -+ LZO_UNUSED_FUNC(lzo_bitops_cttz64_func); -+#endif -+ LZO_UNUSED_FUNC(lzo_bitops_unused_funcs); -+} -+ -+#if defined(__lzo_alignof) && !(LZO_CFG_NO_UNALIGNED) -+#ifndef __lzo_memops_tcheck -+#define __lzo_memops_tcheck(t,a,b) ((void)0, sizeof(t) == (a) && __lzo_alignof(t) == (b)) -+#endif -+#endif -+#ifndef lzo_memops_TU0p -+#define lzo_memops_TU0p void __LZO_MMODEL * -+#endif -+#ifndef lzo_memops_TU1p -+#define lzo_memops_TU1p unsigned char __LZO_MMODEL * -+#endif -+#ifndef lzo_memops_TU2p -+#if (LZO_OPT_UNALIGNED16) -+typedef lzo_uint16_t __lzo_may_alias lzo_memops_TU2; -+#define lzo_memops_TU2p volatile lzo_memops_TU2 * -+#elif defined(__lzo_byte_struct) -+__lzo_byte_struct(lzo_memops_TU2_struct,2) -+typedef struct lzo_memops_TU2_struct lzo_memops_TU2; -+#else -+struct lzo_memops_TU2_struct { unsigned char a[2]; } __lzo_may_alias; -+typedef struct lzo_memops_TU2_struct lzo_memops_TU2; -+#endif -+#ifndef lzo_memops_TU2p -+#define lzo_memops_TU2p lzo_memops_TU2 * -+#endif -+#endif -+#ifndef lzo_memops_TU4p -+#if (LZO_OPT_UNALIGNED32) -+typedef lzo_uint32_t __lzo_may_alias lzo_memops_TU4; -+#define lzo_memops_TU4p volatile lzo_memops_TU4 __LZO_MMODEL * -+#elif defined(__lzo_byte_struct) -+__lzo_byte_struct(lzo_memops_TU4_struct,4) -+typedef struct lzo_memops_TU4_struct lzo_memops_TU4; -+#else -+struct lzo_memops_TU4_struct { unsigned char a[4]; } __lzo_may_alias; -+typedef struct lzo_memops_TU4_struct lzo_memops_TU4; -+#endif -+#ifndef lzo_memops_TU4p -+#define lzo_memops_TU4p lzo_memops_TU4 __LZO_MMODEL * -+#endif -+#endif -+#ifndef lzo_memops_TU8p -+#if (LZO_OPT_UNALIGNED64) -+typedef lzo_uint64_t __lzo_may_alias lzo_memops_TU8; -+#define lzo_memops_TU8p volatile lzo_memops_TU8 __LZO_MMODEL * -+#elif defined(__lzo_byte_struct) -+__lzo_byte_struct(lzo_memops_TU8_struct,8) -+typedef struct lzo_memops_TU8_struct lzo_memops_TU8; -+#else -+struct lzo_memops_TU8_struct { unsigned char a[8]; } __lzo_may_alias; -+typedef struct lzo_memops_TU8_struct lzo_memops_TU8; -+#endif -+#ifndef lzo_memops_TU8p -+#define lzo_memops_TU8p lzo_memops_TU8 __LZO_MMODEL * -+#endif -+#endif -+#ifndef lzo_memops_set_TU1p -+#define lzo_memops_set_TU1p volatile lzo_memops_TU1p -+#endif -+#ifndef lzo_memops_move_TU1p -+#define lzo_memops_move_TU1p lzo_memops_TU1p -+#endif -+#define LZO_MEMOPS_SET1(dd,cc) \ -+ LZO_BLOCK_BEGIN \ -+ lzo_memops_set_TU1p d__1 = (lzo_memops_set_TU1p) (lzo_memops_TU0p) (dd); \ -+ d__1[0] = LZO_BYTE(cc); \ -+ LZO_BLOCK_END -+#define LZO_MEMOPS_SET2(dd,cc) \ -+ LZO_BLOCK_BEGIN \ -+ lzo_memops_set_TU1p d__2 = (lzo_memops_set_TU1p) (lzo_memops_TU0p) (dd); \ -+ d__2[0] = LZO_BYTE(cc); d__2[1] = LZO_BYTE(cc); \ -+ LZO_BLOCK_END -+#define LZO_MEMOPS_SET3(dd,cc) \ -+ LZO_BLOCK_BEGIN \ -+ lzo_memops_set_TU1p d__3 = (lzo_memops_set_TU1p) (lzo_memops_TU0p) (dd); \ -+ d__3[0] = LZO_BYTE(cc); d__3[1] = LZO_BYTE(cc); d__3[2] = LZO_BYTE(cc); \ -+ LZO_BLOCK_END -+#define LZO_MEMOPS_SET4(dd,cc) \ -+ LZO_BLOCK_BEGIN \ -+ lzo_memops_set_TU1p d__4 = (lzo_memops_set_TU1p) (lzo_memops_TU0p) (dd); \ -+ d__4[0] = LZO_BYTE(cc); d__4[1] = LZO_BYTE(cc); d__4[2] = LZO_BYTE(cc); d__4[3] = LZO_BYTE(cc); \ -+ LZO_BLOCK_END -+#define LZO_MEMOPS_MOVE1(dd,ss) \ -+ LZO_BLOCK_BEGIN \ -+ lzo_memops_move_TU1p d__1 = (lzo_memops_move_TU1p) (lzo_memops_TU0p) (dd); \ -+ const lzo_memops_move_TU1p s__1 = (const lzo_memops_move_TU1p) (const lzo_memops_TU0p) (ss); \ -+ d__1[0] = s__1[0]; \ -+ LZO_BLOCK_END -+#define LZO_MEMOPS_MOVE2(dd,ss) \ -+ LZO_BLOCK_BEGIN \ -+ lzo_memops_move_TU1p d__2 = (lzo_memops_move_TU1p) (lzo_memops_TU0p) (dd); \ -+ const lzo_memops_move_TU1p s__2 = (const lzo_memops_move_TU1p) (const lzo_memops_TU0p) (ss); \ -+ d__2[0] = s__2[0]; d__2[1] = s__2[1]; \ -+ LZO_BLOCK_END -+#define LZO_MEMOPS_MOVE3(dd,ss) \ -+ LZO_BLOCK_BEGIN \ -+ lzo_memops_move_TU1p d__3 = (lzo_memops_move_TU1p) (lzo_memops_TU0p) (dd); \ -+ const lzo_memops_move_TU1p s__3 = (const lzo_memops_move_TU1p) (const lzo_memops_TU0p) (ss); \ -+ d__3[0] = s__3[0]; d__3[1] = s__3[1]; d__3[2] = s__3[2]; \ -+ LZO_BLOCK_END -+#define LZO_MEMOPS_MOVE4(dd,ss) \ -+ LZO_BLOCK_BEGIN \ -+ lzo_memops_move_TU1p d__4 = (lzo_memops_move_TU1p) (lzo_memops_TU0p) (dd); \ -+ const lzo_memops_move_TU1p s__4 = (const lzo_memops_move_TU1p) (const lzo_memops_TU0p) (ss); \ -+ d__4[0] = s__4[0]; d__4[1] = s__4[1]; d__4[2] = s__4[2]; d__4[3] = s__4[3]; \ -+ LZO_BLOCK_END -+#define LZO_MEMOPS_MOVE8(dd,ss) \ -+ LZO_BLOCK_BEGIN \ -+ lzo_memops_move_TU1p d__8 = (lzo_memops_move_TU1p) (lzo_memops_TU0p) (dd); \ -+ const lzo_memops_move_TU1p s__8 = (const lzo_memops_move_TU1p) (const lzo_memops_TU0p) (ss); \ -+ d__8[0] = s__8[0]; d__8[1] = s__8[1]; d__8[2] = s__8[2]; d__8[3] = s__8[3]; \ -+ d__8[4] = s__8[4]; d__8[5] = s__8[5]; d__8[6] = s__8[6]; d__8[7] = s__8[7]; \ -+ LZO_BLOCK_END -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU1p)0)==1) -+#define LZO_MEMOPS_COPY1(dd,ss) LZO_MEMOPS_MOVE1(dd,ss) -+#if (LZO_OPT_UNALIGNED16) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU2p)0)==2) -+#define LZO_MEMOPS_COPY2(dd,ss) \ -+ * (lzo_memops_TU2p) (lzo_memops_TU0p) (dd) = * (const lzo_memops_TU2p) (const lzo_memops_TU0p) (ss) -+#elif defined(__lzo_memops_tcheck) -+#define LZO_MEMOPS_COPY2(dd,ss) \ -+ LZO_BLOCK_BEGIN if (__lzo_memops_tcheck(lzo_memops_TU2,2,1)) { \ -+ * (lzo_memops_TU2p) (lzo_memops_TU0p) (dd) = * (const lzo_memops_TU2p) (const lzo_memops_TU0p) (ss); \ -+ } else { LZO_MEMOPS_MOVE2(dd,ss); } LZO_BLOCK_END -+#else -+#define LZO_MEMOPS_COPY2(dd,ss) LZO_MEMOPS_MOVE2(dd,ss) -+#endif -+#if (LZO_OPT_UNALIGNED32) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU4p)0)==4) -+#define LZO_MEMOPS_COPY4(dd,ss) \ -+ * (lzo_memops_TU4p) (lzo_memops_TU0p) (dd) = * (const lzo_memops_TU4p) (const lzo_memops_TU0p) (ss) -+#elif defined(__lzo_memops_tcheck) -+#define LZO_MEMOPS_COPY4(dd,ss) \ -+ LZO_BLOCK_BEGIN if (__lzo_memops_tcheck(lzo_memops_TU4,4,1)) { \ -+ * (lzo_memops_TU4p) (lzo_memops_TU0p) (dd) = * (const lzo_memops_TU4p) (const lzo_memops_TU0p) (ss); \ -+ } else { LZO_MEMOPS_MOVE4(dd,ss); } LZO_BLOCK_END -+#else -+#define LZO_MEMOPS_COPY4(dd,ss) LZO_MEMOPS_MOVE4(dd,ss) -+#endif -+#if (LZO_WORDSIZE != 8) -+#define LZO_MEMOPS_COPY8(dd,ss) \ -+ LZO_BLOCK_BEGIN LZO_MEMOPS_COPY4(dd,ss); LZO_MEMOPS_COPY4((lzo_memops_TU1p)(lzo_memops_TU0p)(dd)+4,(const lzo_memops_TU1p)(const lzo_memops_TU0p)(ss)+4); LZO_BLOCK_END -+#else -+#if (LZO_OPT_UNALIGNED64) -+LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU8p)0)==8) -+#define LZO_MEMOPS_COPY8(dd,ss) \ -+ * (lzo_memops_TU8p) (lzo_memops_TU0p) (dd) = * (const lzo_memops_TU8p) (const lzo_memops_TU0p) (ss) -+#elif (LZO_OPT_UNALIGNED32) -+#define LZO_MEMOPS_COPY8(dd,ss) \ -+ LZO_BLOCK_BEGIN LZO_MEMOPS_COPY4(dd,ss); LZO_MEMOPS_COPY4((lzo_memops_TU1p)(lzo_memops_TU0p)(dd)+4,(const lzo_memops_TU1p)(const lzo_memops_TU0p)(ss)+4); LZO_BLOCK_END -+#elif defined(__lzo_memops_tcheck) -+#define LZO_MEMOPS_COPY8(dd,ss) \ -+ LZO_BLOCK_BEGIN if (__lzo_memops_tcheck(lzo_memops_TU8,8,1)) { \ -+ * (lzo_memops_TU8p) (lzo_memops_TU0p) (dd) = * (const lzo_memops_TU8p) (const lzo_memops_TU0p) (ss); \ -+ } else { LZO_MEMOPS_MOVE8(dd,ss); } LZO_BLOCK_END -+#else -+#define LZO_MEMOPS_COPY8(dd,ss) LZO_MEMOPS_MOVE8(dd,ss) -+#endif -+#endif -+#define LZO_MEMOPS_COPYN(dd,ss,nn) \ -+ LZO_BLOCK_BEGIN \ -+ lzo_memops_TU1p d__n = (lzo_memops_TU1p) (lzo_memops_TU0p) (dd); \ -+ const lzo_memops_TU1p s__n = (const lzo_memops_TU1p) (const lzo_memops_TU0p) (ss); \ -+ lzo_uint n__n = (nn); \ -+ while ((void)0, n__n >= 8) { LZO_MEMOPS_COPY8(d__n, s__n); d__n += 8; s__n += 8; n__n -= 8; } \ -+ if ((void)0, n__n >= 4) { LZO_MEMOPS_COPY4(d__n, s__n); d__n += 4; s__n += 4; n__n -= 4; } \ -+ if ((void)0, n__n > 0) do { *d__n++ = *s__n++; } while (--n__n > 0); \ -+ LZO_BLOCK_END -+ -+__lzo_static_forceinline lzo_uint16_t lzo_memops_get_le16(const lzo_voidp ss) -+{ -+ lzo_uint16_t v; -+#if (LZO_ABI_LITTLE_ENDIAN) -+ LZO_MEMOPS_COPY2(&v, ss); -+#elif (LZO_OPT_UNALIGNED16 && LZO_ARCH_POWERPC && LZO_ABI_BIG_ENDIAN) && (LZO_ASM_SYNTAX_GNUC) -+ const lzo_memops_TU2p s = (const lzo_memops_TU2p) ss; -+ unsigned long vv; -+ __asm__("lhbrx %0,0,%1" : "=r" (vv) : "r" (s), "m" (*s)); -+ v = (lzo_uint16_t) vv; -+#else -+ const lzo_memops_TU1p s = (const lzo_memops_TU1p) ss; -+ v = (lzo_uint16_t) (((lzo_uint16_t)s[0]) | ((lzo_uint16_t)s[1] << 8)); -+#endif -+ return v; -+} -+#if (LZO_OPT_UNALIGNED16) && (LZO_ABI_LITTLE_ENDIAN) -+#define LZO_MEMOPS_GET_LE16(ss) * (const lzo_memops_TU2p) (const lzo_memops_TU0p) (ss) -+#else -+#define LZO_MEMOPS_GET_LE16(ss) lzo_memops_get_le16(ss) -+#endif - --#undef LZO_HAVE_CONFIG_H --#include "minilzo.h" -- --#if !defined(MINILZO_VERSION) || (MINILZO_VERSION != 0x1080) --# error "version mismatch in miniLZO source files" -+__lzo_static_forceinline lzo_uint32_t lzo_memops_get_le32(const lzo_voidp ss) -+{ -+ lzo_uint32_t v; -+#if (LZO_ABI_LITTLE_ENDIAN) -+ LZO_MEMOPS_COPY4(&v, ss); -+#elif (LZO_OPT_UNALIGNED32 && LZO_ARCH_POWERPC && LZO_ABI_BIG_ENDIAN) && (LZO_ASM_SYNTAX_GNUC) -+ const lzo_memops_TU4p s = (const lzo_memops_TU4p) ss; -+ unsigned long vv; -+ __asm__("lwbrx %0,0,%1" : "=r" (vv) : "r" (s), "m" (*s)); -+ v = (lzo_uint32_t) vv; -+#else -+ const lzo_memops_TU1p s = (const lzo_memops_TU1p) ss; -+ v = (lzo_uint32_t) (((lzo_uint32_t)s[0]) | ((lzo_uint32_t)s[1] << 8) | ((lzo_uint32_t)s[2] << 16) | ((lzo_uint32_t)s[3] << 24)); - #endif -- --#ifdef MINILZO_HAVE_CONFIG_H --# define LZO_HAVE_CONFIG_H -+ return v; -+} -+#if (LZO_OPT_UNALIGNED32) && (LZO_ABI_LITTLE_ENDIAN) -+#define LZO_MEMOPS_GET_LE32(ss) * (const lzo_memops_TU4p) (const lzo_memops_TU0p) (ss) -+#else -+#define LZO_MEMOPS_GET_LE32(ss) lzo_memops_get_le32(ss) - #endif - --#if !defined(LZO_NO_SYS_TYPES_H) --# include -+#if (LZO_OPT_UNALIGNED64) && (LZO_ABI_LITTLE_ENDIAN) -+#define LZO_MEMOPS_GET_LE64(ss) * (const lzo_memops_TU8p) (const lzo_memops_TU0p) (ss) - #endif --#include -- --#ifndef __LZO_CONF_H --#define __LZO_CONF_H - --#if !defined(__LZO_IN_MINILZO) --# ifndef __LZOCONF_H --# include --# endif -+__lzo_static_forceinline lzo_uint16_t lzo_memops_get_ne16(const lzo_voidp ss) -+{ -+ lzo_uint16_t v; -+ LZO_MEMOPS_COPY2(&v, ss); -+ return v; -+} -+#if (LZO_OPT_UNALIGNED16) -+#define LZO_MEMOPS_GET_NE16(ss) * (const lzo_memops_TU2p) (const lzo_memops_TU0p) (ss) -+#else -+#define LZO_MEMOPS_GET_NE16(ss) lzo_memops_get_ne16(ss) - #endif - --#if defined(__BOUNDS_CHECKING_ON) --# include -+__lzo_static_forceinline lzo_uint32_t lzo_memops_get_ne32(const lzo_voidp ss) -+{ -+ lzo_uint32_t v; -+ LZO_MEMOPS_COPY4(&v, ss); -+ return v; -+} -+#if (LZO_OPT_UNALIGNED32) -+#define LZO_MEMOPS_GET_NE32(ss) * (const lzo_memops_TU4p) (const lzo_memops_TU0p) (ss) - #else --# define BOUNDS_CHECKING_OFF_DURING(stmt) stmt --# define BOUNDS_CHECKING_OFF_IN_EXPR(expr) (expr) -+#define LZO_MEMOPS_GET_NE32(ss) lzo_memops_get_ne32(ss) - #endif - --#if !defined(LZO_HAVE_CONFIG_H) --# include --# include --# if !defined(NO_STDLIB_H) --# include --# endif --# define HAVE_MEMCMP --# define HAVE_MEMCPY --# define HAVE_MEMMOVE --# define HAVE_MEMSET --#else --# include --# if defined(HAVE_STDDEF_H) --# include --# endif --# if defined(STDC_HEADERS) --# include --# include --# endif -+#if (LZO_OPT_UNALIGNED64) -+#define LZO_MEMOPS_GET_NE64(ss) * (const lzo_memops_TU8p) (const lzo_memops_TU0p) (ss) - #endif - --#if defined(__LZO_DOS16) || defined(__LZO_WIN16) --# define HAVE_MALLOC_H --# define HAVE_HALLOC -+__lzo_static_forceinline void lzo_memops_put_le16(lzo_voidp dd, lzo_uint16_t vv) -+{ -+#if (LZO_ABI_LITTLE_ENDIAN) -+ LZO_MEMOPS_COPY2(dd, &vv); -+#elif (LZO_OPT_UNALIGNED16 && LZO_ARCH_POWERPC && LZO_ABI_BIG_ENDIAN) && (LZO_ASM_SYNTAX_GNUC) -+ lzo_memops_TU2p d = (lzo_memops_TU2p) dd; -+ unsigned long v = vv; -+ __asm__("sthbrx %2,0,%1" : "=m" (*d) : "r" (d), "r" (v)); -+#else -+ lzo_memops_TU1p d = (lzo_memops_TU1p) dd; -+ d[0] = LZO_BYTE((vv ) & 0xff); -+ d[1] = LZO_BYTE((vv >> 8) & 0xff); -+#endif -+} -+#if (LZO_OPT_UNALIGNED16) && (LZO_ABI_LITTLE_ENDIAN) -+#define LZO_MEMOPS_PUT_LE16(dd,vv) (* (lzo_memops_TU2p) (lzo_memops_TU0p) (dd) = (vv)) -+#else -+#define LZO_MEMOPS_PUT_LE16(dd,vv) lzo_memops_put_le16(dd,vv) - #endif - --#undef NDEBUG --#if !defined(LZO_DEBUG) --# define NDEBUG -+__lzo_static_forceinline void lzo_memops_put_le32(lzo_voidp dd, lzo_uint32_t vv) -+{ -+#if (LZO_ABI_LITTLE_ENDIAN) -+ LZO_MEMOPS_COPY4(dd, &vv); -+#elif (LZO_OPT_UNALIGNED32 && LZO_ARCH_POWERPC && LZO_ABI_BIG_ENDIAN) && (LZO_ASM_SYNTAX_GNUC) -+ lzo_memops_TU4p d = (lzo_memops_TU4p) dd; -+ unsigned long v = vv; -+ __asm__("stwbrx %2,0,%1" : "=m" (*d) : "r" (d), "r" (v)); -+#else -+ lzo_memops_TU1p d = (lzo_memops_TU1p) dd; -+ d[0] = LZO_BYTE((vv ) & 0xff); -+ d[1] = LZO_BYTE((vv >> 8) & 0xff); -+ d[2] = LZO_BYTE((vv >> 16) & 0xff); -+ d[3] = LZO_BYTE((vv >> 24) & 0xff); - #endif --#if defined(LZO_DEBUG) || !defined(NDEBUG) --# if !defined(NO_STDIO_H) --# include --# endif -+} -+#if (LZO_OPT_UNALIGNED32) && (LZO_ABI_LITTLE_ENDIAN) -+#define LZO_MEMOPS_PUT_LE32(dd,vv) (* (lzo_memops_TU4p) (lzo_memops_TU0p) (dd) = (vv)) -+#else -+#define LZO_MEMOPS_PUT_LE32(dd,vv) lzo_memops_put_le32(dd,vv) - #endif --#include - --#if !defined(LZO_COMPILE_TIME_ASSERT) --# define LZO_COMPILE_TIME_ASSERT(expr) \ -- { typedef int __lzo_compile_time_assert_fail[1 - 2 * !(expr)]; } -+__lzo_static_forceinline void lzo_memops_put_ne16(lzo_voidp dd, lzo_uint16_t vv) -+{ -+ LZO_MEMOPS_COPY2(dd, &vv); -+} -+#if (LZO_OPT_UNALIGNED16) -+#define LZO_MEMOPS_PUT_NE16(dd,vv) (* (lzo_memops_TU2p) (lzo_memops_TU0p) (dd) = (vv)) -+#else -+#define LZO_MEMOPS_PUT_NE16(dd,vv) lzo_memops_put_ne16(dd,vv) - #endif - --#if !defined(LZO_UNUSED) --# if 1 --# define LZO_UNUSED(var) ((void)&var) --# elif 0 --# define LZO_UNUSED(var) { typedef int __lzo_unused[sizeof(var) ? 2 : 1]; } --# else --# define LZO_UNUSED(parm) (parm = parm) --# endif -+__lzo_static_forceinline void lzo_memops_put_ne32(lzo_voidp dd, lzo_uint32_t vv) -+{ -+ LZO_MEMOPS_COPY4(dd, &vv); -+} -+#if (LZO_OPT_UNALIGNED32) -+#define LZO_MEMOPS_PUT_NE32(dd,vv) (* (lzo_memops_TU4p) (lzo_memops_TU0p) (dd) = (vv)) -+#else -+#define LZO_MEMOPS_PUT_NE32(dd,vv) lzo_memops_put_ne32(dd,vv) - #endif - --#if !defined(__inline__) && !defined(__GNUC__) --# if defined(__cplusplus) --# define __inline__ inline --# else --# define __inline__ --# endif -+#if 1 && (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || (LZO_CC_GNUC >= 0x020700ul) || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) -+static void __attribute__((__unused__)) -+#else -+__lzo_static_forceinline void - #endif -+lzo_memops_unused_funcs(void) -+{ -+ LZO_UNUSED_FUNC(lzo_memops_get_le16); -+ LZO_UNUSED_FUNC(lzo_memops_get_le32); -+ LZO_UNUSED_FUNC(lzo_memops_get_ne16); -+ LZO_UNUSED_FUNC(lzo_memops_get_ne32); -+ LZO_UNUSED_FUNC(lzo_memops_put_le16); -+ LZO_UNUSED_FUNC(lzo_memops_put_le32); -+ LZO_UNUSED_FUNC(lzo_memops_put_ne16); -+ LZO_UNUSED_FUNC(lzo_memops_put_ne32); -+ LZO_UNUSED_FUNC(lzo_memops_unused_funcs); -+} - --#if defined(NO_MEMCMP) --# undef HAVE_MEMCMP - #endif - --#if !defined(HAVE_MEMCMP) --# undef memcmp --# define memcmp lzo_memcmp -+#ifndef UA_SET1 -+#define UA_SET1 LZO_MEMOPS_SET1 - #endif --#if !defined(HAVE_MEMCPY) --# undef memcpy --# define memcpy lzo_memcpy -+#ifndef UA_SET2 -+#define UA_SET2 LZO_MEMOPS_SET2 - #endif --#if !defined(HAVE_MEMMOVE) --# undef memmove --# define memmove lzo_memmove -+#ifndef UA_SET3 -+#define UA_SET3 LZO_MEMOPS_SET3 - #endif --#if !defined(HAVE_MEMSET) --# undef memset --# define memset lzo_memset -+#ifndef UA_SET4 -+#define UA_SET4 LZO_MEMOPS_SET4 - #endif -- --#if 0 --# define LZO_BYTE(x) ((unsigned char) (x)) --#else --# define LZO_BYTE(x) ((unsigned char) ((x) & 0xff)) -+#ifndef UA_MOVE1 -+#define UA_MOVE1 LZO_MEMOPS_MOVE1 - #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)))) -- --#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) -- --#define LZO_STYPE_MAX(b) (((1l << (8*(b)-2)) - 1l) + (1l << (8*(b)-2))) --#define LZO_UTYPE_MAX(b) (((1ul << (8*(b)-1)) - 1ul) + (1ul << (8*(b)-1))) -- --#if !defined(SIZEOF_UNSIGNED) --# if (UINT_MAX == 0xffff) --# define SIZEOF_UNSIGNED 2 --# elif (UINT_MAX == LZO_0xffffffffL) --# define SIZEOF_UNSIGNED 4 --# elif (UINT_MAX >= LZO_0xffffffffL) --# define SIZEOF_UNSIGNED 8 --# else --# error "SIZEOF_UNSIGNED" --# endif -+#ifndef UA_MOVE2 -+#define UA_MOVE2 LZO_MEMOPS_MOVE2 - #endif -- --#if !defined(SIZEOF_UNSIGNED_LONG) --# if (ULONG_MAX == LZO_0xffffffffL) --# define SIZEOF_UNSIGNED_LONG 4 --# elif (ULONG_MAX >= LZO_0xffffffffL) --# define SIZEOF_UNSIGNED_LONG 8 --# else --# error "SIZEOF_UNSIGNED_LONG" --# endif -+#ifndef UA_MOVE3 -+#define UA_MOVE3 LZO_MEMOPS_MOVE3 - #endif -- --#if !defined(SIZEOF_SIZE_T) --# define SIZEOF_SIZE_T SIZEOF_UNSIGNED -+#ifndef UA_MOVE4 -+#define UA_MOVE4 LZO_MEMOPS_MOVE4 - #endif --#if !defined(SIZE_T_MAX) --# define SIZE_T_MAX LZO_UTYPE_MAX(SIZEOF_SIZE_T) -+#ifndef UA_MOVE8 -+#define UA_MOVE8 LZO_MEMOPS_MOVE8 - #endif -- --#if 1 && defined(__LZO_i386) && (UINT_MAX == LZO_0xffffffffL) --# if !defined(LZO_UNALIGNED_OK_2) && (USHRT_MAX == 0xffff) --# define LZO_UNALIGNED_OK_2 --# endif --# if !defined(LZO_UNALIGNED_OK_4) && (LZO_UINT32_MAX == LZO_0xffffffffL) --# define LZO_UNALIGNED_OK_4 --# endif -+#ifndef UA_COPY1 -+#define UA_COPY1 LZO_MEMOPS_COPY1 - #endif -- --#if defined(LZO_UNALIGNED_OK_2) || defined(LZO_UNALIGNED_OK_4) --# if !defined(LZO_UNALIGNED_OK) --# define LZO_UNALIGNED_OK --# endif -+#ifndef UA_COPY2 -+#define UA_COPY2 LZO_MEMOPS_COPY2 - #endif -- --#if defined(__LZO_NO_UNALIGNED) --# undef LZO_UNALIGNED_OK --# undef LZO_UNALIGNED_OK_2 --# undef LZO_UNALIGNED_OK_4 -+#ifndef UA_COPY3 -+#define UA_COPY3 LZO_MEMOPS_COPY3 - #endif -- --#if defined(LZO_UNALIGNED_OK_2) && (USHRT_MAX != 0xffff) --# error "LZO_UNALIGNED_OK_2 must not be defined on this system" -+#ifndef UA_COPY4 -+#define UA_COPY4 LZO_MEMOPS_COPY4 - #endif --#if defined(LZO_UNALIGNED_OK_4) && (LZO_UINT32_MAX != LZO_0xffffffffL) --# error "LZO_UNALIGNED_OK_4 must not be defined on this system" -+#ifndef UA_COPY8 -+#define UA_COPY8 LZO_MEMOPS_COPY8 - #endif -- --#if defined(__LZO_NO_ALIGNED) --# undef LZO_ALIGNED_OK_4 -+#ifndef UA_COPYN -+#define UA_COPYN LZO_MEMOPS_COPYN - #endif -- --#if defined(LZO_ALIGNED_OK_4) && (LZO_UINT32_MAX != LZO_0xffffffffL) --# error "LZO_ALIGNED_OK_4 must not be defined on this system" -+#ifndef UA_COPYN_X -+#define UA_COPYN_X LZO_MEMOPS_COPYN - #endif -- --#define LZO_LITTLE_ENDIAN 1234 --#define LZO_BIG_ENDIAN 4321 --#define LZO_PDP_ENDIAN 3412 -- --#if !defined(LZO_BYTE_ORDER) --# if defined(MFX_BYTE_ORDER) --# define LZO_BYTE_ORDER MFX_BYTE_ORDER --# elif defined(__LZO_i386) --# define LZO_BYTE_ORDER LZO_LITTLE_ENDIAN --# elif defined(BYTE_ORDER) --# define LZO_BYTE_ORDER BYTE_ORDER --# elif defined(__BYTE_ORDER) --# define LZO_BYTE_ORDER __BYTE_ORDER --# endif -+#ifndef UA_GET_LE16 -+#define UA_GET_LE16 LZO_MEMOPS_GET_LE16 - #endif -- --#if defined(LZO_BYTE_ORDER) --# if (LZO_BYTE_ORDER != LZO_LITTLE_ENDIAN) && \ -- (LZO_BYTE_ORDER != LZO_BIG_ENDIAN) --# error "invalid LZO_BYTE_ORDER" --# endif -+#ifndef UA_GET_LE32 -+#define UA_GET_LE32 LZO_MEMOPS_GET_LE32 - #endif -- --#if defined(LZO_UNALIGNED_OK) && !defined(LZO_BYTE_ORDER) --# error "LZO_BYTE_ORDER is not defined" -+#ifdef LZO_MEMOPS_GET_LE64 -+#ifndef UA_GET_LE64 -+#define UA_GET_LE64 LZO_MEMOPS_GET_LE64 - #endif -- --#define LZO_OPTIMIZE_GNUC_i386_IS_BUGGY -- --#if defined(NDEBUG) && !defined(LZO_DEBUG) && !defined(__LZO_CHECKER) --# if defined(__GNUC__) && defined(__i386__) --# if !defined(LZO_OPTIMIZE_GNUC_i386_IS_BUGGY) --# define LZO_OPTIMIZE_GNUC_i386 --# endif --# endif -+#endif -+#ifndef UA_GET_NE16 -+#define UA_GET_NE16 LZO_MEMOPS_GET_NE16 -+#endif -+#ifndef UA_GET_NE32 -+#define UA_GET_NE32 LZO_MEMOPS_GET_NE32 -+#endif -+#ifdef LZO_MEMOPS_GET_NE64 -+#ifndef UA_GET_NE64 -+#define UA_GET_NE64 LZO_MEMOPS_GET_NE64 -+#endif -+#endif -+#ifndef UA_PUT_LE16 -+#define UA_PUT_LE16 LZO_MEMOPS_PUT_LE16 -+#endif -+#ifndef UA_PUT_LE32 -+#define UA_PUT_LE32 LZO_MEMOPS_PUT_LE32 -+#endif -+#ifndef UA_PUT_NE16 -+#define UA_PUT_NE16 LZO_MEMOPS_PUT_NE16 -+#endif -+#ifndef UA_PUT_NE32 -+#define UA_PUT_NE32 LZO_MEMOPS_PUT_NE32 - #endif - --__LZO_EXTERN_C int __lzo_init_done; --__LZO_EXTERN_C const lzo_byte __lzo_copyright[]; --LZO_EXTERN(const lzo_byte *) lzo_copyright(void); --__LZO_EXTERN_C const lzo_uint32 _lzo_crc32_table[256]; -- --#define _LZO_STRINGIZE(x) #x --#define _LZO_MEXPAND(x) _LZO_STRINGIZE(x) -- --#define _LZO_CONCAT2(a,b) a ## b --#define _LZO_CONCAT3(a,b,c) a ## b ## c --#define _LZO_CONCAT4(a,b,c,d) a ## b ## c ## d --#define _LZO_CONCAT5(a,b,c,d,e) a ## b ## c ## d ## e -- --#define _LZO_ECONCAT2(a,b) _LZO_CONCAT2(a,b) --#define _LZO_ECONCAT3(a,b,c) _LZO_CONCAT3(a,b,c) --#define _LZO_ECONCAT4(a,b,c,d) _LZO_CONCAT4(a,b,c,d) --#define _LZO_ECONCAT5(a,b,c,d,e) _LZO_CONCAT5(a,b,c,d,e) -- --#if 0 -- --#define __LZO_IS_COMPRESS_QUERY(i,il,o,ol,w) ((lzo_voidp)(o) == (w)) --#define __LZO_QUERY_COMPRESS(i,il,o,ol,w,n,s) \ -- (*ol = (n)*(s), LZO_E_OK) -+#define MEMCPY8_DS(dest,src,len) \ -+ lzo_memcpy(dest,src,len); dest += len; src += len - --#define __LZO_IS_DECOMPRESS_QUERY(i,il,o,ol,w) ((lzo_voidp)(o) == (w)) --#define __LZO_QUERY_DECOMPRESS(i,il,o,ol,w,n,s) \ -- (*ol = (n)*(s), LZO_E_OK) -+#define BZERO8_PTR(s,l,n) \ -+ lzo_memset((lzo_voidp)(s),0,(lzo_uint)(l)*(n)) - --#define __LZO_IS_OPTIMIZE_QUERY(i,il,o,ol,w) ((lzo_voidp)(o) == (w)) --#define __LZO_QUERY_OPTIMIZE(i,il,o,ol,w,n,s) \ -- (*ol = (n)*(s), LZO_E_OK) -+#define MEMCPY_DS(dest,src,len) \ -+ do *dest++ = *src++; while (--len > 0) - --#endif -+LZO_EXTERN(const lzo_bytep) lzo_copyright(void); - - #ifndef __LZO_PTR_H --#define __LZO_PTR_H -+#define __LZO_PTR_H 1 - - #ifdef __cplusplus - extern "C" { - #endif - --#if defined(__LZO_DOS16) || defined(__LZO_WIN16) --# include --# if 1 && defined(__WATCOMC__) --# include -- __LZO_EXTERN_C unsigned char _HShift; --# define __LZO_HShift _HShift --# elif 1 && defined(_MSC_VER) -- __LZO_EXTERN_C unsigned short __near _AHSHIFT; --# define __LZO_HShift ((unsigned) &_AHSHIFT) --# elif defined(__LZO_WIN16) --# define __LZO_HShift 3 --# else --# define __LZO_HShift 12 --# endif --# if !defined(_FP_SEG) && defined(FP_SEG) --# define _FP_SEG FP_SEG --# endif --# if !defined(_FP_OFF) && defined(FP_OFF) --# define _FP_OFF FP_OFF --# endif --#endif -- --#if !defined(lzo_ptrdiff_t) --# if (UINT_MAX >= LZO_0xffffffffL) -- typedef ptrdiff_t lzo_ptrdiff_t; --# else -- typedef long lzo_ptrdiff_t; --# endif --#endif -- --#if !defined(__LZO_HAVE_PTR_T) --# if defined(lzo_ptr_t) --# define __LZO_HAVE_PTR_T --# endif --#endif --#if !defined(__LZO_HAVE_PTR_T) --# if defined(SIZEOF_CHAR_P) && defined(SIZEOF_UNSIGNED_LONG) --# if (SIZEOF_CHAR_P == SIZEOF_UNSIGNED_LONG) -- typedef unsigned long lzo_ptr_t; -- typedef long lzo_sptr_t; --# define __LZO_HAVE_PTR_T --# endif --# endif --#endif --#if !defined(__LZO_HAVE_PTR_T) --# if defined(SIZEOF_CHAR_P) && defined(SIZEOF_UNSIGNED) --# if (SIZEOF_CHAR_P == SIZEOF_UNSIGNED) -- typedef unsigned int lzo_ptr_t; -- typedef int lzo_sptr_t; --# define __LZO_HAVE_PTR_T --# endif --# endif --#endif --#if !defined(__LZO_HAVE_PTR_T) --# if defined(SIZEOF_CHAR_P) && defined(SIZEOF_UNSIGNED_SHORT) --# if (SIZEOF_CHAR_P == SIZEOF_UNSIGNED_SHORT) -- typedef unsigned short lzo_ptr_t; -- typedef short lzo_sptr_t; --# define __LZO_HAVE_PTR_T --# endif --# endif --#endif --#if !defined(__LZO_HAVE_PTR_T) --# if defined(LZO_HAVE_CONFIG_H) || defined(SIZEOF_CHAR_P) --# error "no suitable type for lzo_ptr_t" --# else -- typedef unsigned long lzo_ptr_t; -- typedef long lzo_sptr_t; --# define __LZO_HAVE_PTR_T --# endif --#endif -- --#if defined(__LZO_DOS16) || defined(__LZO_WIN16) --#define PTR(a) ((lzo_bytep) (a)) --#define PTR_ALIGNED_4(a) ((_FP_OFF(a) & 3) == 0) --#define PTR_ALIGNED2_4(a,b) (((_FP_OFF(a) | _FP_OFF(b)) & 3) == 0) -+#if (LZO_ARCH_I086) -+#error "LZO_ARCH_I086 is unsupported" -+#elif (LZO_MM_PVP) -+#error "LZO_MM_PVP is unsupported" - #else --#define PTR(a) ((lzo_ptr_t) (a)) -+#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) -@@ -414,10 +3797,10 @@ extern "C" { - - #define PTR_LT(a,b) (PTR(a) < PTR(b)) - #define PTR_GE(a,b) (PTR(a) >= PTR(b)) --#define PTR_DIFF(a,b) ((lzo_ptrdiff_t) (PTR(a) - PTR(b))) -+#define PTR_DIFF(a,b) (PTR(a) - PTR(b)) - #define pd(a,b) ((lzo_uint) ((a)-(b))) - --LZO_EXTERN(lzo_ptr_t) -+LZO_EXTERN(lzo_uintptr_t) - __lzo_ptr_linear(const lzo_voidp ptr); - - typedef union -@@ -432,21 +3815,28 @@ typedef union - unsigned long a_ulong; - lzo_int a_lzo_int; - lzo_uint a_lzo_uint; -- lzo_int32 a_lzo_int32; -- lzo_uint32 a_lzo_uint32; -+ lzo_xint a_lzo_xint; -+ lzo_int16_t a_lzo_int16_t; -+ lzo_uint16_t a_lzo_uint16_t; -+ lzo_int32_t a_lzo_int32_t; -+ lzo_uint32_t a_lzo_uint32_t; -+#if defined(lzo_uint64_t) -+ lzo_int64_t a_lzo_int64_t; -+ lzo_uint64_t a_lzo_uint64_t; -+#endif -+ size_t a_size_t; - ptrdiff_t a_ptrdiff_t; -- lzo_ptrdiff_t a_lzo_ptrdiff_t; -- lzo_ptr_t a_lzo_ptr_t; -- lzo_voidp a_lzo_voidp; -+ lzo_uintptr_t a_lzo_uintptr_t; - 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; -+ unsigned char * a_uchar_p; -+ const void * a_c_void_p; -+ const char * a_c_char_p; -+ const unsigned char * a_c_uchar_p; -+ lzo_voidp a_lzo_voidp; -+ lzo_bytep a_lzo_bytep; -+ const lzo_voidp a_c_lzo_voidp; -+ const lzo_bytep a_c_lzo_bytep; - } - lzo_full_align_t; - -@@ -456,36 +3846,37 @@ lzo_full_align_t; - - #endif - --#define LZO_DETERMINISTIC -+#ifndef LZO_DETERMINISTIC -+#define LZO_DETERMINISTIC 1 -+#endif - --#define LZO_DICT_USE_PTR --#if defined(__LZO_DOS16) || defined(__LZO_WIN16) || defined(__LZO_STRICT_16BIT) --# undef LZO_DICT_USE_PTR -+#ifndef LZO_DICT_USE_PTR -+#define LZO_DICT_USE_PTR 1 - #endif - --#if defined(LZO_DICT_USE_PTR) -+#if (LZO_DICT_USE_PTR) - # define lzo_dict_t const lzo_bytep --# define lzo_dict_p lzo_dict_t __LZO_MMODEL * -+# define lzo_dict_p lzo_dict_t * - #else - # define lzo_dict_t lzo_uint --# define lzo_dict_p lzo_dict_t __LZO_MMODEL * -+# define lzo_dict_p lzo_dict_t * - #endif - --#if !defined(lzo_moff_t) --#define lzo_moff_t lzo_uint - #endif - --#endif -+#if !defined(MINILZO_CFG_SKIP_LZO_PTR) - --LZO_PUBLIC(lzo_ptr_t) -+LZO_PUBLIC(lzo_uintptr_t) - __lzo_ptr_linear(const lzo_voidp ptr) - { -- lzo_ptr_t p; -+ lzo_uintptr_t p; - --#if defined(__LZO_DOS16) || defined(__LZO_WIN16) -- p = (((lzo_ptr_t)(_FP_SEG(ptr))) << (16 - __LZO_HShift)) + (_FP_OFF(ptr)); -+#if (LZO_ARCH_I086) -+#error "LZO_ARCH_I086 is unsupported" -+#elif (LZO_MM_PVP) -+#error "LZO_MM_PVP is unsupported" - #else -- p = PTR_LINEAR(ptr); -+ p = (lzo_uintptr_t) PTR_LINEAR(ptr); - #endif - - return p; -@@ -494,242 +3885,44 @@ __lzo_ptr_linear(const lzo_voidp ptr) - LZO_PUBLIC(unsigned) - __lzo_align_gap(const lzo_voidp ptr, lzo_uint size) - { -- lzo_ptr_t p, s, n; -- -- assert(size > 0); -- -- p = __lzo_ptr_linear(ptr); -- s = (lzo_ptr_t) (size - 1); --#if 0 -- assert((size & (size - 1)) == 0); -- n = ((p + s) & ~s) - p; -+#if (__LZO_UINTPTR_T_IS_POINTER) -+#error "__LZO_UINTPTR_T_IS_POINTER is unsupported" - #else -- n = (((p + s) / size) * size) - p; -+ 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 <= s); -- -+ assert(n <= size); - return (unsigned)n; - } - --#ifndef __LZO_UTIL_H --#define __LZO_UTIL_H -- --#ifndef __LZO_CONF_H --#endif -- --#ifdef __cplusplus --extern "C" { --#endif -- --#if 1 && defined(HAVE_MEMCPY) --#if !defined(__LZO_DOS16) && !defined(__LZO_WIN16) -- --#define MEMCPY8_DS(dest,src,len) \ -- memcpy(dest,src,len); \ -- dest += len; \ -- src += len -- --#endif --#endif -- --#if 0 && !defined(MEMCPY8_DS) -- --#define MEMCPY8_DS(dest,src,len) \ -- { do { \ -- *dest++ = *src++; \ -- *dest++ = *src++; \ -- *dest++ = *src++; \ -- *dest++ = *src++; \ -- *dest++ = *src++; \ -- *dest++ = *src++; \ -- *dest++ = *src++; \ -- *dest++ = *src++; \ -- len -= 8; \ -- } while (len > 0); } -- --#endif -- --#if !defined(MEMCPY8_DS) -- --#define MEMCPY8_DS(dest,src,len) \ -- { register lzo_uint __l = (len) / 8; \ -- do { \ -- *dest++ = *src++; \ -- *dest++ = *src++; \ -- *dest++ = *src++; \ -- *dest++ = *src++; \ -- *dest++ = *src++; \ -- *dest++ = *src++; \ -- *dest++ = *src++; \ -- *dest++ = *src++; \ -- } while (--__l > 0); } -- --#endif -- --#define MEMCPY_DS(dest,src,len) \ -- do *dest++ = *src++; \ -- while (--len > 0) -- --#define MEMMOVE_DS(dest,src,len) \ -- do *dest++ = *src++; \ -- while (--len > 0) -- --#if 0 && defined(LZO_OPTIMIZE_GNUC_i386) -- --#define BZERO8_PTR(s,l,n) \ --__asm__ __volatile__( \ -- "movl %0,%%eax \n" \ -- "movl %1,%%edi \n" \ -- "movl %2,%%ecx \n" \ -- "cld \n" \ -- "rep \n" \ -- "stosl %%eax,(%%edi) \n" \ -- : \ -- :"g" (0),"g" (s),"g" (n) \ -- :"eax","edi","ecx", "memory", "cc" \ --) -- --#elif (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMSET) -- --#if 1 --#define BZERO8_PTR(s,l,n) memset((s),0,(lzo_uint)(l)*(n)) --#else --#define BZERO8_PTR(s,l,n) memset((lzo_voidp)(s),0,(lzo_uint)(l)*(n)) --#endif -- --#else -- --#define BZERO8_PTR(s,l,n) \ -- lzo_memset((lzo_voidp)(s),0,(lzo_uint)(l)*(n)) -- --#endif -- --#if 0 --#if defined(__GNUC__) && defined(__i386__) -- --unsigned char lzo_rotr8(unsigned char value, int shift); --extern __inline__ unsigned char lzo_rotr8(unsigned char value, int shift) --{ -- unsigned char result; -- -- __asm__ __volatile__ ("movb %b1, %b0; rorb %b2, %b0" -- : "=a"(result) : "g"(value), "c"(shift)); -- return result; --} -- --unsigned short lzo_rotr16(unsigned short value, int shift); --extern __inline__ unsigned short lzo_rotr16(unsigned short value, int shift) --{ -- unsigned short result; -- -- __asm__ __volatile__ ("movw %b1, %b0; rorw %b2, %b0" -- : "=a"(result) : "g"(value), "c"(shift)); -- return result; --} -- --#endif --#endif -- --#ifdef __cplusplus --} --#endif -- - #endif -+#if !defined(MINILZO_CFG_SKIP_LZO_UTIL) - --LZO_PUBLIC(lzo_bool) --lzo_assert(int expr) --{ -- return (expr) ? 1 : 0; --} -- --/* If you use the LZO library in a product, you *must* keep this -- * copyright string in the executable of your product. -- */ -- --const lzo_byte __lzo_copyright[] = --#if !defined(__LZO_IN_MINLZO) -- LZO_VERSION_STRING; --#else -- "\n\n\n" -- "LZO real-time data compression library.\n" -- "Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Markus Franz Xaver Johannes Oberhumer\n" -- "\n" -- "http://www.oberhumer.com/opensource/lzo/\n" -- "\n" -- "LZO version: v" LZO_VERSION_STRING ", " LZO_VERSION_DATE "\n" -- "LZO build date: " __DATE__ " " __TIME__ "\n\n" -- "LZO special compilation options:\n" --#ifdef __cplusplus -- " __cplusplus\n" --#endif --#if defined(__PIC__) -- " __PIC__\n" --#elif defined(__pic__) -- " __pic__\n" --#endif --#if (UINT_MAX < LZO_0xffffffffL) -- " 16BIT\n" --#endif --#if defined(__LZO_STRICT_16BIT) -- " __LZO_STRICT_16BIT\n" --#endif --#if (UINT_MAX > LZO_0xffffffffL) -- " UINT_MAX=" _LZO_MEXPAND(UINT_MAX) "\n" --#endif --#if (ULONG_MAX > LZO_0xffffffffL) -- " ULONG_MAX=" _LZO_MEXPAND(ULONG_MAX) "\n" --#endif --#if defined(LZO_BYTE_ORDER) -- " LZO_BYTE_ORDER=" _LZO_MEXPAND(LZO_BYTE_ORDER) "\n" --#endif --#if defined(LZO_UNALIGNED_OK_2) -- " LZO_UNALIGNED_OK_2\n" --#endif --#if defined(LZO_UNALIGNED_OK_4) -- " LZO_UNALIGNED_OK_4\n" --#endif --#if defined(LZO_ALIGNED_OK_4) -- " LZO_ALIGNED_OK_4\n" --#endif --#if defined(LZO_DICT_USE_PTR) -- " LZO_DICT_USE_PTR\n" --#endif --#if defined(__LZO_QUERY_COMPRESS) -- " __LZO_QUERY_COMPRESS\n" --#endif --#if defined(__LZO_QUERY_DECOMPRESS) -- " __LZO_QUERY_DECOMPRESS\n" --#endif --#if defined(__LZO_IN_MINILZO) -- " __LZO_IN_MINILZO\n" --#endif -- "\n\n" -- "$Id: LZO " LZO_VERSION_STRING " built " __DATE__ " " __TIME__ --#if defined(__GNUC__) && defined(__VERSION__) -- " by gcc " __VERSION__ --#elif defined(__BORLANDC__) -- " by Borland C " _LZO_MEXPAND(__BORLANDC__) --#elif defined(_MSC_VER) -- " by Microsoft C " _LZO_MEXPAND(_MSC_VER) --#elif defined(__PUREC__) -- " by Pure C " _LZO_MEXPAND(__PUREC__) --#elif defined(__SC__) -- " by Symantec C " _LZO_MEXPAND(__SC__) --#elif defined(__TURBOC__) -- " by Turbo C " _LZO_MEXPAND(__TURBOC__) --#elif defined(__WATCOMC__) -- " by Watcom C " _LZO_MEXPAND(__WATCOMC__) --#endif -- " $\n" -- "$Copyright: LZO (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Markus Franz Xaver Johannes Oberhumer $\n"; -+/* 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) -+ LZO_VERSION_STRING; -+#else -+ "\r\n\n" -+ "LZO data compression library.\n" -+ "$Copyright: LZO Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer\n" -+ "\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_byte *) -+LZO_PUBLIC(const lzo_bytep) - lzo_copyright(void) - { -- return __lzo_copyright; -+ return (const lzo_bytep) __lzo_copyright; - } - - LZO_PUBLIC(unsigned) -@@ -765,619 +3958,378 @@ _lzo_version_date(void) - #define LZO_BASE 65521u - #define LZO_NMAX 5552 - --#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); -+#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_byte *buf, lzo_uint len) -+LZO_PUBLIC(lzo_uint32_t) -+lzo_adler32(lzo_uint32_t adler, const lzo_bytep buf, lzo_uint len) - { -- lzo_uint32 s1 = adler & 0xffff; -- lzo_uint32 s2 = (adler >> 16) & 0xffff; -- int k; -+ lzo_uint32_t s1 = adler & 0xffff; -+ lzo_uint32_t s2 = (adler >> 16) & 0xffff; -+ unsigned k; - - if (buf == NULL) -- return 1; -+ return 1; - - while (len > 0) - { -- k = len < LZO_NMAX ? (int) 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; -+ 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; - } - --LZO_PUBLIC(int) --lzo_memcmp(const lzo_voidp s1, const lzo_voidp s2, lzo_uint len) -+#undef LZO_DO1 -+#undef LZO_DO2 -+#undef LZO_DO4 -+#undef LZO_DO8 -+#undef LZO_DO16 -+ -+#endif -+#if !defined(MINILZO_CFG_SKIP_LZO_STRING) -+#undef lzo_memcmp -+#undef lzo_memcpy -+#undef lzo_memmove -+#undef lzo_memset -+#if !defined(__LZO_MMODEL_HUGE) -+# undef LZO_HAVE_MM_HUGE_PTR -+#endif -+#define lzo_hsize_t lzo_uint -+#define lzo_hvoid_p lzo_voidp -+#define lzo_hbyte_p lzo_bytep -+#define LZOLIB_PUBLIC(r,f) LZO_PUBLIC(r) f -+#define lzo_hmemcmp lzo_memcmp -+#define lzo_hmemcpy lzo_memcpy -+#define lzo_hmemmove lzo_memmove -+#define lzo_hmemset lzo_memset -+#define __LZOLIB_HMEMCPY_CH_INCLUDED 1 -+#if !defined(LZOLIB_PUBLIC) -+# define LZOLIB_PUBLIC(r,f) r __LZOLIB_FUNCNAME(f) -+#endif -+LZOLIB_PUBLIC(int, lzo_hmemcmp) (const lzo_hvoid_p s1, const lzo_hvoid_p s2, lzo_hsize_t len) - { --#if (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMCMP) -- return memcmp(s1,s2,len); --#else -- const lzo_byte *p1 = (const lzo_byte *) s1; -- const lzo_byte *p2 = (const lzo_byte *) s2; -- int d; -- -- if (len > 0) do -+#if (LZO_HAVE_MM_HUGE_PTR) || !(HAVE_MEMCMP) -+ const lzo_hbyte_p p1 = LZO_STATIC_CAST(const lzo_hbyte_p, s1); -+ const lzo_hbyte_p p2 = LZO_STATIC_CAST(const lzo_hbyte_p, s2); -+ if __lzo_likely(len > 0) do - { -- d = *p1 - *p2; -- if (d != 0) -- return d; -- p1++; -- p2++; -- } -- while (--len > 0); -+ int d = *p1 - *p2; -+ if (d != 0) -+ return d; -+ p1++; p2++; -+ } while __lzo_likely(--len > 0); - return 0; -+#else -+ return memcmp(s1, s2, len); - #endif - } -- --LZO_PUBLIC(lzo_voidp) --lzo_memcpy(lzo_voidp dest, const lzo_voidp src, lzo_uint len) -+LZOLIB_PUBLIC(lzo_hvoid_p, lzo_hmemcpy) (lzo_hvoid_p dest, const lzo_hvoid_p src, lzo_hsize_t len) - { --#if (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMCPY) -- return memcpy(dest,src,len); --#else -- lzo_byte *p1 = (lzo_byte *) dest; -- const lzo_byte *p2 = (const lzo_byte *) src; -- -- if (len <= 0 || p1 == p2) -- return dest; -+#if (LZO_HAVE_MM_HUGE_PTR) || !(HAVE_MEMCPY) -+ lzo_hbyte_p p1 = LZO_STATIC_CAST(lzo_hbyte_p, dest); -+ const lzo_hbyte_p p2 = LZO_STATIC_CAST(const lzo_hbyte_p, src); -+ if (!(len > 0) || p1 == p2) -+ return dest; - do -- *p1++ = *p2++; -- while (--len > 0); -+ *p1++ = *p2++; -+ while __lzo_likely(--len > 0); - return dest; -+#else -+ return memcpy(dest, src, len); - #endif - } -- --LZO_PUBLIC(lzo_voidp) --lzo_memmove(lzo_voidp dest, const lzo_voidp src, lzo_uint len) -+LZOLIB_PUBLIC(lzo_hvoid_p, lzo_hmemmove) (lzo_hvoid_p dest, const lzo_hvoid_p src, lzo_hsize_t len) - { --#if (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMMOVE) -- return memmove(dest,src,len); --#else -- lzo_byte *p1 = (lzo_byte *) dest; -- const lzo_byte *p2 = (const lzo_byte *) src; -- -- if (len <= 0 || p1 == p2) -- return dest; -- -+#if (LZO_HAVE_MM_HUGE_PTR) || !(HAVE_MEMMOVE) -+ lzo_hbyte_p p1 = LZO_STATIC_CAST(lzo_hbyte_p, dest); -+ const lzo_hbyte_p p2 = LZO_STATIC_CAST(const lzo_hbyte_p, src); -+ if (!(len > 0) || p1 == p2) -+ return dest; - if (p1 < p2) - { -- do -- *p1++ = *p2++; -- while (--len > 0); -+ do -+ *p1++ = *p2++; -+ while __lzo_likely(--len > 0); - } - else - { -- p1 += len; -- p2 += len; -- do -- *--p1 = *--p2; -- while (--len > 0); -+ p1 += len; -+ p2 += len; -+ do -+ *--p1 = *--p2; -+ while __lzo_likely(--len > 0); - } - return dest; --#endif --} -- --LZO_PUBLIC(lzo_voidp) --lzo_memset(lzo_voidp s, int c, lzo_uint len) --{ --#if (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMSET) -- return memset(s,c,len); - #else -- lzo_byte *p = (lzo_byte *) s; -- -- if (len > 0) do -- *p++ = LZO_BYTE(c); -- while (--len > 0); -- return s; -+ return memmove(dest, src, len); - #endif - } -- --#if 0 --# define IS_SIGNED(type) (((type) (1ul << (8 * sizeof(type) - 1))) < 0) --# define IS_UNSIGNED(type) (((type) (1ul << (8 * sizeof(type) - 1))) > 0) --#else --# define IS_SIGNED(type) (((type) (-1)) < ((type) 0)) --# define IS_UNSIGNED(type) (((type) (-1)) > ((type) 0)) --#endif -- --#define IS_POWER_OF_2(x) (((x) & ((x) - 1)) == 0) -- --static lzo_bool schedule_insns_bug(void); --static lzo_bool strength_reduce_bug(int *); -- --#if 0 || defined(LZO_DEBUG) --#include --static lzo_bool __lzo_assert_fail(const char *s, unsigned line) -+LZOLIB_PUBLIC(lzo_hvoid_p, lzo_hmemset) (lzo_hvoid_p s, int cc, lzo_hsize_t len) - { --#if defined(__palmos__) -- printf("LZO assertion failed in line %u: '%s'\n",line,s); -+#if (LZO_HAVE_MM_HUGE_PTR) || !(HAVE_MEMSET) -+ lzo_hbyte_p p = LZO_STATIC_CAST(lzo_hbyte_p, s); -+ unsigned char c = LZO_ITRUNC(unsigned char, cc); -+ if __lzo_likely(len > 0) do -+ *p++ = c; -+ while __lzo_likely(--len > 0); -+ return s; - #else -- fprintf(stderr,"LZO assertion failed in line %u: '%s'\n",line,s); -+ return memset(s, cc, len); - #endif -- return 0; - } --# define __lzo_assert(x) ((x) ? 1 : __lzo_assert_fail(#x,__LINE__)) --#else --# define __lzo_assert(x) ((x) ? 1 : 0) --#endif -- --#undef COMPILE_TIME_ASSERT --#if 0 --# define COMPILE_TIME_ASSERT(expr) r &= __lzo_assert(expr) --#else --# define COMPILE_TIME_ASSERT(expr) LZO_COMPILE_TIME_ASSERT(expr) --#endif -- --static lzo_bool basic_integral_check(void) --{ -- lzo_bool r = 1; -- -- COMPILE_TIME_ASSERT(CHAR_BIT == 8); -- COMPILE_TIME_ASSERT(sizeof(char) == 1); -- COMPILE_TIME_ASSERT(sizeof(short) >= 2); -- COMPILE_TIME_ASSERT(sizeof(long) >= 4); -- COMPILE_TIME_ASSERT(sizeof(int) >= sizeof(short)); -- COMPILE_TIME_ASSERT(sizeof(long) >= sizeof(int)); -- -- COMPILE_TIME_ASSERT(sizeof(lzo_uint) == sizeof(lzo_int)); -- COMPILE_TIME_ASSERT(sizeof(lzo_uint32) == sizeof(lzo_int32)); -- -- COMPILE_TIME_ASSERT(sizeof(lzo_uint32) >= 4); -- COMPILE_TIME_ASSERT(sizeof(lzo_uint32) >= sizeof(unsigned)); --#if defined(__LZO_STRICT_16BIT) -- COMPILE_TIME_ASSERT(sizeof(lzo_uint) == 2); --#else -- COMPILE_TIME_ASSERT(sizeof(lzo_uint) >= 4); -- COMPILE_TIME_ASSERT(sizeof(lzo_uint) >= sizeof(unsigned)); --#endif -- --#if (USHRT_MAX == 65535u) -- COMPILE_TIME_ASSERT(sizeof(short) == 2); --#elif (USHRT_MAX == LZO_0xffffffffL) -- COMPILE_TIME_ASSERT(sizeof(short) == 4); --#elif (USHRT_MAX >= LZO_0xffffffffL) -- COMPILE_TIME_ASSERT(sizeof(short) > 4); --#endif --#if (UINT_MAX == 65535u) -- COMPILE_TIME_ASSERT(sizeof(int) == 2); --#elif (UINT_MAX == LZO_0xffffffffL) -- COMPILE_TIME_ASSERT(sizeof(int) == 4); --#elif (UINT_MAX >= LZO_0xffffffffL) -- COMPILE_TIME_ASSERT(sizeof(int) > 4); --#endif --#if (ULONG_MAX == 65535ul) -- COMPILE_TIME_ASSERT(sizeof(long) == 2); --#elif (ULONG_MAX == LZO_0xffffffffL) -- COMPILE_TIME_ASSERT(sizeof(long) == 4); --#elif (ULONG_MAX >= LZO_0xffffffffL) -- COMPILE_TIME_ASSERT(sizeof(long) > 4); -+#undef LZOLIB_PUBLIC - #endif -+#if !defined(MINILZO_CFG_SKIP_LZO_INIT) - --#if defined(SIZEOF_UNSIGNED) -- COMPILE_TIME_ASSERT(SIZEOF_UNSIGNED == sizeof(unsigned)); --#endif --#if defined(SIZEOF_UNSIGNED_LONG) -- COMPILE_TIME_ASSERT(SIZEOF_UNSIGNED_LONG == sizeof(unsigned long)); --#endif --#if defined(SIZEOF_UNSIGNED_SHORT) -- COMPILE_TIME_ASSERT(SIZEOF_UNSIGNED_SHORT == sizeof(unsigned short)); --#endif - #if !defined(__LZO_IN_MINILZO) --#if defined(SIZEOF_SIZE_T) -- COMPILE_TIME_ASSERT(SIZEOF_SIZE_T == sizeof(size_t)); --#endif --#endif -- -- COMPILE_TIME_ASSERT(IS_UNSIGNED(unsigned char)); -- COMPILE_TIME_ASSERT(IS_UNSIGNED(unsigned short)); -- COMPILE_TIME_ASSERT(IS_UNSIGNED(unsigned)); -- COMPILE_TIME_ASSERT(IS_UNSIGNED(unsigned long)); -- COMPILE_TIME_ASSERT(IS_SIGNED(short)); -- COMPILE_TIME_ASSERT(IS_SIGNED(int)); -- COMPILE_TIME_ASSERT(IS_SIGNED(long)); -- -- COMPILE_TIME_ASSERT(IS_UNSIGNED(lzo_uint32)); -- COMPILE_TIME_ASSERT(IS_UNSIGNED(lzo_uint)); -- COMPILE_TIME_ASSERT(IS_SIGNED(lzo_int32)); -- COMPILE_TIME_ASSERT(IS_SIGNED(lzo_int)); -- -- COMPILE_TIME_ASSERT(INT_MAX == LZO_STYPE_MAX(sizeof(int))); -- COMPILE_TIME_ASSERT(UINT_MAX == LZO_UTYPE_MAX(sizeof(unsigned))); -- COMPILE_TIME_ASSERT(LONG_MAX == LZO_STYPE_MAX(sizeof(long))); -- COMPILE_TIME_ASSERT(ULONG_MAX == LZO_UTYPE_MAX(sizeof(unsigned long))); -- COMPILE_TIME_ASSERT(SHRT_MAX == LZO_STYPE_MAX(sizeof(short))); -- COMPILE_TIME_ASSERT(USHRT_MAX == LZO_UTYPE_MAX(sizeof(unsigned short))); -- COMPILE_TIME_ASSERT(LZO_UINT32_MAX == LZO_UTYPE_MAX(sizeof(lzo_uint32))); -- COMPILE_TIME_ASSERT(LZO_UINT_MAX == LZO_UTYPE_MAX(sizeof(lzo_uint))); --#if !defined(__LZO_IN_MINILZO) -- COMPILE_TIME_ASSERT(SIZE_T_MAX == LZO_UTYPE_MAX(sizeof(size_t))); --#endif -- -- r &= __lzo_assert(LZO_BYTE(257) == 1); -- -- return r; --} -- --static lzo_bool basic_ptr_check(void) --{ -- lzo_bool r = 1; -- -- COMPILE_TIME_ASSERT(sizeof(char *) >= sizeof(int)); -- COMPILE_TIME_ASSERT(sizeof(lzo_byte *) >= sizeof(char *)); -- -- COMPILE_TIME_ASSERT(sizeof(lzo_voidp) == sizeof(lzo_byte *)); -- COMPILE_TIME_ASSERT(sizeof(lzo_voidp) == sizeof(lzo_voidpp)); -- COMPILE_TIME_ASSERT(sizeof(lzo_voidp) == sizeof(lzo_bytepp)); -- COMPILE_TIME_ASSERT(sizeof(lzo_voidp) >= sizeof(lzo_uint)); -- -- COMPILE_TIME_ASSERT(sizeof(lzo_ptr_t) == sizeof(lzo_voidp)); -- COMPILE_TIME_ASSERT(sizeof(lzo_ptr_t) == sizeof(lzo_sptr_t)); -- COMPILE_TIME_ASSERT(sizeof(lzo_ptr_t) >= sizeof(lzo_uint)); - -- COMPILE_TIME_ASSERT(sizeof(lzo_ptrdiff_t) >= 4); -- COMPILE_TIME_ASSERT(sizeof(lzo_ptrdiff_t) >= sizeof(ptrdiff_t)); -+#define LZO_WANT_ACC_CHK_CH 1 -+#undef LZOCHK_ASSERT - -- COMPILE_TIME_ASSERT(sizeof(ptrdiff_t) >= sizeof(size_t)); -- COMPILE_TIME_ASSERT(sizeof(lzo_ptrdiff_t) >= sizeof(lzo_uint)); -- --#if defined(SIZEOF_CHAR_P) -- COMPILE_TIME_ASSERT(SIZEOF_CHAR_P == sizeof(char *)); --#endif --#if defined(SIZEOF_PTRDIFF_T) -- COMPILE_TIME_ASSERT(SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t)); -+ LZOCHK_ASSERT((LZO_UINT32_C(1) << (int)(8*sizeof(LZO_UINT32_C(1))-1)) > 0) -+ LZOCHK_ASSERT_IS_SIGNED_T(lzo_int) -+ LZOCHK_ASSERT_IS_UNSIGNED_T(lzo_uint) -+#if !(__LZO_UINTPTR_T_IS_POINTER) -+ LZOCHK_ASSERT_IS_UNSIGNED_T(lzo_uintptr_t) - #endif -+ LZOCHK_ASSERT(sizeof(lzo_uintptr_t) >= sizeof(lzo_voidp)) -+ LZOCHK_ASSERT_IS_UNSIGNED_T(lzo_xint) - -- COMPILE_TIME_ASSERT(IS_SIGNED(ptrdiff_t)); -- COMPILE_TIME_ASSERT(IS_UNSIGNED(size_t)); -- COMPILE_TIME_ASSERT(IS_SIGNED(lzo_ptrdiff_t)); -- COMPILE_TIME_ASSERT(IS_SIGNED(lzo_sptr_t)); -- COMPILE_TIME_ASSERT(IS_UNSIGNED(lzo_ptr_t)); -- COMPILE_TIME_ASSERT(IS_UNSIGNED(lzo_moff_t)); -- -- return r; --} -- --static lzo_bool ptr_check(void) --{ -- lzo_bool r = 1; -- int i; -- char _wrkmem[10 * sizeof(lzo_byte *) + sizeof(lzo_full_align_t)]; -- lzo_bytep wrkmem; -- lzo_bytepp dict; -- unsigned char x[4 * sizeof(lzo_full_align_t)]; -- long d; -- lzo_full_align_t a; -- lzo_full_align_t u; -- -- for (i = 0; i < (int) sizeof(x); i++) -- x[i] = LZO_BYTE(i); -- -- wrkmem = LZO_PTR_ALIGN_UP((lzo_byte *)_wrkmem,sizeof(lzo_full_align_t)); -- --#if 0 -- dict = (lzo_bytepp) wrkmem; --#else -- -- u.a_lzo_bytep = wrkmem; dict = u.a_lzo_bytepp; - #endif -+#undef LZOCHK_ASSERT - -- d = (long) ((const lzo_bytep) dict - (const lzo_bytep) _wrkmem); -- r &= __lzo_assert(d >= 0); -- r &= __lzo_assert(d < (long) sizeof(lzo_full_align_t)); -- -- memset(&a,0,sizeof(a)); -- r &= __lzo_assert(a.a_lzo_voidp == NULL); -- -- memset(&a,0xff,sizeof(a)); -- r &= __lzo_assert(a.a_ushort == USHRT_MAX); -- r &= __lzo_assert(a.a_uint == UINT_MAX); -- r &= __lzo_assert(a.a_ulong == ULONG_MAX); -- r &= __lzo_assert(a.a_lzo_uint == LZO_UINT_MAX); -- r &= __lzo_assert(a.a_lzo_uint32 == LZO_UINT32_MAX); -- -- if (r == 1) -- { -- for (i = 0; i < 8; i++) -- r &= __lzo_assert((const lzo_voidp) (&dict[i]) == (const lzo_voidp) (&wrkmem[i * sizeof(lzo_byte *)])); -- } -- -- memset(&a,0,sizeof(a)); -- r &= __lzo_assert(a.a_char_p == NULL); -- r &= __lzo_assert(a.a_lzo_bytep == NULL); -- r &= __lzo_assert(NULL == (void *)0); -- if (r == 1) -- { -- for (i = 0; i < 10; i++) -- dict[i] = wrkmem; -- BZERO8_PTR(dict+1,sizeof(dict[0]),8); -- r &= __lzo_assert(dict[0] == wrkmem); -- for (i = 1; i < 9; i++) -- r &= __lzo_assert(dict[i] == NULL); -- r &= __lzo_assert(dict[9] == wrkmem); -- } -- -- if (r == 1) -- { -- unsigned k = 1; -- const unsigned n = (unsigned) sizeof(lzo_uint32); -- lzo_byte *p0; -- lzo_byte *p1; -- -- k += __lzo_align_gap(&x[k],n); -- p0 = (lzo_bytep) &x[k]; --#if defined(PTR_LINEAR) -- r &= __lzo_assert((PTR_LINEAR(p0) & (n-1)) == 0); --#else -- r &= __lzo_assert(n == 4); -- r &= __lzo_assert(PTR_ALIGNED_4(p0)); -+union lzo_config_check_union { -+ lzo_uint a[2]; -+ unsigned char b[2*LZO_MAX(8,sizeof(lzo_uint))]; -+#if defined(lzo_uint64_t) -+ lzo_uint64_t c[2]; - #endif -+}; - -- r &= __lzo_assert(k >= 1); -- p1 = (lzo_bytep) &x[1]; -- r &= __lzo_assert(PTR_GE(p0,p1)); -- -- r &= __lzo_assert(k < 1+n); -- p1 = (lzo_bytep) &x[1+n]; -- r &= __lzo_assert(PTR_LT(p0,p1)); -- -- if (r == 1) -- { -- lzo_uint32 v0, v1; - #if 0 -- v0 = * (lzo_uint32 *) &x[k]; -- v1 = * (lzo_uint32 *) &x[k+n]; -+#define u2p(ptr,off) ((lzo_voidp) (((lzo_bytep)(lzo_voidp)(ptr)) + (off))) - #else -- -- u.a_uchar_p = &x[k]; -- v0 = *u.a_lzo_uint32_p; -- u.a_uchar_p = &x[k+n]; -- v1 = *u.a_lzo_uint32_p; --#endif -- r &= __lzo_assert(v0 > 0); -- r &= __lzo_assert(v1 > 0); -- } -- } -- -- return r; -+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; -- int i; -- union { -- lzo_uint32 a; -- unsigned short b; -- lzo_uint32 aa[4]; -- unsigned char x[4*sizeof(lzo_full_align_t)]; -- } u; -- -- COMPILE_TIME_ASSERT( (int) ((unsigned char) ((signed char) -1)) == 255); -- COMPILE_TIME_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0); -- --#if 0 -- r &= __lzo_assert((const void *)&u == (const void *)&u.a); -- r &= __lzo_assert((const void *)&u == (const void *)&u.b); -- r &= __lzo_assert((const void *)&u == (const void *)&u.x[0]); -- r &= __lzo_assert((const void *)&u == (const void *)&u.aa[0]); --#endif -- -- r &= basic_integral_check(); -- r &= basic_ptr_check(); -- if (r != 1) -- return LZO_E_ERROR; -- -- u.a = 0; u.b = 0; -- for (i = 0; i < (int) sizeof(u.x); i++) -- u.x[i] = LZO_BYTE(i); -- --#if defined(LZO_BYTE_ORDER) -- if (r == 1) -- { --# if (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN) -- lzo_uint32 a = (lzo_uint32) (u.a & LZO_0xffffffffL); -- unsigned short b = (unsigned short) (u.b & 0xffff); -- r &= __lzo_assert(a == 0x03020100L); -- r &= __lzo_assert(b == 0x0100); --# elif (LZO_BYTE_ORDER == LZO_BIG_ENDIAN) -- lzo_uint32 a = u.a >> (8 * sizeof(u.a) - 32); -- unsigned short b = u.b >> (8 * sizeof(u.b) - 16); -- r &= __lzo_assert(a == 0x00010203L); -- r &= __lzo_assert(b == 0x0001); --# else --# error "invalid LZO_BYTE_ORDER" --# endif -- } --#endif -- --#if defined(LZO_UNALIGNED_OK_2) -- COMPILE_TIME_ASSERT(sizeof(short) == 2); -- if (r == 1) -- { -- unsigned short b[4]; -- -- for (i = 0; i < 4; i++) -- b[i] = * (const unsigned short *) &u.x[i]; -- --# if (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN) -- r &= __lzo_assert(b[0] == 0x0100); -- r &= __lzo_assert(b[1] == 0x0201); -- r &= __lzo_assert(b[2] == 0x0302); -- r &= __lzo_assert(b[3] == 0x0403); --# elif (LZO_BYTE_ORDER == LZO_BIG_ENDIAN) -- r &= __lzo_assert(b[0] == 0x0001); -- r &= __lzo_assert(b[1] == 0x0102); -- r &= __lzo_assert(b[2] == 0x0203); -- r &= __lzo_assert(b[3] == 0x0304); --# endif -- } --#endif -- --#if defined(LZO_UNALIGNED_OK_4) -- COMPILE_TIME_ASSERT(sizeof(lzo_uint32) == 4); -- if (r == 1) -- { -- lzo_uint32 a[4]; -- -- for (i = 0; i < 4; i++) -- a[i] = * (const lzo_uint32 *) &u.x[i]; -- --# if (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN) -- r &= __lzo_assert(a[0] == 0x03020100L); -- r &= __lzo_assert(a[1] == 0x04030201L); -- r &= __lzo_assert(a[2] == 0x05040302L); -- r &= __lzo_assert(a[3] == 0x06050403L); --# elif (LZO_BYTE_ORDER == LZO_BIG_ENDIAN) -- r &= __lzo_assert(a[0] == 0x00010203L); -- r &= __lzo_assert(a[1] == 0x01020304L); -- r &= __lzo_assert(a[2] == 0x02030405L); -- r &= __lzo_assert(a[3] == 0x03040506L); --# endif -- } --#endif -- --#if defined(LZO_ALIGNED_OK_4) -- COMPILE_TIME_ASSERT(sizeof(lzo_uint32) == 4); --#endif -- -- COMPILE_TIME_ASSERT(lzo_sizeof_dict_t == sizeof(lzo_dict_t)); -- --#if defined(__LZO_IN_MINLZO) -- if (r == 1) -- { -- lzo_uint32 adler; -- adler = lzo_adler32(0, NULL, 0); -- adler = lzo_adler32(adler, lzo_copyright(), 200); -- r &= __lzo_assert(adler == 0xc76f1751L); -- } --#endif -- -- if (r == 1) -- { -- r &= __lzo_assert(!schedule_insns_bug()); -- } -- -- if (r == 1) -- { -- static int x[3]; -- static unsigned xn = 3; -- register unsigned j; -- -- for (j = 0; j < xn; j++) -- x[j] = (int)j - 3; -- r &= __lzo_assert(!strength_reduce_bug(x)); -- } -- -- if (r == 1) -- { -- r &= ptr_check(); -- } -+#if (LZO_CC_CLANG && (LZO_CC_CLANG >= 0x030100ul && LZO_CC_CLANG < 0x030300ul)) -+# if 0 -+ volatile -+# endif -+#endif -+ union lzo_config_check_union u; -+ lzo_voidp p; -+ unsigned r = 1; -+ -+ u.a[0] = u.a[1] = 0; -+ p = u2p(&u, 0); -+ r &= ((* (lzo_bytep) p) == 0); -+#if !(LZO_CFG_NO_CONFIG_CHECK) -+#if (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 (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 -+ u.a[0] = u.a[1] = 0; -+ u.b[0] = 1; u.b[3] = 2; -+ p = u2p(&u, 1); -+ r &= UA_GET_NE16(p) == 0; -+ r &= UA_GET_LE16(p) == 0; -+ u.b[1] = 128; -+ r &= UA_GET_LE16(p) == 128; -+ u.b[2] = 129; -+ r &= UA_GET_LE16(p) == LZO_UINT16_C(0x8180); -+#if (LZO_ABI_BIG_ENDIAN) -+ r &= UA_GET_NE16(p) == LZO_UINT16_C(0x8081); -+#endif -+#if (LZO_ABI_LITTLE_ENDIAN) -+ r &= UA_GET_NE16(p) == LZO_UINT16_C(0x8180); -+#endif -+ u.a[0] = u.a[1] = 0; -+ u.b[0] = 3; u.b[5] = 4; -+ p = u2p(&u, 1); -+ r &= UA_GET_NE32(p) == 0; -+ r &= UA_GET_LE32(p) == 0; -+ u.b[1] = 128; -+ r &= UA_GET_LE32(p) == 128; -+ u.b[2] = 129; u.b[3] = 130; u.b[4] = 131; -+ r &= UA_GET_LE32(p) == LZO_UINT32_C(0x83828180); -+#if (LZO_ABI_BIG_ENDIAN) -+ r &= UA_GET_NE32(p) == LZO_UINT32_C(0x80818283); -+#endif -+#if (LZO_ABI_LITTLE_ENDIAN) -+ r &= UA_GET_NE32(p) == LZO_UINT32_C(0x83828180); -+#endif -+#if defined(UA_GET_NE64) -+ u.c[0] = u.c[1] = 0; -+ u.b[0] = 5; u.b[9] = 6; -+ p = u2p(&u, 1); -+ u.c[0] = u.c[1] = 0; -+ r &= UA_GET_NE64(p) == 0; -+#if defined(UA_GET_LE64) -+ r &= UA_GET_LE64(p) == 0; -+ u.b[1] = 128; -+ r &= UA_GET_LE64(p) == 128; -+#endif -+#endif -+#if defined(lzo_bitops_ctlz32) -+ { unsigned i = 0; lzo_uint32_t v; -+ for (v = 1; v != 0 && r == 1; v <<= 1, i++) { -+ r &= lzo_bitops_ctlz32(v) == 31 - i; -+ r &= lzo_bitops_ctlz32_func(v) == 31 - i; -+ }} -+#endif -+#if defined(lzo_bitops_ctlz64) -+ { unsigned i = 0; lzo_uint64_t v; -+ for (v = 1; v != 0 && r == 1; v <<= 1, i++) { -+ r &= lzo_bitops_ctlz64(v) == 63 - i; -+ r &= lzo_bitops_ctlz64_func(v) == 63 - i; -+ }} -+#endif -+#if defined(lzo_bitops_cttz32) -+ { unsigned i = 0; lzo_uint32_t v; -+ for (v = 1; v != 0 && r == 1; v <<= 1, i++) { -+ r &= lzo_bitops_cttz32(v) == i; -+ r &= lzo_bitops_cttz32_func(v) == i; -+ }} -+#endif -+#if defined(lzo_bitops_cttz64) -+ { unsigned i = 0; lzo_uint64_t v; -+ for (v = 1; v != 0 && r == 1; v <<= 1, i++) { -+ r &= lzo_bitops_cttz64(v) == i; -+ r &= lzo_bitops_cttz64_func(v) == i; -+ }} -+#endif -+#endif -+ LZO_UNUSED_FUNC(lzo_bitops_unused_funcs); - - return r == 1 ? LZO_E_OK : LZO_E_ERROR; - } - --static lzo_bool schedule_insns_bug(void) --{ --#if defined(__LZO_CHECKER) -- return 0; --#else -- const int clone[] = {1, 2, 0}; -- const int *q; -- q = clone; -- return (*q) ? 0 : 1; --#endif --} -- --static lzo_bool strength_reduce_bug(int *x) --{ -- return x[0] != -3 || x[1] != -2 || x[2] != -1; --} -- --#undef COMPILE_TIME_ASSERT -- --int __lzo_init_done = 0; -- - LZO_PUBLIC(int) --__lzo_init2(unsigned v, int s1, int s2, int s3, int s4, int s5, -- int s6, int s7, int s8, int s9) -+__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; - -- __lzo_init_done = 1; -+#if defined(__LZO_IN_MINILZO) -+#elif (LZO_CC_MSC && ((_MSC_VER) < 700)) -+#else -+#define LZO_WANT_ACC_CHK_CH 1 -+#undef LZOCHK_ASSERT -+#define LZOCHK_ASSERT(expr) LZO_COMPILE_TIME_ASSERT(expr) -+#endif -+#undef LZOCHK_ASSERT - - if (v == 0) -- return LZO_E_ERROR; -+ 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_compress_t)); -+ (s2 == -1 || s2 == (int) sizeof(int)) && -+ (s3 == -1 || s3 == (int) sizeof(long)) && -+ (s4 == -1 || s4 == (int) sizeof(lzo_uint32_t)) && -+ (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; -+ return LZO_E_ERROR; - - r = _lzo_config_check(); - if (r != LZO_E_OK) -- return r; -+ return r; - - return r; - } - - #if !defined(__LZO_IN_MINILZO) - --LZO_EXTERN(int) --__lzo_init(unsigned v,int s1,int s2,int s3,int s4,int s5,int s6,int s7); -+#if (LZO_OS_WIN16 && LZO_CC_WATCOMC) && defined(__SW_BD) - --LZO_PUBLIC(int) --__lzo_init(unsigned v,int s1,int s2,int s3,int s4,int s5,int s6,int s7) -+#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 - { -- if (v == 0 || v > 0x1010) -- return LZO_E_ERROR; -- return __lzo_init2(v,s1,s2,s3,s4,s5,-1,-1,s6,s7); -+ LZO_UNUSED(a); LZO_UNUSED(b); LZO_UNUSED(c); LZO_UNUSED(d); -+ return 1; - } - - #endif - --#define do_compress _lzo1x_1_do_compress -+#endif -+ -+#endif -+ -+#define LZO1X 1 -+#define LZO_EOF_CODE 1 -+#define M2_MAX_OFFSET 0x0800 -+ -+#if !defined(MINILZO_CFG_SKIP_LZO1X_1_COMPRESS) -+ -+#if 1 && defined(UA_GET_LE32) -+#undef LZO_DICT_USE_PTR -+#define LZO_DICT_USE_PTR 0 -+#undef lzo_dict_t -+#define lzo_dict_t lzo_uint16_t -+#endif - --#define LZO_NEED_DICT_H -+#define LZO_NEED_DICT_H 1 -+#ifndef D_BITS - #define D_BITS 14 --#define D_INDEX1(d,p) d = DM((0x21*DX3(p,5,5,6)) >> 5) -+#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 - - #ifndef __LZO_CONFIG1X_H --#define __LZO_CONFIG1X_H -+#define __LZO_CONFIG1X_H 1 - - #if !defined(LZO1X) && !defined(LZO1Y) && !defined(LZO1Z) --# define LZO1X -+# define LZO1X 1 - #endif - - #if !defined(__LZO_IN_MINILZO) --#include -+#include "lzo/lzo1x.h" - #endif - --#define LZO_EOF_CODE -+#ifndef LZO_EOF_CODE -+#define LZO_EOF_CODE 1 -+#endif - #undef LZO_DETERMINISTIC - - #define M1_MAX_OFFSET 0x0400 -@@ -1417,7 +4369,7 @@ __lzo_init(unsigned v,int s1,int s2,int s3,int s4,int s5,int s6,int s7) - #define DL_MIN_LEN M2_MIN_LEN - - #ifndef __LZO_DICT_H --#define __LZO_DICT_H -+#define __LZO_DICT_H 1 - - #ifdef __cplusplus - extern "C" { -@@ -1458,10 +4410,10 @@ extern "C" { - #if (D_BITS != DL_BITS + DD_BITS) - # error "D_BITS does not match" - #endif --#if (D_BITS < 8 || D_BITS > 18) -+#if (D_BITS < 6 || D_BITS > 18) - # error "invalid D_BITS" - #endif --#if (DL_BITS < 8 || DL_BITS > 20) -+#if (DL_BITS < 6 || DL_BITS > 20) - # error "invalid DL_BITS" - #endif - #if (DD_BITS < 0 || DD_BITS > 6) -@@ -1484,29 +4436,32 @@ extern "C" { - # error "choose a hashing strategy" - #endif - -+#undef DM -+#undef DX -+ - #if (DL_MIN_LEN == 3) - # define _DV2_A(p,shift1,shift2) \ -- (((( (lzo_uint32)((p)[0]) << shift1) ^ (p)[1]) << shift2) ^ (p)[2]) -+ (((( (lzo_xint)((p)[0]) << shift1) ^ (p)[1]) << shift2) ^ (p)[2]) - # define _DV2_B(p,shift1,shift2) \ -- (((( (lzo_uint32)((p)[2]) << shift1) ^ (p)[1]) << shift2) ^ (p)[0]) -+ (((( (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]) -+ ((_DV2_B((p)+1,shift1,shift2) << (shift3)) ^ (p)[0]) - #elif (DL_MIN_LEN == 2) - # define _DV2_A(p,shift1,shift2) \ -- (( (lzo_uint32)(p[0]) << shift1) ^ p[1]) -+ (( (lzo_xint)(p[0]) << shift1) ^ p[1]) - # define _DV2_B(p,shift1,shift2) \ -- (( (lzo_uint32)(p[1]) << shift1) ^ p[2]) -+ (( (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_uint32)((p)[2]) << (s2)) + (p)[1]) << (s1)) + (p)[0]) -+ (((((lzo_xint)((p)[2]) << (s2)) + (p)[1]) << (s1)) + (p)[0]) - #define DS2(p,s1,s2) \ -- (((((lzo_uint32)((p)[2]) << (s2)) - (p)[1]) << (s1)) - (p)[0]) -+ (((((lzo_xint)((p)[2]) << (s2)) - (p)[1]) << (s1)) - (p)[0]) - #define DX2(p,s1,s2) \ -- (((((lzo_uint32)((p)[2]) << (s2)) ^ (p)[1]) << (s1)) ^ (p)[0]) -+ (((((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]) -@@ -1517,26 +4472,26 @@ extern "C" { - # define _DINDEX(dv,p) (_DV_A((p),DL_SHIFT)) - - #elif (LZO_HASH == LZO_HASH_GZIP_INCREMENTAL) --# define __LZO_HASH_INCREMENTAL -+# 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) --# define __LZO_HASH_INCREMENTAL -+# define __LZO_HASH_INCREMENTAL 1 - # define DVAL_FIRST(dv,p) dv = _DV_A((p),5) - # define DVAL_NEXT(dv,p) \ -- dv ^= (lzo_uint32)(p[-1]) << (2*5); dv = (((dv) << 5) ^ p[2]) --# define _DINDEX(dv,p) ((0x9f5f * (dv)) >> 5) -+ 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) --# define __LZO_HASH_INCREMENTAL -+# 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_uint32)(p[2]) << (2*5))) --# define _DINDEX(dv,p) ((0x9f5f * (dv)) >> 5) -+ 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 -@@ -1561,9 +4516,14 @@ extern "C" { - - #if !defined(DVAL_ASSERT) - #if defined(__LZO_HASH_INCREMENTAL) && !defined(NDEBUG) --static void DVAL_ASSERT(lzo_uint32 dv, const lzo_byte *p) -+#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_uint32 df; -+ lzo_xint df; - DVAL_FIRST(df,(p)); - assert(DINDEX(dv,p) == DINDEX(df,p)); - } -@@ -1572,11 +4532,11 @@ static void DVAL_ASSERT(lzo_uint32 dv, const lzo_byte *p) - #endif - #endif - --#if defined(LZO_DICT_USE_PTR) -+#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_uint) ((p)-(in))) -+# define DENTRY(p,in) ((lzo_dict_t) pd(p, in)) - # define GINDEX(m_pos,m_off,dict,dindex,in) m_off = dict[dindex] - #endif - -@@ -1589,40 +4549,41 @@ static void DVAL_ASSERT(lzo_uint32 dv, const lzo_byte *p) - #else - - # define UPDATE_D(dict,drun,dv,p,in) \ -- dict[ DINDEX(dv,p) + drun++ ] = DENTRY(p,in); drun &= DD_MASK -+ 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 -+ dict[ (index) + drun++ ] = DENTRY(p,in); drun &= DD_MASK - # define UPDATE_P(ptr,drun,p,in) \ -- (ptr) [ drun++ ] = DENTRY(p,in); drun &= DD_MASK -+ (ptr) [ drun++ ] = DENTRY(p,in); drun &= DD_MASK - - #endif - --#if defined(LZO_DICT_USE_PTR) -+#if (LZO_DICT_USE_PTR) - - #define LZO_CHECK_MPOS_DET(m_pos,m_off,in,ip,max_offset) \ -- (m_pos == NULL || (m_off = (lzo_moff_t) (ip - m_pos)) > max_offset) -+ (m_pos == NULL || (m_off = pd(ip, m_pos)) > max_offset) - - #define LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,max_offset) \ -- (BOUNDS_CHECKING_OFF_IN_EXPR( \ -- (PTR_LT(m_pos,in) || \ -- (m_off = (lzo_moff_t) PTR_DIFF(ip,m_pos)) <= 0 || \ -- m_off > 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 = (lzo_moff_t) ((ip)-(in)) - m_off) > max_offset) || \ -- (m_pos = (ip) - (m_off), 0) ) -+ (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) \ -- ((lzo_moff_t) ((ip)-(in)) <= m_off || \ -- ((m_off = (lzo_moff_t) ((ip)-(in)) - m_off) > max_offset) || \ -- (m_pos = (ip) - (m_off), 0) ) -+ (pd(ip, in) <= m_off || \ -+ ((m_off = pd(ip, in) - m_off) > max_offset) || \ -+ (m_pos = (ip) - (m_off), 0) ) - - #endif - --#if defined(LZO_DETERMINISTIC) -+#if (LZO_DETERMINISTIC) - # define LZO_CHECK_MPOS LZO_CHECK_MPOS_DET - #else - # define LZO_CHECK_MPOS LZO_CHECK_MPOS_NON_DET -@@ -1638,336 +4599,402 @@ static void DVAL_ASSERT(lzo_uint32 dv, const lzo_byte *p) - - #endif - -+#define LZO_DETERMINISTIC !(LZO_DICT_USE_PTR) -+ -+#ifndef DO_COMPRESS - #define DO_COMPRESS lzo1x_1_compress -+#endif - --static --lzo_uint do_compress ( const lzo_byte *in , lzo_uint in_len, -- lzo_byte *out, lzo_uintp out_len, -- lzo_voidp wrkmem ) --{ --#if 0 && defined(__GNUC__) && defined(__i386__) -- register const lzo_byte *ip __asm__("%esi"); --#else -- register const lzo_byte *ip; -+#if 1 && defined(DO_COMPRESS) && !defined(do_compress) -+# define do_compress LZO_PP_ECONCAT2(DO_COMPRESS,_core) - #endif -- lzo_byte *op; -- const lzo_byte * const in_end = in + in_len; -- const lzo_byte * const ip_end = in + in_len - M2_MAX_LEN - 5; -- const lzo_byte *ii; -+ -+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) -+{ -+ 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 += 4; -+ ip += ti < 4 ? 4 - ti : 0; - for (;;) - { --#if 0 && defined(__GNUC__) && defined(__i386__) -- register const lzo_byte *m_pos __asm__("%edi"); --#else -- register const lzo_byte *m_pos; --#endif -- lzo_moff_t m_off; -- lzo_uint m_len; -- 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,M4_MAX_OFFSET)) -- goto literal; -+ 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); -+ 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; -+ 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 1 && defined(LZO_UNALIGNED_OK_2) -- if (* (const lzo_ushortp) m_pos != * (const lzo_ushortp) ip) -+#if (LZO_OPT_UNALIGNED32) -+ if (UA_GET_NE32(m_pos) != UA_GET_NE32(ip)) - #else -- if (m_pos[0] != ip[0] || m_pos[1] != ip[1]) -+ if (m_pos[0] != ip[0] || m_pos[1] != ip[1] || m_pos[2] != ip[2] || m_pos[3] != ip[3]) - #endif -- { -- } -- else -- { -- if (m_pos[2] == ip[2]) -- { --#if 0 -- if (m_off <= M2_MAX_OFFSET) -- goto match; -- if (lit <= 3) -- goto match; -- if (lit == 3) -- { -- assert(op - 2 > out); op[-2] |= LZO_BYTE(3); -- *op++ = *ii++; *op++ = *ii++; *op++ = *ii++; -- goto code_match; -- } -- if (m_pos[3] == ip[3]) --#endif -- goto match; -- } -- else -- { --#if 0 --#if 0 -- if (m_off <= M1_MAX_OFFSET && lit > 0 && lit <= 3) -+ { -+literal: -+ UPDATE_I(dict,0,dindex,ip,in); -+ ip += 1 + ((ip - ii) >> 5); -+ continue; -+ } -+ UPDATE_I(dict,0,dindex,ip,in); - #else -- if (m_off <= M1_MAX_OFFSET && lit == 3) --#endif -- { -- register lzo_uint t; -- -- t = lit; -- assert(op - 2 > out); op[-2] |= LZO_BYTE(t); -- do *op++ = *ii++; while (--t > 0); -- assert(ii == ip); -- m_off -= 1; -- *op++ = LZO_BYTE(M1_MARKER | ((m_off & 3) << 2)); -- *op++ = LZO_BYTE(m_off >> 2); -- ip += 2; -- goto match_done; -- } --#endif -- } -- } -- -+ lzo_uint m_off; -+ lzo_uint m_len; -+ { -+ lzo_uint32_t dv; -+ lzo_uint dindex; - literal: -- UPDATE_I(dict,0,dindex,ip,in); -- ++ip; -- if (ip >= ip_end) -- break; -- continue; -- --match: -- UPDATE_I(dict,0,dindex,ip,in); -- if (pd(ip,ii) > 0) -- { -- register lzo_uint t = pd(ip,ii); -- -- if (t <= 3) -- { -- assert(op - 2 > out); -- op[-2] |= LZO_BYTE(t); -- } -- else if (t <= 18) -- *op++ = LZO_BYTE(t - 3); -- else -- { -- register lzo_uint tt = t - 18; -- -- *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); -- ip += 3; -- if (m_pos[3] != *ip++ || m_pos[4] != *ip++ || m_pos[5] != *ip++ || -- m_pos[6] != *ip++ || m_pos[7] != *ip++ || m_pos[8] != *ip++ --#ifdef LZO1Y -- || m_pos[ 9] != *ip++ || m_pos[10] != *ip++ || m_pos[11] != *ip++ -- || m_pos[12] != *ip++ || m_pos[13] != *ip++ || m_pos[14] != *ip++ --#endif -- ) -- { -- --ip; -- m_len = ip - ii; -- assert(m_len >= 3); assert(m_len <= M2_MAX_LEN); -- -- if (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; -- *op++ = LZO_BYTE(M3_MARKER | (m_len - 2)); -- goto m3_m4_offset; -- } -- else -+ ip += 1 + ((ip - ii) >> 5); -+next: -+ if __lzo_unlikely(ip >= ip_end) -+ break; -+ dv = UA_GET_LE32(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_GET_LE32(m_pos)) -+ goto literal; -+ } -+#endif -+ -+ ii -= ti; ti = 0; -+ { -+ lzo_uint t = pd(ip,ii); -+ if (t != 0) -+ { -+ if (t <= 3) -+ { -+ op[-2] = LZO_BYTE(op[-2] | t); -+#if (LZO_OPT_UNALIGNED32) -+ UA_COPY4(op, ii); -+ op += t; -+#else -+ { do *op++ = *ii++; while (--t > 0); } -+#endif -+ } -+#if (LZO_OPT_UNALIGNED32) || (LZO_OPT_UNALIGNED64) -+ else if (t <= 16) -+ { -+ *op++ = LZO_BYTE(t - 3); -+ UA_COPY8(op, ii); -+ UA_COPY8(op+8, ii+8); -+ op += t; -+ } -+#endif -+ else -+ { -+ if (t <= 18) -+ *op++ = LZO_BYTE(t - 3); -+ else -+ { -+ lzo_uint tt = t - 18; -+ *op++ = 0; -+ while __lzo_unlikely(tt > 255) -+ { -+ tt -= 255; -+ UA_SET1(op, 0); -+ op++; -+ } -+ assert(tt > 0); -+ *op++ = LZO_BYTE(tt); -+ } -+#if (LZO_OPT_UNALIGNED32) || (LZO_OPT_UNALIGNED64) -+ do { -+ UA_COPY8(op, ii); -+ UA_COPY8(op+8, ii+8); -+ op += 16; ii += 16; t -= 16; -+ } while (t >= 16); if (t > 0) -+#endif -+ { do *op++ = *ii++; while (--t > 0); } -+ } -+ } -+ } -+ m_len = 4; -+ { -+#if (LZO_OPT_UNALIGNED64) -+ lzo_uint64_t v; -+ v = UA_GET_NE64(ip + m_len) ^ UA_GET_NE64(m_pos + m_len); -+ if __lzo_unlikely(v == 0) { -+ do { -+ m_len += 8; -+ v = UA_GET_NE64(ip + m_len) ^ UA_GET_NE64(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_ctlz64) -+ m_len += lzo_bitops_ctlz64(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_cttz64) -+ m_len += lzo_bitops_cttz64(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 (LZO_OPT_UNALIGNED32) -+ lzo_uint32_t v; -+ v = UA_GET_NE32(ip + m_len) ^ UA_GET_NE32(m_pos + m_len); -+ if __lzo_unlikely(v == 0) { -+ do { -+ m_len += 4; -+ v = UA_GET_NE32(ip + m_len) ^ UA_GET_NE32(m_pos + m_len); -+ if (v != 0) -+ break; -+ m_len += 4; -+ v = UA_GET_NE32(ip + m_len) ^ UA_GET_NE32(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_ctlz32) -+ m_len += lzo_bitops_ctlz32(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_cttz32) -+ m_len += lzo_bitops_cttz32(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 (ip[m_len] != m_pos[m_len]) -+ break; -+ m_len += 1; -+ if (ip[m_len] != m_pos[m_len]) -+ break; -+ m_len += 1; -+ if (ip[m_len] != m_pos[m_len]) -+ break; -+ m_len += 1; -+ if (ip[m_len] != m_pos[m_len]) -+ break; -+ m_len += 1; -+ if (ip[m_len] != m_pos[m_len]) -+ break; -+ m_len += 1; -+ if (ip[m_len] != m_pos[m_len]) -+ break; -+ m_len += 1; -+ if (ip[m_len] != m_pos[m_len]) -+ break; -+ 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) -- { -- m_off -= 0x4000; -- assert(m_off > 0); assert(m_off <= 0x7fff); -- *op++ = LZO_BYTE(M4_MARKER | -- ((m_off & 0x4000) >> 11) | (m_len - 2)); -- goto m3_m4_offset; -- } -+ *op++ = LZO_BYTE(((m_len - 1) << 5) | ((m_off & 7) << 2)); -+ *op++ = LZO_BYTE(m_off >> 3); - #elif defined(LZO1Y) -- goto m4_match; --#endif -- } -- else -- { -- { -- const lzo_byte *end = in_end; -- const lzo_byte *m = m_pos + M2_MAX_LEN + 1; -- while (ip < end && *m == *ip) -- m++, ip++; -- m_len = (ip - ii); -- } -- assert(m_len > M2_MAX_LEN); -- -- if (m_off <= M3_MAX_OFFSET) -- { -- m_off -= 1; -- if (m_len <= 33) -- *op++ = LZO_BYTE(M3_MARKER | (m_len - 2)); -- else -- { -- m_len -= 33; -- *op++ = M3_MARKER | 0; -- goto m3_m4_len; -- } -- } -- else -- { --#if defined(LZO1Y) --m4_match: --#endif -- m_off -= 0x4000; -- assert(m_off > 0); assert(m_off <= 0x7fff); -- if (m_len <= M4_MAX_LEN) -- *op++ = LZO_BYTE(M4_MARKER | -- ((m_off & 0x4000) >> 11) | (m_len - 2)); -- else -- { -- m_len -= M4_MAX_LEN; -- *op++ = LZO_BYTE(M4_MARKER | ((m_off & 0x4000) >> 11)); --m3_m4_len: -- while (m_len > 255) -- { -- m_len -= 255; -- *op++ = 0; -- } -- assert(m_len > 0); -- *op++ = LZO_BYTE(m_len); -- } -- } -- --m3_m4_offset: -- *op++ = LZO_BYTE((m_off & 63) << 2); -- *op++ = LZO_BYTE(m_off >> 6); -- } -- --#if 0 --match_done: --#endif -- ii = ip; -- if (ip >= ip_end) -- break; -+ *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; -+ UA_SET1(op, 0); -+ op++; -+ } -+ *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; -+ UA_SET1(op, 0); -+ op++; -+ } -+ *op++ = LZO_BYTE(m_len); -+ } -+ *op++ = LZO_BYTE(m_off << 2); -+ *op++ = LZO_BYTE(m_off >> 6); -+ } -+ goto next; - } - -- *out_len = op - out; -- return pd(in_end,ii); -+ *out_len = pd(op, out); -+ return pd(in_end,ii-ti); - } - - LZO_PUBLIC(int) --DO_COMPRESS ( const lzo_byte *in , lzo_uint in_len, -- lzo_byte *out, lzo_uintp out_len, -- lzo_voidp wrkmem ) -+DO_COMPRESS ( const lzo_bytep in , lzo_uint in_len, -+ lzo_bytep out, lzo_uintp out_len, -+ lzo_voidp wrkmem ) - { -- lzo_byte *op = out; -- lzo_uint t; -- --#if defined(__LZO_QUERY_COMPRESS) -- if (__LZO_IS_COMPRESS_QUERY(in,in_len,out,out_len,wrkmem)) -- return __LZO_QUERY_COMPRESS(in,in_len,out,out_len,wrkmem,D_SIZE,lzo_sizeof(lzo_dict_t)); --#endif -+ const lzo_bytep ip = in; -+ lzo_bytep op = out; -+ lzo_uint l = in_len; -+ lzo_uint t = 0; - -- if (in_len <= M2_MAX_LEN + 5) -- t = in_len; -- else -+ while (l > 20) - { -- t = do_compress(in,in_len,op,out_len,wrkmem); -- op += *out_len; -+ 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_byte *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; -- *op++ = 0; -- } -- assert(tt > 0); -- *op++ = LZO_BYTE(tt); -- } -- do *op++ = *ii++; while (--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(op[-2] | t); -+ else if (t <= 18) -+ *op++ = LZO_BYTE(t - 3); -+ else -+ { -+ lzo_uint tt = t - 18; -+ -+ *op++ = 0; -+ while (tt > 255) -+ { -+ tt -= 255; -+ UA_SET1(op, 0); -+ op++; -+ } -+ assert(tt > 0); -+ *op++ = LZO_BYTE(tt); -+ } -+ UA_COPYN(op, ii, t); -+ op += t; - } - - *op++ = M4_MARKER | 1; - *op++ = 0; - *op++ = 0; - -- *out_len = op - out; -+ *out_len = pd(op, out); - return LZO_E_OK; - } - -+#endif -+ - #undef do_compress - #undef DO_COMPRESS - #undef LZO_HASH - --#undef LZO_TEST_DECOMPRESS_OVERRUN --#undef LZO_TEST_DECOMPRESS_OVERRUN_INPUT --#undef LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT --#undef LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND -+#undef LZO_TEST_OVERRUN - #undef DO_DECOMPRESS - #define DO_DECOMPRESS lzo1x_decompress - --#if defined(LZO_TEST_DECOMPRESS_OVERRUN) --# if !defined(LZO_TEST_DECOMPRESS_OVERRUN_INPUT) --# define LZO_TEST_DECOMPRESS_OVERRUN_INPUT 2 -+#if !defined(MINILZO_CFG_SKIP_LZO1X_DECOMPRESS) -+ -+#if defined(LZO_TEST_OVERRUN) -+# if !defined(LZO_TEST_OVERRUN_INPUT) -+# define LZO_TEST_OVERRUN_INPUT 2 - # endif --# if !defined(LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT) --# define LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT 2 -+# if !defined(LZO_TEST_OVERRUN_OUTPUT) -+# define LZO_TEST_OVERRUN_OUTPUT 2 - # endif --# if !defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND) --# define LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND -+# if !defined(LZO_TEST_OVERRUN_LOOKBEHIND) -+# define LZO_TEST_OVERRUN_LOOKBEHIND 1 - # endif - #endif - - #undef TEST_IP - #undef TEST_OP --#undef TEST_LOOKBEHIND -+#undef TEST_IP_AND_TEST_OP -+#undef TEST_LB -+#undef TEST_LBO - #undef NEED_IP - #undef NEED_OP -+#undef TEST_IV -+#undef TEST_OV - #undef HAVE_TEST_IP - #undef HAVE_TEST_OP - #undef HAVE_NEED_IP -@@ -1975,31 +5002,35 @@ DO_COMPRESS ( const lzo_byte *in , lzo_uint in_len, - #undef HAVE_ANY_IP - #undef HAVE_ANY_OP - --#if defined(LZO_TEST_DECOMPRESS_OVERRUN_INPUT) --# if (LZO_TEST_DECOMPRESS_OVERRUN_INPUT >= 1) -+#if defined(LZO_TEST_OVERRUN_INPUT) -+# if (LZO_TEST_OVERRUN_INPUT >= 1) - # define TEST_IP (ip < ip_end) - # endif --# if (LZO_TEST_DECOMPRESS_OVERRUN_INPUT >= 2) -+# if (LZO_TEST_OVERRUN_INPUT >= 2) - # define NEED_IP(x) \ -- if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x)) goto input_overrun -+ if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x)) goto input_overrun -+# define TEST_IV(x) if ((x) > (lzo_uint)0 - (511)) goto input_overrun - # endif - #endif - --#if defined(LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT) --# if (LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT >= 1) -+#if defined(LZO_TEST_OVERRUN_OUTPUT) -+# if (LZO_TEST_OVERRUN_OUTPUT >= 1) - # define TEST_OP (op <= op_end) - # endif --# if (LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT >= 2) -+# if (LZO_TEST_OVERRUN_OUTPUT >= 2) - # undef TEST_OP - # define NEED_OP(x) \ -- if ((lzo_uint)(op_end - op) < (lzo_uint)(x)) goto output_overrun -+ if ((lzo_uint)(op_end - op) < (lzo_uint)(x)) goto output_overrun -+# define TEST_OV(x) if ((x) > (lzo_uint)0 - (511)) goto output_overrun - # endif - #endif - --#if defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND) --# define TEST_LOOKBEHIND(m_pos,out) if (m_pos < out) goto lookbehind_overrun -+#if defined(LZO_TEST_OVERRUN_LOOKBEHIND) -+# define TEST_LB(m_pos) if (PTR_LT(m_pos,out) || PTR_GE(m_pos,op)) goto lookbehind_overrun -+# define TEST_LBO(m_pos,o) if (PTR_LT(m_pos,out) || PTR_GE(m_pos,op-(o))) goto lookbehind_overrun - #else --# define TEST_LOOKBEHIND(m_pos,op) ((void) 0) -+# define TEST_LB(m_pos) ((void) 0) -+# define TEST_LBO(m_pos,o) ((void) 0) - #endif - - #if !defined(LZO_EOF_CODE) && !defined(TEST_IP) -@@ -2007,64 +5038,66 @@ DO_COMPRESS ( const lzo_byte *in , lzo_uint in_len, - #endif - - #if defined(TEST_IP) --# define HAVE_TEST_IP -+# define HAVE_TEST_IP 1 - #else - # define TEST_IP 1 - #endif - #if defined(TEST_OP) --# define HAVE_TEST_OP -+# define HAVE_TEST_OP 1 - #else - # define TEST_OP 1 - #endif - -+#if defined(HAVE_TEST_IP) && defined(HAVE_TEST_OP) -+# define TEST_IP_AND_TEST_OP (TEST_IP && TEST_OP) -+#elif defined(HAVE_TEST_IP) -+# define TEST_IP_AND_TEST_OP TEST_IP -+#elif defined(HAVE_TEST_OP) -+# define TEST_IP_AND_TEST_OP TEST_OP -+#else -+# define TEST_IP_AND_TEST_OP 1 -+#endif -+ - #if defined(NEED_IP) --# define HAVE_NEED_IP -+# define HAVE_NEED_IP 1 - #else - # define NEED_IP(x) ((void) 0) -+# define TEST_IV(x) ((void) 0) - #endif - #if defined(NEED_OP) --# define HAVE_NEED_OP -+# define HAVE_NEED_OP 1 - #else - # define NEED_OP(x) ((void) 0) -+# define TEST_OV(x) ((void) 0) - #endif - - #if defined(HAVE_TEST_IP) || defined(HAVE_NEED_IP) --# define HAVE_ANY_IP -+# define HAVE_ANY_IP 1 - #endif - #if defined(HAVE_TEST_OP) || defined(HAVE_NEED_OP) --# define HAVE_ANY_OP --#endif -- --#undef __COPY4 --#define __COPY4(dst,src) * (lzo_uint32p)(dst) = * (const lzo_uint32p)(src) -- --#undef COPY4 --#if defined(LZO_UNALIGNED_OK_4) --# define COPY4(dst,src) __COPY4(dst,src) --#elif defined(LZO_ALIGNED_OK_4) --# define COPY4(dst,src) __COPY4((lzo_ptr_t)(dst),(lzo_ptr_t)(src)) -+# define HAVE_ANY_OP 1 - #endif - - #if defined(DO_DECOMPRESS) - LZO_PUBLIC(int) --DO_DECOMPRESS ( const lzo_byte *in , lzo_uint in_len, -- lzo_byte *out, lzo_uintp out_len, -- lzo_voidp wrkmem ) -+DO_DECOMPRESS ( const lzo_bytep in , lzo_uint in_len, -+ lzo_bytep out, lzo_uintp out_len, -+ lzo_voidp wrkmem ) - #endif - { -- register lzo_byte *op; -- register const lzo_byte *ip; -- register lzo_uint t; -+ lzo_bytep op; -+ const lzo_bytep ip; -+ lzo_uint t; - #if defined(COPY_DICT) - lzo_uint m_off; -- const lzo_byte *dict_end; -+ const lzo_bytep dict_end; - #else -- register const lzo_byte *m_pos; -+ const lzo_bytep m_pos; - #endif - -- const lzo_byte * const ip_end = in + in_len; -+ const lzo_bytep const ip_end = in + in_len; - #if defined(HAVE_ANY_OP) -- lzo_byte * const op_end = out + *out_len; -+ lzo_bytep const op_end = out + *out_len; - #endif - #if defined(LZO1Z) - lzo_uint last_m_off = 0; -@@ -2072,25 +5105,20 @@ DO_DECOMPRESS ( const lzo_byte *in , lzo_uint in_len, - - LZO_UNUSED(wrkmem); - --#if defined(__LZO_QUERY_DECOMPRESS) -- if (__LZO_IS_DECOMPRESS_QUERY(in,in_len,out,out_len,wrkmem)) -- return __LZO_QUERY_DECOMPRESS(in,in_len,out,out_len,wrkmem,0,0); --#endif -- - #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; -+ 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; -+ dict_len = 0; -+ dict_end = NULL; - } - #endif - -@@ -2099,367 +5127,415 @@ DO_DECOMPRESS ( const lzo_byte *in , lzo_uint in_len, - op = out; - ip = in; - -+ NEED_IP(1); - 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; -+ t = *ip++ - 17; -+ if (t < 4) -+ goto match_next; -+ assert(t > 0); NEED_OP(t); NEED_IP(t+3); -+ do *op++ = *ip++; while (--t > 0); -+ goto first_literal_run; - } - -- while (TEST_IP && TEST_OP) -+ for (;;) - { -- t = *ip++; -- if (t >= 16) -- goto match; -- if (t == 0) -- { -- NEED_IP(1); -- while (*ip == 0) -- { -- t += 255; -- ip++; -- NEED_IP(1); -- } -- t += 15 + *ip++; -- } -- assert(t > 0); NEED_OP(t+3); NEED_IP(t+4); --#if defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4) --#if !defined(LZO_UNALIGNED_OK_4) -- if (PTR_ALIGNED2_4(op,ip)) -- { --#endif -- COPY4(op,ip); -- op += 4; ip += 4; -- if (--t > 0) -- { -- if (t >= 4) -- { -- do { -- COPY4(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) -- { -- *op++ = *ip++; *op++ = *ip++; *op++ = *ip++; -- do *op++ = *ip++; while (--t > 0); -- } -+ NEED_IP(3); -+ t = *ip++; -+ if (t >= 16) -+ goto match; -+ if (t == 0) -+ { -+ while (*ip == 0) -+ { -+ t += 255; -+ ip++; -+ TEST_IV(t); -+ NEED_IP(1); -+ } -+ t += 15 + *ip++; -+ } -+ assert(t > 0); NEED_OP(t+3); NEED_IP(t+6); -+#if (LZO_OPT_UNALIGNED64) && (LZO_OPT_UNALIGNED32) -+ t += 3; -+ if (t >= 8) do -+ { -+ UA_COPY8(op,ip); -+ op += 8; ip += 8; t -= 8; -+ } while (t >= 8); -+ if (t >= 4) -+ { -+ UA_COPY4(op,ip); -+ op += 4; ip += 4; t -= 4; -+ } -+ if (t > 0) -+ { -+ *op++ = *ip++; -+ if (t > 1) { *op++ = *ip++; if (t > 2) { *op++ = *ip++; } } -+ } -+#elif (LZO_OPT_UNALIGNED32) || (LZO_ALIGNED_OK_4) -+#if !(LZO_OPT_UNALIGNED32) -+ if (PTR_ALIGNED2_4(op,ip)) -+ { -+#endif -+ UA_COPY4(op,ip); -+ op += 4; ip += 4; -+ if (--t > 0) -+ { -+ if (t >= 4) -+ { -+ do { -+ UA_COPY4(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 !(LZO_OPT_UNALIGNED32) -+ } -+ else -+#endif -+#endif -+#if !(LZO_OPT_UNALIGNED32) -+ { -+ *op++ = *ip++; *op++ = *ip++; *op++ = *ip++; -+ do *op++ = *ip++; while (--t > 0); -+ } - #endif - - first_literal_run: - -- t = *ip++; -- if (t >= 16) -- goto match; -+ 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; -+ 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); -+ m_off = (1 + M2_MAX_OFFSET) + (t >> 2) + (*ip++ << 2); - #endif -- NEED_OP(3); -- t = 3; COPY_DICT(t,m_off) -+ NEED_OP(3); -+ t = 3; COPY_DICT(t,m_off) - #else - #if defined(LZO1Z) -- t = (1 + M2_MAX_OFFSET) + (t << 6) + (*ip++ >> 2); -- m_pos = op - t; -- last_m_off = t; -+ 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; -+ m_pos = op - (1 + M2_MAX_OFFSET); -+ m_pos -= t >> 2; -+ m_pos -= *ip++ << 2; - #endif -- TEST_LOOKBEHIND(m_pos,out); NEED_OP(3); -- *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos; -+ TEST_LB(m_pos); NEED_OP(3); -+ *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos; - #endif -- goto match_done; -+ goto match_done; - -- while (TEST_IP && TEST_OP) -- { -+ for (;;) { - match: -- if (t >= 64) -- { -+ if (t >= 64) -+ { - #if defined(COPY_DICT) - #if defined(LZO1X) -- m_off = 1 + ((t >> 2) & 7) + (*ip++ << 3); -- t = (t >> 5) - 1; -+ 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; -+ 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; -+ 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 - #if defined(LZO1X) -- m_pos = op - 1; -- m_pos -= (t >> 2) & 7; -- m_pos -= *ip++ << 3; -- t = (t >> 5) - 1; -+ 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; -+ 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_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1); -- goto copy_match; --#endif -- } -- else if (t >= 32) -- { -- t &= 31; -- if (t == 0) -- { -- NEED_IP(1); -- while (*ip == 0) -- { -- t += 255; -- ip++; -- NEED_IP(1); -- } -- t += 31 + *ip++; -- } -+ { -+ 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 -+ } -+ else if (t >= 32) -+ { -+ t &= 31; -+ if (t == 0) -+ { -+ while (*ip == 0) -+ { -+ t += 255; -+ ip++; -+ TEST_OV(t); -+ NEED_IP(1); -+ } -+ t += 31 + *ip++; -+ NEED_IP(2); -+ } - #if defined(COPY_DICT) - #if defined(LZO1Z) -- m_off = 1 + (ip[0] << 6) + (ip[1] >> 2); -- last_m_off = m_off; -+ m_off = 1 + (ip[0] << 6) + (ip[1] >> 2); -+ last_m_off = m_off; - #else -- m_off = 1 + (ip[0] >> 2) + (ip[1] << 6); -+ m_off = 1 + (ip[0] >> 2) + (ip[1] << 6); - #endif - #else - #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) && (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN) -- m_pos = op - 1; -- m_pos -= (* (const lzo_ushortp) ip) >> 2; --#else -- m_pos = op - 1; -- m_pos -= (ip[0] >> 2) + (ip[1] << 6); --#endif --#endif -- ip += 2; -- } -- else if (t >= 16) -- { -+ { -+ lzo_uint off = 1 + (ip[0] << 6) + (ip[1] >> 2); -+ m_pos = op - off; -+ last_m_off = off; -+ } -+#elif (LZO_OPT_UNALIGNED16) && (LZO_ABI_LITTLE_ENDIAN) -+ m_pos = op - 1; -+ m_pos -= UA_GET_LE16(ip) >> 2; -+#else -+ m_pos = op - 1; -+ m_pos -= (ip[0] >> 2) + (ip[1] << 6); -+#endif -+#endif -+ ip += 2; -+ } -+ else if (t >= 16) -+ { - #if defined(COPY_DICT) -- m_off = (t & 8) << 11; --#else -- m_pos = op; -- m_pos -= (t & 8) << 11; --#endif -- t &= 7; -- if (t == 0) -- { -- NEED_IP(1); -- while (*ip == 0) -- { -- t += 255; -- ip++; -- NEED_IP(1); -- } -- t += 7 + *ip++; -- } -+ m_off = (t & 8) << 11; -+#else -+ m_pos = op; -+ m_pos -= (t & 8) << 11; -+#endif -+ t &= 7; -+ if (t == 0) -+ { -+ while (*ip == 0) -+ { -+ t += 255; -+ ip++; -+ TEST_OV(t); -+ NEED_IP(1); -+ } -+ t += 7 + *ip++; -+ NEED_IP(2); -+ } - #if defined(COPY_DICT) - #if defined(LZO1Z) -- m_off += (ip[0] << 6) + (ip[1] >> 2); -+ m_off += (ip[0] << 6) + (ip[1] >> 2); - #else -- m_off += (ip[0] >> 2) + (ip[1] << 6); -+ m_off += (ip[0] >> 2) + (ip[1] << 6); - #endif -- ip += 2; -- if (m_off == 0) -- goto eof_found; -- m_off += 0x4000; -+ ip += 2; -+ if (m_off == 0) -+ goto eof_found; -+ m_off += 0x4000; - #if defined(LZO1Z) -- last_m_off = m_off; -+ last_m_off = m_off; - #endif - #else - #if defined(LZO1Z) -- m_pos -= (ip[0] << 6) + (ip[1] >> 2); --#elif defined(LZO_UNALIGNED_OK_2) && (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN) -- m_pos -= (* (const lzo_ushortp) ip) >> 2; -+ m_pos -= (ip[0] << 6) + (ip[1] >> 2); -+#elif (LZO_OPT_UNALIGNED16) && (LZO_ABI_LITTLE_ENDIAN) -+ m_pos -= UA_GET_LE16(ip) >> 2; - #else -- m_pos -= (ip[0] >> 2) + (ip[1] << 6); -+ m_pos -= (ip[0] >> 2) + (ip[1] << 6); - #endif -- ip += 2; -- if (m_pos == op) -- goto eof_found; -- m_pos -= 0x4000; -+ ip += 2; -+ if (m_pos == op) -+ goto eof_found; -+ m_pos -= 0x4000; - #if defined(LZO1Z) -- last_m_off = op - m_pos; -+ last_m_off = pd((const lzo_bytep)op, m_pos); - #endif - #endif -- } -- else -- { -+ } -+ else -+ { - #if defined(COPY_DICT) - #if defined(LZO1Z) -- m_off = 1 + (t << 6) + (*ip++ >> 2); -- last_m_off = m_off; -+ m_off = 1 + (t << 6) + (*ip++ >> 2); -+ last_m_off = m_off; - #else -- m_off = 1 + (t >> 2) + (*ip++ << 2); -+ m_off = 1 + (t >> 2) + (*ip++ << 2); - #endif -- NEED_OP(2); -- t = 2; COPY_DICT(t,m_off) -+ NEED_OP(2); -+ t = 2; COPY_DICT(t,m_off) - #else - #if defined(LZO1Z) -- t = 1 + (t << 6) + (*ip++ >> 2); -- m_pos = op - t; -- last_m_off = t; -+ 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; -+ m_pos = op - 1; -+ m_pos -= t >> 2; -+ m_pos -= *ip++ << 2; - #endif -- TEST_LOOKBEHIND(m_pos,out); NEED_OP(2); -- *op++ = *m_pos++; *op++ = *m_pos; -+ TEST_LB(m_pos); NEED_OP(2); -+ *op++ = *m_pos++; *op++ = *m_pos; - #endif -- goto match_done; -- } -+ goto match_done; -+ } - - #if defined(COPY_DICT) - -- NEED_OP(t+3-1); -- t += 3-1; COPY_DICT(t,m_off) -+ NEED_OP(t+3-1); -+ t += 3-1; COPY_DICT(t,m_off) - - #else - -- TEST_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1); --#if 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); -+ TEST_LB(m_pos); assert(t > 0); NEED_OP(t+3-1); -+#if (LZO_OPT_UNALIGNED64) && (LZO_OPT_UNALIGNED32) -+ if (op - m_pos >= 8) -+ { -+ t += (3 - 1); -+ if (t >= 8) do -+ { -+ UA_COPY8(op,m_pos); -+ op += 8; m_pos += 8; t -= 8; -+ } while (t >= 8); -+ if (t >= 4) -+ { -+ UA_COPY4(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 (LZO_OPT_UNALIGNED32) || (LZO_ALIGNED_OK_4) -+#if !(LZO_OPT_UNALIGNED32) -+ if (t >= 2 * 4 - (3 - 1) && PTR_ALIGNED2_4(op,m_pos)) -+ { -+ assert((op - m_pos) >= 4); - #else -- if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4) -- { --#endif -- COPY4(op,m_pos); -- op += 4; m_pos += 4; t -= 4 - (3 - 1); -- do { -- COPY4(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 -- { -+ if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4) -+ { -+#endif -+ UA_COPY4(op,m_pos); -+ op += 4; m_pos += 4; t -= 4 - (3 - 1); -+ do { -+ UA_COPY4(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); -- } -+ *op++ = *m_pos++; *op++ = *m_pos++; -+ do *op++ = *m_pos++; while (--t > 0); -+ } - - #endif - - match_done: - #if defined(LZO1Z) -- t = ip[-1] & 3; -+ t = ip[-1] & 3; - #else -- t = ip[-2] & 3; -+ t = ip[-2] & 3; - #endif -- if (t == 0) -- break; -+ if (t == 0) -+ break; - - match_next: -- 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) -- *out_len = op - out; -- return LZO_E_EOF_NOT_FOUND; -+ assert(t > 0); assert(t < 4); NEED_OP(t); NEED_IP(t+3); -+#if 0 -+ do *op++ = *ip++; while (--t > 0); -+#else -+ *op++ = *ip++; -+ if (t > 1) { *op++ = *ip++; if (t > 2) { *op++ = *ip++; } } - #endif -+ t = *ip++; -+ } -+ } - - eof_found: -- assert(t == 1); -- *out_len = op - out; -+ *out_len = pd(op, out); - return (ip == ip_end ? LZO_E_OK : -- (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); -+ (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); - - #if defined(HAVE_NEED_IP) - input_overrun: -- *out_len = op - out; -+ *out_len = pd(op, out); - return LZO_E_INPUT_OVERRUN; - #endif - - #if defined(HAVE_NEED_OP) - output_overrun: -- *out_len = op - out; -+ *out_len = pd(op, out); - return LZO_E_OUTPUT_OVERRUN; - #endif - --#if defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND) -+#if defined(LZO_TEST_OVERRUN_LOOKBEHIND) - lookbehind_overrun: -- *out_len = op - out; -+ *out_len = pd(op, out); - return LZO_E_LOOKBEHIND_OVERRUN; - #endif - } - --#define LZO_TEST_DECOMPRESS_OVERRUN -+#endif -+ -+#define LZO_TEST_OVERRUN 1 - #undef DO_DECOMPRESS - #define DO_DECOMPRESS lzo1x_decompress_safe - --#if defined(LZO_TEST_DECOMPRESS_OVERRUN) --# if !defined(LZO_TEST_DECOMPRESS_OVERRUN_INPUT) --# define LZO_TEST_DECOMPRESS_OVERRUN_INPUT 2 -+#if !defined(MINILZO_CFG_SKIP_LZO1X_DECOMPRESS_SAFE) -+ -+#if defined(LZO_TEST_OVERRUN) -+# if !defined(LZO_TEST_OVERRUN_INPUT) -+# define LZO_TEST_OVERRUN_INPUT 2 - # endif --# if !defined(LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT) --# define LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT 2 -+# if !defined(LZO_TEST_OVERRUN_OUTPUT) -+# define LZO_TEST_OVERRUN_OUTPUT 2 - # endif --# if !defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND) --# define LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND -+# if !defined(LZO_TEST_OVERRUN_LOOKBEHIND) -+# define LZO_TEST_OVERRUN_LOOKBEHIND 1 - # endif - #endif - - #undef TEST_IP - #undef TEST_OP --#undef TEST_LOOKBEHIND -+#undef TEST_IP_AND_TEST_OP -+#undef TEST_LB -+#undef TEST_LBO - #undef NEED_IP - #undef NEED_OP -+#undef TEST_IV -+#undef TEST_OV - #undef HAVE_TEST_IP - #undef HAVE_TEST_OP - #undef HAVE_NEED_IP -@@ -2467,31 +5543,35 @@ lookbehind_overrun: - #undef HAVE_ANY_IP - #undef HAVE_ANY_OP - --#if defined(LZO_TEST_DECOMPRESS_OVERRUN_INPUT) --# if (LZO_TEST_DECOMPRESS_OVERRUN_INPUT >= 1) -+#if defined(LZO_TEST_OVERRUN_INPUT) -+# if (LZO_TEST_OVERRUN_INPUT >= 1) - # define TEST_IP (ip < ip_end) - # endif --# if (LZO_TEST_DECOMPRESS_OVERRUN_INPUT >= 2) -+# if (LZO_TEST_OVERRUN_INPUT >= 2) - # define NEED_IP(x) \ -- if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x)) goto input_overrun -+ if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x)) goto input_overrun -+# define TEST_IV(x) if ((x) > (lzo_uint)0 - (511)) goto input_overrun - # endif - #endif - --#if defined(LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT) --# if (LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT >= 1) -+#if defined(LZO_TEST_OVERRUN_OUTPUT) -+# if (LZO_TEST_OVERRUN_OUTPUT >= 1) - # define TEST_OP (op <= op_end) - # endif --# if (LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT >= 2) -+# if (LZO_TEST_OVERRUN_OUTPUT >= 2) - # undef TEST_OP - # define NEED_OP(x) \ -- if ((lzo_uint)(op_end - op) < (lzo_uint)(x)) goto output_overrun -+ if ((lzo_uint)(op_end - op) < (lzo_uint)(x)) goto output_overrun -+# define TEST_OV(x) if ((x) > (lzo_uint)0 - (511)) goto output_overrun - # endif - #endif - --#if defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND) --# define TEST_LOOKBEHIND(m_pos,out) if (m_pos < out) goto lookbehind_overrun -+#if defined(LZO_TEST_OVERRUN_LOOKBEHIND) -+# define TEST_LB(m_pos) if (PTR_LT(m_pos,out) || PTR_GE(m_pos,op)) goto lookbehind_overrun -+# define TEST_LBO(m_pos,o) if (PTR_LT(m_pos,out) || PTR_GE(m_pos,op-(o))) goto lookbehind_overrun - #else --# define TEST_LOOKBEHIND(m_pos,op) ((void) 0) -+# define TEST_LB(m_pos) ((void) 0) -+# define TEST_LBO(m_pos,o) ((void) 0) - #endif - - #if !defined(LZO_EOF_CODE) && !defined(TEST_IP) -@@ -2499,64 +5579,66 @@ lookbehind_overrun: - #endif - - #if defined(TEST_IP) --# define HAVE_TEST_IP -+# define HAVE_TEST_IP 1 - #else - # define TEST_IP 1 - #endif - #if defined(TEST_OP) --# define HAVE_TEST_OP -+# define HAVE_TEST_OP 1 - #else - # define TEST_OP 1 - #endif - -+#if defined(HAVE_TEST_IP) && defined(HAVE_TEST_OP) -+# define TEST_IP_AND_TEST_OP (TEST_IP && TEST_OP) -+#elif defined(HAVE_TEST_IP) -+# define TEST_IP_AND_TEST_OP TEST_IP -+#elif defined(HAVE_TEST_OP) -+# define TEST_IP_AND_TEST_OP TEST_OP -+#else -+# define TEST_IP_AND_TEST_OP 1 -+#endif -+ - #if defined(NEED_IP) --# define HAVE_NEED_IP -+# define HAVE_NEED_IP 1 - #else - # define NEED_IP(x) ((void) 0) -+# define TEST_IV(x) ((void) 0) - #endif - #if defined(NEED_OP) --# define HAVE_NEED_OP -+# define HAVE_NEED_OP 1 - #else - # define NEED_OP(x) ((void) 0) -+# define TEST_OV(x) ((void) 0) - #endif - - #if defined(HAVE_TEST_IP) || defined(HAVE_NEED_IP) --# define HAVE_ANY_IP -+# define HAVE_ANY_IP 1 - #endif - #if defined(HAVE_TEST_OP) || defined(HAVE_NEED_OP) --# define HAVE_ANY_OP --#endif -- --#undef __COPY4 --#define __COPY4(dst,src) * (lzo_uint32p)(dst) = * (const lzo_uint32p)(src) -- --#undef COPY4 --#if defined(LZO_UNALIGNED_OK_4) --# define COPY4(dst,src) __COPY4(dst,src) --#elif defined(LZO_ALIGNED_OK_4) --# define COPY4(dst,src) __COPY4((lzo_ptr_t)(dst),(lzo_ptr_t)(src)) -+# define HAVE_ANY_OP 1 - #endif - - #if defined(DO_DECOMPRESS) - LZO_PUBLIC(int) --DO_DECOMPRESS ( const lzo_byte *in , lzo_uint in_len, -- lzo_byte *out, lzo_uintp out_len, -- lzo_voidp wrkmem ) -+DO_DECOMPRESS ( const lzo_bytep in , lzo_uint in_len, -+ lzo_bytep out, lzo_uintp out_len, -+ lzo_voidp wrkmem ) - #endif - { -- register lzo_byte *op; -- register const lzo_byte *ip; -- register lzo_uint t; -+ lzo_bytep op; -+ const lzo_bytep ip; -+ lzo_uint t; - #if defined(COPY_DICT) - lzo_uint m_off; -- const lzo_byte *dict_end; -+ const lzo_bytep dict_end; - #else -- register const lzo_byte *m_pos; -+ const lzo_bytep m_pos; - #endif - -- const lzo_byte * const ip_end = in + in_len; -+ const lzo_bytep const ip_end = in + in_len; - #if defined(HAVE_ANY_OP) -- lzo_byte * const op_end = out + *out_len; -+ lzo_bytep const op_end = out + *out_len; - #endif - #if defined(LZO1Z) - lzo_uint last_m_off = 0; -@@ -2564,25 +5646,20 @@ DO_DECOMPRESS ( const lzo_byte *in , lzo_uint in_len, - - LZO_UNUSED(wrkmem); - --#if defined(__LZO_QUERY_DECOMPRESS) -- if (__LZO_IS_DECOMPRESS_QUERY(in,in_len,out,out_len,wrkmem)) -- return __LZO_QUERY_DECOMPRESS(in,in_len,out,out_len,wrkmem,0,0); --#endif -- - #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; -+ 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; -+ dict_len = 0; -+ dict_end = NULL; - } - #endif - -@@ -2591,345 +5668,386 @@ DO_DECOMPRESS ( const lzo_byte *in , lzo_uint in_len, - op = out; - ip = in; - -+ NEED_IP(1); - 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; -+ t = *ip++ - 17; -+ if (t < 4) -+ goto match_next; -+ assert(t > 0); NEED_OP(t); NEED_IP(t+3); -+ do *op++ = *ip++; while (--t > 0); -+ goto first_literal_run; - } - -- while (TEST_IP && TEST_OP) -+ for (;;) - { -- t = *ip++; -- if (t >= 16) -- goto match; -- if (t == 0) -- { -- NEED_IP(1); -- while (*ip == 0) -- { -- t += 255; -- ip++; -- NEED_IP(1); -- } -- t += 15 + *ip++; -- } -- assert(t > 0); NEED_OP(t+3); NEED_IP(t+4); --#if defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4) --#if !defined(LZO_UNALIGNED_OK_4) -- if (PTR_ALIGNED2_4(op,ip)) -- { --#endif -- COPY4(op,ip); -- op += 4; ip += 4; -- if (--t > 0) -- { -- if (t >= 4) -- { -- do { -- COPY4(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) -- { -- *op++ = *ip++; *op++ = *ip++; *op++ = *ip++; -- do *op++ = *ip++; while (--t > 0); -- } -+ NEED_IP(3); -+ t = *ip++; -+ if (t >= 16) -+ goto match; -+ if (t == 0) -+ { -+ while (*ip == 0) -+ { -+ t += 255; -+ ip++; -+ TEST_IV(t); -+ NEED_IP(1); -+ } -+ t += 15 + *ip++; -+ } -+ assert(t > 0); NEED_OP(t+3); NEED_IP(t+6); -+#if (LZO_OPT_UNALIGNED64) && (LZO_OPT_UNALIGNED32) -+ t += 3; -+ if (t >= 8) do -+ { -+ UA_COPY8(op,ip); -+ op += 8; ip += 8; t -= 8; -+ } while (t >= 8); -+ if (t >= 4) -+ { -+ UA_COPY4(op,ip); -+ op += 4; ip += 4; t -= 4; -+ } -+ if (t > 0) -+ { -+ *op++ = *ip++; -+ if (t > 1) { *op++ = *ip++; if (t > 2) { *op++ = *ip++; } } -+ } -+#elif (LZO_OPT_UNALIGNED32) || (LZO_ALIGNED_OK_4) -+#if !(LZO_OPT_UNALIGNED32) -+ if (PTR_ALIGNED2_4(op,ip)) -+ { -+#endif -+ UA_COPY4(op,ip); -+ op += 4; ip += 4; -+ if (--t > 0) -+ { -+ if (t >= 4) -+ { -+ do { -+ UA_COPY4(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 !(LZO_OPT_UNALIGNED32) -+ } -+ else -+#endif -+#endif -+#if !(LZO_OPT_UNALIGNED32) -+ { -+ *op++ = *ip++; *op++ = *ip++; *op++ = *ip++; -+ do *op++ = *ip++; while (--t > 0); -+ } - #endif - - first_literal_run: - -- t = *ip++; -- if (t >= 16) -- goto match; -+ 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; -+ 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); -+ m_off = (1 + M2_MAX_OFFSET) + (t >> 2) + (*ip++ << 2); - #endif -- NEED_OP(3); -- t = 3; COPY_DICT(t,m_off) -+ NEED_OP(3); -+ t = 3; COPY_DICT(t,m_off) - #else - #if defined(LZO1Z) -- t = (1 + M2_MAX_OFFSET) + (t << 6) + (*ip++ >> 2); -- m_pos = op - t; -- last_m_off = t; -+ 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; -+ m_pos = op - (1 + M2_MAX_OFFSET); -+ m_pos -= t >> 2; -+ m_pos -= *ip++ << 2; - #endif -- TEST_LOOKBEHIND(m_pos,out); NEED_OP(3); -- *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos; -+ TEST_LB(m_pos); NEED_OP(3); -+ *op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos; - #endif -- goto match_done; -+ goto match_done; - -- while (TEST_IP && TEST_OP) -- { -+ for (;;) { - match: -- if (t >= 64) -- { -+ if (t >= 64) -+ { - #if defined(COPY_DICT) - #if defined(LZO1X) -- m_off = 1 + ((t >> 2) & 7) + (*ip++ << 3); -- t = (t >> 5) - 1; -+ 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; -+ 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; -+ 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 - #if defined(LZO1X) -- m_pos = op - 1; -- m_pos -= (t >> 2) & 7; -- m_pos -= *ip++ << 3; -- t = (t >> 5) - 1; -+ 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; -+ 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_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1); -- goto copy_match; --#endif -- } -- else if (t >= 32) -- { -- t &= 31; -- if (t == 0) -- { -- NEED_IP(1); -- while (*ip == 0) -- { -- t += 255; -- ip++; -- NEED_IP(1); -- } -- t += 31 + *ip++; -- } -+ { -+ 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 -+ } -+ else if (t >= 32) -+ { -+ t &= 31; -+ if (t == 0) -+ { -+ while (*ip == 0) -+ { -+ t += 255; -+ ip++; -+ TEST_OV(t); -+ NEED_IP(1); -+ } -+ t += 31 + *ip++; -+ NEED_IP(2); -+ } - #if defined(COPY_DICT) - #if defined(LZO1Z) -- m_off = 1 + (ip[0] << 6) + (ip[1] >> 2); -- last_m_off = m_off; -+ m_off = 1 + (ip[0] << 6) + (ip[1] >> 2); -+ last_m_off = m_off; - #else -- m_off = 1 + (ip[0] >> 2) + (ip[1] << 6); -+ m_off = 1 + (ip[0] >> 2) + (ip[1] << 6); - #endif - #else - #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) && (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN) -- m_pos = op - 1; -- m_pos -= (* (const lzo_ushortp) ip) >> 2; --#else -- m_pos = op - 1; -- m_pos -= (ip[0] >> 2) + (ip[1] << 6); --#endif --#endif -- ip += 2; -- } -- else if (t >= 16) -- { -+ { -+ lzo_uint off = 1 + (ip[0] << 6) + (ip[1] >> 2); -+ m_pos = op - off; -+ last_m_off = off; -+ } -+#elif (LZO_OPT_UNALIGNED16) && (LZO_ABI_LITTLE_ENDIAN) -+ m_pos = op - 1; -+ m_pos -= UA_GET_LE16(ip) >> 2; -+#else -+ m_pos = op - 1; -+ m_pos -= (ip[0] >> 2) + (ip[1] << 6); -+#endif -+#endif -+ ip += 2; -+ } -+ else if (t >= 16) -+ { - #if defined(COPY_DICT) -- m_off = (t & 8) << 11; --#else -- m_pos = op; -- m_pos -= (t & 8) << 11; --#endif -- t &= 7; -- if (t == 0) -- { -- NEED_IP(1); -- while (*ip == 0) -- { -- t += 255; -- ip++; -- NEED_IP(1); -- } -- t += 7 + *ip++; -- } -+ m_off = (t & 8) << 11; -+#else -+ m_pos = op; -+ m_pos -= (t & 8) << 11; -+#endif -+ t &= 7; -+ if (t == 0) -+ { -+ while (*ip == 0) -+ { -+ t += 255; -+ ip++; -+ TEST_OV(t); -+ NEED_IP(1); -+ } -+ t += 7 + *ip++; -+ NEED_IP(2); -+ } - #if defined(COPY_DICT) - #if defined(LZO1Z) -- m_off += (ip[0] << 6) + (ip[1] >> 2); -+ m_off += (ip[0] << 6) + (ip[1] >> 2); - #else -- m_off += (ip[0] >> 2) + (ip[1] << 6); -+ m_off += (ip[0] >> 2) + (ip[1] << 6); - #endif -- ip += 2; -- if (m_off == 0) -- goto eof_found; -- m_off += 0x4000; -+ ip += 2; -+ if (m_off == 0) -+ goto eof_found; -+ m_off += 0x4000; - #if defined(LZO1Z) -- last_m_off = m_off; -+ last_m_off = m_off; - #endif - #else - #if defined(LZO1Z) -- m_pos -= (ip[0] << 6) + (ip[1] >> 2); --#elif defined(LZO_UNALIGNED_OK_2) && (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN) -- m_pos -= (* (const lzo_ushortp) ip) >> 2; -+ m_pos -= (ip[0] << 6) + (ip[1] >> 2); -+#elif (LZO_OPT_UNALIGNED16) && (LZO_ABI_LITTLE_ENDIAN) -+ m_pos -= UA_GET_LE16(ip) >> 2; - #else -- m_pos -= (ip[0] >> 2) + (ip[1] << 6); -+ m_pos -= (ip[0] >> 2) + (ip[1] << 6); - #endif -- ip += 2; -- if (m_pos == op) -- goto eof_found; -- m_pos -= 0x4000; -+ ip += 2; -+ if (m_pos == op) -+ goto eof_found; -+ m_pos -= 0x4000; - #if defined(LZO1Z) -- last_m_off = op - m_pos; -+ last_m_off = pd((const lzo_bytep)op, m_pos); - #endif - #endif -- } -- else -- { -+ } -+ else -+ { - #if defined(COPY_DICT) - #if defined(LZO1Z) -- m_off = 1 + (t << 6) + (*ip++ >> 2); -- last_m_off = m_off; -+ m_off = 1 + (t << 6) + (*ip++ >> 2); -+ last_m_off = m_off; - #else -- m_off = 1 + (t >> 2) + (*ip++ << 2); -+ m_off = 1 + (t >> 2) + (*ip++ << 2); - #endif -- NEED_OP(2); -- t = 2; COPY_DICT(t,m_off) -+ NEED_OP(2); -+ t = 2; COPY_DICT(t,m_off) - #else - #if defined(LZO1Z) -- t = 1 + (t << 6) + (*ip++ >> 2); -- m_pos = op - t; -- last_m_off = t; -+ 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; -+ m_pos = op - 1; -+ m_pos -= t >> 2; -+ m_pos -= *ip++ << 2; - #endif -- TEST_LOOKBEHIND(m_pos,out); NEED_OP(2); -- *op++ = *m_pos++; *op++ = *m_pos; -+ TEST_LB(m_pos); NEED_OP(2); -+ *op++ = *m_pos++; *op++ = *m_pos; - #endif -- goto match_done; -- } -+ goto match_done; -+ } - - #if defined(COPY_DICT) - -- NEED_OP(t+3-1); -- t += 3-1; COPY_DICT(t,m_off) -+ NEED_OP(t+3-1); -+ t += 3-1; COPY_DICT(t,m_off) - - #else - -- TEST_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1); --#if 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); -+ TEST_LB(m_pos); assert(t > 0); NEED_OP(t+3-1); -+#if (LZO_OPT_UNALIGNED64) && (LZO_OPT_UNALIGNED32) -+ if (op - m_pos >= 8) -+ { -+ t += (3 - 1); -+ if (t >= 8) do -+ { -+ UA_COPY8(op,m_pos); -+ op += 8; m_pos += 8; t -= 8; -+ } while (t >= 8); -+ if (t >= 4) -+ { -+ UA_COPY4(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 (LZO_OPT_UNALIGNED32) || (LZO_ALIGNED_OK_4) -+#if !(LZO_OPT_UNALIGNED32) -+ if (t >= 2 * 4 - (3 - 1) && PTR_ALIGNED2_4(op,m_pos)) -+ { -+ assert((op - m_pos) >= 4); - #else -- if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4) -- { --#endif -- COPY4(op,m_pos); -- op += 4; m_pos += 4; t -= 4 - (3 - 1); -- do { -- COPY4(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 -- { -+ if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4) -+ { -+#endif -+ UA_COPY4(op,m_pos); -+ op += 4; m_pos += 4; t -= 4 - (3 - 1); -+ do { -+ UA_COPY4(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); -- } -+ *op++ = *m_pos++; *op++ = *m_pos++; -+ do *op++ = *m_pos++; while (--t > 0); -+ } - - #endif - - match_done: - #if defined(LZO1Z) -- t = ip[-1] & 3; -+ t = ip[-1] & 3; - #else -- t = ip[-2] & 3; -+ t = ip[-2] & 3; - #endif -- if (t == 0) -- break; -+ if (t == 0) -+ break; - - match_next: -- 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) -- *out_len = op - out; -- return LZO_E_EOF_NOT_FOUND; -+ assert(t > 0); assert(t < 4); NEED_OP(t); NEED_IP(t+3); -+#if 0 -+ do *op++ = *ip++; while (--t > 0); -+#else -+ *op++ = *ip++; -+ if (t > 1) { *op++ = *ip++; if (t > 2) { *op++ = *ip++; } } - #endif -+ t = *ip++; -+ } -+ } - - eof_found: -- assert(t == 1); -- *out_len = op - out; -+ *out_len = pd(op, out); - return (ip == ip_end ? LZO_E_OK : -- (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); -+ (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); - - #if defined(HAVE_NEED_IP) - input_overrun: -- *out_len = op - out; -+ *out_len = pd(op, out); - return LZO_E_INPUT_OVERRUN; - #endif - - #if defined(HAVE_NEED_OP) - output_overrun: -- *out_len = op - out; -+ *out_len = pd(op, out); - return LZO_E_OUTPUT_OVERRUN; - #endif - --#if defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND) -+#if defined(LZO_TEST_OVERRUN_LOOKBEHIND) - lookbehind_overrun: -- *out_len = op - out; -+ *out_len = pd(op, out); - return LZO_E_LOOKBEHIND_OVERRUN; - #endif - } - --/***** End of minilzo.c *****/ -+#endif - -+/***** End of minilzo.c *****/ -diff --git a/lzo/minilzo.h b/lzo/minilzo.h -index e3270f9..7937454 100644 ---- a/lzo/minilzo.h -+++ b/lzo/minilzo.h -@@ -2,13 +2,7 @@ - - This file is part of the LZO real-time data compression library. - -- 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 -+ Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer - All Rights Reserved. - - The LZO library is free software; you can redistribute it and/or -@@ -24,7 +18,7 @@ - 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., -- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - Markus F.X.J. Oberhumer - -@@ -39,9 +33,9 @@ - - - #ifndef __MINILZO_H --#define __MINILZO_H -+#define __MINILZO_H 1 - --#define MINILZO_VERSION 0x1080 -+#define MINILZO_VERSION 0x2080 - - #ifdef __LZOCONF_H - # error "you cannot use both LZO and miniLZO" -@@ -69,26 +63,26 @@ extern "C" { - */ - - #define LZO1X_MEM_COMPRESS LZO1X_1_MEM_COMPRESS --#define LZO1X_1_MEM_COMPRESS ((lzo_uint32) (16384L * lzo_sizeof_dict_t)) -+#define LZO1X_1_MEM_COMPRESS ((lzo_uint32_t) (16384L * lzo_sizeof_dict_t)) - #define LZO1X_MEM_DECOMPRESS (0) - - - /* compression */ - LZO_EXTERN(int) --lzo1x_1_compress ( const lzo_byte *src, lzo_uint src_len, -- lzo_byte *dst, lzo_uintp dst_len, -+lzo1x_1_compress ( const lzo_bytep src, lzo_uint src_len, -+ lzo_bytep dst, lzo_uintp dst_len, - lzo_voidp wrkmem ); - - /* decompression */ - LZO_EXTERN(int) --lzo1x_decompress ( const lzo_byte *src, lzo_uint src_len, -- lzo_byte *dst, lzo_uintp dst_len, -+lzo1x_decompress ( const lzo_bytep src, lzo_uint src_len, -+ lzo_bytep dst, lzo_uintp dst_len, - lzo_voidp wrkmem /* NOT USED */ ); - - /* safe decompression with overrun testing */ - LZO_EXTERN(int) --lzo1x_decompress_safe ( const lzo_byte *src, lzo_uint src_len, -- lzo_byte *dst, lzo_uintp dst_len, -+lzo1x_decompress_safe ( const lzo_bytep src, lzo_uint src_len, -+ lzo_bytep dst, lzo_uintp dst_len, - lzo_voidp wrkmem /* NOT USED */ ); - - diff --git a/distcc.spec b/distcc.spec index 762345a..9394608 100644 --- a/distcc.spec +++ b/distcc.spec @@ -1,8 +1,9 @@ %define _hardened_build 1 +%define _lto_cflags %{nil} Name: distcc Version: 3.3.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -22,6 +23,7 @@ BuildRequires: desktop-file-utils BuildRequires: avahi-devel BuildRequires: krb5-devel BuildRequires: binutils-devel +BuildRequires: systemd-rpm-macros %description distcc is a program to distribute compilation of C or C++ code across @@ -43,10 +45,7 @@ Summary: Server for distributed C/C++ compilation License: GPLv2+ Requires: %{name}%{?_isa} = %{version}-%{release} -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -Requires(post): systemd-sysv +%{?systemd_requires} %description server This package contains the compilation server needed to use %{name}. @@ -61,11 +60,11 @@ export PYTHON='/usr/bin/python3' ./autogen.sh export CFLAGS="%{optflags} -fcommon" %configure --with-gtk --disable-Werror --with-auth -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install # Move desktop file to right directory mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -93,31 +92,19 @@ ln -s /usr/lib/distcc $RPM_BUILD_ROOT/usr/lib64/distcc rm -rf $RPM_BUILD_ROOT%{_docdir}/* %post server -#[ $1 -lt 2 ] && /sbin/chkconfig --add distccd ||: -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post distccd.service %{_sbindir}/update-distcc-symlinks %preun server -#[ $1 -eq 0 ] && /sbin/chkconfig --del distccd ||: -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable distccd.service > /dev/null 2>&1 || : - /bin/systemctl stop distccd.service > /dev/null 2>&1 || : -fi +%systemd_preun distccd.service %postun server -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart distccd.service >/dev/null 2>&1 || : -fi +%systemd_postun_with_restart distccd.service %files +%license COPYING %doc AUTHORS doc/* NEWS README.pump TODO -%doc COPYING INSTALL README survey.txt +%doc INSTALL README survey.txt %{_bindir}/distcc %{_bindir}/distccmon-text %{_bindir}/lsdistcc @@ -139,7 +126,8 @@ fi %files server -%doc COPYING README +%license COPYING +%doc README %{_bindir}/distccd %{_unitdir}/* %{_sysconfdir}/default/distcc @@ -152,6 +140,9 @@ fi %dir /usr/lib/gcc-cross %changelog +* Mon Nov 23 2020 Gwyn Ciesla - 3.3.3-10 +- Spec cleanup, fix FTBFS. + * Wed Sep 16 2020 Gwyn Ciesla - 3.3.3-9 - Use gtk, not gnome, for monitor. From f3ce7d43ad672cd51b414f2c65a9ad1dba6144fa Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 04:34:30 +0000 Subject: [PATCH 55/82] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- distcc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/distcc.spec b/distcc.spec index 9394608..7dc535d 100644 --- a/distcc.spec +++ b/distcc.spec @@ -24,6 +24,7 @@ BuildRequires: avahi-devel BuildRequires: krb5-devel BuildRequires: binutils-devel BuildRequires: systemd-rpm-macros +BuildRequires: make %description distcc is a program to distribute compilation of C or C++ code across From 971c4a7257cb636bbad196e87bffc7b69d8ad378 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 4 Jan 2021 09:46:15 -0600 Subject: [PATCH 56/82] 3.3.5 --- .gitignore | 1 + distcc.spec | 17 +++++++++-------- sources | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index d4c05f5..e65a0f1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ distcc-2.18.3.tar.bz2 /distcc-3.2rc1.tar.gz /distcc-3.3.2.tar.gz /distcc-3.3.3.tar.gz +/distcc-3.3.5.tar.gz diff --git a/distcc.spec b/distcc.spec index 7dc535d..bbc195c 100644 --- a/distcc.spec +++ b/distcc.spec @@ -1,9 +1,8 @@ %define _hardened_build 1 -%define _lto_cflags %{nil} Name: distcc -Version: 3.3.3 -Release: 10%{?dist} +Version: 3.3.5 +Release: 1%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -14,6 +13,7 @@ Patch0: distcc-localhost.patch BuildRequires: automake BuildRequires: autoconf +BuildRequires: which BuildRequires: libtool BuildRequires: popt-devel BuildRequires: gtk2-devel @@ -67,10 +67,8 @@ export CFLAGS="%{optflags} -fcommon" %install %make_install -# Move desktop file to right directory -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/*.desktop $RPM_BUILD_ROOT%{_datadir}/applications/ -sed -i 's@Icon=@Icon=%{_datadir}/%{name}/@' $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop +# Fix desktop file +sed -i 's@Icon=@Icon=%{_datadir}/pixmaps/@' $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop # Install sample hosts file install -Dm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/hosts @@ -122,7 +120,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %files gnome %{_bindir}/distccmon-gnome -%{_datadir}/%{name} +%{_datadir}/pixmaps/distccmon-gnome.png %{_datadir}/applications/*.desktop @@ -141,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Mon Jan 04 2021 Gwyn Ciesla - 3.3.5-1 +- 3.3.5 + * Mon Nov 23 2020 Gwyn Ciesla - 3.3.3-10 - Spec cleanup, fix FTBFS. diff --git a/sources b/sources index 9f3b8c5..1cfd511 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (distcc-3.3.3.tar.gz) = 3b673dc23734d268b073bf06b7cb8a402e45db764784eba30faccd8badfb9ff1b5836adfeccd0927dba457c9f3bff9d08af6de35ebf490f03748a758f9b38fa2 +SHA512 (distcc-3.3.5.tar.gz) = 7db03fef5c3d1d829a95da36e8ccb6aa618cf27f9304f5755b23ff5b0a838e4646ce258e782d1a0f41bef8421caa031f18f2f07d7334ec8a908d43e8dd523b61 From 933ef530ba16745bac2b3ac06bafa8e4b0b8d531 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 03:28:33 +0000 Subject: [PATCH 57/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index bbc195c..9617412 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -139,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 3.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jan 04 2021 Gwyn Ciesla - 3.3.5-1 - 3.3.5 From 64b65cf032b0bb00554eb576b8e9d76f03960b02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:57 +0100 Subject: [PATCH 58/82] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- distcc.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 9617412..a241c0a 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -139,6 +139,10 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 3.3.5-3 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Jan 26 2021 Fedora Release Engineering - 3.3.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 3122134ccea1bb9be99b3b598b7e8249c39f7c3c Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 8 Mar 2021 10:43:49 -0600 Subject: [PATCH 59/82] Stop output at install time. --- distcc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/distcc.spec b/distcc.spec index a241c0a..47366c3 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -92,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %post server %systemd_post distccd.service -%{_sbindir}/update-distcc-symlinks +%{_sbindir}/update-distcc-symlinks > /dev/null 2>&1 %preun server %systemd_preun distccd.service @@ -139,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Mon Mar 08 2021 Gwyn Ciesla - 3.3.5-4 +- Silence update-distcc-symlinks at install time. + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 3.3.5-3 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 3237f2eaf0fec3e515c84938f27fc082f1f265d0 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 24 Mar 2021 08:36:08 -0500 Subject: [PATCH 60/82] Fix desktop file path. --- distcc.spec | 8 +++++--- fixArgc.patch | 11 ----------- 2 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 fixArgc.patch diff --git a/distcc.spec b/distcc.spec index 47366c3..f11b806 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -67,8 +67,7 @@ export CFLAGS="%{optflags} -fcommon" %install %make_install -# Fix desktop file -sed -i 's@Icon=@Icon=%{_datadir}/pixmaps/@' $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop # Install sample hosts file install -Dm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/hosts @@ -139,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Wed Mar 24 2021 Gwyn Ciesla - 3.3.5-5 +- Fix desktop file icon path. + * Mon Mar 08 2021 Gwyn Ciesla - 3.3.5-4 - Silence update-distcc-symlinks at install time. diff --git a/fixArgc.patch b/fixArgc.patch deleted file mode 100644 index a8402a0..0000000 --- a/fixArgc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- distcc-3.1.orig/source/src/arg.c -+++ distcc-3.1/source/src/arg.c -@@ -515,6 +515,8 @@ - } - free(argv); - *argv_ptr = argv = new_argv; -+ i += extra_args - 1; -+ argc += extra_args - 1; - } - } - return 0; From e8faa0691cca7ca9e068f831cf4039976b49f44f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:03:02 +0200 Subject: [PATCH 61/82] Rebuilt for Python 3.10 --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index f11b806..7a054b9 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Fri Jun 04 2021 Python Maint - 3.3.5-6 +- Rebuilt for Python 3.10 + * Wed Mar 24 2021 Gwyn Ciesla - 3.3.5-5 - Fix desktop file icon path. From bafc9f14cc260620b4db549cb172c24dcd4b4ada Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 20:51:17 +0000 Subject: [PATCH 62/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 7a054b9..21db49a 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 3.3.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 3.3.5-6 - Rebuilt for Python 3.10 From 75b9cee786463b64ab349077935c65dae84923e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 00:44:33 +0000 Subject: [PATCH 63/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 21db49a..6bf4060 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.5 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 3.3.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 3.3.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 13d2a4fe9395b2954813b35ff3034d083964d376 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 14:49:22 +0200 Subject: [PATCH 64/82] Rebuilt for Python 3.11 --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 6bf4060..e9f197d 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.5 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Mon Jun 13 2022 Python Maint - 3.3.5-9 +- Rebuilt for Python 3.11 + * Thu Jan 20 2022 Fedora Release Engineering - 3.3.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 0cf08f2b7fbf659936e75ebd6dd666c647260c50 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 00:32:43 +0000 Subject: [PATCH 65/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index e9f197d..1cdb7ae 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.5 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 3.3.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 3.3.5-9 - Rebuilt for Python 3.11 From d6954a8e6f191b33a7bf594560de75a50dc42c39 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 21 Dec 2022 12:42:09 -0600 Subject: [PATCH 66/82] BR setuptools --- distcc.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 1cdb7ae..56e00d6 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.5 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -19,6 +19,7 @@ BuildRequires: popt-devel BuildRequires: gtk2-devel BuildRequires: pango-devel BuildRequires: python3-devel +Buildrequires: python3-setuptools BuildRequires: desktop-file-utils BuildRequires: avahi-devel BuildRequires: krb5-devel @@ -138,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Wed Dec 21 2022 Gwyn Ciesla - 3.3.5-11 +- BR setuptools. + * Thu Jul 21 2022 Fedora Release Engineering - 3.3.5-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From bb4535fa285e39530b1f48911ac6d4d4b5dcbf72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 01:29:06 +0000 Subject: [PATCH 67/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 56e00d6..c5318d6 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.5 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Distributed C/C++ compilation License: GPLv2+ URL: https://github.com/distcc/distcc @@ -139,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 3.3.5-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Dec 21 2022 Gwyn Ciesla - 3.3.5-11 - BR setuptools. From 5f8ed83495bd138c9f9a5aa6b7638232317f43d8 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 7 Mar 2023 15:18:27 -0600 Subject: [PATCH 68/82] migrated to SPDX license --- distcc.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/distcc.spec b/distcc.spec index c5318d6..5d42c4f 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,9 +2,9 @@ Name: distcc Version: 3.3.5 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Distributed C/C++ compilation -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/distcc/distcc Source0: https://github.com/distcc/distcc/archive/v%{version}/%{name}-%{version}.tar.gz Source1: hosts.sample @@ -44,7 +44,7 @@ This package contains the Gnome frontend of the distcc monitoring tool. %package server Summary: Server for distributed C/C++ compilation -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{name}%{?_isa} = %{version}-%{release} %{?systemd_requires} @@ -139,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Tue Mar 07 2023 Gwyn Ciesla - 3.3.5-13 +- migrated to SPDX license + * Thu Jan 19 2023 Fedora Release Engineering - 3.3.5-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 16dc27af83cc86dde7298e9855eb9628b1bcca20 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:20:24 +0200 Subject: [PATCH 69/82] Rebuilt for Python 3.12 --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 5d42c4f..489c969 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.5 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Distributed C/C++ compilation License: GPL-2.0-or-later URL: https://github.com/distcc/distcc @@ -139,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Tue Jun 13 2023 Python Maint - 3.3.5-14 +- Rebuilt for Python 3.12 + * Tue Mar 07 2023 Gwyn Ciesla - 3.3.5-13 - migrated to SPDX license From aef4c7fb6fae9df956a384f01a6a7b07a986ae22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 17:33:02 +0000 Subject: [PATCH 70/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 489c969..5d1856e 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.3.5 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Distributed C/C++ compilation License: GPL-2.0-or-later URL: https://github.com/distcc/distcc @@ -139,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 3.3.5-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 13 2023 Python Maint - 3.3.5-14 - Rebuilt for Python 3.12 From cc833f0fa8f3c2bd8a71db6538695408bfb54ecd Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 16 Jan 2024 13:59:38 -0600 Subject: [PATCH 71/82] 3.4 --- .gitignore | 1 + crash.patch | 11 +++++++++++ distcc.spec | 15 +++++++++------ sources | 2 +- 4 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 crash.patch diff --git a/.gitignore b/.gitignore index e65a0f1..7827728 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ distcc-2.18.3.tar.bz2 /distcc-3.3.2.tar.gz /distcc-3.3.3.tar.gz /distcc-3.3.5.tar.gz +/distcc-3.4.tar.gz diff --git a/crash.patch b/crash.patch new file mode 100644 index 0000000..5fb26e1 --- /dev/null +++ b/crash.patch @@ -0,0 +1,11 @@ +--- src/compile.c 2021-05-11 13:26:29.000000000 -0400 ++++ src/compile.c 2024-01-15 16:45:00.558851171 -0500 +@@ -584,7 +584,7 @@ + return -ENOENT; + + +- newcmd_len = strlen(target_with_vendor) + 1 + strlen(argv[0] + 1); ++ newcmd_len = strlen(target_with_vendor) + 1 + strlen(argv[0]) + 1; + newcmd = malloc(newcmd_len); + if (!newcmd) + return -ENOMEM; diff --git a/distcc.spec b/distcc.spec index 5d1856e..d40b08e 100644 --- a/distcc.spec +++ b/distcc.spec @@ -1,8 +1,6 @@ -%define _hardened_build 1 - Name: distcc -Version: 3.3.5 -Release: 15%{?dist} +Version: 3.4 +Release: 1%{?dist} Summary: Distributed C/C++ compilation License: GPL-2.0-or-later URL: https://github.com/distcc/distcc @@ -10,13 +8,14 @@ Source0: https://github.com/distcc/distcc/archive/v%{version}/%{name}-%{versi Source1: hosts.sample Source2: distccd.service Patch0: distcc-localhost.patch +Patch1: crash.patch BuildRequires: automake BuildRequires: autoconf BuildRequires: which BuildRequires: libtool BuildRequires: popt-devel -BuildRequires: gtk2-devel +BuildRequires: gtk3-devel BuildRequires: pango-devel BuildRequires: python3-devel Buildrequires: python3-setuptools @@ -55,7 +54,8 @@ This package contains the compilation server needed to use %{name}. %prep %setup -q -%patch0 -p0 +%patch -P 0 -p0 +%patch -P 1 -p0 %build export PYTHON='/usr/bin/python3' @@ -139,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Fri Jan 05 2024 Gwyn Ciesla - 3.4-1 +- 3.4 + * Wed Jul 19 2023 Fedora Release Engineering - 3.3.5-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 1cfd511..1f53dc1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (distcc-3.3.5.tar.gz) = 7db03fef5c3d1d829a95da36e8ccb6aa618cf27f9304f5755b23ff5b0a838e4646ce258e782d1a0f41bef8421caa031f18f2f07d7334ec8a908d43e8dd523b61 +SHA512 (distcc-3.4.tar.gz) = aa6018326da8aa73b40479471c0c26d752ea17b46b40caa55662885e4d67a920eb2e33f0cceec9d1738050a069660a4be1175448c0ad9762c7ea9527f556a02b From 0412dc267f3b61415cb3e94641b4a52051af153a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 17:14:45 +0000 Subject: [PATCH 72/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index d40b08e..072820f 100644 --- a/distcc.spec +++ b/distcc.spec @@ -1,6 +1,6 @@ Name: distcc Version: 3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Distributed C/C++ compilation License: GPL-2.0-or-later URL: https://github.com/distcc/distcc @@ -139,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 05 2024 Gwyn Ciesla - 3.4-1 - 3.4 From b4f96ad0040a50e99841dc95e99b47a54d65c173 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 09:31:31 +0000 Subject: [PATCH 73/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 072820f..0f8c7e4 100644 --- a/distcc.spec +++ b/distcc.spec @@ -1,6 +1,6 @@ Name: distcc Version: 3.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Distributed C/C++ compilation License: GPL-2.0-or-later URL: https://github.com/distcc/distcc @@ -139,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5d7d44bcb882dfba12d57f743173d6a1de793d68 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 13 Feb 2024 14:30:31 -0600 Subject: [PATCH 74/82] Disable LTO to fix distccmon-gnome crash, 2263992. --- distcc.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 0f8c7e4..3587ee3 100644 --- a/distcc.spec +++ b/distcc.spec @@ -1,6 +1,8 @@ +%global _lto_cflags %nil + Name: distcc Version: 3.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Distributed C/C++ compilation License: GPL-2.0-or-later URL: https://github.com/distcc/distcc @@ -139,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Tue Feb 13 2024 Gwyn Ciesla - 3.4-4 +- Disable LTO to fix distccmon-gnome crash, 2263992. + * Wed Jan 24 2024 Fedora Release Engineering - 3.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 20b6b3b33da6a619d88e6186450e6cdfa7bf3745 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 08:31:15 +0200 Subject: [PATCH 75/82] Rebuilt for Python 3.13 --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 3587ee3..38df0bb 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Distributed C/C++ compilation License: GPL-2.0-or-later URL: https://github.com/distcc/distcc @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Fri Jun 07 2024 Python Maint - 3.4-5 +- Rebuilt for Python 3.13 + * Tue Feb 13 2024 Gwyn Ciesla - 3.4-4 - Disable LTO to fix distccmon-gnome crash, 2263992. From 10951a8c74c0ddc93fb291398a13b7fab4214872 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 21:04:11 +0000 Subject: [PATCH 76/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 38df0bb..115314c 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Distributed C/C++ compilation License: GPL-2.0-or-later URL: https://github.com/distcc/distcc @@ -141,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 3.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 3.4-5 - Rebuilt for Python 3.13 From b0efecb1a23cd2d9d68d06eadfe5e531340265e0 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 21 Oct 2024 10:38:04 -0500 Subject: [PATCH 77/82] Patch for Py_ssize_t --- 479.patch | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++ distcc.spec | 7 ++++++- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 479.patch diff --git a/479.patch b/479.patch new file mode 100644 index 0000000..0f55826 --- /dev/null +++ b/479.patch @@ -0,0 +1,55 @@ +From 83e030a852daf1d4d8c906e46f86375d421b781e Mon Sep 17 00:00:00 2001 +From: hephooey +Date: Sun, 15 Jan 2023 15:43:50 -0500 +Subject: [PATCH] Replace int with Py_ssize_t for distcc pump extension + +Defining PY_SSIZE_T_CLEAN is required since python 3.10, and I have to +modify the type of length to match it. Otherwise functions like +OsPathExists will always return False. + +The PY_SSIZE_T_CLEAN macro is supported at least back to python 3.5 +according to docs.python.org, that is why I included it without any +python version conditions +--- + .../c_extensions/distcc_pump_c_extensions_module.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/include_server/c_extensions/distcc_pump_c_extensions_module.c b/include_server/c_extensions/distcc_pump_c_extensions_module.c +index 763dd425..a4c6e9eb 100644 +--- a/include_server/c_extensions/distcc_pump_c_extensions_module.c ++++ b/include_server/c_extensions/distcc_pump_c_extensions_module.c +@@ -21,6 +21,7 @@ + /* distcc_pump_c_extensions_module.c -- Python bindings for distcc-pump + * extensions */ + ++#define PY_SSIZE_T_CLEAN + #include "Python.h" + + static const char *version = ".01"; +@@ -56,7 +57,7 @@ static PyObject * + CompressLzo1xAlloc(PyObject *dummy, PyObject *args) { + PyObject *string_object; + const char *in_buf; +- int in_len; ++ Py_ssize_t in_len; + char *out_buf; + size_t out_len; + UNUSED(dummy); +@@ -241,7 +242,7 @@ static /* const */ char OsPathExists_doc__[] = + static PyObject * + OsPathExists(PyObject *dummy, PyObject *args) { + const char *in; +- int len; ++ Py_ssize_t len; + int res; + + struct stat buf; +@@ -275,7 +276,7 @@ static /* const */ char OsPathIsFile_doc__[] = + static PyObject * + OsPathIsFile(PyObject *dummy, PyObject *args) { + const char *in; +- int len; ++ Py_ssize_t len; + int res; + + struct stat buf; diff --git a/distcc.spec b/distcc.spec index 115314c..e2f0432 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Distributed C/C++ compilation License: GPL-2.0-or-later URL: https://github.com/distcc/distcc @@ -11,6 +11,7 @@ Source1: hosts.sample Source2: distccd.service Patch0: distcc-localhost.patch Patch1: crash.patch +Patch2: 479.patch BuildRequires: automake BuildRequires: autoconf @@ -58,6 +59,7 @@ This package contains the compilation server needed to use %{name}. %setup -q %patch -P 0 -p0 %patch -P 1 -p0 +%patch -P 2 -p1 %build export PYTHON='/usr/bin/python3' @@ -141,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Mon Oct 21 2024 Gwyn Ciesla - 3.4-7 +- Patch for Py_ssize_t + * Wed Jul 17 2024 Fedora Release Engineering - 3.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b7f1195d73ef6b9bb6b35d7bccbe8b1feb1737da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 15:51:37 +0000 Subject: [PATCH 78/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index e2f0432..3c1524b 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Distributed C/C++ compilation License: GPL-2.0-or-later URL: https://github.com/distcc/distcc @@ -143,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 3.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Oct 21 2024 Gwyn Ciesla - 3.4-7 - Patch for Py_ssize_t From de52c7d141a71c35f5f8ce37174eb332f3514a6c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 19:55:04 +0200 Subject: [PATCH 79/82] Rebuilt for Python 3.14 --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 3c1524b..5e7a782 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Distributed C/C++ compilation License: GPL-2.0-or-later URL: https://github.com/distcc/distcc @@ -143,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Mon Jun 02 2025 Python Maint - 3.4-9 +- Rebuilt for Python 3.14 + * Thu Jan 16 2025 Fedora Release Engineering - 3.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 0da26add79dae0c976a3c3fdcb056d68d25e8b67 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 19:19:59 +0000 Subject: [PATCH 80/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 5e7a782..5939814 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Distributed C/C++ compilation License: GPL-2.0-or-later URL: https://github.com/distcc/distcc @@ -143,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 3.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 02 2025 Python Maint - 3.4-9 - Rebuilt for Python 3.14 From 4d11b0280b56db1663839f6093b008c8b4dba0c6 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:44:27 +0200 Subject: [PATCH 81/82] Rebuilt for Python 3.14.0rc2 bytecode --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index 5939814..bffefda 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Distributed C/C++ compilation License: GPL-2.0-or-later URL: https://github.com/distcc/distcc @@ -143,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Fri Aug 15 2025 Python Maint - 3.4-11 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Jul 23 2025 Fedora Release Engineering - 3.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 055c8480d38d2b777e3e8d11a6cdeed0dda238ad Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:13:50 +0200 Subject: [PATCH 82/82] Rebuilt for Python 3.14.0rc3 bytecode --- distcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distcc.spec b/distcc.spec index bffefda..113b0ed 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ Name: distcc Version: 3.4 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Distributed C/C++ compilation License: GPL-2.0-or-later URL: https://github.com/distcc/distcc @@ -143,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/* %dir /usr/lib/gcc-cross %changelog +* Fri Sep 19 2025 Python Maint - 3.4-12 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 3.4-11 - Rebuilt for Python 3.14.0rc2 bytecode