Browse Source

* Char -> AnsiChar

Michael VAN CANNEYT 2 years ago
parent
commit
1d331117b5
4 changed files with 28 additions and 28 deletions
  1. 2 2
      rtl/gba/dos.pp
  2. 19 19
      rtl/gba/libch.inc
  3. 3 3
      rtl/gba/sysfile.inc
  4. 4 4
      rtl/gba/system.pp

+ 2 - 2
rtl/gba/dos.pp

@@ -91,7 +91,7 @@ procedure DeleteExtIO ();
 begin
 begin
 end;
 end;
 
 
-function Createport(name : PChar; pri : longint): integer;
+function Createport(name : PAnsiChar; pri : longint): integer;
 begin
 begin
   result := -1;
   result := -1;
 end;
 end;
@@ -241,7 +241,7 @@ procedure AddDevice(str : String);
 begin
 begin
 end;
 end;
 
 
-function MakeDeviceName(str : pchar): string;
+function MakeDeviceName(str : PAnsiChar): string;
 begin
 begin
   result := '';
   result := '';
 end;
 end;

+ 19 - 19
rtl/gba/libch.inc

@@ -33,17 +33,17 @@ type
 
 
 
 
 (* Some libc functions *)
 (* Some libc functions *)
-//function printf(format: Pchar; args: array of const): longint; cdecl; external;
-function printf(format: Pchar): longint; cdecl; varargs; external;
-//function sprintf(s: Pchar; format: Pchar; args: array of const): longint; cdecl; external;
-function sprintf(s: Pchar; format: Pchar): longint; varargs; cdecl; external;
-//function iprintf(format: Pchar; args: array of const): longint; cdecl; external;
-function iprintf(format: Pchar): longint; varargs; cdecl; external;
-//function scanf(format: Pchar; args: array of const): longint; cdecl; external;
-function scanf(format: Pchar): longint; cdecl; varargs; external;
-//function sscanf(s: Pchar; format: Pchar; args: array of const): longint; cdecl; external;
-function sscanf(s: Pchar; format: Pchar): longint; cdecl; varargs; external;
-function strcmp(s1: Pchar; s2: Pchar): longint; cdecl; external;
+//function printf(format: PAnsiChar; args: array of const): longint; cdecl; external;
+function printf(format: PAnsiChar): longint; cdecl; varargs; external;
+//function sprintf(s: PAnsiChar; format: PAnsiChar; args: array of const): longint; cdecl; external;
+function sprintf(s: PAnsiChar; format: PAnsiChar): longint; varargs; cdecl; external;
+//function iprintf(format: PAnsiChar; args: array of const): longint; cdecl; external;
+function iprintf(format: PAnsiChar): longint; varargs; cdecl; external;
+//function scanf(format: PAnsiChar; args: array of const): longint; cdecl; external;
+function scanf(format: PAnsiChar): longint; cdecl; varargs; external;
+//function sscanf(s: PAnsiChar; format: PAnsiChar; args: array of const): longint; cdecl; external;
+function sscanf(s: PAnsiChar; format: PAnsiChar): longint; cdecl; varargs; external;
+function strcmp(s1: PAnsiChar; s2: PAnsiChar): longint; cdecl; external;
 
 
 function malloc(size: integer): pointer; cdecl; external;
 function malloc(size: integer): pointer; cdecl; external;
 function realloc(ptr: pointer; size: integer): pointer; cdecl; external;
 function realloc(ptr: pointer; size: integer): pointer; cdecl; external;
@@ -149,7 +149,7 @@ function S_ISSOCK(m: longint): boolean; inline;
 type
 type
   dirent = record
   dirent = record
     d_ino: longint;
     d_ino: longint;
-    d_name: array [0..NAME_MAX] of char;
+    d_name: array [0..NAME_MAX] of AnsiChar;
   end;
   end;
   PDirent = ^dirent;
   PDirent = ^dirent;
   PPDirent = ^PDirent;
   PPDirent = ^PDirent;
@@ -163,7 +163,7 @@ type
 
 
 (* DIR handling *)
 (* DIR handling *)
 function closedir(dirp: PDIR): longint; cdecl; external;
 function closedir(dirp: PDIR): longint; cdecl; external;
-function opendir(const dirname: pchar): PDIR; cdecl; external;
+function opendir(const dirname: PAnsiChar): PDIR; cdecl; external;
 function readdir(dirp: PDIR): PDirent; cdecl; external;
 function readdir(dirp: PDIR): PDirent; cdecl; external;
 function readdir_r(dirp: PDIR; entry: PDirent; result: PPDirent): longint; cdecl; external;
 function readdir_r(dirp: PDIR; entry: PDirent; result: PPDirent): longint; cdecl; external;
 procedure rewinddir(dirp: PDIR); cdecl; external;
 procedure rewinddir(dirp: PDIR); cdecl; external;
@@ -171,13 +171,13 @@ procedure seekdir(dirp: PDIR; loc: longint); cdecl; external;
 function telldir(dirp: PDIR): longint; cdecl; external;
 function telldir(dirp: PDIR): longint; cdecl; external;
 
 
 
 
