-The dos version of _lztimer.asm can't be assembled by the GNU assember. A
-newer version is available from Scitech, a patch between the version in MGL
-5.1 and the newer version is included below:
-
---- scitech/src/pm/dos/_lztimer.asm.orig 2004-04-15 20:36:33.000000000 +0100
-+++ scitech/src/pm/dos/_lztimer.asm 2005-04-26 18:39:57.000000000 +0100
-@@ -4,11 +4,11 @@
- ;*
- ;* ========================================================================
- ;*
--;* Copyright (C) 1991-2002 SciTech Software, Inc. All rights reserved.
-+;* Copyright (C) 1991-2004 SciTech Software, Inc. All rights reserved.
- ;*
- ;* This file may be distributed and/or modified under the terms of the
--;* GNU Lesser General Public License version 2.1 as published by the Free
--;* Software Foundation and appearing in the file LICENSE.LGPL included
-+;* GNU General Public License version 2.0 as published by the Free
-+;* Software Foundation and appearing in the file LICENSE.GPL included
- ;* in the packaging of this file.
- ;*
- ;* Licensees holding a valid Commercial License for this product from
-@@ -288,8 +288,8 @@
- ; Convert the BIOS time to microseconds
-
- @@CalcBIOSTime:
-- mov ax,[WORD EndBIOSCount]
-- sub ax,[WORD StartBIOSCount]
-+ mov ax,[EndBIOSCount]
-+ sub ax,[StartBIOSCount]
- mov dx,54925 ; Number of microseconds each
- ; BIOS count represents.
- mul dx
-@@ -352,17 +352,17 @@
- ; See if more than an hour passed during timing. If so, notify the user.
-
- @@CheckForHour:
-- mov ax,[WORD StartBIOSCount+2]
-- cmp ax,[WORD EndBIOSCount+2]
-+ mov ax,[StartBIOSCount+2]
-+ cmp ax,[EndBIOSCount+2]
- jz @@CalcBIOSTime ; Hour count didn't change, so
- ; everything is fine
-
- inc ax
-- cmp ax,[WORD EndBIOSCount+2]
-+ cmp ax,[EndBIOSCount+2]
- jnz @@TestTooLong ; Two hour boundaries passed, so the
- ; results are no good
-- mov ax,[WORD EndBIOSCount]
-- cmp ax,[WORD StartBIOSCount]
-+ mov ax,[EndBIOSCount]
-+ cmp ax,[StartBIOSCount]
- jb @@CalcBIOSTime ; a single hour boundary passed. That's
- ; OK, so long as the total time wasn't
- ; more than an hour.
-@@ -384,8 +384,8 @@
- ; Convert the BIOS time to microseconds
-
- @@CalcBIOSTime:
-- mov ax,[WORD EndBIOSCount]
-- sub ax,[WORD StartBIOSCount]
-+ mov ax,[EndBIOSCount]
-+ sub ax,[StartBIOSCount]
- mov dx,54925 ; Number of microseconds each
- ; BIOS count represents.
- mul dx
-
+The following small change is also required to include/tcl/hashmap.hpp:
+
+--- scitech/include/tcl/hashtab.hpp.orig 2006-01-20 19:51:12.000000000 +0000
++++ scitech/include/tcl/hashtab.hpp 2006-01-22 14:12:12.000000000 +0000
+@@ -60,7 +60,7 @@
+ TCHashTableNode **prev;
+
+ friend class TCGenHashTable;
+- friend ostream& operator << (ostream& o,TCGenHashTable& h);
++ friend ostream& operator << (ostream& o, class TCGenHashTable& h);
+ public:
+ // Constructor to satisfy some compilers :-(
+ TCHashTableNode() {};
+
projects / wxWidgets.git / commitdiff
