Merge branch 'bug/There-are-two-different-notifications-#5794' into develop

6 files changed, 279 insertions, 279 deletions

diff --git a/app/lzo/B/win16/bc.bat b/app/lzo/B/win16/bc.bat
index f252ada8..06f64bda 100644
--- a/app/lzo/B/win16/bc.bat
+++ b/app/lzo/B/win16/bc.bat
@@ -1,42 +1,42 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

-@echo //

-@echo //   Windows 16-bit

-@echo //   Borland C/C++

-@echo //

-@call b\prepare.bat

-@if "%BECHO%"=="n" echo off

-

-

-set CC=bcc -ml -2 -tW -h

-set CF=-O1 -d -w -w-rch -w-sig %CFI% -Iinclude\lzo

-set LF=%BLIB%

-

-%CC% %CF% -Isrc -c @b\src.rsp

-@if errorlevel 1 goto error

-tlib %BLIB% @b\dos16\bc.rsp

-@if errorlevel 1 goto error

-

-%CC% %CF% -Iexamples examples\dict.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% -Iexamples examples\lzopack.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% -Iexamples examples\precomp.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% -Iexamples examples\precomp2.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% -Iexamples examples\simple.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% -ls -Ilzotest lzotest\lzotest.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% -ls -Iminilzo minilzo\testmini.c minilzo\minilzo.c

-@if errorlevel 1 goto error

-

-

-@call b\done.bat

-@goto end

-:error

-@echo ERROR during build!

-:end

-@call b\unset.bat

+@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer
+@echo //
+@echo //   Windows 16-bit
+@echo //   Borland C/C++
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set CC=bcc -ml -2 -tW -h
+set CF=-O1 -d -w -w-rch -w-sig %CFI% -Iinclude\lzo
+set LF=%BLIB%
+
+%CC% %CF% -Isrc -c @b\src.rsp
+@if errorlevel 1 goto error
+tlib %BLIB% @b\dos16\bc.rsp
+@if errorlevel 1 goto error
+
+%CC% %CF% -Iexamples examples\dict.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -Iexamples examples\lzopack.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -Iexamples examples\precomp.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -Iexamples examples\precomp2.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -Iexamples examples\simple.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% -ls -Ilzotest lzotest\lzotest.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% -ls -Iminilzo minilzo\testmini.c minilzo\minilzo.c
+@if errorlevel 1 goto error
+
+
+@call b\done.bat
+@goto end
+:error
+@echo ERROR during build!
+:end
+@call b\unset.bat
diff --git a/app/lzo/B/win16/dm.bat b/app/lzo/B/win16/dm.bat
index 8009a996..d844ef83 100644
--- a/app/lzo/B/win16/dm.bat
+++ b/app/lzo/B/win16/dm.bat
@@ -1,43 +1,43 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

-@echo //

-@echo //   Windows 16-bit

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

-@echo //

-@call b\prepare.bat

-@if "%BECHO%"=="n" echo off

-

-

-set CC=dmc -ml -2 -W

-set CF=-o -w- %CFI%

-set LF=%BLIB% libw.lib commdlg.lib lwindos.lib /L/map/stack:8096

-

-%CC% %CF% -c @b\src.rsp

-@if errorlevel 1 goto error

-lib %BLIB% /b /c /n /noi @b\dos16\bc.rsp

-@if errorlevel 1 goto error

-

-%CC% %CF% examples\dict.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\lzopack.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\precomp.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\precomp2.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\simple.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% lzotest\lzotest.c %LF%

-@if errorlevel 1 goto error

-

-set LF=libw.lib commdlg.lib lwindos.lib /L/map/stack:8096

-%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c %LF%

-@if errorlevel 1 goto error

-

-

-@call b\done.bat

-@goto end

-:error

-@echo ERROR during build!

-:end

-@call b\unset.bat

