瀏覽代碼

* Char -> AnsiChar

Michael VAN CANNEYT 2 年之前
父節點
當前提交
a3dda25878
共有 3 個文件被更改,包括 14 次插入14 次删除
  1. 9 9
      rtl/android/cwstring.pp
  2. 3 3
      rtl/android/sysandroid.inc
  3. 2 2
      rtl/android/unixandroid.inc

+ 9 - 9
rtl/android/cwstring.pp

@@ -176,7 +176,7 @@ begin
   SetCodePage(dest, cp, False);
 end;
 
-procedure Ansi2UnicodeMove(source:pchar;cp : TSystemCodePage;var dest:unicodestring;len:SizeInt);
+procedure Ansi2UnicodeMove(source:PAnsiChar;cp : TSystemCodePage;var dest:unicodestring;len:SizeInt);
 var
   len2: SizeInt;
   conv: PUConverter;
@@ -317,7 +317,7 @@ begin
   Result:=CompareUnicodeString(UnicodeString(s1), UnicodeString(s2), []);
 end;
 
-function StrCompAnsi(s1,s2 : PChar): PtrInt;
+function StrCompAnsi(s1,s2 : PAnsiChar): PtrInt;
 begin
   Result:=CompareUnicodeString(UnicodeString(s1), UnicodeString(s2), []);
 end;
@@ -327,12 +327,12 @@ begin
   Result:=CompareUnicodeString(UnicodeString(s1), UnicodeString(s2), [coIgnoreCase]);
 end;
 
-function AnsiStrIComp(S1, S2: PChar): PtrInt;
+function AnsiStrIComp(S1, S2: PAnsiChar): PtrInt;
 begin
   Result:=CompareUnicodeString(UnicodeString(s1), UnicodeString(s2), [coIgnoreCase]);
 end;
 
-function AnsiStrLComp(S1, S2: PChar; MaxLen: PtrUInt): PtrInt;
+function AnsiStrLComp(S1, S2: PAnsiChar; MaxLen: PtrUInt): PtrInt;
 var
   as1, as2: ansistring;
 begin
@@ -341,7 +341,7 @@ begin
   Result:=CompareUnicodeString(UnicodeString(as1), UnicodeString(as2), []);
 end;
 
-function AnsiStrLIComp(S1, S2: PChar; MaxLen: PtrUInt): PtrInt;
+function AnsiStrLIComp(S1, S2: PAnsiChar; MaxLen: PtrUInt): PtrInt;
 var
   as1, as2: ansistring;
 begin
@@ -350,7 +350,7 @@ begin
   Result:=CompareUnicodeString(UnicodeString(as1), UnicodeString(as2), [coIgnoreCase]);
 end;
 
-function AnsiStrLower(Str: PChar): PChar;
+function AnsiStrLower(Str: PAnsiChar): PAnsiChar;
 var
   s, res: ansistring;
 begin
@@ -362,7 +362,7 @@ begin
   Result:=Str;
 end;
 
-function AnsiStrUpper(Str: PChar): PChar;
+function AnsiStrUpper(Str: PAnsiChar): PAnsiChar;
 var
   s, res: ansistring;
 begin
@@ -374,7 +374,7 @@ begin
   Result:=Str;
 end;
 
-function CodePointLength(const Str: PChar; MaxLookAead: PtrInt): Ptrint;
+function CodePointLength(const Str: PAnsiChar; MaxLookAead: PtrInt): Ptrint;
 var
   c: byte;
 begin
@@ -420,7 +420,7 @@ begin
   SetStdIOCodePage(StdErr);
 end;
 
-procedure Ansi2WideMove(source:pchar; cp:TSystemCodePage; var dest:widestring; len:SizeInt);
+procedure Ansi2WideMove(source:PAnsiChar; cp:TSystemCodePage; var dest:widestring; len:SizeInt);
 var
   us: UnicodeString;
 begin

+ 3 - 3
rtl/android/sysandroid.inc

@@ -166,7 +166,7 @@ end;
 
 // ************* Misc functions
 
-function __system_property_get(name:Pchar; value:Pchar):longint;cdecl;external 'c' name '__system_property_get';
+function __system_property_get(name:PAnsiChar; value:PAnsiChar):longint;cdecl;external 'c' name '__system_property_get';
 
 function GetSystemProperty(Name: PAnsiChar): shortstring;
 begin
@@ -196,7 +196,7 @@ end;
 var
   DefaultLogTag: string[20];
 
-function __android_log_write(prio: longint; tag, text: pchar): longint; cdecl; external 'log' name '__android_log_write';
+function __android_log_write(prio: longint; tag, text: PAnsiChar): longint; cdecl; external 'log' name '__android_log_write';
 
 procedure SysLogWrite(Priority: longint; Tag, Msg: PAnsiChar);
 begin
@@ -218,7 +218,7 @@ end;
 const
   IOBufferLength = 512;
 threadvar
-  IOBuf : array[0..IOBufferLength] of char;
+  IOBuf : array[0..IOBufferLength] of AnsiChar;
   IOLen : SizeInt;
 var
   IORedirected: boolean;

+ 2 - 2
rtl/android/unixandroid.inc

@@ -109,8 +109,8 @@ type
         tm_yday : longint;
         tm_isdst : longint;
         case boolean of
-          false : (tm_gmtoff : longint;tm_zone : Pchar);
-          true  : (__tm_gmtoff : longint;__tm_zone : Pchar);
+          false : (tm_gmtoff : longint;tm_zone : PAnsiChar);
+          true  : (__tm_gmtoff : longint;__tm_zone : PAnsiChar);
 	 end;
 
 function localtime(t: Ptime_t): Ptm; cdecl; external 'c' name 'localtime';