-function diropen(const path: pchar): PDIR_ITER; cdecl; external;
+function diropen(const path: PAnsiChar): PDIR_ITER; cdecl; external;
 function dirreset(dirState: PDIR_ITER): longint; cdecl; external;
 function dirreset(dirState: PDIR_ITER): longint; cdecl; external;
-function dirnext(dirState: PDIR_ITER; filename: pchar; filestat: Pstat): longint; cdecl; external;
+function dirnext(dirState: PDIR_ITER; filename: PAnsiChar; filestat: Pstat): longint; cdecl; external;
 function dirclose(dirState: PDIR_ITER): longint; cdecl; external;
 function dirclose(dirState: PDIR_ITER): longint; cdecl; external;
 
 
 (* File handling *)
 (* File handling *)
-function fopen(filename: Pchar; modes: Pchar): P_FILE; cdecl; external;
+function fopen(filename: PAnsiChar; modes: PAnsiChar): P_FILE; cdecl; external;
 function fread(ptr: pointer; size: longint; n: longint; stream: P_FILE): longint; cdecl; external;
 function fread(ptr: pointer; size: longint; n: longint; stream: P_FILE): longint; cdecl; external;
 function fread(var ptr; size: longint; n: longint; var stream: _FILE): longint; cdecl; external;
 function fread(var ptr; size: longint; n: longint; var stream: _FILE): longint; cdecl; external;
 function fwrite(ptr: pointer; size: longint; n: longint; s: P_FILE): longint; cdecl; external;
 function fwrite(ptr: pointer; size: longint; n: longint; s: P_FILE): longint; cdecl; external;
@@ -193,7 +193,7 @@ function fileno(para1: P_FILE): longint; cdecl; external;
 function fileno(var para1: _FILE): longint; cdecl; external;
 function fileno(var para1: _FILE): longint; cdecl; external;
 function fstat(fildes: longint; buf: PStat): longint; cdecl; external;
 function fstat(fildes: longint; buf: PStat): longint; cdecl; external;
 function fstat(fildes: longint; var buf: TStat): longint; cdecl; external;
 function fstat(fildes: longint; var buf: TStat): longint; cdecl; external;
-function _stat(__file:Pchar; var __buf:Tstat):longint; cdecl; external name 'stat';
+function _stat(__file:PAnsiChar; var __buf:Tstat):longint; cdecl; external name 'stat';
 function ftruncate(fildes: longint; len: longint): longint; cdecl; external;
 function ftruncate(fildes: longint; len: longint): longint; cdecl; external;
-function unlink(path: Pchar): longint; cdecl; external;
-function rename(para1: Pchar; para2: Pchar): longint; cdecl; external;
+function unlink(path: PAnsiChar): longint; cdecl; external;
+function rename(para1: PAnsiChar; para2: PAnsiChar): longint; cdecl; external;

+ 3 - 3
rtl/gba/sysfile.inc

@@ -27,11 +27,11 @@ begin
 
 
 end;
 end;
 
 
-procedure do_erase(p : pchar; pchangeable: boolean);
+procedure do_erase(p : PAnsiChar; pchangeable: boolean);
 begin
 begin
 end;
 end;
 
 
-procedure do_rename(p1,p2 : pchar; p1changeable, p2changeable: boolean);
+procedure do_rename(p1,p2 : PAnsiChar; p1changeable, p2changeable: boolean);
 begin
 begin
 end;
 end;
 
 
@@ -69,7 +69,7 @@ procedure do_truncate(handle, pos: longint);
 begin
 begin
 end;
 end;
 
 
-procedure do_open(var f;p:pchar;flags:longint; pchangeable: boolean);
+procedure do_open(var f;p:PAnsiChar;flags:longint; pchangeable: boolean);
 begin
 begin
 end;
 end;
 
 

+ 4 - 4
rtl/gba/system.pp

@@ -40,8 +40,8 @@ const
  DriveSeparator = ':';
  DriveSeparator = ':';
  ExtensionSeparator = '.';
  ExtensionSeparator = '.';
  PathSeparator = ';';
  PathSeparator = ';';
- AllowDirectorySeparators : set of char = ['\','/'];
- AllowDriveSeparators : set of char = [':'];
+ AllowDirectorySeparators : set of AnsiChar = ['\','/'];
+ AllowDriveSeparators : set of AnsiChar = [':'];
  FileNameCaseSensitive = false;
  FileNameCaseSensitive = false;
  FileNameCasePreserving = true;
  FileNameCasePreserving = true;
  maxExitCode = 255;
  maxExitCode = 255;
@@ -58,8 +58,8 @@ const
 
 
 var
 var
   argc: LongInt = 0;
   argc: LongInt = 0;
-  argv: PPChar;
-  envp: PPChar;
+  argv: PPAnsiChar;
+  envp: PPAnsiChar;
   fake_heap_end: ^byte; cvar; external;
   fake_heap_end: ^byte; cvar; external;