Browse Source

Merged revisions 9041 via svnmerge from
svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r9041 | yury | 2007-11-01 15:16:43 +0100 (Thu, 01 Nov 2007) | 1 line

* Fixed warnings and notes.
........

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

Jonas Maebe 18 years ago
parent
commit
66ce03948a
3 changed files with 6 additions and 4 deletions
  1. 3 1
      rtl/arm/arm.inc
  2. 1 1
      rtl/inc/wstrings.inc
  3. 2 2
      rtl/wince/system.pp

+ 3 - 1
rtl/arm/arm.inc

@@ -17,9 +17,11 @@
 
 {$asmmode gas}
 
+{$ifdef FPC_SYSTEM_FPC_MOVE}
 const
   cpu_has_edsp : boolean = false;
   in_edsp_test : boolean = false;
+{$endif FPC_SYSTEM_FPC_MOVE}
 
 procedure fpc_cpuinit;
 begin
@@ -407,13 +409,13 @@ end;
 
 procedure fpc_cpucodeinit;
 begin
+{$ifdef FPC_SYSTEM_FPC_MOVE}
   cpu_has_edsp:=true;
   in_edsp_test:=true;
   asm
     pld [r0]
   end;
   in_edsp_test:=false;
-{$ifdef FPC_SYSTEM_FPC_MOVE}
   if cpu_has_edsp then
     moveproc:=@move_pld
   else

+ 1 - 1
rtl/inc/wstrings.inc

@@ -1091,7 +1091,7 @@ begin
               then
         begin
           Dec(Pointer(S),WideFirstOff);
-          if L*sizeof(WideChar)+WideRecLen>MemSize(Pointer(S)) then
+          if SizeUInt(L*sizeof(WideChar)+WideRecLen)>MemSize(Pointer(S)) then
               reallocmem(pointer(S), L*sizeof(WideChar)+WideRecLen);
           Inc(Pointer(S), WideFirstOff);
         end

+ 2 - 2
rtl/wince/system.pp

@@ -871,7 +871,7 @@ begin
      DLL_THREAD_ATTACH :
        begin
          inclocked(Thread_count);
-{$warning Allocate Threadvars !}
+{$note Allocate Threadvars !}
          if assigned(Dll_Thread_Attach_Hook) then
            Dll_Thread_Attach_Hook(DllParam);
        end;
@@ -880,7 +880,7 @@ begin
          declocked(Thread_count);
          if assigned(Dll_Thread_Detach_Hook) then
            Dll_Thread_Detach_Hook(DllParam);
-{$warning Release Threadvars !}
+{$note Release Threadvars !}
        end;
      DLL_PROCESS_DETACH :
        begin