+@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer
+@echo //
+@echo //   Windows 16-bit
+@echo //   Digital Mars C/C++ (using WINIO)
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set CC=dmc -ml -2 -W
+set CF=-o -w- %CFI%
+set LF=%BLIB% libw.lib commdlg.lib lwindos.lib /L/map/stack:8096
+
+%CC% %CF% -c @b\src.rsp
+@if errorlevel 1 goto error
+lib %BLIB% /b /c /n /noi @b\dos16\bc.rsp
+@if errorlevel 1 goto error
+
+%CC% %CF% examples\dict.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\lzopack.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\precomp.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\precomp2.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\simple.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% lzotest\lzotest.c %LF%
+@if errorlevel 1 goto error
+
+set LF=libw.lib commdlg.lib lwindos.lib /L/map/stack:8096
+%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c %LF%
+@if errorlevel 1 goto error
+
+
+@call b\done.bat
+@goto end
+:error
+@echo ERROR during build!
+:end
+@call b\unset.bat
diff --git a/app/lzo/B/win16/mc.bat b/app/lzo/B/win16/mc.bat
index 4404e421..26af7b6e 100644
--- a/app/lzo/B/win16/mc.bat
+++ b/app/lzo/B/win16/mc.bat
@@ -1,56 +1,56 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

-@echo //

-@echo //   Windows 16-bit

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

-@echo //

-@call b\prepare.bat

-@if "%BECHO%"=="n" echo off

-

-

-set CC=cl -nologo -AL -G2 -Mq

-set CF=-O -Gf -W3 %CFI%

-set LF=/seg:256 /stack:8096 /nod:llibce /map

-

-%CC% %CF% -c src\*.c

-@if errorlevel 1 goto error

-lib /nologo %BLIB% @b\dos16\bc.rsp;

-@if errorlevel 1 goto error

-

-%CC% %CF% -c examples\dict.c

-@if errorlevel 1 goto error

-link %LF% dict.obj,,,llibcewq.lib libw.lib %BLIB%;

-@if errorlevel 1 goto error

-%CC% %CF% -c examples\lzopack.c

-@if errorlevel 1 goto error

-link %LF% lzopack.obj,,,llibcewq.lib libw.lib %BLIB%;

-@if errorlevel 1 goto error

-%CC% %CF% -c examples\precomp.c

-@if errorlevel 1 goto error

-link %LF% precomp.obj,,,llibcewq.lib libw.lib %BLIB%;

-@if errorlevel 1 goto error

-%CC% %CF% -c examples\precomp2.c

-@if errorlevel 1 goto error

-link %LF% precomp2.obj,,,llibcewq.lib libw.lib %BLIB%;

-@if errorlevel 1 goto error

-%CC% %CF% -c examples\simple.c

-@if errorlevel 1 goto error

-link %LF% simple.obj,,,llibcewq.lib libw.lib %BLIB%;

-@if errorlevel 1 goto error

-

-%CC% %CF% -c lzotest\lzotest.c

-@if errorlevel 1 goto error

-link %LF% lzotest.obj,,,llibcewq.lib libw.lib %BLIB%;

-@if errorlevel 1 goto error

-

-%CC% %CF% -Iinclude\lzo -c minilzo\testmini.c minilzo\minilzo.c

-@if errorlevel 1 goto error

-link %LF% testmini.obj minilzo.obj,,,llibcewq.lib libw.lib;

-@if errorlevel 1 goto error

-

-

-@call b\done.bat

-@goto end

-:error

-@echo ERROR during build!

-:end

-@call b\unset.bat

+@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer
+@echo //
+@echo //   Windows 16-bit
+@echo //   Microsoft C/C++ (using QuickWin)
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set CC=cl -nologo -AL -G2 -Mq
+set CF=-O -Gf -W3 %CFI%
+set LF=/seg:256 /stack:8096 /nod:llibce /map
+
+%CC% %CF% -c src\*.c
+@if errorlevel 1 goto error
+lib /nologo %BLIB% @b\dos16\bc.rsp;
+@if errorlevel 1 goto error
+
+%CC% %CF% -c examples\dict.c
+@if errorlevel 1 goto error
+link %LF% dict.obj,,,llibcewq.lib libw.lib %BLIB%;
+@if errorlevel 1 goto error
+%CC% %CF% -c examples\lzopack.c
+@if errorlevel 1 goto error
+link %LF% lzopack.obj,,,llibcewq.lib libw.lib %BLIB%;
+@if errorlevel 1 goto error
+%CC% %CF% -c examples\precomp.c
+@if errorlevel 1 goto error
+link %LF% precomp.obj,,,llibcewq.lib libw.lib %BLIB%;
+@if errorlevel 1 goto error
+%CC% %CF% -c examples\precomp2.c
+@if errorlevel 1 goto error
+link %LF% precomp2.obj,,,llibcewq.lib libw.lib %BLIB%;
+@if errorlevel 1 goto error
+%CC% %CF% -c examples\simple.c
+@if errorlevel 1 goto error
+link %LF% simple.obj,,,llibcewq.lib libw.lib %BLIB%;
+@if errorlevel 1 goto error
+
+%CC% %CF% -c lzotest\lzotest.c
+@if errorlevel 1 goto error
+link %LF% lzotest.obj,,,llibcewq.lib libw.lib %BLIB%;
+@if errorlevel 1 goto error
+
+%CC% %CF% -Iinclude\lzo -c minilzo\testmini.c minilzo\minilzo.c
+@if errorlevel 1 goto error
+link %LF% testmini.obj minilzo.obj,,,llibcewq.lib libw.lib;
+@if errorlevel 1 goto error
+
+
+@call b\done.bat
+@goto end
+:error
+@echo ERROR during build!
+:end
+@call b\unset.bat
diff --git a/app/lzo/B/win16/sc.bat b/app/lzo/B/win16/sc.bat
index 0dab9e3c..89dd73c5 100644
--- a/app/lzo/B/win16/sc.bat
+++ b/app/lzo/B/win16/sc.bat
@@ -1,53 +1,53 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

