浏览代码

- removed FPC_REAL2REAL_FIXED-related checks, FPC 2.6.4 has it

git-svn-id: trunk@31693 -
Jonas Maebe 10 年之前
父节点
当前提交
9ab80874cc
共有 2 个文件被更改,包括 0 次插入3 次删除
  1. 0 1
      compiler/options.pas
  2. 0 2
      compiler/pexpr.pas

+ 0 - 1
compiler/options.pas

@@ -3248,7 +3248,6 @@ begin
   def_system_macro('VER'+version_nr+'_'+release_nr+'_'+patch_nr);
   def_system_macro('VER'+version_nr+'_'+release_nr+'_'+patch_nr);
 
 
 { Temporary defines, until things settle down }
 { Temporary defines, until things settle down }
-  def_system_macro('FPC_REAL2REAL_FIXED');
   def_system_macro('FPC_STRTOCHARARRAYPROC');
   def_system_macro('FPC_STRTOCHARARRAYPROC');
   def_system_macro('FPC_STRTOSHORTSTRINGPROC');
   def_system_macro('FPC_STRTOSHORTSTRINGPROC');
   def_system_macro('FPC_OBJFPC_EXTENDED_IF');
   def_system_macro('FPC_OBJFPC_EXTENDED_IF');

+ 0 - 2
compiler/pexpr.pas

@@ -1583,7 +1583,6 @@ implementation
            Message(parser_e_error_in_real);
            Message(parser_e_error_in_real);
            d:=1.0;
            d:=1.0;
          end;
          end;
-{$ifdef FPC_REAL2REAL_FIXED}
         if current_settings.fputype=fpu_none then
         if current_settings.fputype=fpu_none then
           Message(parser_e_unsupported_real);
           Message(parser_e_unsupported_real);
         if (current_settings.minfpconstprec=s32real) and
         if (current_settings.minfpconstprec=s32real) and
@@ -1593,7 +1592,6 @@ implementation
                 (d = double(d)) then
                 (d = double(d)) then
           result:=crealconstnode.create(d,s64floattype)
           result:=crealconstnode.create(d,s64floattype)
         else
         else
-{$endif FPC_REAL2REAL_FIXED}
           result:=crealconstnode.create(d,pbestrealtype^);
           result:=crealconstnode.create(d,pbestrealtype^);
         val(pattern,cur,code);
         val(pattern,cur,code);
         if code=0 then
         if code=0 then