ソースを参照

* fixed warnings and notes while compiling system unit for wince.

git-svn-id: trunk@4250 -
yury 19 年 前
コミット
11576fd24b

+ 8 - 8
rtl/arm/math.inc

@@ -36,7 +36,7 @@
       runerror(207);
       result:=0;
     end;
-    { atn isn't supported by the linux fpe it seems
+    (* atn isn't supported by the linux fpe it seems
     {$define FPC_SYSTEM_HAS_ARCTAN}
     function fpc_arctan_real(d : extended) : extended;compilerproc;
     begin
@@ -44,8 +44,8 @@
       runerror(207);
       result:=0;
     end;
-    }
-    { lgn isn't supported by the linux fpe it seems
+    *)
+    (* lgn isn't supported by the linux fpe it seems
     {$define FPC_SYSTEM_HAS_LN}
     function fpc_ln_real(d : extended) : extended;compilerproc;
     begin
@@ -53,8 +53,8 @@
       runerror(207);
       result:=0;
     end;
-    }
-    { sind isn't supported by the linux fpe it seems
+    *)
+    (* sind isn't supported by the linux fpe it seems
     {$define FPC_SYSTEM_HAS_SIN}
     function fpc_sin_real(d : extended) : extended;compilerproc;
     begin
@@ -62,8 +62,8 @@
       runerror(207);
       result:=0;
     end;
-    }
-    { cos isn't supported by the linux fpe it seems
+    *)
+    (* cos isn't supported by the linux fpe it seems
     {$define FPC_SYSTEM_HAS_COS}
     function fpc_cos_real(d : extended) : extended;compilerproc;
     begin
@@ -71,5 +71,5 @@
       runerror(207);
       result:=0;
     end;
-    }
+    *)
 {$endif WINCE}

+ 0 - 1
rtl/arm/setjump.inc

@@ -15,7 +15,6 @@
  **********************************************************************}
 
 function setjmp(var S : jmp_buf) : longint;assembler;[Public, alias : 'FPC_SETJMP'];nostackframe;
-  label FPC_SETJMP;
   asm
     stmia   r0,{v1-v6, sl, fp, sp, lr}
     mov     r0,#0

+ 1 - 1
rtl/inc/dynarr.inc

@@ -344,7 +344,7 @@ procedure DynArraySetLength(var a: Pointer; typeInfo: Pointer; dimCnt: SizeInt;
     i : SizeInt;
     p : PSizeInt;
   begin
-    if dimCnt<=length(preallocated) then
+    if dimCnt<=high(preallocated)+1 then
       p:=@preallocated
     else
       getmem(p,sizeof(SizeInt)*dimCnt);

+ 1 - 1
rtl/inc/generic.inc

@@ -554,7 +554,7 @@ end;
 procedure fpc_shortstr_append_shortstr(var s1:shortstring;const s2:shortstring);compilerproc;
     [public,alias:'FPC_SHORTSTR_APPEND_SHORTSTR'];
 var
-  s1l, s2l : byte;
+  s1l, s2l : integer;
 begin
   s1l:=length(s1);
   s2l:=length(s2);

+ 2 - 2
rtl/inc/rtti.inc

@@ -221,7 +221,7 @@ begin
 end;
 
 
-{
+(*
 Procedure fpc_Copy (Src, Dest, TypeInfo : Pointer);[Public,alias : 'FPC_COPY'];  compilerproc;
 var
   Temp : pbyte;
@@ -290,7 +290,7 @@ begin
       VarCopyProc(pvardata(dest)^,pvardata(src)^);
   end;
 end;
-}
+*)
 
 
 procedure fpc_finalize_array(data,typeinfo : pointer;count,size : longint); [Public,Alias:'FPC_FINALIZEARRAY'];  compilerproc;

+ 2 - 1
rtl/inc/wstrings.inc

@@ -1383,7 +1383,7 @@ procedure unimplementedwidestring;
     HandleErrorFrame(215,get_frame);
   end;
 
-
+{$warnings off}
 function GenericWideCase(const s : WideString) : WideString;
   begin
     unimplementedwidestring;
@@ -1406,6 +1406,7 @@ function CharLengthPChar(const Str: PChar): PtrInt;
   begin
     unimplementedwidestring;
   end;
+{$warnings on}
 
 procedure initwidestringmanager;
   begin

+ 1 - 1
rtl/win/sysdir.inc

@@ -77,10 +77,10 @@ procedure GetDir (DriveNr: byte; var Dir: ShortString);
 {$ifndef WINCE}
 const
   Drive:array[0..3]of char=(#0,':',#0,#0);
-{$endif WINCE}
 var
   defaultdrive:boolean;
   DirBuf,SaveBuf:array[0..259] of Char;
+{$endif WINCE}
 begin
 {$ifndef WINCE}
   defaultdrive:=drivenr=0;

+ 1 - 1
rtl/win/systhrd.inc

@@ -411,7 +411,7 @@ end;
 
 procedure intRTLEventWaitFor(AEvent: PRTLEvent);
 const
-  INFINITE=-1;
+  INFINITE=dword(-1);
 begin
   WaitForSingleObject(THANDLE(AEvent), INFINITE);
 end;

+ 3 - 2
rtl/wince/system.pp

@@ -22,6 +22,7 @@ interface
 {$endif SYSTEMDEBUG}
 
 {$define WINCE_EXCEPTION_HANDLING}
+{$define DISABLE_NO_THREAD_MANAGER}
 
 { include system-independent routine headers }
 {$I systemh.inc}
@@ -796,10 +797,12 @@ begin
   ExitThread(exitcode);
 end;
 
+{$ifdef cpu386}
 var
   { value of the stack segment
     to check if the call stack can be written on exceptions }
   _SS : Cardinal;
+{$endif cpu386}
 
 Const
   { DllEntryPoint  }
@@ -807,8 +810,6 @@ Const
      DLL_THREAD_ATTACH = 2;
      DLL_PROCESS_DETACH = 0;
      DLL_THREAD_DETACH = 3;
-Var
-     DLLBuf : Jmp_buf;
 Const
      DLLExitOK : boolean = true;