-@echo //

-@echo //   Windows 16-bit

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

-@echo //

-@echo // NOTE: LZO breaks the optimizer, so we disable optimizations

-@echo //

-@call b\prepare.bat

-@if "%BECHO%"=="n" echo off

-

-

-set CC=sc -ml -2 -W

-set CF=-w- %CFI%

-set LF=%BLIB% libw.lib commdlg.lib lwindos.lib /L/map/stack:8096

-

-%CC% %CF% -c @b\src.rsp

-@if errorlevel 1 goto error

-lib %BLIB% /b /c /n /noi @b\dos16\bc.rsp

-@if errorlevel 1 goto error

-

-%CC% %CF% -c examples\dict.c

-@if errorlevel 1 goto error

-%CC% dict.obj %LF%

-@if errorlevel 1 goto error

-%CC% %CF% -c examples\lzopack.c

-@if errorlevel 1 goto error

-%CC% lzopack.obj %LF%

-@if errorlevel 1 goto error

-%CC% %CF% -c examples\precomp.c

-@if errorlevel 1 goto error

-%CC% precomp.obj %LF%

-@if errorlevel 1 goto error

-%CC% %CF% -c examples\precomp2.c

-@if errorlevel 1 goto error

-%CC% precomp2.obj %LF%

-@if errorlevel 1 goto error

-%CC% %CF% -c examples\simple.c

-@if errorlevel 1 goto error

-%CC% simple.obj %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% -c lzotest\lzotest.c

-@if errorlevel 1 goto error

-%CC% lzotest.obj %LF%

-@if errorlevel 1 goto error

-

-

-@call b\done.bat

-@goto end

-:error

-@echo ERROR during build!

-:end

-@call b\unset.bat

+@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer
+@echo //
+@echo //   Windows 16-bit
+@echo //   Symantec C/C++ (using WINIO)
+@echo //
+@echo // NOTE: LZO breaks the optimizer, so we disable optimizations
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set CC=sc -ml -2 -W
+set CF=-w- %CFI%
+set LF=%BLIB% libw.lib commdlg.lib lwindos.lib /L/map/stack:8096
+
+%CC% %CF% -c @b\src.rsp
+@if errorlevel 1 goto error
+lib %BLIB% /b /c /n /noi @b\dos16\bc.rsp
+@if errorlevel 1 goto error
+
+%CC% %CF% -c examples\dict.c
+@if errorlevel 1 goto error
+%CC% dict.obj %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -c examples\lzopack.c
+@if errorlevel 1 goto error
+%CC% lzopack.obj %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -c examples\precomp.c
+@if errorlevel 1 goto error
+%CC% precomp.obj %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -c examples\precomp2.c
+@if errorlevel 1 goto error
+%CC% precomp2.obj %LF%
+@if errorlevel 1 goto error
+%CC% %CF% -c examples\simple.c
+@if errorlevel 1 goto error
+%CC% simple.obj %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% -c lzotest\lzotest.c
+@if errorlevel 1 goto error
+%CC% lzotest.obj %LF%
+@if errorlevel 1 goto error
+
+
+@call b\done.bat
+@goto end
+:error
+@echo ERROR during build!
+:end
+@call b\unset.bat
diff --git a/app/lzo/B/win16/vc.bat b/app/lzo/B/win16/vc.bat
index 2c35cfc4..74962326 100644
--- a/app/lzo/B/win16/vc.bat
+++ b/app/lzo/B/win16/vc.bat
@@ -1,43 +1,43 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

