Merge

59 files changed, 68 insertions, 69 deletions

diff --git a/lzo/B/00README.TXT b/lzo/B/00README.TXT
index f78a0b74..45bdf7b8 100644
--- a/lzo/B/00README.TXT
+++ b/lzo/B/00README.TXT
@@ -4,10 +4,10 @@ Simple make drivers for DOS, Windows, OS/2 and other systems
 This directory contains a bunch of simple build scripts - I've tried

 to make them as foolproof as possible.

 

-To build LZO for your system type `b\OS\COMPILER' in the base directory,

-e.g. `b\win32\vc.bat' will build the Win32 Visual C/C++ version.

+To build LZO for your system type 'b\OS\COMPILER' in the base directory,

+e.g. 'b\win32\vc.bat' will build the Win32 Visual C/C++ version.

 

-After building do a basic test by running `lzotest.exe -mlzo COPYING'.

+After building do a basic test by running 'lzotest.exe -mlzo COPYING'.

 util\check.sh is an example of a more thorough test driver.

 

 Please send me your additional/improved versions.

diff --git a/lzo/B/dos16/bc.bat b/lzo/B/dos16/bc.bat
index 13ed99f6..292b793a 100644
--- a/lzo/B/dos16/bc.bat
+++ b/lzo/B/dos16/bc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 16-bit

 @echo //   Borland C/C++

diff --git a/lzo/B/dos16/bc_286.bat b/lzo/B/dos16/bc_286.bat
index eb5ea84e..025a48ea 100644
--- a/lzo/B/dos16/bc_286.bat
+++ b/lzo/B/dos16/bc_286.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 16-bit

 @echo //   Borland C/C++ + Pharlap 286DOS-Extender

diff --git a/lzo/B/dos16/bc_pp.bat b/lzo/B/dos16/bc_pp.bat
index 513fae42..6c0aac37 100644
--- a/lzo/B/dos16/bc_pp.bat
+++ b/lzo/B/dos16/bc_pp.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 16-bit

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

diff --git a/lzo/B/dos16/dm.bat b/lzo/B/dos16/dm.bat
index 5c0e03e8..1ec6feca 100644
--- a/lzo/B/dos16/dm.bat
+++ b/lzo/B/dos16/dm.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 16-bit

 @echo //   Digital Mars C/C++

diff --git a/lzo/B/dos16/mc.bat b/lzo/B/dos16/mc.bat
index 4112d0f2..4f34a36f 100644
--- a/lzo/B/dos16/mc.bat
+++ b/lzo/B/dos16/mc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 16-bit

 @echo //   Microsoft C/C++

diff --git a/lzo/B/dos16/mc_qc.bat b/lzo/B/dos16/mc_qc.bat
index dfe8e045..1c2ce940 100644
--- a/lzo/B/dos16/mc_qc.bat
+++ b/lzo/B/dos16/mc_qc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 16-bit

 @echo //   Microsoft C/C++ (QuickC)

diff --git a/lzo/B/dos16/qc.bat b/lzo/B/dos16/qc.bat
index 473fc6d0..82734fd7 100644
--- a/lzo/B/dos16/qc.bat
+++ b/lzo/B/dos16/qc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 16-bit

 @echo //   Microsoft QuickC

diff --git a/lzo/B/dos16/sc.bat b/lzo/B/dos16/sc.bat
index d57d2b9d..056c04a9 100644
--- a/lzo/B/dos16/sc.bat
+++ b/lzo/B/dos16/sc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 16-bit

 @echo //   Symantec C/C++

diff --git a/lzo/B/dos16/tc.bat b/lzo/B/dos16/tc.bat
index a90de3b4..a3c32770 100644
--- a/lzo/B/dos16/tc.bat
+++ b/lzo/B/dos16/tc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 16-bit

 @echo //   Turbo C/C++

diff --git a/lzo/B/dos16/vc.bat b/lzo/B/dos16/vc.bat
index 887cfa12..b0617859 100644
--- a/lzo/B/dos16/vc.bat
+++ b/lzo/B/dos16/vc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 16-bit

 @echo //   Microsoft Visual C/C++

diff --git a/lzo/B/dos16/vc_qc.bat b/lzo/B/dos16/vc_qc.bat
index 4f3b5b69..329b092f 100644
--- a/lzo/B/dos16/vc_qc.bat
+++ b/lzo/B/dos16/vc_qc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 16-bit

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

diff --git a/lzo/B/dos16/wc.bat b/lzo/B/dos16/wc.bat
index 9b0f5632..c92135c0 100644
--- a/lzo/B/dos16/wc.bat
+++ b/lzo/B/dos16/wc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 16-bit

 @echo //   Watcom C/C++

diff --git a/lzo/B/dos32/bc_pp.bat b/lzo/B/dos32/bc_pp.bat
index 1079f9e8..7cd86dd4 100644
--- a/lzo/B/dos32/bc_pp.bat
+++ b/lzo/B/dos32/bc_pp.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 32-bit

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

diff --git a/lzo/B/dos32/dj2.bat b/lzo/B/dos32/dj2.bat
index b4013a49..ac493992 100644
--- a/lzo/B/dos32/dj2.bat
+++ b/lzo/B/dos32/dj2.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 32-bit

 @echo //   djgpp2 + gcc

diff --git a/lzo/B/dos32/dj2.opt b/lzo/B/dos32/dj2.opt
index cc5a5dc3..9cd02cd0 100644
--- a/lzo/B/dos32/dj2.opt
+++ b/lzo/B/dos32/dj2.opt
@@ -4,4 +4,3 @@
 -Wcast-align

 -Wcast-qual

 -Wwrite-strings

--Wno-uninitialized

diff --git a/lzo/B/dos32/dm.bat b/lzo/B/dos32/dm.bat
index 69a0d918..0449668c 100644
--- a/lzo/B/dos32/dm.bat
+++ b/lzo/B/dos32/dm.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 32-bit

 @echo //   Digital Mars C/C++

diff --git a/lzo/B/dos32/emx.bat b/lzo/B/dos32/emx.bat
index c25f60b7..ceb97e4d 100644
--- a/lzo/B/dos32/emx.bat
+++ b/lzo/B/dos32/emx.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 32-bit

 @echo //   emx + gcc

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

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

 @echo //

 @echo //   DOS 32-bit

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

diff --git a/lzo/B/dos32/ndp.bat b/lzo/B/dos32/ndp.bat
index 42c94c79..64b04ed4 100644
--- a/lzo/B/dos32/ndp.bat
+++ b/lzo/B/dos32/ndp.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 32-bit

 @echo //   Microway NDP C/C++

diff --git a/lzo/B/dos32/sc.bat b/lzo/B/dos32/sc.bat
index 48e22eeb..1b233336 100644
--- a/lzo/B/dos32/sc.bat
+++ b/lzo/B/dos32/sc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 32-bit

 @echo //   Symantec C/C++

diff --git a/lzo/B/dos32/wc.bat b/lzo/B/dos32/wc.bat
index cf301141..bfa776d5 100644
--- a/lzo/B/dos32/wc.bat
+++ b/lzo/B/dos32/wc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 32-bit

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

diff --git a/lzo/B/dos32/zc.bat b/lzo/B/dos32/zc.bat
index 89b29317..0da77941 100644
--- a/lzo/B/dos32/zc.bat
+++ b/lzo/B/dos32/zc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   DOS 32-bit

 @echo //   Zortech C/C++

diff --git a/lzo/B/generic/Makefile b/lzo/B/generic/Makefile
index 88caf3a2..acddb04e 100644
--- a/lzo/B/generic/Makefile
+++ b/lzo/B/generic/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
+# Copyright (C) 1996-2011 Markus F.X.J. Oberhumer
 #
 # this is modelled after build.sh; needs GNU make 3.80 or better
 
@@ -14,7 +14,7 @@ AR ?= ar
 CC ?= cc
 CFLAGS ?= -O
 
-CFI = -I$(top_srcdir)/include -I$(top_srcdir)
+CFI = -I$(top_srcdir)/include -I$(top_srcdir) -I$(top_srcdir)/src
 BNAME = lzo2
 BLIB = lib$(BNAME).a
 
diff --git a/lzo/B/generic/build.sh b/lzo/B/generic/build.sh
index 5456e056..1bf5585b 100755
--- a/lzo/B/generic/build.sh
+++ b/lzo/B/generic/build.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # vi:ts=4:et
 set -e
-echo "// Copyright (C) 1996-2008 Markus F.X.J. Oberhumer"
+echo "// Copyright (C) 1996-2011 Markus F.X.J. Oberhumer"
 echo "//"
 echo "//   Generic Posix/Unix system"
 echo "//   Generic C compiler"
@@ -15,7 +15,7 @@ test "X${CFLAGS+set}" = Xset || CFLAGS="-O"
 # LZO_EXTRA_CPPFLAGS, LZO_EXTRA_CFLAGS, LZO_EXTRA_LDFLAGS
 # LZO_EXTRA_SOURCES, LZO_EXTRA_OBJECTS, LZO_EXTRA_LIBS
 
-CFI="-I${top_srcdir}/include -I${top_srcdir}"
+CFI="-I${top_srcdir}/include -I${top_srcdir} -I${top_srcdir}/src"
 BNAME=lzo2
 BLIB=lib${BNAME}.a
 
diff --git a/lzo/B/generic/build_gcc.sh b/lzo/B/generic/build_gcc.sh
index 3aaa4aa0..179d8c0f 100755
--- a/lzo/B/generic/build_gcc.sh
+++ b/lzo/B/generic/build_gcc.sh
@@ -10,7 +10,7 @@ UNAME_MACHINE=unknown
 CC="gcc -fPIC"
 CC="gcc -static"
 CC="gcc"
-CFLAGS="-Wall -Wno-uninitialized -O2 -fomit-frame-pointer"
+CFLAGS="-Wall -O2 -fomit-frame-pointer"
 
 # delete the next line to disable assembler support
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
diff --git a/lzo/B/generic/clean.sh b/lzo/B/generic/clean.sh
index 0a946cc2..11c23951 100755
--- a/lzo/B/generic/clean.sh
+++ b/lzo/B/generic/clean.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # vi:ts=4:et
-# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
+# Copyright (C) 1996-2011 Markus F.X.J. Oberhumer
 
 rm -f *.o liblzo2.a dict.out lzopack.out precomp.out precomp2.out simple.out lzotest.out testmini.out
 
diff --git a/lzo/B/os2/emx.bat b/lzo/B/os2/emx.bat
index 0306a521..01d7dfa4 100644
--- a/lzo/B/os2/emx.bat
+++ b/lzo/B/os2/emx.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   OS/2 32-bit

 @echo //   emx + gcc

diff --git a/lzo/B/os2/wc.bat b/lzo/B/os2/wc.bat
index bc4de97a..79e2082b 100644
--- a/lzo/B/os2/wc.bat
+++ b/lzo/B/os2/wc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   OS/2 32-bit

 @echo //   Watcom C/C++

diff --git a/lzo/B/os2/zc.bat b/lzo/B/os2/zc.bat
index 0627e3fd..47a6d51b 100644
--- a/lzo/B/os2/zc.bat
+++ b/lzo/B/os2/zc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   OS/2 32-bit

 @echo //   Zortech C/C++

diff --git a/lzo/B/os2_16/mc.bat b/lzo/B/os2_16/mc.bat
index 4e256f3f..95742d41 100644
--- a/lzo/B/os2_16/mc.bat
+++ b/lzo/B/os2_16/mc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   OS/2 16-bit

 @echo //   Microsoft C/C++

diff --git a/lzo/B/os2_16/wc.bat b/lzo/B/os2_16/wc.bat
index 472188ad..bbe17430 100644
--- a/lzo/B/os2_16/wc.bat
+++ b/lzo/B/os2_16/wc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   OS/2 16-bit

 @echo //   Watcom C/C++

diff --git a/lzo/B/prepare.bat b/lzo/B/prepare.bat
index 2c958f20..34bac191 100644
--- a/lzo/B/prepare.bat
+++ b/lzo/B/prepare.bat
@@ -1,7 +1,7 @@
 @call b\unset.bat

 @call b\clean.bat

 

-@set CFI=-Iinclude -I.

+@set CFI=-Iinclude -I. -Isrc

 @set CFASM=-DLZO_USE_ASM

 @set BNAME=lzo2

 @set BLIB=lzo2.lib

diff --git a/lzo/B/win16/bc.bat b/lzo/B/win16/bc.bat
index f16443df..f252ada8 100644
--- a/lzo/B/win16/bc.bat
+++ b/lzo/B/win16/bc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 16-bit

 @echo //   Borland C/C++

diff --git a/lzo/B/win16/dm.bat b/lzo/B/win16/dm.bat
index 54226daf..8009a996 100644
--- a/lzo/B/win16/dm.bat
+++ b/lzo/B/win16/dm.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 16-bit

 @echo //   Digital Mars C/C++ (using WINIO)

diff --git a/lzo/B/win16/mc.bat b/lzo/B/win16/mc.bat
index 5540086b..4404e421 100644
--- a/lzo/B/win16/mc.bat
+++ b/lzo/B/win16/mc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 16-bit

 @echo //   Microsoft C/C++ (using QuickWin)

diff --git a/lzo/B/win16/sc.bat b/lzo/B/win16/sc.bat
index bcc46191..0dab9e3c 100644
--- a/lzo/B/win16/sc.bat
+++ b/lzo/B/win16/sc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 16-bit

 @echo //   Symantec C/C++ (using WINIO)

diff --git a/lzo/B/win16/vc.bat b/lzo/B/win16/vc.bat
index dfb813af..2c35cfc4 100644
--- a/lzo/B/win16/vc.bat
+++ b/lzo/B/win16/vc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 16-bit

 @echo //   Microsoft Visual C/C++ (using QuickWin)

diff --git a/lzo/B/win16/wc.bat b/lzo/B/win16/wc.bat
index e2d45a8e..b5dbf22a 100644
--- a/lzo/B/win16/wc.bat
+++ b/lzo/B/win16/wc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 16-bit

 @echo //   Watcom C/C++

diff --git a/lzo/B/win32/bc.bat b/lzo/B/win32/bc.bat
index 25864e07..2aa9028c 100644
--- a/lzo/B/win32/bc.bat
+++ b/lzo/B/win32/bc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 32-bit

 @echo //   Borland C/C++

diff --git a/lzo/B/win32/cygwin.bat b/lzo/B/win32/cygwin.bat
index ff1aa17c..661badba 100644
--- a/lzo/B/win32/cygwin.bat
+++ b/lzo/B/win32/cygwin.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 32-bit

 @echo //   cygwin + gcc

@@ -12,7 +12,7 @@ set CC=gcc
 set CF=-O2 -fomit-frame-pointer -Wall %CFI% %CFASM%

 set LF=%BLIB% -lwinmm -s

 

-%CC% %CF% -Wno-uninitialized -c src/*.c

+%CC% %CF% -c src/*.c

 @if errorlevel 1 goto error

 %CC% -x assembler-with-cpp -c asm/i386/src_gas/*.S

 @if errorlevel 1 goto error

@@ -33,7 +33,7 @@ ar rcs %BLIB% @b/win32/cygwin.rsp
 %CC% %CF% -o lzotest.exe lzotest/lzotest.c %LF%

 @if errorlevel 1 goto error

 

-%CC% %CF% -Iinclude/lzo -Wno-uninitialized -o testmini.exe minilzo/testmini.c minilzo/minilzo.c

+%CC% %CF% -Iinclude/lzo -o testmini.exe minilzo/testmini.c minilzo/minilzo.c

 @if errorlevel 1 goto error

 

 

diff --git a/lzo/B/win32/dm.bat b/lzo/B/win32/dm.bat
index 0bfd09fa..c06498d7 100644
--- a/lzo/B/win32/dm.bat
+++ b/lzo/B/win32/dm.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 32-bit

 @echo //   Digital Mars C/C++

diff --git a/lzo/B/win32/ic.bat b/lzo/B/win32/ic.bat
index 0394b59d..807e33d9 100644
--- a/lzo/B/win32/ic.bat
+++ b/lzo/B/win32/ic.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 32-bit

 @echo //   Intel C/C++

diff --git a/lzo/B/win32/lccwin32.bat b/lzo/B/win32/lccwin32.bat
index 6ab5e421..e9a1c5f9 100644
--- a/lzo/B/win32/lccwin32.bat
+++ b/lzo/B/win32/lccwin32.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 32-bit

 @echo //   lcc-win32

diff --git a/lzo/B/win32/mingw.bat b/lzo/B/win32/mingw.bat
index 43eb5916..1a747bbd 100644
--- a/lzo/B/win32/mingw.bat
+++ b/lzo/B/win32/mingw.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 32-bit

 @echo //   MinGW + gcc

@@ -12,7 +12,7 @@ set CC=gcc
 set CF=-O2 -fomit-frame-pointer -Wall %CFI% %CFASM%

 set LF=%BLIB% -lwinmm -s

 

-%CC% %CF% -Wno-uninitialized -c src/*.c

+%CC% %CF% -c src/*.c

 @if errorlevel 1 goto error

 %CC% -x assembler-with-cpp -c asm/i386/src_gas/*.S

 @if errorlevel 1 goto error

@@ -33,7 +33,7 @@ ar rcs %BLIB% *.o
 %CC% %CF% -o lzotest.exe lzotest/lzotest.c %LF%

 @if errorlevel 1 goto error

 

-%CC% %CF% -Iinclude/lzo -Wno-uninitialized -o testmini.exe minilzo/testmini.c minilzo/minilzo.c

+%CC% %CF% -Iinclude/lzo -o testmini.exe minilzo/testmini.c minilzo/minilzo.c

 @if errorlevel 1 goto error

 

 

diff --git a/lzo/B/win32/mwerks.bat b/lzo/B/win32/mwerks.bat
index feb32e18..99395cc0 100644
--- a/lzo/B/win32/mwerks.bat
+++ b/lzo/B/win32/mwerks.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 32-bit

 @echo //   Metrowerks CodeWarrior C/C++

diff --git a/lzo/B/win32/pellesc.bat b/lzo/B/win32/pellesc.bat
index 1968fb8c..4c9569f1 100644
--- a/lzo/B/win32/pellesc.bat
+++ b/lzo/B/win32/pellesc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 32-bit

 @echo //   Pelles C

diff --git a/lzo/B/win32/pgi.bat b/lzo/B/win32/pgi.bat
index d7b84e66..73be86ed 100644
--- a/lzo/B/win32/pgi.bat
+++ b/lzo/B/win32/pgi.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 32-bit

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

diff --git a/lzo/B/win32/pw32.bat b/lzo/B/win32/pw32.bat
index 1b8e1c8a..b863dd0a 100644
--- a/lzo/B/win32/pw32.bat
+++ b/lzo/B/win32/pw32.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 32-bit

 @echo //   PW32 + gcc

@@ -12,7 +12,7 @@ set CC=gcc
 set CF=-O2 -fomit-frame-pointer -Wall %CFI% %CFASM%

 set LF=%BLIB% -lwinmm -s

 

-%CC% %CF% -Wno-uninitialized -c src/*.c

+%CC% %CF% -c src/*.c

 @if errorlevel 1 goto error

 %CC% -x assembler-with-cpp -c asm/i386/src_gas/*.S

 @if errorlevel 1 goto error

@@ -33,7 +33,7 @@ ar rcs %BLIB% *.o
 %CC% %CF% -o lzotest.exe lzotest/lzotest.c %LF%

 @if errorlevel 1 goto error

 

-%CC% %CF% -Iinclude/lzo -Wno-uninitialized -o testmini.exe minilzo/testmini.c minilzo/minilzo.c

+%CC% %CF% -Iinclude/lzo -o testmini.exe minilzo/testmini.c minilzo/minilzo.c

 @if errorlevel 1 goto error

 

 

diff --git a/lzo/B/win32/rsxnt.bat b/lzo/B/win32/rsxnt.bat
index 4d7a4a2c..8f7b5795 100644
--- a/lzo/B/win32/rsxnt.bat
+++ b/lzo/B/win32/rsxnt.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 32-bit

 @echo //   rsxnt + gcc

diff --git a/lzo/B/win32/sc.bat b/lzo/B/win32/sc.bat
index 7f3c183f..83a4e565 100644
--- a/lzo/B/win32/sc.bat
+++ b/lzo/B/win32/sc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 32-bit

 @echo //   Symantec C/C++

diff --git a/lzo/B/win32/vc.bat b/lzo/B/win32/vc.bat
index 06aaf25d..5a8a394b 100644
--- a/lzo/B/win32/vc.bat
+++ b/lzo/B/win32/vc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 32-bit

 @echo //   Microsoft Visual C/C++

diff --git a/lzo/B/win32/vc_dll.bat b/lzo/B/win32/vc_dll.bat
index 06c0cefe..f6aa14c0 100644
--- a/lzo/B/win32/vc_dll.bat
+++ b/lzo/B/win32/vc_dll.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 32-bit

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

diff --git a/lzo/B/win32/wc.bat b/lzo/B/win32/wc.bat
index c711e6c8..ffdbe636 100644
--- a/lzo/B/win32/wc.bat
+++ b/lzo/B/win32/wc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 32-bit

 @echo //   Watcom C/C++

diff --git a/lzo/B/win64/ic.bat b/lzo/B/win64/ic.bat
index 635149fb..c5d367a9 100644
--- a/lzo/B/win64/ic.bat
+++ b/lzo/B/win64/ic.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 64-bit (Itanium)

 @echo //   Intel C/C++

diff --git a/lzo/B/win64/ic_dll.bat b/lzo/B/win64/ic_dll.bat
index d0d45251..6e5b7df7 100644
--- a/lzo/B/win64/ic_dll.bat
+++ b/lzo/B/win64/ic_dll.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

 @echo //   Windows 64-bit (Itanium)

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

diff --git a/lzo/B/win64/vc.bat b/lzo/B/win64/vc.bat
index 3386b91b..67245460 100644
--- a/lzo/B/win64/vc.bat
+++ b/lzo/B/win64/vc.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

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

 @echo //   Microsoft Visual C/C++

diff --git a/lzo/B/win64/vc_dll.bat b/lzo/B/win64/vc_dll.bat
index 77161293..73bf6d3f 100644
--- a/lzo/B/win64/vc_dll.bat
+++ b/lzo/B/win64/vc_dll.bat
@@ -1,4 +1,4 @@
-@echo // Copyright (C) 1996-2008 Markus F.X.J. Oberhumer

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

 @echo //

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

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

diff --git a/lzo/B/win64/vc_dll.def b/lzo/B/win64/vc_dll.def
index 91681f88..e80a637a 100644
--- a/lzo/B/win64/vc_dll.def
+++ b/lzo/B/win64/vc_dll.def
@@ -1 +1 @@
-LIBRARY lzo2

+EXPORTS