소스 검색

Fix wince rtl compilation (fix for bug report 32859)

git-svn-id: trunk@37778 -
pierre 7 년 전
부모
커밋
ec45d8617c
4개의 변경된 파일7개의 추가작업 그리고 9개의 파일을 삭제
  1. 0 2
      rtl/objpas/sysutils/dati.inc
  2. 2 2
      rtl/objpas/sysutils/datih.inc
  3. 2 2
      rtl/objpas/sysutils/sysutilh.inc
  4. 3 3
      rtl/objpas/sysutils/sysutils.inc

+ 0 - 2
rtl/objpas/sysutils/dati.inc

@@ -915,9 +915,7 @@ var
   isEnable_E_Format : Boolean;
   isEnable_G_Format : Boolean;
   eastasiainited : boolean;
-{$endif win32 or win64}
 
-{$if defined(win32) or defined(win64)}
   procedure InitEastAsia;
   var     ALCID : LCID;
          PriLangID , SubLangID : Word;

+ 2 - 2
rtl/objpas/sysutils/datih.inc

@@ -90,10 +90,10 @@ var
 
 type
 { windows isn't defined in 2.0.2 (FK) }
-{$if defined(win32) or defined(win64)}
+{$if defined(win32) or defined(win64) or defined (wince)}
    { Win32/Win64 reuses the struct from the Windows unit }
 {$DEFINE HAS_SYSTEMTIME}
-{$endif windows}
+{$endif win32 or win64 or wince }
 
 {$IFNDEF HAS_SYSTEMTIME}
    TSystemTime = record

+ 2 - 2
rtl/objpas/sysutils/sysutilh.inc

@@ -129,7 +129,7 @@ type
    ExceptClass = class of Exception;
 
    EExternal = class(Exception)
-{$if defined(win32) or defined(win64)}
+{$if defined(win32) or defined(win64) or defined(wince)}
    { OS-provided exception record is stored on stack and has very limited lifetime.
      Therefore store a complete copy. }
    private
@@ -137,7 +137,7 @@ type
      function GetExceptionRecord: PExceptionRecord;
    public
      property ExceptionRecord : PExceptionRecord read GetExceptionRecord;
-{$endif win32 or win64}
+{$endif win32 or win64 or wince}
    end;
 
    { integer math exceptions }

+ 3 - 3
rtl/objpas/sysutils/sysutils.inc

@@ -288,13 +288,13 @@ end;
        ErrCode:=Code;
     end;
 
-{$if defined(win32) or defined(win64)}
+{$if defined(win32) or defined(win64) or defined (wince)}
 function EExternal.GetExceptionRecord: PExceptionRecord;
 begin
   result:=@FExceptionRecord;
 end;
 
-{$endif win32 or win64}
+{$endif win32 or win64 or wince}
 
 {$push}
 {$S-}
@@ -726,7 +726,7 @@ begin
 end;
 {$endif}
 
-{$if defined(win32) or defined(win64)}
+{$if defined(win32) or defined(win64) or defined(wince)}
 function GetModuleName(Module: HMODULE): string;
 var
   ResultLength, BufferLength: DWORD;