head	1.3;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.3
	OPENPKG_E1_FP:1.3
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE_20061018:1.3
	OPENPKG_2_STABLE_20060622:1.3
	OPENPKG_2_STABLE:1.3.0.10
	OPENPKG_2_STABLE_BP:1.3
	OPENPKG_2_5_RELEASE:1.3
	OPENPKG_2_5_SOLID:1.3.0.8
	OPENPKG_2_5_SOLID_BP:1.3
	OPENPKG_2_4_RELEASE:1.3
	OPENPKG_2_4_SOLID:1.3.0.6
	OPENPKG_2_4_SOLID_BP:1.3
	OPENPKG_CW_FP:1.3
	OPENPKG_2_3_RELEASE:1.3
	OPENPKG_2_3_SOLID:1.3.0.4
	OPENPKG_2_3_SOLID_BP:1.3
	OPENPKG_2_2_RELEASE:1.3
	OPENPKG_2_2_SOLID:1.3.0.2
	OPENPKG_2_2_SOLID_BP:1.3
	OPENPKG_2_1_RELEASE:1.2
	OPENPKG_2_1_SOLID:1.2.0.4
	OPENPKG_2_1_SOLID_BP:1.2
	OPENPKG_2_0_RELEASE:1.2
	OPENPKG_2_0_SOLID:1.2.0.2
	OPENPKG_2_0_SOLID_BP:1.2
	OPENPKG_1_3_RELEASE:1.1.2.2
	OPENPKG_1_3_SOLID:1.1.2.2.0.2
	OPENPKG_1_3_SOLID_BP:1.1.2.2
	OPENPKG_1_STABLE:1.1.0.2
	OPENPKG_1_STABLE_MP:1.2;
locks; strict;
comment	@# @;


1.3
date	2004.08.03.17.21.18;	author ms;	state Exp;
branches;
next	1.2;

1.2
date	2003.07.28.12.37.34;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2003.06.12.12.21.31;	author mlelstv;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2003.07.24.20.50.54;	author rse;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2003.07.28.12.59.16;	author rse;	state Exp;
branches;
next	;


desc
@@


1.3
log
@upgrading package: unrar 3.4.1 -> 3.4.2
@
text
@--- rar.hpp.dist	Thu Jun 12 14:16:15 2003
+++ rar.hpp	Thu Jun 12 14:15:31 2003
@@@@ -18,6 +18,7 @@@@
 #include "int64.hpp"
 #include "unicode.hpp"
 #include "errhnd.hpp"
+#include "global.hpp"
 #include "array.hpp"
 #include "timefn.hpp"
 #include "headers.hpp"
@@@@ -74,7 +74,6 @@@@
 #include "smallfn.hpp"
 #include "ulinks.hpp"
 
-#include "global.hpp"
 
 
 #endif
--- rarvm.cpp.orig	2003-05-15 10:37:58.000000000 +0200
+++ rarvm.cpp	2003-07-28 14:36:01.000000000 +0200
@@@@ -376,16 +376,16 @@@@
       case VM_PUSHA:
         {
           const int RegCount=sizeof(R)/sizeof(R[0]);
-          for (int I=0,SP=R[7]-4;I<RegCount;I++,SP-=4)
-            SET_VALUE(false,(uint *)&Mem[SP & VM_MEMMASK],R[I]);
+          for (int I=0,SPTR=R[7]-4;I<RegCount;I++,SPTR-=4)
+            SET_VALUE(false,(uint *)&Mem[SPTR & VM_MEMMASK],R[I]);
           R[7]-=RegCount*4;
         }
         break;
       case VM_POPA:
         {
           const int RegCount=sizeof(R)/sizeof(R[0]);
-          for (uint I=0,SP=R[7];I<RegCount;I++,SP+=4)
-            R[7-I]=GET_VALUE(false,(uint *)&Mem[SP & VM_MEMMASK]);
+          for (uint I=0,SPTR=R[7];I<RegCount;I++,SPTR+=4)
+            R[7-I]=GET_VALUE(false,(uint *)&Mem[SPTR & VM_MEMMASK]);
         }
         break;
       case VM_PUSHF:
@


1.2
log
@Solaris 9/x86 seems to have a #define for SP somewhere in the system includes, so replace SP with SPTR
@
text
@d3 1
a3 1
@@@@ -16,6 +16,7 @@@@
d11 1
a11 1
@@@@ -71,7 +72,6 @@@@
@


1.1
log
@fix header order as C++ standard now allows and gcc33 assumes that templates are compiled before instantiated for a specific type.
@
text
@d19 23
@


1.1.2.1
log
@mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class PLUS only]
@
text
@@


1.1.2.2
log
@MFC: all changes since last merge
@
text
@a18 23
--- rarvm.cpp.orig	2003-05-15 10:37:58.000000000 +0200
+++ rarvm.cpp	2003-07-28 14:36:01.000000000 +0200
@@@@ -376,16 +376,16 @@@@
       case VM_PUSHA:
         {
           const int RegCount=sizeof(R)/sizeof(R[0]);
-          for (int I=0,SP=R[7]-4;I<RegCount;I++,SP-=4)
-            SET_VALUE(false,(uint *)&Mem[SP & VM_MEMMASK],R[I]);
+          for (int I=0,SPTR=R[7]-4;I<RegCount;I++,SPTR-=4)
+            SET_VALUE(false,(uint *)&Mem[SPTR & VM_MEMMASK],R[I]);
           R[7]-=RegCount*4;
         }
         break;
       case VM_POPA:
         {
           const int RegCount=sizeof(R)/sizeof(R[0]);
-          for (uint I=0,SP=R[7];I<RegCount;I++,SP+=4)
-            R[7-I]=GET_VALUE(false,(uint *)&Mem[SP & VM_MEMMASK]);
+          for (uint I=0,SPTR=R[7];I<RegCount;I++,SPTR+=4)
+            R[7-I]=GET_VALUE(false,(uint *)&Mem[SPTR & VM_MEMMASK]);
         }
         break;
       case VM_PUSHF:
@