* fixes bootstrapping with 2.6.0

git-svn-id: trunk@19491 -

compiler/cp1251.pas

@@ -6,7 +6,7 @@ unit cp1251;
   implementation
 
   uses
-     {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4};
+     {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif};
 
   const
      map : array[0..255] of tunicodecharmapping = (

compiler/cp1252.pp

@@ -6,7 +6,7 @@ unit CP1252;
   implementation
 
   uses
-     {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4};
+     {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif};
 
   const
      map : array[0..255] of tunicodecharmapping = (

compiler/cp437.pas

@@ -6,7 +6,7 @@ unit cp437;
   implementation
 
   uses
-     {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4};
+     {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif};
 
   const
      map : array[0..255] of tunicodecharmapping = (

compiler/cp850.pas

@@ -6,7 +6,7 @@ unit cp850;
   implementation
 
   uses
-     {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4};
+     {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif};
 
   const
      map : array[0..255] of tunicodecharmapping = (

compiler/cp866.pas

@@ -6,7 +6,7 @@ unit cp866;
   implementation
 
   uses
-     {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4};
+     {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif};
 
   const
      map : array[0..255] of tunicodecharmapping = (

compiler/cp8859_1.pas

@@ -6,7 +6,7 @@ unit cp8859_1;
   implementation
 
   uses
-     {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4};
+    {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif};
 
   const
      map : array[0..255] of tunicodecharmapping = (

compiler/cp8859_5.pas

@@ -6,7 +6,7 @@ unit cp8859_5;
   implementation
 
   uses
-     {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4};
+     {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif};
 
   const
      map : array[0..255] of tunicodecharmapping = (

compiler/cresstr.pas

@@ -40,7 +40,7 @@ uses
    aasmcpu,
 {$if FPC_FULLVERSION<20700}
    ccharset,
-{$endif }
+{$endif}
    asmutils;
 
     Type

compiler/options.pas

@@ -78,7 +78,7 @@ implementation
 
 uses
   widestr,
-  {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4},
+  {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif},
   SysUtils,
   version,
   cutils,cmsgs,

compiler/scanner.pas

@@ -269,7 +269,7 @@ implementation
       { This is needed for tcputype }
       cpuinfo,
       fmodule
-{$ifdef VER2_4}
+{$if FPC_FULLVERSION<20700}
       ,ccharset
 {$endif}
       ;

compiler/widestr.pas

@@ -28,7 +28,7 @@ unit widestr;
   interface
 
     uses
-       {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4},globtype;
+       {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif},globtype;
 
 
     type