-@echo //

-@echo //   Windows 16-bit

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

-@echo //

-@call b\prepare.bat

-@if "%BECHO%"=="n" echo off

-

-

-set CC=cl -nologo -AL -G2 -Mq

-set CF=-O -Gf -Gs -Gy -W3 %CFI%

-set LF=%BLIB% -Fm /link /seg:256

-

-%CC% %CF% -c @b\src.rsp

-@if errorlevel 1 goto error

-lib /nologo %BLIB% @b\dos16\bc.rsp;

-@if errorlevel 1 goto error

-

-%CC% %CF% examples\dict.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\lzopack.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\precomp.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\precomp2.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\simple.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% lzotest\lzotest.c %LF%

-@if errorlevel 1 goto error

-

-set LF=-Fm /link /seg:256

-%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c %LF%

-@if errorlevel 1 goto error

-

-

-@call b\done.bat

-@goto end

-:error

-@echo ERROR during build!

-:end

-@call b\unset.bat

+@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer
+@echo //
+@echo //   Windows 16-bit
+@echo //   Microsoft Visual C/C++ (using QuickWin)
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set CC=cl -nologo -AL -G2 -Mq
+set CF=-O -Gf -Gs -Gy -W3 %CFI%
+set LF=%BLIB% -Fm /link /seg:256
+
+%CC% %CF% -c @b\src.rsp
+@if errorlevel 1 goto error
+lib /nologo %BLIB% @b\dos16\bc.rsp;
+@if errorlevel 1 goto error
+
+%CC% %CF% examples\dict.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\lzopack.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\precomp.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\precomp2.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\simple.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% lzotest\lzotest.c %LF%
+@if errorlevel 1 goto error
+
+set LF=-Fm /link /seg:256
+%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c %LF%
+@if errorlevel 1 goto error
+
+
+@call b\done.bat
+@goto end
+:error
+@echo ERROR during build!
+:end
+@call b\unset.bat
diff --git a/app/lzo/B/win16/wc.bat b/app/lzo/B/win16/wc.bat
index b5dbf22a..be06828a 100644
--- a/app/lzo/B/win16/wc.bat
+++ b/app/lzo/B/win16/wc.bat
@@ -1,42 +1,42 @@
-@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer

-@echo //

-@echo //   Windows 16-bit

-@echo //   Watcom C/C++

-@echo //

-@call b\prepare.bat

-@if "%BECHO%"=="n" echo off

-

-

-set CC=wcl -zq -ml -2 -bw -bt#windows -l#windows

-set CF=-ox %CFI%

-set LF=%BLIB%

-

-%CC% %CF% -c src\*.c

-@if errorlevel 1 goto error

-wlib -q -b -n -t %BLIB% @b\dos16\wc.rsp

-@if errorlevel 1 goto error

-

-%CC% %CF% examples\dict.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\lzopack.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\precomp.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\precomp2.c %LF%

-@if errorlevel 1 goto error

-%CC% %CF% examples\simple.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% lzotest\lzotest.c %LF%

-@if errorlevel 1 goto error

-

-%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c

-@if errorlevel 1 goto error

-

-

-@call b\done.bat

-@goto end

-:error

-@echo ERROR during build!

-:end

-@call b\unset.bat

+@echo // Copyright (C) 1996-2011 Markus F.X.J. Oberhumer
+@echo //
+@echo //   Windows 16-bit
+@echo //   Watcom C/C++
+@echo //
+@call b\prepare.bat
+@if "%BECHO%"=="n" echo off
+
+
+set CC=wcl -zq -ml -2 -bw -bt#windows -l#windows
+set CF=-ox %CFI%
+set LF=%BLIB%
+
+%CC% %CF% -c src\*.c
+@if errorlevel 1 goto error
+wlib -q -b -n -t %BLIB% @b\dos16\wc.rsp
+@if errorlevel 1 goto error
+
+%CC% %CF% examples\dict.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\lzopack.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\precomp.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\precomp2.c %LF%
+@if errorlevel 1 goto error
+%CC% %CF% examples\simple.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% lzotest\lzotest.c %LF%
+@if errorlevel 1 goto error
+
+%CC% %CF% -Iinclude\lzo minilzo\testmini.c minilzo\minilzo.c
+@if errorlevel 1 goto error
+
+
+@call b\done.bat
+@goto end
+:error
+@echo ERROR during build!
+:end
+@call b\unset.bat