Merged revisions 8042-8044,8046,8048,8051,8060,8069 via svnmerge from

svn+ssh://svn.freepascal.org/FPC/svn/fpc/trunk

........
  r8042 | vincents | 2007-07-13 23:37:20 +0200 (Fri, 13 Jul 2007) | 1 line
  
  * fixed test for win64; it doesn't have 80 bit floating point, even if it runs on a x86_64 processor
........
  r8043 | vincents | 2007-07-14 08:37:46 +0200 (Sat, 14 Jul 2007) | 1 line
  
  * fixed test
........
  r8069 | vincents | 2007-07-15 22:37:41 +0200 (Sun, 15 Jul 2007) | 1 line
  
  * fixed test for win64
........

git-svn-id: branches/fixes_2_2@8075 -

tests/test/tlibrary2.pp

@@ -15,7 +15,7 @@
 {$ifdef supported}
 
 const
-{$ifdef win32}
+{$ifdef windows}
   libname='tlibrary1.dll';
 {$else}
   libname='tlibrary1';

tests/webtbs/tw2129.pp

@@ -36,14 +36,14 @@ begin
   comp1:=swap(comp1);
 {$endif FPC_DOUBLE_HILO_SWAPPED}
   str(comp1,s);
-{$if defined(cpui386) or defined(cpux86_64)}
+{$ifdef FPC_HAS_TYPE_EXTENDED}
   if s<>'-6.53142228756617E+0018' then
-{$else cpui386}
+{$else FPC_HAS_TYPE_EXTENDED}
   { this constant has been verified and is correct (FK) }
   { doubles have slightly different precision on processors <> x86, because }
   { intermediate calculations are not performed in 80 bit there (JM)        }
   if Copy(s,1,Length(s)-1)<>'-653142228756617021' then
-{$endif cpui386}
+{$endif FPC_HAS_TYPE_EXTENDED}
     begin
       writeln(s);
       writeln('error');