Browse Source

* Char -> AnsiChar

Michael VAN CANNEYT 2 years ago
parent
commit
fc32211dd2

+ 13 - 13
rtl/netware/aio.pp

@@ -170,10 +170,10 @@ type
         notSupportedMask   : LONGINT;
         minBitRate         : BYTE;
         maxBitRate         : BYTE;       { minimum bit rate index supported }
-        minDataBits        : BYTE;       { minimum data bits per char index supported }
-        maxDataBits        : BYTE;       { maximum data bits per char index supported }
-        minStopBits        : BYTE;       { minimum stop bits per char index supported }
-        maxStopBits        : BYTE;       { maximum stop bits per char index supported }
+        minDataBits        : BYTE;       { minimum data bits per AnsiChar index supported }
+        maxDataBits        : BYTE;       { maximum data bits per AnsiChar index supported }
+        minStopBits        : BYTE;       { minimum stop bits per AnsiChar index supported }
+        maxStopBits        : BYTE;       { maximum stop bits per AnsiChar index supported }
         minParityMode      : BYTE;       { minimum parity mode index supported }
         maxParityMode      : BYTE;       { maximum parity mode index supported }
         minFlowCtrlMode    : BYTE;       { minimum flow control mode index supported }
@@ -280,7 +280,7 @@ type
         portNumber       : longint;        { "     " }
         bitRate          : BYTE;           { Bits per second index }
         dataBits         : BYTE;           { Bits per character index }
-        stopBits         : BYTE;           { Stop bits per char index }
+        stopBits         : BYTE;           { Stop bits per AnsiChar index }
         parityMode       : BYTE;           { Generated parity index }
         flowCtrlMode     : BYTE;           { Flow control mode }
         breakMode        : BYTE;           { Break control mode }
@@ -375,7 +375,7 @@ type
    TAIODRIVERLISTENTRY = record
         hardwareType : longint;
         ports : longint;
-        name  : array[0..127] of char;
+        name  : array[0..127] of AnsiChar;
      end;
 
    PAIODRIVERLIST = ^TAIODRIVERLIST;
@@ -396,7 +396,7 @@ type
    TAIOBOARDLISTENTRY = record
         boardNumber : longint;
         ports       : longint;
-        name        : array[0..127] of char;
+        name        : array[0..127] of AnsiChar;
      end;
 
    PAIOBOARDLIST = ^TAIOBOARDLIST;
@@ -453,11 +453,11 @@ function AIOGetExternalStatus(portHandle:longint; extStatus:PLongint; chgdExtSta
 function AIOGetExternalStatus(portHandle:longint; var extStatus,chgdExtStatus:Longint):longint;cdecl;external aionlm name 'AIOGetExternalStatus';
 
 function AIOGetFirstPortInfo(hardwareType:longint; boardNumber:longint; portNumber:longint; portSearchP:PAIOPORTSEARCH; portInfoP:PAIOPORTINFO;
-           capabilitiesP:PAIOPORTCAPABILITIES; dvrCapabilitiesP:PAIODVRCAPABILITIES; NLMModuleNameP:Pchar):longint;cdecl;external aionlm name 'AIOGetFirstPortInfo';
-function AIOGetNextPortInfo(portSearchP:PAIOPORTSEARCH; portInfoP:PAIOPORTINFO; capabilitiesP:PAIOPORTCAPABILITIES; dvrCapabilitiesP:PAIODVRCAPABILITIES; NLMModuleNameP:Pchar):longint;cdecl;external aionlm name 'AIOGetNextPortInfo';
+           capabilitiesP:PAIOPORTCAPABILITIES; dvrCapabilitiesP:PAIODVRCAPABILITIES; NLMModuleNameP:PAnsiChar):longint;cdecl;external aionlm name 'AIOGetFirstPortInfo';
+function AIOGetNextPortInfo(portSearchP:PAIOPORTSEARCH; portInfoP:PAIOPORTINFO; capabilitiesP:PAIOPORTCAPABILITIES; dvrCapabilitiesP:PAIODVRCAPABILITIES; NLMModuleNameP:PAnsiChar):longint;cdecl;external aionlm name 'AIOGetNextPortInfo';
 function AIOGetName_FirstPortInfo(hardwareType:longint; boardNumber:longint; portNumber:longint; portSearchP:PAIOPORTSEARCH; portInfoP:PAIOPORTINFO;
-           capabilitiesP:PAIOPORTCAPABILITIES; dvrCapabilitiesP:PAIODVRCAPABILITIES; NLMModuleNameP:Pchar):longint;cdecl;external aionlm name 'AIOGetName_FirstPortInfo';
-function AIOGetName_NextPortInfo(portSearchP:PAIOPORTSEARCH; portInfoP:PAIOPORTINFO; capabilitiesP:PAIOPORTCAPABILITIES; dvrCapabilitiesP:PAIODVRCAPABILITIES; NLMModuleNameP:Pchar):longint;cdecl;external aionlm name 'AIOGetName_NextPortInfo';
+           capabilitiesP:PAIOPORTCAPABILITIES; dvrCapabilitiesP:PAIODVRCAPABILITIES; NLMModuleNameP:PAnsiChar):longint;cdecl;external aionlm name 'AIOGetName_FirstPortInfo';
+function AIOGetName_NextPortInfo(portSearchP:PAIOPORTSEARCH; portInfoP:PAIOPORTINFO; capabilitiesP:PAIOPORTCAPABILITIES; dvrCapabilitiesP:PAIODVRCAPABILITIES; NLMModuleNameP:PAnsiChar):longint;cdecl;external aionlm name 'AIOGetName_NextPortInfo';
 function AIOGetPortCapability(portHandle:longint; pCapabilities:PAIOPORTCAPABILITIES; pDvrCapabilities:PAIODVRCAPABILITIES):longint;cdecl;external aionlm name 'AIOGetPortCapability';
 function AIOGetPortConfiguration(portHandle:longint; pPortConfig:PAIOPORTCONFIG; pDvrConfig:PAIODVRCONFIG):longint;cdecl;external aionlm name 'AIOGetPortConfiguration';
 function AIOGetPortStatus(portHandle:longint; writeCount:PLongint; writeState:PWORD; readCount:PLongint; readState:PWORD;
@@ -474,7 +474,7 @@ function AIOGetPortStatistics(portHandle:longint; var pPortStatistics:TAIOPORTST
 function AIOGetWriteBufferSize(portHandle:longint; writeSize:PLongint):longint;cdecl;external aionlm name 'AIOGetWriteBufferSize';
 function AIOGetWriteBufferSize(portHandle:longint; var writeSize:Longint):longint;cdecl;external aionlm name 'AIOGetWriteBufferSize';
 
-function AIOReadData(portHandle:longint; buffer:Pchar; length:longint; numberBytesRead:PLongint):longint;cdecl;external aionlm name 'AIOReadData';
+function AIOReadData(portHandle:longint; buffer:PAnsiChar; length:longint; numberBytesRead:PLongint):longint;cdecl;external aionlm name 'AIOReadData';
 function AIOReadData(portHandle:longint; var buffer; length:longint; var numberBytesRead:Longint):longint;cdecl;external aionlm name 'AIOReadData';
 
 function AIOReadStatus(portHandle:longint; count:PLongint; state:PWORD):longint;cdecl;external aionlm name 'AIOReadStatus';
@@ -490,7 +490,7 @@ function AIOSetFlowControlCharacters(portHandle:longint; transmitXon:byte; trans
 function AIOSetReadBufferSize(portHandle:longint; bufferSize:longint):longint;cdecl;external aionlm name 'AIOSetReadBufferSize';
 function AIOSetWriteBufferSize(portHandle:longint; bufferSize:longint):longint;cdecl;external aionlm name 'AIOSetWriteBufferSize';
 
-function AIOWriteData(portHandle:longint; buffer:Pchar; length:longint; numberBytesWritten:PLongint):longint;cdecl;external aionlm name 'AIOWriteData';
+function AIOWriteData(portHandle:longint; buffer:PAnsiChar; length:longint; numberBytesWritten:PLongint):longint;cdecl;external aionlm name 'AIOWriteData';
 function AIOWriteData(portHandle:longint; var buffer; length:longint; var numberBytesWritten:Longint):longint;cdecl;external aionlm name 'AIOWriteData';
 
 function AIOWriteStatus(portHandle:longint; count:PLongint; state:PWORD):longint;cdecl;external aionlm name 'AIOWriteStatus';

+ 6 - 6
rtl/netware/dos.pp

@@ -117,7 +117,7 @@ const maxargs=256;
 procedure exec(const path : pathstr;const comline : comstr);
 var c : comstr;
     i : integer;
-    args : array[0..maxargs] of pchar;
+    args : array[0..maxargs] of PAnsiChar;
     arg0 : pathstr;
     numargs : integer;
 begin
@@ -200,7 +200,7 @@ end;
 
 
 function diskfree(drive : byte) : int64;
-VAR Buf                 : ARRAY [0..255] OF CHAR;
+VAR Buf                 : ARRAY [0..255] OF AnsiChar;
     TotalBlocks         : WORD;
     SectorsPerBlock     : WORD;
     availableBlocks     : WORD;
@@ -230,7 +230,7 @@ end;
 
 
 function disksize(drive : byte) : int64;
-VAR Buf                 : ARRAY [0..255] OF CHAR;
+VAR Buf                 : ARRAY [0..255] OF AnsiChar;
     TotalBlocks         : WORD;
     SectorsPerBlock     : WORD;
     availableBlocks     : WORD;
@@ -287,7 +287,7 @@ END;
 
 procedure findfirst(const path : pathstr;attr : word;var f : searchRec);
 var
-  path0 : array[0..256] of char;
+  path0 : array[0..256] of AnsiChar;
 begin
   IF path = '' then
   begin
@@ -461,8 +461,8 @@ end;
 
 { works fine (at least with netware 6.5) }
 Function  GetEnv(envvar: string): string;
-var envvar0 : array[0..512] of char;
-    p       : pchar;
+var envvar0 : array[0..512] of AnsiChar;
+    p       : PAnsiChar;
     i,isDosPath,res : longint;
 begin
   if upcase(envvar) = 'PATH' then

+ 1 - 1
rtl/netware/dynlibs.inc

@@ -32,7 +32,7 @@ end;
 Function SysGetProcedureAddress(Lib : TLibHandle; const ProcName : AnsiString) : Pointer;
 
 begin
-  Result:=ImportSymbol(GetNlmHandle, pchar(ProcName));
+  Result:=ImportSymbol(GetNlmHandle, PAnsiChar(ProcName));
 end;
 
 Function SysUnloadLibrary(Lib : TLibHandle) : Boolean;

+ 12 - 12
rtl/netware/nwcalls.pp

@@ -43,10 +43,10 @@ type
   Tnuint8 = byte;
   Pnuint8 = ^byte;
   Tnptr = pointer;
-  pnstr = pchar;
-  ppnstr = ppchar;
-  Tnstr8 = char;
-  Pnstr8 = pchar;
+  pnstr = PAnsiChar;
+  ppnstr = PPAnsiChar;
+  Tnstr8 = AnsiChar;
+  Pnstr8 = PAnsiChar;
   nptr = pointer;
   Pnptr = ^pointer;
   Tnflag32 = longint;
@@ -884,7 +884,7 @@ const
   NWU_UNSUPPORTED_AUX_FUNCTION = -(526); // Unsupported AUX function
   NWU_EMBEDDED_NULL = -(525); // Embedded null in len spec string
   NWU_GET_CODE_PAGE_FAILED = -(524); // Failed to get system cp or cc
-  NWU_ILLEGAL_UTF8_CHARACTER = -(506); // Cannot convert UTF8 char to Uni
+  NWU_ILLEGAL_UTF8_CHARACTER = -(506); // Cannot convert UTF8 AnsiChar to Uni
   NWU_INSUFFICIENT_BUFFER = -(500);
     { Error codes for translator based APIs (i.e. NW prefix) }
   UNI_ALREADY_LOADED = -(489); // Already loaded another country or code page
@@ -1112,7 +1112,7 @@ function NWUXUnicodeToNormalized(normalizeHandle: TpCONVERT; normalizedOutput: p
     { Convert Unicode to bytes for file path    }
     { Handle to Byte <-> Uni converter   }
 
-    { Ptr to single or double-byte char  }
+    { Ptr to single or double-byte AnsiChar  }
     { # bytes in character (1 or 2)      }
 function NWUXGetCharSize(byteUniHandle: TpCONVERT; byteInput: Pnuint8; pCharSize: pnuint): Tnint; NWLIB_LOCNLM32;
     { Set action to be taken for no map chars   }
@@ -1143,13 +1143,13 @@ function NWUXSetSubByte(byteUniHandle: TpCONVERT; substituteByte: Tnuint8): Tnin
     { Handle to a Byte <-> Unicode converter    }
     { Substitution byte returned here           }
 function NWUXGetSubByte(byteUniHandle: TpCONVERT; substituteByte: pnuint8): Tnint; NWLIB_LOCNLM32;
-    { Set substitute uni char for converter     }
+    { Set substitute uni AnsiChar for converter     }
     { Handle to a Byte <-> Unicode converter    }
     { Unicode character to be substituted       }
 function NWUXSetSubUni(byteUniHandle: TpCONVERT; substituteUni: Tunicode): Tnint; NWLIB_LOCNLM32;
-    { Get substitute uni char for converter     }
+    { Get substitute uni AnsiChar for converter     }
     { Handle to a Byte <-> Unicode converter    }
-    { Substitution unicode char returned here   }
+    { Substitution unicode AnsiChar returned here   }
 function NWUXGetSubUni(byteUniHandle: TpCONVERT; substituteUni: punicode): Tnint; NWLIB_LOCNLM32;
     { Set up unmappable byte handling           }
     { Handle to a Byte <-> Unicode converter    }
@@ -1169,7 +1169,7 @@ function NWUXGetByteFunctions(byteUniHandle: TpCONVERT; var noMapByteFunc: TNMBY
     { Unicode scanning function                 }
     { Unicode parsing function                  }
 function NWUXSetUniFunctions(byteUniHandle: TpCONVERT; noMapUniFunc: TNMUNI; scanUniFunc: TSCUNI; parseUniFunc: TPRUNI): Tnint; NWLIB_LOCNLM32;
-    { Set up unmappable unicode char handling   }
+    { Set up unmappable unicode AnsiChar handling   }
     { Handle to a Byte <-> Unicode converter    }
     { Function called for unmappable uni chars  }
     { Unicode scan function                     }
@@ -5896,7 +5896,7 @@ function NWDSGetConnectionInfo
   connStatus: pnuint8;
   connType: pnuint8;
   serverFlags: pnuint8;
-  serverName: pchar;
+  serverName: PAnsiChar;
   transType: pnuint8;
   transLen: pnuint32;
   transBuf: pointer;
@@ -5929,7 +5929,7 @@ function NWGetConnectionIDFromAddress
 { replacement - NWCCScanConnInfo, NWCCOpenConnByRef, NWCCLicenseConn }
 function NWGetConnectionIDFromName
   (nameLen: Tnuint32;
-  name: pchar;
+  name: PAnsiChar;
   connHandle: PNWCONN_HANDLE): TNWCCODE; NWLIB_DSAPI;
 { replacement - NWCCScanConnInfo, NWCCOpenConnByRef }
 function NWGetNearestDSConnRef(connRef: pnuint32): TNWCCODE; NWLIB_DSAPI;

+ 193 - 193
rtl/netware/nwnit.pp

@@ -32,22 +32,22 @@ const
 
 function AccountingInstalled (fileServerID:word):longint;cdecl;external Clib name 'AccountingInstalled';
 function GetAccountStatus    (binderyObjectType:word;
-                              binderyObjectName:Pchar;
+                              binderyObjectName:PAnsiChar;
                               balance,limits,holds:Plongint):longint;cdecl;external Clib name 'GetAccountStatus';
 function GetAccountStatus    (binderyObjectType:word;
-                              binderyObjectName:Pchar;
+                              binderyObjectName:PAnsiChar;
                           var balance,limits,holds:longint):longint;cdecl;external Clib name 'GetAccountStatus';
 
 function SubmitAccountCharge(binderyObjectType:word;
-                             binderyObjectName:Pchar;
+                             binderyObjectName:PAnsiChar;
                              serviceType:word;
                              chargeAmount:longint;
                              cancelHoldAmount:longint;
                              commentType:word;
-                             comment:Pchar):longint;cdecl;external Clib name 'SubmitAccountCharge';
+                             comment:PAnsiChar):longint;cdecl;external Clib name 'SubmitAccountCharge';
 function SubmitAccountChargeWithLength(
                              binderyObjectType:word;
-                             binderyObjectName:Pchar;
+                             binderyObjectName:PAnsiChar;
                              serviceType:word;
                              chargeAmount:longint;
                              cancelHoldAmount:longint;
@@ -55,13 +55,13 @@ function SubmitAccountChargeWithLength(
                              commentData:pointer;
                              commentLength:word):longint;cdecl;external Clib name 'SubmitAccountChargeWithLength';
 function SubmitAccountHold  (binderyObjectType:word;
-                             binderyObjectName:Pchar;
+                             binderyObjectName:PAnsiChar;
                              reserveAmount:longint):longint;cdecl;external Clib name 'SubmitAccountHold';
 function SubmitAccountNote  (binderyObjectType:word;
-                             binderyObjectName:Pchar;
+                             binderyObjectName:PAnsiChar;
                              serviceType:word;
                              commentType:word;
-                             comment:Pchar):longint;cdecl;external Clib name 'SubmitAccountNote';
+                             comment:PAnsiChar):longint;cdecl;external Clib name 'SubmitAccountNote';
 
 {------------------------------------------------------------------------------}
 
@@ -83,11 +83,11 @@ type
         backupDate         : word;
         backupTime         : word;
         finderInfo         : array[0..31] of byte;
-        longName           : array[0..32] of char;
-        pad1               : char;
+        longName           : array[0..32] of AnsiChar;
+        pad1               : AnsiChar;
         ownerID            : longint;
-        shortName          : array[0..12] of char;
-        pad2               : char;
+        shortName          : array[0..12] of AnsiChar;
+        pad2               : AnsiChar;
         accessPrivileges   : word;
         proDosInfo         : array[0..5] of byte;
      end;
@@ -109,7 +109,7 @@ type
 function AFPAllocTemporaryDirHandle (connectionID:word;
                                      volumeNum:byte;
                                      AFPEntryID:longint;
-                                     AFPPathString:Pchar;
+                                     AFPPathString:PAnsiChar;
                                      NetWareDirectoryHandle:PBYTE;
                                      AccessRights:PBYTE):longint;  cdecl;external Clib name 'AFPAllocTemporaryDirHandle';
 
@@ -117,7 +117,7 @@ function AFPCreateDirectory (connectionID:word;
                              volumeNum:byte;
                              AFPEntryID:longint;
                              finderInfo:PBYTE;
-                             AFPPathString:Pchar;
+                             AFPPathString:PAnsiChar;
                              newAFPEntryID:Plongint):longint;cdecl;external Clib name 'AFPCreateDirectory';
 
 function AFPCreateFile (connectionID:word;
@@ -125,22 +125,22 @@ function AFPCreateFile (connectionID:word;
                         AFPEntryID:longint;
                         deleteExistingFile:byte;
                         finderInfo:PBYTE;
-                        AFPPathString:Pchar;
+                        AFPPathString:PAnsiChar;
                         newAFPEntryID:Plongint):longint;  cdecl;external Clib name 'AFPCreateFile';
 
 function AFPDelete (connectionID:word;
                     volumeNum:byte;
                     AFPEntryID:longint;
-                    AFPPathString:Pchar):longint;  cdecl;external Clib name 'AFPDelete';
+                    AFPPathString:PAnsiChar):longint;  cdecl;external Clib name 'AFPDelete';
 
 function AFPDirectoryEntry (connectionID:word;
                             directoryHandle:byte;
-                            pathName:Pchar):longint;  cdecl;external Clib name 'AFPDirectoryEntry';
+                            pathName:PAnsiChar):longint;  cdecl;external Clib name 'AFPDirectoryEntry';
 
 function AFPGetEntryIDFromName (connectionID:word;
                                 volumeNum:byte;
                                 AFPEntryID:longint;
-                                AFPPathString:Pchar;
+                                AFPPathString:PAnsiChar;
                                 newAFPEntryID:Plongint):longint;          cdecl;external Clib name 'AFPGetEntryIDFromName';
 
 function AFPGetEntryIDFromNetWareHandle (connectionID:word;
@@ -157,14 +157,14 @@ function AFPGetEntryIDFromNetWareHandle (connectionID:word;
 
 function AFPGetEntryIDFromPathName (connectionID:word;
                                     directoryHandle:byte;
-                                    pathName:Pchar;
+                                    pathName:PAnsiChar;
                                     AFPEntryID:Plongint):longint;         cdecl;external Clib name 'AFPGetEntryIDFromPathName';
 
 function AFPGetFileInformation     (connectionID:word;
                                     volumeNum:byte;
                                     AFPEntryID:longint;
                                     requestBitMap:word;
-                                    AFPPathString:Pchar;
+                                    AFPPathString:PAnsiChar;
                                     strucSize:word;
                                     AFPFileInfo:PAFPFILEINFO):longint;    cdecl;external Clib name 'AFPGetFileInformation';
 
@@ -172,7 +172,7 @@ function AFPGetFileInformation     (connectionID:word;
                                     volumeNum:byte;
                                     AFPEntryID:longint;
                                     requestBitMap:word;
-                                    AFPPathString:Pchar;
+                                    AFPPathString:PAnsiChar;
                                     strucSize:word;
                                 var AFPFileInfo:TAFPFILEINFO):longint;    cdecl;external Clib name 'AFPGetFileInformation';
 
@@ -181,7 +181,7 @@ function AFPOpenFileFork           (connectionID:word;
                                     AFPEntryID:longint;
                                     forkIndicator:byte;
                                     accessMode:byte;
-                                    AFPPathString:Pchar;
+                                    AFPPathString:PAnsiChar;
                                     fileID:Plongint;
                                     forkLength:Plongint;
                                     NetWareHandle:PBYTE;
@@ -192,7 +192,7 @@ function AFPOpenFileFork           (connectionID:word;
                                     AFPEntryID:longint;
                                     forkIndicator:byte;
                                     accessMode:byte;
-                                    AFPPathString:Pchar;
+                                    AFPPathString:PAnsiChar;
                                     var fileID:longint;
                                     var forkLength:longint;
                                     var NetWareHandle:byte;
@@ -203,8 +203,8 @@ function AFPRename                 (connectionID:word;
                                     volumeNum:byte;
                                     AFPSourceEntryID:longint;
                                     AFPDestEntryID:longint;
-                                    AFPSourcePath:Pchar;
-                                    AFPDestPath:Pchar):longint;              cdecl;external Clib name 'AFPRename';
+                                    AFPSourcePath:PAnsiChar;
+                                    AFPDestPath:PAnsiChar):longint;              cdecl;external Clib name 'AFPRename';
 
 function AFPScanFileInformation    (connectionID:word;
                                     volumeNum:byte;
@@ -212,7 +212,7 @@ function AFPScanFileInformation    (connectionID:word;
                                     AFPLastSeenID:Plongint;
                                     searchBitMap:word;
                                     requestBitMap:word;
-                                    AFPPathString:Pchar;
+                                    AFPPathString:PAnsiChar;
                                     strucSize:word;
                                     AFPScanFileInfo:PAFPFILEINFO):longint;    cdecl;external Clib name 'AFPScanFileInformation';
 function AFPScanFileInformation    (connectionID:word;
@@ -221,7 +221,7 @@ function AFPScanFileInformation    (connectionID:word;
                                     AFPLastSeenID:Plongint;
                                     searchBitMap:word;
                                     requestBitMap:word;
-                                    AFPPathString:Pchar;
+                                    AFPPathString:PAnsiChar;
                                     strucSize:word;
                                 var AFPScanFileInfo:TAFPFILEINFO):longint;    cdecl;external Clib name 'AFPScanFileInformation';
 
@@ -229,7 +229,7 @@ function AFPSetFileInformation     (connectionID:word;
                                     volumeNum:byte;
                                     AFPEntryID:longint;
                                     requestBitMap:word;
-                                    AFPPathString:Pchar;
+                                    AFPPathString:PAnsiChar;
                                     strucSize:word;
                                     AFPSetInfo:PAFPSETINFO):longint;          cdecl;external Clib name 'AFPSetFileInformation';
 
@@ -237,7 +237,7 @@ function AFPSetFileInformation     (connectionID:word;
                                     volumeNum:byte;
                                     AFPEntryID:longint;
                                     requestBitMap:word;
-                                    AFPPathString:Pchar;
+                                    AFPPathString:PAnsiChar;
                                     strucSize:word;
                                 var AFPSetInfo:TAFPSETINFO):longint;          cdecl;external Clib name 'AFPSetFileInformation';
 
@@ -295,143 +295,143 @@ const
    BL_PROPERTY                    = 16;
    BL_PASSWORD                    = 128;
 
-function AddBinderyObjectToSet (objectName   : Pchar;
+function AddBinderyObjectToSet (objectName   : PAnsiChar;
                                 objectType   : word;
-                                propertyName : Pchar;
-                                memberName   : Pchar;
+                                propertyName : PAnsiChar;
+                                memberName   : PAnsiChar;
                                 memberType   : word):longint;  cdecl;external Clib name 'AddBinderyObjectToSet';
 
-function ChangeBinderyObjectPassword (objectName  : Pchar;
+function ChangeBinderyObjectPassword (objectName  : PAnsiChar;
                                       objectType  : word;
-                                      oldPassword : Pchar;
-                                      newPassword : Pchar):longint;  cdecl;external Clib name 'ChangeBinderyObjectPassword';
+                                      oldPassword : PAnsiChar;
+                                      newPassword : PAnsiChar):longint;  cdecl;external Clib name 'ChangeBinderyObjectPassword';
 
-function ChangeBinderyObjectSecurity (objectName  : Pchar;
+function ChangeBinderyObjectSecurity (objectName  : PAnsiChar;
                                       objectType  : word;
                                       newObjectSecurity : byte):longint;  cdecl;external Clib name 'ChangeBinderyObjectSecurity';
 
 
-function ChangePropertySecurity (objectName         : Pchar;
+function ChangePropertySecurity (objectName         : PAnsiChar;
                                  objectType         : word;
-                                 propertyName       : Pchar;
+                                 propertyName       : PAnsiChar;
                                  newPropertySecurity: byte):longint;  cdecl;external Clib name 'ChangePropertySecurity';
 
 function CloseBindery:longint;  cdecl;external Clib name 'CloseBindery';
-function CreateBinderyObject    (objectName         : Pchar;
+function CreateBinderyObject    (objectName         : PAnsiChar;
                                  objectType         : word;
                                  objectFlag         : byte;
                                  objectSecurity     : byte):longint;       cdecl;external Clib name 'CreateBinderyObject';
-function CreateProperty         (objectName         : Pchar;
+function CreateProperty         (objectName         : PAnsiChar;
                                  objectType         : word;
-                                 propertyName       : Pchar;
+                                 propertyName       : PAnsiChar;
                                  propertyFlags      : byte;
                                  propertySecurity   : byte):longint;     cdecl;external Clib name 'CreateProperty';
 
-function DeleteBinderyObject    (objectName         : Pchar;
+function DeleteBinderyObject    (objectName         : PAnsiChar;
                                  objectType         : word):longint;           cdecl;external Clib name 'DeleteBinderyObject';
 
-function DeleteBinderyObjectFromSet (objectName:Pchar;
+function DeleteBinderyObjectFromSet (objectName:PAnsiChar;
                                      objectType:word;
-                                     propertyName:Pchar;
-                                     memberName:Pchar;
+                                     propertyName:PAnsiChar;
+                                     memberName:PAnsiChar;
                                      memberType:word):longint;       cdecl;external Clib name 'DeleteBinderyObjectFromSet';
 
-function DeleteProperty             (objectName:Pchar;
+function DeleteProperty             (objectName:PAnsiChar;
                                      objectType:word;
-                                     propertyName:Pchar):longint;    cdecl;external Clib name 'DeleteProperty';
+                                     propertyName:PAnsiChar):longint;    cdecl;external Clib name 'DeleteProperty';
 function GetBinderyAccessLevel      (accessLevel:PBYTE;
                                      objectID:Plongint):longint;     cdecl;external Clib name 'GetBinderyAccessLevel';
 function GetBinderyAccessLevel      (var accessLevel:byte;
                                      var objectID:longint):longint;  cdecl;external Clib name 'GetBinderyAccessLevel';
 
-function GetBinderyObjectID         (objectName:Pchar;
+function GetBinderyObjectID         (objectName:PAnsiChar;
                                      objectType:word;
                                      objectID:Plongint):longint;     cdecl;external Clib name 'GetBinderyObjectID';
-function GetBinderyObjectID         (objectName:Pchar;
+function GetBinderyObjectID         (objectName:PAnsiChar;
                                      objectType:word;
                                  var objectID:longint):longint;      cdecl;external Clib name 'GetBinderyObjectID';
 function GetBinderyObjectName       (objectID:longint;
-                                     objectName:Pchar;
+                                     objectName:PAnsiChar;
                                      objectType:PWORD):longint;      cdecl;external Clib name 'GetBinderyObjectName';
 function GetBinderyObjectName       (objectID:longint;
-                                     objectName:Pchar;
+                                     objectName:PAnsiChar;
                                  var objectType:word):longint;       cdecl;external Clib name 'GetBinderyObjectName';
 
-function IsBinderyObjectInSet       (objectName:Pchar;
+function IsBinderyObjectInSet       (objectName:PAnsiChar;
                                      objectType:word;
-                                     propertyName:Pchar;
-                                     memberName:Pchar;
+                                     propertyName:PAnsiChar;
+                                     memberName:PAnsiChar;
                                      memberType:word):longint;       cdecl;external Clib name 'IsBinderyObjectInSet';
 function OpenBindery:longint;                                        cdecl;external Clib name 'OpenBindery';
-function ReadPropertyValue          (objectName   : Pchar;
+function ReadPropertyValue          (objectName   : PAnsiChar;
                                      objectType   : word;
-                                     propertyName : Pchar;
+                                     propertyName : PAnsiChar;
                                      segmentNumber: longint;
                                      propertyValue: PBYTE;
                                      moreSegments : PBYTE;
                                      propertyFlags: PBYTE):longint;   cdecl;external Clib name 'ReadPropertyValue';
-function ReadPropertyValue          (objectName   : Pchar;
+function ReadPropertyValue          (objectName   : PAnsiChar;
                                      objectType   : word;
-                                     propertyName : Pchar;
+                                     propertyName : PAnsiChar;
                                      segmentNumber: longint;
                                  var propertyValue: byte;
                                  var moreSegments : byte;
                                  var propertyFlags: byte):longint;   cdecl;external Clib name 'ReadPropertyValue';
 
-function RenameBinderyObject        (objectName   : Pchar;
-                                     newObjectName: Pchar;
+function RenameBinderyObject        (objectName   : PAnsiChar;
+                                     newObjectName: PAnsiChar;
                                      objectType   : word):longint;   cdecl;external Clib name 'RenameBinderyObject';
 
-function ScanBinderyObject          (searchObjectName:Pchar;
+function ScanBinderyObject          (searchObjectName:PAnsiChar;
                                      searchObjectType:word;
                                      objectID:Plongint;
-                                     objectName:Pchar;
+                                     objectName:PAnsiChar;
                                      objectType:PWORD;
-                                     objectHasProperties:Pchar;
-                                     objectFlag:Pchar;
-                                     objectSecurity:Pchar):longint;   cdecl;external Clib name 'ScanBinderyObject';
-function ScanBinderyObject          (searchObjectName:Pchar;
+                                     objectHasProperties:PAnsiChar;
+                                     objectFlag:PAnsiChar;
+                                     objectSecurity:PAnsiChar):longint;   cdecl;external Clib name 'ScanBinderyObject';
+function ScanBinderyObject          (searchObjectName:PAnsiChar;
                                      searchObjectType:word;
                                  var objectID:longint;
-                                     objectName:Pchar;
+                                     objectName:PAnsiChar;
                                  var objectType:word;
-                                     objectHasProperties:Pchar;
-                                     objectFlag:Pchar;
-                                     objectSecurity:Pchar):longint;   cdecl;external Clib name 'ScanBinderyObject';
+                                     objectHasProperties:PAnsiChar;
+                                     objectFlag:PAnsiChar;
+                                     objectSecurity:PAnsiChar):longint;   cdecl;external Clib name 'ScanBinderyObject';
 
-function ScanProperty               (objectName:Pchar;
+function ScanProperty               (objectName:PAnsiChar;
                                      objectType:word;
-                                     searchPropertyName:Pchar;
+                                     searchPropertyName:PAnsiChar;
                                      sequenceNumber:Plongint;
-                                     propertyName:Pchar;
-                                     propertyFlags:Pchar;
-                                     propertySecurity:Pchar;
-                                     propertyHasValue:Pchar;
+                                     propertyName:PAnsiChar;
+                                     propertyFlags:PAnsiChar;
+                                     propertySecurity:PAnsiChar;
+                                     propertyHasValue:PAnsiChar;
                                      moreProperties:Pbyte):longint;   cdecl;external Clib name 'ScanProperty';
-function ScanProperty               (objectName:Pchar;
+function ScanProperty               (objectName:PAnsiChar;
                                      objectType:word;
-                                     searchPropertyName:Pchar;
+                                     searchPropertyName:PAnsiChar;
                                  var sequenceNumber:longint;
-                                     propertyName:Pchar;
-                                     propertyFlags:Pchar;
-                                     propertySecurity:Pchar;
-                                     propertyHasValue:Pchar;
+                                     propertyName:PAnsiChar;
+                                     propertyFlags:PAnsiChar;
+                                     propertySecurity:PAnsiChar;
+                                     propertyHasValue:PAnsiChar;
                                  var moreProperties:byte):longint;   cdecl;external Clib name 'ScanProperty';
 
 
-function VerifyBinderyObjectPassword (objectName : Pchar;
+function VerifyBinderyObjectPassword (objectName : PAnsiChar;
                                       objectType : word;
-                                      password   : Pchar):longint;       cdecl;external Clib name 'VerifyBinderyObjectPassword';
+                                      password   : PAnsiChar):longint;       cdecl;external Clib name 'VerifyBinderyObjectPassword';
 
-function WritePropertyValue          (objectName    : Pchar;
+function WritePropertyValue          (objectName    : PAnsiChar;
                                       objectType    : word;
-                                      propertyName  : Pchar;
+                                      propertyName  : PAnsiChar;
                                       segmentNumber : longint;
                                       propertyValue : PBYTE;
                                       moreSegments  : byte):longint;        cdecl;external Clib name 'WritePropertyValue';
-function WritePropertyValue          (objectName    : Pchar;
+function WritePropertyValue          (objectName    : PAnsiChar;
                                       objectType    : word;
-                                      propertyName  : Pchar;
+                                      propertyName  : PAnsiChar;
                                       segmentNumber : longint;
                                   var propertyValue : byte;
                                       moreSegments  : byte):longint;        cdecl;external Clib name 'WritePropertyValue';
@@ -475,14 +475,14 @@ type
         InfoBlockSize : longint;
         AvailSpace    : longint;
         UsedSpace     : longint;
-        SMString      : char; // 128 length limit, Info block follows string
+        SMString      : AnsiChar; // 128 length limit, Info block follows string
      end;
 
 {$include npackoff.inc}
 
 
 function NWDeRegisterDMSupportModule    (SupportModuleID:longint;
-                                         SupportModuleName:PChar;
+                                         SupportModuleName:PAnsiChar;
                                          SlotNumber:longint):longint;  cdecl;external Clib name 'NWDeRegisterDMSupportModule';
 function NWDeRegisterRTDataMigrationNLM (Station:longint;
                                          DMTAG:PBYTE;
@@ -504,13 +504,13 @@ function NWGetDefaultSupportModule      (defaultSupportModuleID:PLongint):longin
 function NWGetDefaultSupportModule      (var defaultSupportModuleID:longint):longint; cdecl;external Clib name 'NWGetDefaultSupportModule';
 
 { Local and Remote call  }
-function NWGetDMFileInfo (path:Pchar;
+function NWGetDMFileInfo (path:PAnsiChar;
                           nameSpace:longint;
                           supportModuleID:PLongint;
                           validDataStreams:PLongint;
                           estRetrievalTime:PLongint;
                           info:PLongint):longint;cdecl;external Clib name 'NWGetDMFileInfo';
-function NWGetDMFileInfo (path:Pchar;
+function NWGetDMFileInfo (path:PAnsiChar;
                           nameSpace:longint;
                           var supportModuleID:longint;
                           var validDataStreams:longint;
@@ -546,15 +546,15 @@ function NWGetSupportModuleInfo (informationLevel:longint;
 
 function NWIsDataMigrationAllowed (Volume:longint):longint; cdecl;external Clib name 'NWIsDataMigrationAllowed';
 { Local and Remote call  }
-function NWMoveFileFromDM         (path:Pchar;
+function NWMoveFileFromDM         (path:PAnsiChar;
                                    nameSpace:longint):longint; cdecl;external Clib name 'NWMoveFileFromDM';
 { Local and Remote call  }
-function NWMoveFileToDM           (path:Pchar;
+function NWMoveFileToDM           (path:PAnsiChar;
                                    nameSpace:longint;
                                    SupportModuleID:longint;
                                    flags:longint):longint; cdecl;external Clib name 'NWMoveFileToDM';
 
-function NWPeekFileData           (path:Pchar;
+function NWPeekFileData           (path:PAnsiChar;
                                    nameSpace:longint;
                                    noWaitFlag:longint;
                                    startingSector:longint;
@@ -563,7 +563,7 @@ function NWPeekFileData           (path:Pchar;
                                    sectorsRead:PLongint;
                                    bytesRead:PLongint;
                                    NoWaitReason:PLongint):longint; cdecl;external Clib name 'NWPeekFileData';
-function NWPeekFileData           (path:Pchar;
+function NWPeekFileData           (path:PAnsiChar;
                                    nameSpace:longint;
                                    noWaitFlag:longint;
                                    startingSector:longint;
@@ -648,7 +648,7 @@ type
         isHashing : byte;
         isRemovable : byte;
         isMounted : byte;
-        volumeName : array[0..16] of char;
+        volumeName : array[0..16] of AnsiChar;
         purgableBlocks : longint;
         notYetPurgableBlocks : longint;
      end;
@@ -667,7 +667,7 @@ type
         isHashing : byte;
         isRemovable : byte;
         isMounted : byte;
-        volumeName : array[0..16] of char;
+        volumeName : array[0..16] of AnsiChar;
         purgableBlocks : longint;
         notYetPurgableBlocks : longint;
      end;
@@ -711,34 +711,34 @@ type
 
 {$include npackoff.inc}
 
-function AddSpaceRestrictionForDirectory (pathName:Pchar;
+function AddSpaceRestrictionForDirectory (pathName:PAnsiChar;
                                           value:longint;
                                           allowWildCardsFlag:longint):longint;cdecl;external Clib name 'AddSpaceRestrictionForDirectory';
-function AddTrustee                      (pathName:Pchar;
+function AddTrustee                      (pathName:PAnsiChar;
                                           trusteeID:longint;
                                           newRights:word):longint; cdecl;external Clib name 'AddTrustee';
 function AddUserSpaceRestriction         (volume:longint;
                                           trusteeID:longint;
                                           value:longint):longint;cdecl;external Clib name 'AddUserSpaceRestriction';
-function ChangeDirectoryEntry            (pathName:Pchar;
+function ChangeDirectoryEntry            (pathName:PAnsiChar;
                                           modifyVector:pointer;  //PModifyStructure;
                                           modifyBits:longint;
                                           allowWildCardsFlag:longint):longint;cdecl;external Clib name 'ChangeDirectoryEntry';
-function ChangeDirectoryEntry            (pathName:Pchar;
+function ChangeDirectoryEntry            (pathName:PAnsiChar;
                                       var modifyVector;
                                           modifyBits:longint;
                                           allowWildCardsFlag:longint):longint;cdecl;external Clib name 'ChangeDirectoryEntry';
-function ConvertNameToFullPath           (partialPath:Pchar;
-                                          fullPath:Pchar):longint;cdecl;external Clib name 'ConvertNameToFullPath';
-function ConvertNameToVolumePath         (fileName:Pchar;
-                                          volumePath:Pchar):longint;cdecl;external Clib name 'ConvertNameToVolumePath';
-function DeleteTrustee                   (pathName:Pchar;
+function ConvertNameToFullPath           (partialPath:PAnsiChar;
+                                          fullPath:PAnsiChar):longint;cdecl;external Clib name 'ConvertNameToFullPath';
+function ConvertNameToVolumePath         (fileName:PAnsiChar;
+                                          volumePath:PAnsiChar):longint;cdecl;external Clib name 'ConvertNameToVolumePath';
+function DeleteTrustee                   (pathName:PAnsiChar;
                                           trusteeID:longint):longint;cdecl;external Clib name 'DeleteTrustee';
 function DeleteUserSpaceRestriction      (volume:longint;
                                           trusteeID:longint):longint;cdecl;external Clib name 'DeleteUserSpaceRestriction';
-function GetAvailableUserDiskSpace       (pathName:Pchar;
+function GetAvailableUserDiskSpace       (pathName:PAnsiChar;
                                           availableSpace:PLongint):longint;cdecl;external Clib name 'GetAvailableUserDiskSpace';
-function GetAvailableUserDiskSpace       (pathName:Pchar;
+function GetAvailableUserDiskSpace       (pathName:PAnsiChar;
                                       var availableSpace:longint):longint;cdecl;external Clib name 'GetAvailableUserDiskSpace';
 function GetDiskSpaceUsedByObject        (trusteeID:longint;
                                           volume:longint;
@@ -746,9 +746,9 @@ function GetDiskSpaceUsedByObject        (trusteeID:longint;
 function GetDiskSpaceUsedByObject        (trusteeID:longint;
                                           volume:longint;
                                       var usedSpace:longint):longint;cdecl;external Clib name 'GetDiskSpaceUsedByObject';
-function GetEffectiveRights              (pathName:Pchar;
+function GetEffectiveRights              (pathName:PAnsiChar;
                                           accessRights:PWORD):longint;cdecl;external Clib name 'GetEffectiveRights';
-function GetEffectiveRights              (pathName:Pchar;
+function GetEffectiveRights              (pathName:PAnsiChar;
                                       var accessRights:word):longint;cdecl;external Clib name 'GetEffectiveRights';
 function GetMaximumUserSpaceRestriction  (trusteeID, volume:longint; maxRestriction:PLongint):longint;cdecl;external Clib name 'GetMaximumUserSpaceRestriction';
 function GetMaximumUserSpaceRestriction  (trusteeID, volume:longint; var maxRestriction:longint):longint;cdecl;external Clib name 'GetMaximumUserSpaceRestriction';
@@ -762,7 +762,7 @@ function GetVolumeInformation            (connectionID:word;
                                           structSize:longint;
                                       var volumeStatistics:TVOLUME_STATS):longint;cdecl;external Clib name 'GetVolumeInformation';
 function GetVolumeInfoWithNumber         (volumeNumber:byte;
-                                          volumeName:Pchar;
+                                          volumeName:PAnsiChar;
                                           totalBlocks:PWORD;
                                           sectorsPerBlock:PWORD;
                                           availableBlocks:PWORD;
@@ -770,17 +770,17 @@ function GetVolumeInfoWithNumber         (volumeNumber:byte;
                                           availableDirectorySlots:PWORD;
                                           volumeIsRemovable:PWORD):longint;cdecl;external Clib name 'GetVolumeInfoWithNumber';
 function GetVolumeInfoWithNumber         (volumeNumber:byte;
-                                          volumeName:Pchar;
+                                          volumeName:PAnsiChar;
                                       var totalBlocks:word;
                                       var sectorsPerBlock:word;
                                       var availableBlocks:word;
                                       var totalDirectorySlots:word;
                                       var availableDirectorySlots:word;
                                       var volumeIsRemovable:word):longint;cdecl;external Clib name 'GetVolumeInfoWithNumber';
-function GetVolumeName(volumeNumber:longint; volumeName:Pchar):longint;cdecl;external Clib name 'GetVolumeName';
+function GetVolumeName(volumeNumber:longint; volumeName:PAnsiChar):longint;cdecl;external Clib name 'GetVolumeName';
 
-function GetVolumeNumber(volumeName:Pchar; volumeNumber:Plongint):longint;cdecl;external Clib name 'GetVolumeNumber';
-function GetVolumeNumber(volumeName:Pchar; var volumeNumber:longint):longint;cdecl;external Clib name 'GetVolumeNumber';
+function GetVolumeNumber(volumeName:PAnsiChar; volumeNumber:Plongint):longint;cdecl;external Clib name 'GetVolumeNumber';
+function GetVolumeNumber(volumeName:PAnsiChar; var volumeNumber:longint):longint;cdecl;external Clib name 'GetVolumeNumber';
 function GetVolumeStatistics             (connectionID:word;
                                           volumeNumber:byte;
                                           structSize:longint;
@@ -790,34 +790,34 @@ function GetVolumeStatistics             (connectionID:word;
                                           structSize:longint;
                                       var volumeStatistics:TVOLUME_INFO):longint;cdecl;external Clib name 'GetVolumeStatistics';
 
-procedure _makepath                      (path:Pchar;
-                                          drive:Pchar;
-                                          dir:Pchar;
-                                          fname:Pchar;
-                                          ext:Pchar);cdecl;external Clib name '_makepath';
+procedure _makepath                      (path:PAnsiChar;
+                                          drive:PAnsiChar;
+                                          dir:PAnsiChar;
+                                          fname:PAnsiChar;
+                                          ext:PAnsiChar);cdecl;external Clib name '_makepath';
 
-function ModifyInheritedRightsMask       (path:Pchar;
+function ModifyInheritedRightsMask       (path:PAnsiChar;
                                           revokeRightsMask:word;
                                           grantRightsMask:word):longint;cdecl;external Clib name 'ModifyInheritedRightsMask';
 function NWGetExtendedVolumeInfo         (volNumber:longint;
-                                          volName:Pchar;
+                                          volName:PAnsiChar;
                                           volInfo:PNWVolExtendedInfo):longint;cdecl;external Clib name 'NWGetExtendedVolumeInfo';
 function NWGetExtendedVolumeInfo         (volNumber:longint;
-                                          volName:Pchar;
+                                          volName:PAnsiChar;
                                       var volInfo:TNWVolExtendedInfo):longint;cdecl;external Clib name 'NWGetExtendedVolumeInfo';
 function NWVolumeIsCDROM                 (volNumber:longint;
                                           isCDROM:PLongint):longint;cdecl;external Clib name 'NWVolumeIsCDROM';
 function NWVolumeIsCDROM                 (volNumber:longint;
                                       var isCDROM:longint):longint;cdecl;external Clib name 'NWVolumeIsCDROM';
 
-function ParsePath                       (path:Pchar;
-                                          server:Pchar;
-                                          volume:Pchar;
-                                          directories:Pchar):longint;cdecl;external Clib name 'ParsePath';
+function ParsePath                       (path:PAnsiChar;
+                                          server:PAnsiChar;
+                                          volume:PAnsiChar;
+                                          directories:PAnsiChar):longint;cdecl;external Clib name 'ParsePath';
 function PurgeTrusteeFromVolume          (volume:longint;
                                           trusteeID:longint):longint;cdecl;external Clib name 'PurgeTrusteeFromVolume';
 
-function ReturnSpaceRestrictionForDirectory(pathName:Pchar;
+function ReturnSpaceRestrictionForDirectory(pathName:PAnsiChar;
                                             numberOfStructuresToReturn:longint;
                                             answerBuffer:pointer;
                                             numberOfStructuresReturned:PLongint):longint;cdecl;external Clib name 'ReturnSpaceRestrictionForDirectory';
@@ -825,20 +825,20 @@ function ScanBinderyObjectTrusteePaths     (objectID:longint;
                                             volumeNumber:byte;
                                             sequenceNumber:Plongint;
                                             trusteeAccessMask:PWORD;
-                                            trusteePathName:Pchar):longint;cdecl;external Clib name 'ScanBinderyObjectTrusteePaths';
+                                            trusteePathName:PAnsiChar):longint;cdecl;external Clib name 'ScanBinderyObjectTrusteePaths';
 function ScanBinderyObjectTrusteePaths     (objectID:longint;
                                             volumeNumber:byte;
                                         var sequenceNumber:longint;
                                         var trusteeAccessMask:word;
-                                            trusteePathName:Pchar):longint;cdecl;external Clib name 'ScanBinderyObjectTrusteePaths';
+                                            trusteePathName:PAnsiChar):longint;cdecl;external Clib name 'ScanBinderyObjectTrusteePaths';
 (* Const before type ignored *)
-function ScanTrustees                      (pathName:Pchar;
+function ScanTrustees                      (pathName:PAnsiChar;
                                             startingOffset:longint;
                                             vectorSize:longint;
                                             trusteeVector:PLongint;
                                             maskVector:PWORD;
                                             actualVectorSize:PLongint):longint;cdecl;external Clib name 'ScanTrustees';
-function ScanTrustees                      (pathName:Pchar;
+function ScanTrustees                      (pathName:PAnsiChar;
                                             startingOffset:longint;
                                             vectorSize:longint;
                                         var trusteeVector:longint;
@@ -855,21 +855,21 @@ function ScanUserSpaceRestrictions         (volume:longint;
                                         var answerArea;
                                         var numberOfTrusteesReturned:longint):longint;cdecl;external Clib name 'ScanUserSpaceRestrictions';
 
-function SetDirectoryInfo                  (pathName:Pchar;
+function SetDirectoryInfo                  (pathName:PAnsiChar;
                                             newCreationDateAndTime:PBYTE;
                                             newOwnerObjectID:longint;
                                             inheritedRightsMask:word):longint;cdecl;external Clib name 'SetDirectoryInfo';
 
 function SetWildcardTranslationMode         (newMode:byte):byte;cdecl;external Clib name 'SetWildcardTranslationMode';
 
-procedure _splitpath                        (path:Pchar;
-                                             drive:Pchar;
-                                             dir:Pchar;
-                                             fname:Pchar;
-                                             ext:Pchar);cdecl;external Clib name '_splitpath';
+procedure _splitpath                        (path:PAnsiChar;
+                                             drive:PAnsiChar;
+                                             dir:PAnsiChar;
+                                             fname:PAnsiChar;
+                                             ext:PAnsiChar);cdecl;external Clib name '_splitpath';
 
-function StripFileServerFromPath            (path:Pchar;
-                                             server:Pchar):Pchar;cdecl;external Clib name 'StripFileServerFromPath';
+function StripFileServerFromPath            (path:PAnsiChar;
+                                             server:PAnsiChar):PAnsiChar;cdecl;external Clib name 'StripFileServerFromPath';
 function UpdateDirectoryEntry               (handle:longint):longint;cdecl;external Clib name 'UpdateDirectoryEntry';
 
 {------------------------------------------------------------------------------}
@@ -886,7 +886,7 @@ type
 
    PFILE_SERV_INFO = ^TFILE_SERV_INFO;
    TFILE_SERV_INFO = record
-        serverName : array[0..47] of char;
+        serverName : array[0..47] of AnsiChar;
         netwareVersion : byte;
         netwareSubVersion : byte;
         maxConnectionsSupported : word;
@@ -934,26 +934,26 @@ function GetBinderyObjectDiskSpaceLeft (connectionID:word;
                                     var unusedDiskBlocks:Longint;
                                     var restrictionEnforced:byte):longint;cdecl;external Clib name 'GetBinderyObjectDiskSpaceLeft';
 function GetDiskUtilization            (objectID:longint;
-                                        volumeNumber:char;
+                                        volumeNumber:AnsiChar;
                                         usedDirectories:PLongint;
                                         usedFiles:PLongint;
                                         usedBlocks:PLongint):longint;cdecl;external Clib name 'GetDiskUtilization';
 function GetDiskUtilization            (objectID:longint;
-                                        volumeNumber:char;
+                                        volumeNumber:AnsiChar;
                                     var usedDirectories:Longint;
                                     var usedFiles:Longint;
                                     var usedBlocks:Longint):longint; cdecl;external Clib name 'GetDiskUtilization';
 
-//procedure GetFileServerConnectionID(fileServerName:Pchar; connectionID:PWORD);cdecl;external Clib name 'GetFileServerConnectionID';
+//procedure GetFileServerConnectionID(fileServerName:PAnsiChar; connectionID:PWORD);cdecl;external Clib name 'GetFileServerConnectionID';
 procedure GetFileServerDateAndTime(dateAndTime:PBYTE);cdecl;external Clib name 'GetFileServerDateAndTime';
 procedure GetFileServerDateAndTime(var dateAndTime);cdecl;external Clib name 'GetFileServerDateAndTime';
-function GetFileServerDescriptionStrings (company_Name:Pchar;
-                                          revision:Pchar;
-                                          revisionDate:Pchar;
-                                          copyrightNotice:Pchar):longint;cdecl;external Clib name 'GetFileServerDescriptionStrings';
+function GetFileServerDescriptionStrings (company_Name:PAnsiChar;
+                                          revision:PAnsiChar;
+                                          revisionDate:PAnsiChar;
+                                          copyrightNotice:PAnsiChar):longint;cdecl;external Clib name 'GetFileServerDescriptionStrings';
 function GetFileServerLoginStatus        (loginEnabledFlag:PLongint):longint;cdecl;external Clib name 'GetFileServerLoginStatus';
 function GetFileServerLoginStatus        (var loginEnabledFlag:Longint):longint;cdecl;external Clib name 'GetFileServerLoginStatus';
-procedure GetFileServerName(connectionID:word; fileServerName:Pchar);cdecl;external Clib name 'GetFileServerName';
+procedure GetFileServerName(connectionID:word; fileServerName:PAnsiChar);cdecl;external Clib name 'GetFileServerName';
 function GetServerConfigurationInfo      (serverType:PLongint;
                                           loaderType:PLongint):longint;cdecl;external Clib name 'GetServerConfigurationInfo';
 function GetServerConfigurationInfo      (var serverType:Longint;
@@ -964,10 +964,10 @@ function GetServerInformation            (returnSize:longint;
                                       var serverInfo:TFILE_SERV_INFO):longint;cdecl;external Clib name 'GetServerInformation';
 function GetServerMemorySize:longint;cdecl;external Clib name 'GetServerMemorySize';
 function GetServerUtilization:longint;cdecl;external Clib name 'GetServerUtilization';
-function SendConsoleBroadcast(msg:Pchar;
+function SendConsoleBroadcast(msg:PAnsiChar;
                               connectionCount:word;
                               connectionList:PWORD):longint;cdecl;external Clib name 'SendConsoleBroadcast';
-function SendConsoleBroadcast(msg:Pchar;
+function SendConsoleBroadcast(msg:PAnsiChar;
                               connectionCount:word;
                               const connectionList:array of word):longint;cdecl;external Clib name 'SendConsoleBroadcast';
 function SetFileServerDateAndTime (year,month,day,hour,minute,second:word):longint;cdecl;external Clib name 'SetFileServerDateAndTime';
@@ -1029,7 +1029,7 @@ type
         driverType : byte;
         driverMajorVersion : byte;
         driverMinorVersion : byte;
-        driverDescription : array[0..64] of char;
+        driverDescription : array[0..64] of AnsiChar;
         IOAddr1 : word;
         IOAddr1Size : word;
         IOAddr2 : word;
@@ -1047,7 +1047,7 @@ type
         DMAChannel2Used : byte;
         DMAChannel2 : byte;
         reserved2 : word;
-        configDescription : array[0..79] of char;
+        configDescription : array[0..79] of AnsiChar;
      end;
 
 
@@ -1154,7 +1154,7 @@ type
         hostAddress : array[0..5] of byte;
         LANDriverInstalled : byte;
         optionNumber : byte;
-        configurationText : array[0..159] of char;
+        configurationText : array[0..159] of AnsiChar;
      end;
 
    PPHYS_DISK_STATS = ^TPHYS_DISK_STATS;
@@ -1170,7 +1170,7 @@ type
         driveCylinders : word;
         driveHeads : byte;
         sectorsPerTrack : byte;
-        driveDefinition : array[0..63] of char;
+        driveDefinition : array[0..63] of AnsiChar;
         IOErrorCount : word;
         hotFixStart : longint;
         hotFixSize : word;
@@ -1214,7 +1214,7 @@ type
         lockFlag : byte;
         volumeNumber : byte;
         dirEntry : word;
-        fileName : array[0..13] of char;
+        fileName : array[0..13] of AnsiChar;
      end;
 
    PCONN_OPEN_FILES_386 = ^TCONN_OPEN_FILES_386;
@@ -1733,7 +1733,7 @@ function GetLANDriverConfigInfo(LANBoardNumber:byte; LANConfiguration:PLAN_CONFI
 function GetLANDriverConfigInfo(LANBoardNumber:byte; var LANConfiguration:TLAN_CONFIG):longint;cdecl;external Clib name 'GetLANDriverConfigInfo';
 function GetLogicalRecordInformation(requestSize:longint; request:pointer; buffer:pointer; bufferSize:longint):longint;cdecl;external Clib name 'GetLogicalRecordInformation';
 function GetLogicalRecordsByConnection(connectionNumber:word; nextRecord:word; buffer:pointer; bufferSize:longint):longint;cdecl;external Clib name 'GetLogicalRecordsByConnection';
-function GetPathFromDirectoryEntry(volumeNumber:byte; directoryEntry:word; pathLength:PBYTE; path:Pchar):longint;cdecl;external Clib name 'GetPathFromDirectoryEntry';
+function GetPathFromDirectoryEntry(volumeNumber:byte; directoryEntry:word; pathLength:PBYTE; path:PAnsiChar):longint;cdecl;external Clib name 'GetPathFromDirectoryEntry';
 function GetPhysicalDiskStats(physicalDiskNumber:byte; physicalDiskStats:PPHYS_DISK_STATS):longint;cdecl;external Clib name 'GetPhysicalDiskStats';
 function GetPhysicalDiskStats(physicalDiskNumber:byte; var physicalDiskStats:TPHYS_DISK_STATS):longint;cdecl;external Clib name 'GetPhysicalDiskStats';
 function GetPhysicalRecordLocksByFile(requestSize:longint; request:pointer; buffer:pointer; bufferSize:longint):longint;cdecl;external Clib name 'GetPhysicalRecordLocksByFile';
@@ -1764,7 +1764,7 @@ type
         valueLength : longint;
         keyLength   : word;
         accessFlags : longint;
-        keyValue    : array[0..0] of char;
+        keyValue    : array[0..0] of AnsiChar;
      end;
 {----------------------------------------------------------------------
      T_enumerateEAwithKey is the structure returned in the dataBuffer
@@ -1780,33 +1780,33 @@ type
         accessFlags : longint;
         keyExtants : longint;
         valueExtants : longint;
-        keyValue : array[0..0] of char;
+        keyValue : array[0..0] of AnsiChar;
      end;
 
 {$include npackoff.inc}
 
 function CloseEA(handle:longint):longint;cdecl;external Clib name 'CloseEA';
-function CopyEA (srcPath,destPath:Pchar; destVolumeNumber,destDirectoryNumber:longint;
+function CopyEA (srcPath,destPath:PAnsiChar; destVolumeNumber,destDirectoryNumber:longint;
                  EAcount,EAdataSize,EAkeySize:PLongint):longint;cdecl;external Clib name 'CopyEA';
-function CopyEA (srcPath,destPath:Pchar; destVolumeNumber,destDirectoryNumber:longint;
+function CopyEA (srcPath,destPath:PAnsiChar; destVolumeNumber,destDirectoryNumber:longint;
              var EAcount,EAdataSize,EAkeySize:longint):longint;cdecl;external Clib name 'CopyEA';
 
-function EnumerateEA(handle:longint; keyBuffer:Pchar; dataBuffer:pointer; dataBufferSize:longint;
+function EnumerateEA(handle:longint; keyBuffer:PAnsiChar; dataBuffer:pointer; dataBufferSize:longint;
                      startPosition:longint;
                      dataSize,EAsInReply:PLongint):longint;cdecl;external Clib name 'EnumerateEA';
-function EnumerateEA(handle:longint; keyBuffer:Pchar; var dataBuffer; dataBufferSize:longint;
+function EnumerateEA(handle:longint; keyBuffer:PAnsiChar; var dataBuffer; dataBufferSize:longint;
                      startPosition:longint;
                  var dataSize,EAsInReply:longint):longint;cdecl;external Clib name 'EnumerateEA';
-function EnumerateEA(handle:longint; keyBuffer:Pchar; dataBuffer:pointer; dataBufferSize:longint;
+function EnumerateEA(handle:longint; keyBuffer:PAnsiChar; dataBuffer:pointer; dataBufferSize:longint;
                      startPosition:longint;
                  var dataSize,EAsInReply:longint):longint;cdecl;external Clib name 'EnumerateEA';
 function GetEAInfo (handle:longint; totalEAs,totalDataSizeOfEAs,totalKeySizeOfEAs:PLongint):longint;cdecl;external Clib name 'GetEAInfo';
 function GetEAInfo (handle:longint; var totalEAs,totalDataSizeOfEAs,totalKeySizeOfEAs:longint):longint;cdecl;external Clib name 'GetEAInfo';
 
-function OpenEA(path:Pchar; reserved:longint):longint;cdecl;external Clib name 'OpenEA';
-function ReadEA(handle:longint; keyBuffer:Pchar; dataBuffer:Pchar; dataBufferSize:longint; accessFlags:PLongint):longint;cdecl;external Clib name 'ReadEA';
-function ReadEA(handle:longint; keyBuffer:Pchar; dataBuffer:Pchar; dataBufferSize:longint; var accessFlags:longint):longint;cdecl;external Clib name 'ReadEA';
-function WriteEA(handle:longint; keyBuffer:Pchar; dataBuffer:Pchar; dataBufferSize:longint; accessFlags:longint):longint;cdecl;external Clib name 'WriteEA';
+function OpenEA(path:PAnsiChar; reserved:longint):longint;cdecl;external Clib name 'OpenEA';
+function ReadEA(handle:longint; keyBuffer:PAnsiChar; dataBuffer:PAnsiChar; dataBufferSize:longint; accessFlags:PLongint):longint;cdecl;external Clib name 'ReadEA';
+function ReadEA(handle:longint; keyBuffer:PAnsiChar; dataBuffer:PAnsiChar; dataBufferSize:longint; var accessFlags:longint):longint;cdecl;external Clib name 'ReadEA';
+function WriteEA(handle:longint; keyBuffer:PAnsiChar; dataBuffer:PAnsiChar; dataBufferSize:longint; accessFlags:longint):longint;cdecl;external Clib name 'WriteEA';
 
 {------------------------------------------------------------------------------}
 
@@ -1814,15 +1814,15 @@ const MAX_CONSOLE_MESSAGE_LENGTH =  80;
       MAX_MESSAGE_LENGTH         =  58;
       NEW_MAX_MESSAGE_LENGTH     = 250;
 
-function BroadcastToConsole       (msg:Pchar):longint;       cdecl;external Clib name 'BroadcastToConsole';
+function BroadcastToConsole       (msg:PAnsiChar):longint;       cdecl;external Clib name 'BroadcastToConsole';
 function DisableStationBroadcasts:longint;                   cdecl;external Clib name 'DisableStationBroadcasts';
 function EnableStationBroadcasts:longint;                    cdecl;external Clib name 'EnableStationBroadcasts';
-function GetBroadcastMessage      (msgBuffer:Pchar):longint; cdecl;external Clib name 'GetBroadcastMessage';
-function SendBroadcastMessage     (msg:Pchar;
+function GetBroadcastMessage      (msgBuffer:PAnsiChar):longint; cdecl;external Clib name 'GetBroadcastMessage';
+function SendBroadcastMessage     (msg:PAnsiChar;
                                    connectionList:PWORD;
                                    resultList:PBYTE;
                                    connectionCount:word):longint; cdecl;external Clib name 'SendBroadcastMessage';
-function SendBroadcastMessage     (msg:Pchar;
+function SendBroadcastMessage     (msg:PAnsiChar;
                                    var connectionList;
                                    var resultList;
                                    var connectionCount:word):longint; cdecl;external Clib name 'SendBroadcastMessage';
@@ -1910,7 +1910,7 @@ type
         _type : word;
         position : word;
         controlFlags : word;
-        assocFileName : array[0..13] of char;
+        assocFileName : array[0..13] of AnsiChar;
         fileHandle : TNWFileHandle_t;
      end;
 
@@ -1921,7 +1921,7 @@ type
         formType : word;
         position : word;
         controlFlags : word;
-        assocFileName : array[0..13] of char;
+        assocFileName : array[0..13] of AnsiChar;
         fileHandle : TNWFileHandle_t;
      end;
 
@@ -1944,12 +1944,12 @@ type
         printControlFlags : word;
         maxLinesPerPage : word;
         maxCharsPerLine : word;
-        formName : array[0..12] of char;
+        formName : array[0..12] of AnsiChar;
         reserve : array[0..8] of byte;
-        bannerNameField : array[0..12] of char;
-        bannerFileField : array[0..12] of char;
-        bannerFileName : array[0..13] of char;
-        directoryPath : array[0..79] of char;
+        bannerNameField : array[0..12] of AnsiChar;
+        bannerFileField : array[0..12] of AnsiChar;
+        bannerFileName : array[0..13] of AnsiChar;
+        directoryPath : array[0..79] of AnsiChar;
      end;
 {$include npackoff.inc}
 
@@ -1961,8 +1961,8 @@ function ChangeQueueJobPosition(queueID:longint; jobNumber:word; newPosition:byt
 function ChangeToClientRights(queueID:longint; jobNumber:word):longint;cdecl;external Clib name 'ChangeToClientRights';
 function CloseFileAndAbortQueueJob(queueID:longint; jobNumber:word; fileHandle:longint):longint;cdecl;external Clib name 'CloseFileAndAbortQueueJob';
 function CloseFileAndStartQueueJob(queueID:longint; jobNumber:word; fileHandle:longint):longint;cdecl;external Clib name 'CloseFileAndStartQueueJob';
-function CreateAQueue(queueName:Pchar; queueType:longint; pathName:Pchar; queueID:Plongint):longint;cdecl;external Clib name 'CreateAQueue';
-function CreateAQueue(queueName:Pchar; queueType:longint; pathName:Pchar; var queueID:longint):longint;cdecl;external Clib name 'CreateAQueue';
+function CreateAQueue(queueName:PAnsiChar; queueType:longint; pathName:PAnsiChar; queueID:Plongint):longint;cdecl;external Clib name 'CreateAQueue';
+function CreateAQueue(queueName:PAnsiChar; queueType:longint; pathName:PAnsiChar; var queueID:longint):longint;cdecl;external Clib name 'CreateAQueue';
 function CreateQueueJobAndFile(queueID:longint; job:PJobStruct; fileHandle:Plongint):longint;cdecl;external Clib name 'CreateQueueJobAndFile';
 function CreateQueueJobAndFile(queueID:longint; var job:TJobStruct; var fileHandle:longint):longint;cdecl;external Clib name 'CreateQueueJobAndFile';
 function DestroyQueue(queueID:longint):longint;cdecl;external Clib name 'DestroyQueue';
@@ -1978,7 +1978,7 @@ function NWQChangeJobEntry(queueID:longint; jobInfo:PNWQJobRec_t):longint;cdecl;
 function NWQChangeJobPosition(queueID:longint; jobNum:longint; newPosition:longint):longint;cdecl;external Clib name 'NWQChangeJobPosition';
 function NWQChangeJobQueue(srcQueueID:longint; srcJobNum:longint; dstQueueID:longint; dstJobNum:Plongint):longint;cdecl;external Clib name 'NWQChangeJobQueue';
 function NWQChangeToClientRights(queueID:longint; jobNum:longint):longint;cdecl;external Clib name 'NWQChangeToClientRights';
-function NWQCreate(queueName:Pchar; queueType:word; pathName:Pchar; queueID:Plongint):longint;cdecl;external Clib name 'NWQCreate';
+function NWQCreate(queueName:PAnsiChar; queueType:word; pathName:PAnsiChar; queueID:Plongint):longint;cdecl;external Clib name 'NWQCreate';
 function NWQCreateJob(queueID:longint; jobInfo:PNWQJobRec_t; fileHandle:Plongint):longint;cdecl;external Clib name 'NWQCreateJob';
 function NWQCreateJob(queueID:longint; var jobInfo:TNWQJobRec_t; fileHandle:Plongint):longint;cdecl;external Clib name 'NWQCreateJob';
 function NWQDestroy(queueID:longint):longint;cdecl;external Clib name 'NWQDestroy';
@@ -2001,7 +2001,7 @@ function NWQSetStatus(queueID:longint; queueStatus:longint):longint;cdecl;extern
 function ReadQueueCurrentStatus(queueID:longint; queueStatus:PBYTE; numberOfJobs:PBYTE; numberOfServers:PBYTE; serverIDList:Plongint;
            serverStationList:PWORD; maxNumberOfServers:word):longint;cdecl;external Clib name 'ReadQueueCurrentStatus';
 function ReadQueueJobEntry(queueID:longint; jobNumber:word; job:PJobStruct):longint;cdecl;external Clib name 'ReadQueueJobEntry';
-function ReadQueueServerCurrentStatus(queueID:longint; serverID:longint; serverStation:char; serverStatusRecord:Pchar):longint;cdecl;external Clib name 'ReadQueueServerCurrentStatus';
+function ReadQueueServerCurrentStatus(queueID:longint; serverID:longint; serverStation:AnsiChar; serverStatusRecord:PAnsiChar):longint;cdecl;external Clib name 'ReadQueueServerCurrentStatus';
 function RemoveJobFromQueue(queueID:longint; jobNumber:word):longint;cdecl;external Clib name 'RemoveJobFromQueue';
 function RestoreQueueServerRights:longint;cdecl;external Clib name 'RestoreQueueServerRights';
 function ServiceQueueJobAndOpenFile(queueID:longint; targetJobType:word; job:PJobStruct; fileHandle:Plongint):longint;cdecl;external Clib name 'ServiceQueueJobAndOpenFile';
@@ -3101,7 +3101,7 @@ function SSGetProtocolNumbersByMedia(mediaNumber:longint; buffer:pointer; buffer
 function SSGetProtocolStatistics(stackNumber:longint; buffer:pointer; bufferLen:word):longint;cdecl;external Clib name 'SSGetProtocolStatistics';
 function SSGetRouterAndSAPInfo(buffer:pointer; bufferLen:word):longint;cdecl;external Clib name 'SSGetRouterAndSAPInfo';
 function SSGetServerInfo(serverType:longint; nameLength:byte; name:PBYTE; buffer:pointer; bufferLen:word):longint;cdecl;external Clib name 'SSGetServerInfo';
-function SSGetServerSourcesInfo(startNumber:longint; serverType:longint; nameLength:byte; name:PChar; buffer:pointer;
+function SSGetServerSourcesInfo(startNumber:longint; serverType:longint; nameLength:byte; name:PAnsiChar; buffer:pointer;
            bufferLen:word):longint;cdecl;external Clib name 'SSGetServerSourcesInfo';
 function SSGetUserInfo(connectionNumber:longint; buffer:pointer; bufferLen:word):longint;cdecl;external Clib name 'SSGetUserInfo';
 function SSGetVolumeSegmentList(volumeNumber:longint; buffer:pointer; bufferLen:word):longint;cdecl;external Clib name 'SSGetVolumeSegmentList';
@@ -3111,9 +3111,9 @@ function SSGetVolumeSwitchInfo(startNumber:longint; buffer:pointer; bufferLen:wo
 const _MAX_LOGREC_NAME = 128;
      _MAX_SEMAPHORE_NAME = 128;
 
-function  ClearFile(fileName:Pchar):longint; cdecl;external Clib name 'ClearFile';
+function  ClearFile(fileName:PAnsiChar):longint; cdecl;external Clib name 'ClearFile';
 procedure ClearFileSet;                      cdecl;external Clib name 'ClearFileSet';
-function  ClearLogicalRecord(logicalRecordName:Pchar):longint;cdecl;external Clib name 'ClearLogicalRecord';
+function  ClearLogicalRecord(logicalRecordName:PAnsiChar):longint;cdecl;external Clib name 'ClearLogicalRecord';
 procedure ClearLogicalRecordSet;             cdecl;external Clib name 'ClearLogicalRecordSet';
 function  ClearPhysicalRecord(fileHandle,recordStartOffset,recordLength:longint):longint;cdecl;external Clib name 'ClearPhysicalRecord';
 procedure ClearPhysicalRecordSet;cdecl;external Clib name 'ClearPhysicalRecordSet';
@@ -3123,14 +3123,14 @@ function  ExamineSemaphore(semaphoreHandle:longint; var semaphoreValue:longint;
 function  LockFileSet(timeoutLimit:word):longint;cdecl;external Clib name 'LockFileSet';
 function  LockLogicalRecordSet(timeoutLimit:word):longint;cdecl;external Clib name 'LockLogicalRecordSet';
 function  LockPhysicalRecordSet(lockDirective:byte; timeoutLimit:word):longint;cdecl;external Clib name 'LockPhysicalRecordSet';
-function  LogFile(fileName:Pchar; lockDirective:byte; timeoutLimit:word):longint;cdecl;external Clib name 'LogFile';
-function  LogLogicalRecord(logicalRecordName:Pchar; lockDirective:byte; timeoutLimit:word):longint;cdecl;external Clib name 'LogLogicalRecord';
+function  LogFile(fileName:PAnsiChar; lockDirective:byte; timeoutLimit:word):longint;cdecl;external Clib name 'LogFile';
+function  LogLogicalRecord(logicalRecordName:PAnsiChar; lockDirective:byte; timeoutLimit:word):longint;cdecl;external Clib name 'LogLogicalRecord';
 function  LogPhysicalRecord(fileHandle,recordStartOffset,recordLength:longint; lockDirective:byte; timeoutLimit:word):longint;cdecl;external Clib name 'LogPhysicalRecord';
-function  OpenSemaphore(semaphoreName:Pchar; initialValue:longint; semaphoreHandle:Plongint; openCount:PWORD):longint;cdecl;external Clib name 'OpenSemaphore';
-function  OpenSemaphore(semaphoreName:Pchar; initialValue:longint; var semaphoreHandle:longint; var openCount:word):longint;cdecl;external Clib name 'OpenSemaphore';
-function  ReleaseFile(fileName:Pchar):longint;cdecl;external Clib name 'ReleaseFile';
+function  OpenSemaphore(semaphoreName:PAnsiChar; initialValue:longint; semaphoreHandle:Plongint; openCount:PWORD):longint;cdecl;external Clib name 'OpenSemaphore';
+function  OpenSemaphore(semaphoreName:PAnsiChar; initialValue:longint; var semaphoreHandle:longint; var openCount:word):longint;cdecl;external Clib name 'OpenSemaphore';
+function  ReleaseFile(fileName:PAnsiChar):longint;cdecl;external Clib name 'ReleaseFile';
 procedure ReleaseFileSet;cdecl;external Clib name 'ReleaseFileSet';
-function  ReleaseLogicalRecord(logicalRecordName:Pchar):longint;cdecl;external Clib name 'ReleaseLogicalRecord';
+function  ReleaseLogicalRecord(logicalRecordName:PAnsiChar):longint;cdecl;external Clib name 'ReleaseLogicalRecord';
 procedure ReleaseLogicalRecordSet;cdecl;external Clib name 'ReleaseLogicalRecordSet';
 function  ReleasePhysicalRecord(fileHandle,recordStartOffset,recordLength:longint):longint;cdecl;external Clib name 'ReleasePhysicalRecord';
 procedure ReleasePhysicalRecordSet;cdecl;external Clib name 'ReleasePhysicalRecordSet';

+ 5 - 5
rtl/netware/nwpre.pp

@@ -36,8 +36,8 @@ procedure _nlm_main; external  name '_nlm_main';
 procedure FPC_NW_CHECKFUNCTION; external name 'FPC_NW_CHECKFUNCTION';
 function _StartNLM (NLMHandle              : longint;
                    initErrorScreenID       : longint;
-                   cmdLineP                : pchar;
-                   loadDirectoryPath       : pchar;
+                   cmdLineP                : PAnsiChar;
+                   loadDirectoryPath       : PAnsiChar;
                    uninitializedDataLength : longint;
                    NLMFileHandle           : longint;
                    readRoutineP            : pointer;
@@ -73,7 +73,7 @@ end;
 // structure needed by clib
 type kNLMInfoT =
    packed record
-      Signature      : array [0..3] of char;	// LONG 'NLMI'
+      Signature      : array [0..3] of AnsiChar;	// LONG 'NLMI'
       Flavor         : longint;			// TRADINIONAL_FLAVOR = 0
       Version        : longint;			// TRADINIONAL_VERSION = 0, LIBERTY_VERSION = 1
       LongDoubleSize : longint;			// gcc nwpre defines 12, watcom 8
@@ -99,8 +99,8 @@ procedure CSetB(value:byte; var addr; count:longint); cdecl; external '!' name '
 // created thread
 function _Prelude (NLMHandle               : longint;
                    initErrorScreenID       : longint;
-                   cmdLineP                : pchar;
-                   loadDirectoryPath       : pchar;
+                   cmdLineP                : PAnsiChar;
+                   loadDirectoryPath       : PAnsiChar;
                    uninitializedDataLength : longint;
                    NLMFileHandle           : longint;
                    readRoutineP            : pointer;

+ 61 - 61
rtl/netware/nwprot.pp

@@ -159,18 +159,18 @@ const
 type
    Phostent = ^Thostent;
    Thostent = record
-     h_name      : Pchar;    // official name of host
-     h_aliases   : ^Pchar;   // alias list
+     h_name      : PAnsiChar;    // official name of host
+     h_aliases   : ^PAnsiChar;   // alias list
      h_addrtype  : longint;
      h_length    : longint;  // length of address
-     h_addr_list : ^Pchar;   // list of addresses from name server
+     h_addr_list : ^PAnsiChar;   // list of addresses from name server
    end;
 
 // Assumption here is that a network number fits in 32 bits -- probably a poor one.
    Pnetent = ^Tnetent;
    Tnetent = record
-     n_name     : Pchar;    // official name of net
-     n_aliases  : ^Pchar;   // alias list
+     n_name     : PAnsiChar;    // official name of net
+     n_aliases  : ^PAnsiChar;   // alias list
      n_addrtype : longint;
      n_net      : dword;
      n_mask     : dword;    // Netmask, Novell extension
@@ -178,16 +178,16 @@ type
 
    Pservent = ^Tservent;
    Tservent = record
-     s_name    : Pchar;        // official service name
-     s_aliases : ^Pchar;       // alias list
+     s_name    : PAnsiChar;        // official service name
+     s_aliases : ^PAnsiChar;       // alias list
      s_port    : longint;      // portnumber
-     s_proto   : Pchar;        // protocol to use
+     s_proto   : PAnsiChar;        // protocol to use
    end;
 
    Pprotoent = ^Tprotoent;
    Tprotoent = record
-     p_name    : Pchar;     // official protocol name
-     p_aliases : ^Pchar;
+     p_name    : PAnsiChar;     // official protocol name
+     p_aliases : ^PAnsiChar;
      p_proto   : longint;
    end;
 
@@ -219,7 +219,7 @@ type
                    2 : ( nsu_proto : Tprotoent );
                    3 : ( nsu_serv  : Tservent );
                 end;
-            nse_scratch : array[0..(SCRATCHBUFSIZE)-1] of char;
+            nse_scratch : array[0..(SCRATCHBUFSIZE)-1] of AnsiChar;
          end;
     { Declare the context block.  The client must supply the actual
       block by placing NETDB_DEFINE_CONTEXT in one of the C modules
@@ -231,11 +231,11 @@ type
        ------------------------------------------------------------------------  }
 { Local-file-only routines  }
 
-function NWgethostbyname(nwsktctx:Pnwsockent; name:Pchar):Phostent;cdecl;external {'tcpip'} name 'NWgethostbyname';
-function NWgethostbyname(var nwsktctx:Tnwsockent; name:Pchar):Phostent;cdecl;external {'tcpip'} name 'NWgethostbyname';
+function NWgethostbyname(nwsktctx:Pnwsockent; name:PAnsiChar):Phostent;cdecl;external {'tcpip'} name 'NWgethostbyname';
+function NWgethostbyname(var nwsktctx:Tnwsockent; name:PAnsiChar):Phostent;cdecl;external {'tcpip'} name 'NWgethostbyname';
 
-function NWgethostbyaddr(nwsktctx:Pnwsockent; addr:Pchar; length:longint; _type:longint):Phostent;cdecl;external {'tcpip'} name 'NWgethostbyaddr';
-function NWgethostbyaddr(var nwsktctx:Tnwsockent; addr:Pchar; length:longint; _type:longint):Phostent;cdecl;external {'tcpip'} name 'NWgethostbyaddr';
+function NWgethostbyaddr(nwsktctx:Pnwsockent; addr:PAnsiChar; length:longint; _type:longint):Phostent;cdecl;external {'tcpip'} name 'NWgethostbyaddr';
+function NWgethostbyaddr(var nwsktctx:Tnwsockent; addr:PAnsiChar; length:longint; _type:longint):Phostent;cdecl;external {'tcpip'} name 'NWgethostbyaddr';
 
 function NWgethostent(nwsktctx:Pnwsockent):Phostent;cdecl;external {'tcpip'} name 'NWgethostent';
 function NWgethostent(var nwsktctx:Tnwsockent):Phostent;cdecl;external {'tcpip'} name 'NWgethostent';
@@ -269,7 +269,7 @@ procedure NWendhostent(var nwsktctx:Tnwsockent);cdecl;external {'tcpip'} name 'N
 
         Syntax:
           struct hostent   NetDBgethostbyname(struct nwsockent  nwsktent,
-                                              char  name);
+                                              AnsiChar  name);
 
              nwskent: Points to a context block.
 
@@ -279,8 +279,8 @@ procedure NWendhostent(var nwsktctx:Tnwsockent);cdecl;external {'tcpip'} name 'N
           A pointer to the appropriate struct hostent if any that matches.
           NULL if no match found.
                                                                               }
-function NetDBgethostbyname(nwskent:Pnwsockent; name:Pchar):Phostent;cdecl;external {'tcpip'} name 'NetDBgethostbyname';
-function NetDBgethostbyname(var nwskent:Tnwsockent; name:Pchar):Phostent;cdecl;external {'tcpip'} name 'NetDBgethostbyname';
+function NetDBgethostbyname(nwskent:Pnwsockent; name:PAnsiChar):Phostent;cdecl;external {'tcpip'} name 'NetDBgethostbyname';
+function NetDBgethostbyname(var nwskent:Tnwsockent; name:PAnsiChar):Phostent;cdecl;external {'tcpip'} name 'NetDBgethostbyname';
     {
        NetDBgethostbyaddr() -- returns the host entry (struct hostent  ) given
         the address of a host.
@@ -304,7 +304,7 @@ function NetDBgethostbyname(var nwskent:Tnwsockent; name:Pchar):Phostent;cdecl;e
 
         Syntax:
           struct hostent   NetDBgethostbyaddr(struct nwsockent  nwskent,
-                                              char  addr, int len, int type);
+                                              AnsiChar  addr, int len, int type);
 
              nwsktent: (Input) Points to a context block.
 
@@ -319,8 +319,8 @@ function NetDBgethostbyname(var nwskent:Tnwsockent; name:Pchar):Phostent;cdecl;e
           A pointer to the appropriate struct hostent if any that matches.
           NULL if no match found.
                                                                               }
-function NetDBgethostbyaddr(nwsktent:Pnwsockent; addr:Pchar; len:longint; _type:longint):Phostent;cdecl;external {'tcpip'} name 'NetDBgethostbyaddr';
-function NetDBgethostbyaddr(var nwsktent:Tnwsockent; addr:Pchar; len:longint; _type:longint):Phostent;cdecl;external {'tcpip'} name 'NetDBgethostbyaddr';
+function NetDBgethostbyaddr(nwsktent:Pnwsockent; addr:PAnsiChar; len:longint; _type:longint):Phostent;cdecl;external {'tcpip'} name 'NetDBgethostbyaddr';
+function NetDBgethostbyaddr(var nwsktent:Tnwsockent; addr:PAnsiChar; len:longint; _type:longint):Phostent;cdecl;external {'tcpip'} name 'NetDBgethostbyaddr';
     {
        NetDBgethostent() -- returns the next sequential entry from the
         SYS:ETC/HOSTS file, opening the file it it is not already open.  Once
@@ -406,7 +406,7 @@ procedure NetDBendhostent(var nwsktent:Tnwsockent);cdecl;external {'tcpip'} name
         our own machine.
 
         Syntax:
-          int NetDBgethostname(struct nwsockent  nwsktent, char  name,
+          int NetDBgethostname(struct nwsockent  nwsktent, AnsiChar  name,
                                                                 int namelen);
 
           nwsktent: (Input)  Points to a context block.
@@ -419,12 +419,12 @@ procedure NetDBendhostent(var nwsktent:Tnwsockent);cdecl;external {'tcpip'} name
            0: The call succeeded.
           -1: The call failed.
                                                                               }
-function NetDBgethostname(nwsktent:Pnwsockent; name:Pchar; namelen:longint):longint;cdecl;external {'tcpip'} name 'NetDBgethostname';
-function NetDBgethostname(var nwsktent:Tnwsockent; name:Pchar; namelen:longint):longint;cdecl;external {'tcpip'} name 'NetDBgethostname';
+function NetDBgethostname(nwsktent:Pnwsockent; name:PAnsiChar; namelen:longint):longint;cdecl;external {'tcpip'} name 'NetDBgethostname';
+function NetDBgethostname(var nwsktent:Tnwsockent; name:PAnsiChar; namelen:longint):longint;cdecl;external {'tcpip'} name 'NetDBgethostname';
 
 // Network file examination
-function NWgetnetbyname(nwsktctx:Pnwsockent; name:Pchar):Pnetent;cdecl;external {'tcpip'} name 'NWgetnetbyname';
-function NWgetnetbyname(var nwsktctx:Tnwsockent; name:Pchar):Pnetent;cdecl;external {'tcpip'} name 'NWgetnetbyname';
+function NWgetnetbyname(nwsktctx:Pnwsockent; name:PAnsiChar):Pnetent;cdecl;external {'tcpip'} name 'NWgetnetbyname';
+function NWgetnetbyname(var nwsktctx:Tnwsockent; name:PAnsiChar):Pnetent;cdecl;external {'tcpip'} name 'NWgetnetbyname';
 
 function NWgetnetbyaddr(nwsktctx:Pnwsockent; net:longint; _type:longint):Pnetent;cdecl;external {'tcpip'} name 'NWgetnetbyaddr';
 function NWgetnetbyaddr(var nwsktctx:Tnwsockent; net:longint; _type:longint):Pnetent;cdecl;external {'tcpip'} name 'NWgetnetbyaddr';
@@ -439,11 +439,11 @@ procedure NWendnetent(nwsktctx:Pnwsockent);cdecl;external {'tcpip'} name 'NWendn
 procedure NWendnetent(var nwsktctx:Tnwsockent);cdecl;external {'tcpip'} name 'NWendnetent';
 
 // Service file examination
-function NWgetservbyname(nwsktctx:Pnwsockent; name:Pchar; protocol:Pchar):Pservent;cdecl;external {'tcpip'} name 'NWgetservbyname';
-function NWgetservbyname(var nwsktctx:Tnwsockent; name:Pchar; protocol:Pchar):Pservent;cdecl;external {'tcpip'} name 'NWgetservbyname';
+function NWgetservbyname(nwsktctx:Pnwsockent; name:PAnsiChar; protocol:PAnsiChar):Pservent;cdecl;external {'tcpip'} name 'NWgetservbyname';
+function NWgetservbyname(var nwsktctx:Tnwsockent; name:PAnsiChar; protocol:PAnsiChar):Pservent;cdecl;external {'tcpip'} name 'NWgetservbyname';
 
-function NWgetservbyport(nwsktctx:Pnwsockent; port:longint; protocol:Pchar):Pservent;cdecl;external {'tcpip'} name 'NWgetservbyport';
-function NWgetservbyport(var nwsktctx:Tnwsockent; port:longint; protocol:Pchar):Pservent;cdecl;external {'tcpip'} name 'NWgetservbyport';
+function NWgetservbyport(nwsktctx:Pnwsockent; port:longint; protocol:PAnsiChar):Pservent;cdecl;external {'tcpip'} name 'NWgetservbyport';
+function NWgetservbyport(var nwsktctx:Tnwsockent; port:longint; protocol:PAnsiChar):Pservent;cdecl;external {'tcpip'} name 'NWgetservbyport';
 
 function NWgetservent(nwsktctx:Pnwsockent):Pservent;cdecl;external {'tcpip'} name 'NWgetservent';
 function NWgetservent(var nwsktctx:Tnwsockent):Pservent;cdecl;external {'tcpip'} name 'NWgetservent';
@@ -455,8 +455,8 @@ procedure NWendservent(nwsktctx:Pnwsockent);cdecl;external {'tcpip'} name 'NWend
 procedure NWendservent(var nwsktctx:Tnwsockent);cdecl;external {'tcpip'} name 'NWendservent';
 
 // Protocol file examination
-function NWgetprotobyname(nwsktctx:Pnwsockent; name:Pchar):Pprotoent;cdecl;external {'tcpip'} name 'NWgetprotobyname';
-function NWgetprotobyname(var nwsktctx:Tnwsockent; name:Pchar):Pprotoent;cdecl;external {'tcpip'} name 'NWgetprotobyname';
+function NWgetprotobyname(nwsktctx:Pnwsockent; name:PAnsiChar):Pprotoent;cdecl;external {'tcpip'} name 'NWgetprotobyname';
+function NWgetprotobyname(var nwsktctx:Tnwsockent; name:PAnsiChar):Pprotoent;cdecl;external {'tcpip'} name 'NWgetprotobyname';
 
 function NWgetprotobynumber(nwsktctx:Pnwsockent; protocol:longint):Pprotoent;cdecl;external {'tcpip'} name 'NWgetprotobynumber';
 function NWgetprotobynumber(var nwsktctx:Tnwsockent; protocol:longint):Pprotoent;cdecl;external {'tcpip'} name 'NWgetprotobynumber';
@@ -470,7 +470,7 @@ procedure NWsetprotoent(var nwsktctx:Tnwsockent; stayopen:longint);cdecl;externa
 procedure NWendprotoent(nwsktctx:Pnwsockent);cdecl;external {'tcpip'} name 'NWendprotoent';
 procedure NWendprotoent(var nwsktctx:Tnwsockent);cdecl;external {'tcpip'} name 'NWendprotoent';
 
-function gethostname(name:Pchar; namelen:longint):longint;cdecl;external {'tcpip'} name 'gethostname';
+function gethostname(name:PAnsiChar; namelen:longint):longint;cdecl;external {'tcpip'} name 'gethostname';
 function gethostid:longint;cdecl;external {'tcpip'} name 'gethostid';
 {-tiuser.h---------------------------------------------------------------------}
 const
@@ -548,7 +548,7 @@ var t_errno : longint;cvar;external;
        Tnetbuf = record
          maxlen : dword;
          len    : dword;
-         buf    : Pchar;
+         buf    : PAnsiChar;
        end;
 
        Pt_bind = ^Tt_bind;
@@ -640,7 +640,7 @@ var t_errno : longint;cvar;external;
        _T_NULL = 0;
        _T_ABSREQ = $8000;
       var
-         t_errlist : array of Pchar;cvar;external;
+         t_errlist : array of PAnsiChar;cvar;external;
          t_nerr : longint;cvar;external;
     {---------------------TCP specific Options-------------------------- }
     { TCP Precedence Levels  }
@@ -674,27 +674,27 @@ var t_errno : longint;cvar;external;
 
 
 function t_accept(fd:longint; resfd:longint; call:Pt_call):longint;cdecl;external 'tli' name 't_accept';
-function t_alloc(fd:longint; struct_type:longint; fields:longint):Pchar;cdecl;external 'tli' name 't_alloc';
+function t_alloc(fd:longint; struct_type:longint; fields:longint):PAnsiChar;cdecl;external 'tli' name 't_alloc';
 function t_bind(fd:longint; req:Pt_bind; ret:Pt_bind):longint;cdecl;external 'tli' name 't_bind';
 function t_blocking(fd:longint):longint;cdecl;external 'tli' name 't_blocking';
 function t_close(fd:longint):longint;cdecl;external 'tli' name 't_close';
 function t_connect(fd:longint; sndcall:Pt_call; rcvcall:Pt_call):longint;cdecl;external 'tli' name 't_connect';
-procedure t_error(errmsg:Pchar);cdecl;external 'tli' name 't_error';
-function t_free(ptr:Pchar; struct_type:longint):longint;cdecl;external 'tli' name 't_free';
+procedure t_error(errmsg:PAnsiChar);cdecl;external 'tli' name 't_error';
+function t_free(ptr:PAnsiChar; struct_type:longint):longint;cdecl;external 'tli' name 't_free';
 function t_getinfo(fd:longint; info:Pt_info):longint;cdecl;external 'tli' name 't_getinfo';
 function t_getstate(fd:longint):longint;cdecl;external 'tli' name 't_getstate';
 function t_listen(fd:longint; call:Pt_call):longint;cdecl;external 'tli' name 't_listen';
 function t_look(fd:longint):longint;cdecl;external 'tli' name 't_look';
 function t_nonblocking(fd:longint):longint;cdecl;external 'tli' name 't_nonblocking';
-function t_open(path:Pchar; oflag:longint; info:Pt_info):longint;cdecl;external 'tli' name 't_open';
+function t_open(path:PAnsiChar; oflag:longint; info:Pt_info):longint;cdecl;external 'tli' name 't_open';
 function t_optmgmt(fd:longint; req:Pt_optmgmt; ret:Pt_optmgmt):longint;cdecl;external 'tli' name 't_optmgmt';
-function t_rcv(fd:longint; buf:Pchar; nbytes:dword; flags:Plongint):longint;cdecl;external 'tli' name 't_rcv';
+function t_rcv(fd:longint; buf:PAnsiChar; nbytes:dword; flags:Plongint):longint;cdecl;external 'tli' name 't_rcv';
 function t_rcvconnect(fd:longint; call:Pt_call):longint;cdecl;external 'tli' name 't_rcvconnect';
 function t_rcvdis(fd:longint; discon:Pt_discon):longint;cdecl;external 'tli' name 't_rcvdis';
 function t_rcvrel(fd:longint):longint;cdecl;external 'tli' name 't_rcvrel';
 function t_rcvudata(fd:longint; unitdata:Pt_unitdata; flags:Plongint):longint;cdecl;external 'tli' name 't_rcvudata';
 function t_rcvuderr(fd:longint; uderr:Pt_uderr):longint;cdecl;external 'tli' name 't_rcvuderr';
-function t_snd(fd:longint; buf:Pchar; nbytes:dword; flags:longint):longint;cdecl;external 'tli' name 't_snd';
+function t_snd(fd:longint; buf:PAnsiChar; nbytes:dword; flags:longint):longint;cdecl;external 'tli' name 't_snd';
 function t_snddis(fd:longint; call:Pt_call):longint;cdecl;external 'tli' name 't_snddis';
 function t_sndrel(fd:longint):longint;cdecl;external 'tli' name 't_sndrel';
 function t_sndudata(fd:longint; unitdata:Pt_unitdata):longint;cdecl;external 'tli' name 't_sndudata';
@@ -768,13 +768,13 @@ type
      dflt      : smallint;
      ltpdu     : longint;
      reastime  : smallint;
-     _class    : char;
-     altclass  : char;
-     extform   : char;
-     flowctrl  : char;
-     checksum  : char;
-     netexp    : char;
-     netrecptcf: char;
+     _class    : AnsiChar;
+     altclass  : AnsiChar;
+     extform   : AnsiChar;
+     flowctrl  : AnsiChar;
+     checksum  : AnsiChar;
+     netexp    : AnsiChar;
+     netrecptcf: AnsiChar;
    end;
 
 // Connection oriented options.
@@ -792,7 +792,7 @@ type
      protection     : word;
      priority       : smallint;
      mngmt          : Tmanagement;   // management parameters
-     expd           : char;          // expedited data: T_YES or T_NO
+     expd           : AnsiChar;          // expedited data: T_YES or T_NO
    end;
 
 // Connectionless options.
@@ -870,7 +870,7 @@ type
    Tlog_ctl = record
      mid   : smallint;
      sid   : smallint;
-     level : char;
+     level : AnsiChar;
      flags : smallint;
      ltime : longint;
      ttime : longint;
@@ -881,7 +881,7 @@ type
    Ttrace_ids = record
      ti_mid   : smallint;
      ti_sid   : smallint;
-     ti_level : char;
+     ti_level : AnsiChar;
      ti_flags : smallint;
    end;
 {-strstat.h--------------------------------------------------------------------}
@@ -893,7 +893,7 @@ type
      ms_ocnt : longint;
      ms_ccnt : longint;
      ms_acnt : longint;
-     ms_xptr : Pchar;
+     ms_xptr : PAnsiChar;
      ms_xsize: smallint;
    end;
 {-user.h-----------------------------------------------------------------------}
@@ -913,7 +913,7 @@ type
    Pmodule_info = ^Tmodule_info;
    Tmodule_info = record
      mi_idnum  : word;
-     mi_idname : Pchar;
+     mi_idname : PAnsiChar;
      mi_minpsz : smallint;
      mi_maxpsz : smallint;
      mi_hiwat  : smallint;
@@ -950,8 +950,8 @@ type
      b_next  : Pmsgb;   // next message on queue
      b_prev  : Pmsgb;   // previous message on queue
      b_cont  : Pmsgb;   // next message block of message
-     b_rptr  : PChar;   // first unread data byte in buffer
-     b_wptr  : PChar;   // first unwritten data byte
+     b_rptr  : PAnsiChar;   // first unread data byte in buffer
+     b_wptr  : PAnsiChar;   // first unwritten data byte
      b_datap : Pdatab;  // data block
    end;
 
@@ -967,7 +967,7 @@ type
      q_last  : Pmsgb;
      q_next  : Pqueue;
      q_link  : Pqueue;
-     q_ptr   : Pchar;
+     q_ptr   : PAnsiChar;
      q_count : byte;  //ushort;
      q_flag  : byte;  // ushort;
      q_minpsz: smallint;
@@ -1121,8 +1121,8 @@ function allocq:Pqueue_t;cdecl;external 'streams' name 'allocq';
 function adjmsg(mp:Pmblk_t; len_param:longint):longint;cdecl;external 'streams' name 'adjmsg';
 function backq(q:Pqueue_t):Pqueue_t;cdecl;external 'streams' name 'backq';
 function bufcall(size:longint; pri:longint; func:TFuncLongCdecl; arg:longint):longint;cdecl;external 'streams' name 'bufcall';
-procedure bcopy(src:Pchar; dst:Pchar; len:longint);cdecl;external 'streams' name 'bcopy';
-procedure bzero(buffer:Pchar; nbytes:longint);cdecl;external 'streams' name 'bzero';
+procedure bcopy(src:PAnsiChar; dst:PAnsiChar; len:longint);cdecl;external 'streams' name 'bcopy';
+procedure bzero(buffer:PAnsiChar; nbytes:longint);cdecl;external 'streams' name 'bzero';
 function canput(q:Pqueue_t):longint;cdecl;external 'streams' name 'canput';
 function copyb(mp:Pmblk_t):Pmblk_t;cdecl;external 'streams' name 'copyb';
 function copymsg(mp:Pmblk_t):Pmblk_t;cdecl;external 'streams' name 'copymsg';
@@ -1146,8 +1146,8 @@ function qreply(q:Pqueue_t; mp:Pmblk_t):longint;cdecl;external 'streams' name 'q
 function qsize(q:Pqueue_t):longint;cdecl;external 'streams' name 'qsize';
 function rmvb(mp:Pmblk_t; bp:Pmblk_t):Pmblk_t;cdecl;external 'streams' name 'rmvb';
 function rmvq(q:Pqueue_t; mp:Pmblk_t):longint;cdecl;external 'streams' name 'rmvq';
-function strlog(sid:smallint; mid:smallint; level:char; aflags:smallint; args:array of const):longint;cdecl;external 'streams' name 'strlog';
-function strlog(sid:smallint; mid:smallint; level:char; aflags:smallint):longint;cdecl;external 'streams' name 'strlog';
+function strlog(sid:smallint; mid:smallint; level:AnsiChar; aflags:smallint; args:array of const):longint;cdecl;external 'streams' name 'strlog';
+function strlog(sid:smallint; mid:smallint; level:AnsiChar; aflags:smallint):longint;cdecl;external 'streams' name 'strlog';
 function testb(size:longint; pri:longint):longint;cdecl;external 'streams' name 'testb';
 function timeout(func:TFuncLongCdecl; arg:pointer; ticks:longint):longint;cdecl;external 'streams' name 'timeout';
 function unlinkb(mp:Pmblk_t):Pmblk_t;cdecl;external 'streams' name 'unlinkb';
@@ -1321,7 +1321,7 @@ const
    IN_LOOPBACKNET = 127;
 
 // var sin_port : word;cvar;public;
-//   sin_zero : array[0..7] of char;cvar;public;
+//   sin_zero : array[0..7] of AnsiChar;cvar;public;
 
     const
        IP_OPTIONS = 1;

File diff suppressed because it is too large
+ 240 - 240
rtl/netware/nwserv.pp


+ 81 - 81
rtl/netware/nwsnut.pp

@@ -375,8 +375,8 @@ uses libc;
           cursorLine : longint;
           cursorColumn : longint;
           firstUpdateFlag : longint;
-          headerText : pchar;
-          headerText2 : pchar;
+          headerText : PAnsiChar;
+          headerText2 : PAnsiChar;
           virtualScreen : pointer;
           saveScreen : pointer;
           screenID : TScr;
@@ -415,8 +415,8 @@ uses libc;
           saveFlag        : longint;
           directFlag      : longint;
           headerAttribute : longint;
-          headerText      : pchar;
-          text            : pchar;
+          headerText      : PAnsiChar;
+          text            : PAnsiChar;
        end;
      THELP_SCREEN = THS_;
      PHELP_SCREEN = ^THELP_SCREEN;
@@ -431,7 +431,7 @@ uses libc;
           maxSkew        : word;
           entryProcedure : procedure (listElement:PLIST_STRUCT; displayLine:longint; NUTInfoStructure:pointer);cdecl;
           extra          : longint;
-          text           : array[0..0] of char;
+          text           : array[0..0] of AnsiChar;
        end;
      TLIST = TLIST_STRUCT;
      PLIST = ^TLIST;
@@ -449,22 +449,22 @@ uses libc;
 
      PMI_ = ^TMI_;
      TMI_ = record
-          dynamicMessageOne      : pchar;
-          dynamicMessageTwo      : pchar;
-          dynamicMessageThree    : pchar;
-          dynamicMessageFour     : pchar;
-          dynamicMessageFive     : pchar;
-          dynamicMessageSix      : pchar;
-          dynamicMessageSeven    : pchar;
-          dynamicMessageEight    : pchar;
-          dynamicMessageNine     : pchar;
-          dynamicMessageTen      : pchar;
-          dynamicMessageEleven   : pchar;
-          dynamicMessageTwelve   : pchar;
-          dynamicMessageThirteen : pchar;
-          dynamicMessageFourteen : pchar;
+          dynamicMessageOne      : PAnsiChar;
+          dynamicMessageTwo      : PAnsiChar;
+          dynamicMessageThree    : PAnsiChar;
+          dynamicMessageFour     : PAnsiChar;
+          dynamicMessageFive     : PAnsiChar;
+          dynamicMessageSix      : PAnsiChar;
+          dynamicMessageSeven    : PAnsiChar;
+          dynamicMessageEight    : PAnsiChar;
+          dynamicMessageNine     : PAnsiChar;
+          dynamicMessageTen      : PAnsiChar;
+          dynamicMessageEleven   : PAnsiChar;
+          dynamicMessageTwelve   : PAnsiChar;
+          dynamicMessageThirteen : PAnsiChar;
+          dynamicMessageFourteen : PAnsiChar;
           messageCount : longint;
-          programMesgTable : ppchar;
+          programMesgTable : PPAnsiChar;
        end;
      TMessageInfo = TMI_;
      PMessageInfo = ^TMessageInfo;
@@ -526,9 +526,9 @@ uses libc;
           customData : pointer;
           customDataRelease : procedure (theData:pointer; thisStructure:PNUTInfo_); cdecl;
           displayErrorLabel : longint;
-          markBuffer : pchar;
+          markBuffer : PAnsiChar;
           markBufferLength : longint;
-          editBuffer : pchar;
+          editBuffer : PAnsiChar;
           editBufferLength : longint;
           staticFlag : longint;
           processID : longint;
@@ -607,12 +607,12 @@ uses libc;
           fieldWidth : longint;
           fieldAttribute : longint;
           fieldActivateKeys : longint;
-          fieldFormat : procedure (field:Pfielddef; text:pchar; buffLen:longint);cdecl;
+          fieldFormat : procedure (field:Pfielddef; text:PAnsiChar; buffLen:longint);cdecl;
           fieldControl : function (field:Pfielddef; selectKey:longint; fieldChanged:Plongint; handle:PNUTInfo):longint;
-          fieldVerify : function (field:Pfielddef; data:pchar; handle:PNUTInfo):longint;
+          fieldVerify : function (field:Pfielddef; data:PAnsiChar; handle:PNUTInfo):longint;
           fieldRelease : procedure (para1:Pfielddef);
-          fieldData : pchar;
-          fieldXtra : pchar;
+          fieldData : PAnsiChar;
+          fieldXtra : PAnsiChar;
           fieldHelp : longint;
           fieldAbove : Pfielddef;
           fieldBelow : Pfielddef;
@@ -650,8 +650,8 @@ uses libc;
                  version,
                  headerType,
                  compatibilityLevel : longint;
-                 messageTable       : PPchar;
-                 helpScreens        : pchar;
+                 messageTable       : PPAnsiChar;
+                 helpScreens        : PAnsiChar;
                  screenID           : TScr;     // Clib/OS Screen Id
                  resourceTag        : TRtag;    // OS ResourceTagStructure
              var handle             : PNUTInfo) : longint;cdecl;external External_library name 'NWSInitializeNut';
@@ -659,9 +659,9 @@ uses libc;
   procedure NWSScreenSize(maxLines,maxColumns:plongint);cdecl;external External_library name 'NWSScreenSize';
   procedure NWSScreenSize(var maxLines,maxColumns:longint);cdecl;external External_library name 'NWSScreenSize';
 
-  procedure NWSShowPortalLine(line,column:longint; text:pchar; length:longint; portal:PPCB);cdecl;external External_library name 'NWSShowPortalLine';
+  procedure NWSShowPortalLine(line,column:longint; text:PAnsiChar; length:longint; portal:PPCB);cdecl;external External_library name 'NWSShowPortalLine';
 
-  procedure NWSShowPortalLineAttribute(line,column:longint; text:pchar; attribute,length:longint;
+  procedure NWSShowPortalLineAttribute(line,column:longint; text:PAnsiChar; attribute,length:longint;
               portal:PPCB);cdecl;external External_library name 'NWSShowPortalLineAttribute';
 
   procedure NWSScrollPortalZone(line,column,height,width,attribute,
@@ -673,10 +673,10 @@ uses libc;
   procedure NWSFillPortalZoneAttribute(line,column,height,width,attribute:longint;
               portal:PPCB);cdecl;external External_library name 'NWSFillPortalZoneAttribute';
 
-  function NWSGetMessage(message:longint; messages:PMessageInfo):pchar;cdecl;external External_library name 'NWSGetMessage';
+  function NWSGetMessage(message:longint; messages:PMessageInfo):PAnsiChar;cdecl;external External_library name 'NWSGetMessage';
 
-  procedure NWSSetDynamicMessage(message:longint; text:pchar; messages:PMessageInfo);cdecl;external External_library name 'NWSSetDynamicMessage';
-  procedure NWSSetDynamicMessage(message:longint; text:pchar; var messages:TMessageInfo);cdecl;external External_library name 'NWSSetDynamicMessage';
+  procedure NWSSetDynamicMessage(message:longint; text:PAnsiChar; messages:PMessageInfo);cdecl;external External_library name 'NWSSetDynamicMessage';
+  procedure NWSSetDynamicMessage(message:longint; text:PAnsiChar; var messages:TMessageInfo);cdecl;external External_library name 'NWSSetDynamicMessage';
 
   function NWSCreatePortal
                 (line,
@@ -686,7 +686,7 @@ uses libc;
                  virtualHeight,
                  virtualWidth,
                  saveFlag:longint;
-                 headerText:pchar;
+                 headerText:PAnsiChar;
                  headerAttribute,
                  borderType,
                  borderAttribute,
@@ -729,13 +729,13 @@ type TFreeRoutine = procedure (memoryPointer:pointer); cdecl;
 
   procedure NWSDestroyForm(handle:PNUTInfo);cdecl;external External_library name 'NWSDestroyForm';
 
-  function NWSAppendToList(text:pchar; otherInfo:pointer; handle:PNUTInfo):PLIST;cdecl;external External_library name 'NWSAppendToList';
+  function NWSAppendToList(text:PAnsiChar; otherInfo:pointer; handle:PNUTInfo):PLIST;cdecl;external External_library name 'NWSAppendToList';
 
   function NWSDeleteFromList(el:PLIST; handle:PNUTInfo):PLIST;cdecl;external External_library name 'NWSDeleteFromList';
 
-  function NWSInsertInList(text:pchar; otherInfo:pointer; atElement:PLIST; handle:PNUTInfo):PLIST;cdecl;external External_library name 'NWSInsertInList';
+  function NWSInsertInList(text:PAnsiChar; otherInfo:pointer; atElement:PLIST; handle:PNUTInfo):PLIST;cdecl;external External_library name 'NWSInsertInList';
 
-  function NWSGetListElementText(element:PLIST):pchar;cdecl;external External_library name 'NWSGetListElementText';
+  function NWSGetListElementText(element:PLIST):PAnsiChar;cdecl;external External_library name 'NWSGetListElementText';
 
   function NWSGetListHead(handle:PNUTInfo):PLIST;cdecl;external External_library name 'NWSGetListHead';
 
@@ -763,28 +763,28 @@ type TFreeRoutine = procedure (memoryPointer:pointer); cdecl;
 
   function NWSGetLineDrawCharacter(charIndex:longint):longint;cdecl;external External_library name 'NWSGetLineDrawCharacter';
 
-  function NWSStrcat(_string, newStuff:pchar):longint;cdecl;external External_library name 'NWSStrcat';
+  function NWSStrcat(_string, newStuff:PAnsiChar):longint;cdecl;external External_library name 'NWSStrcat';
 
   procedure NWSMemmove(dest:pointer; source:pointer; len:longint);cdecl;external External_library name 'NWSMemmove';
 
-  function NWSToupper(ch:char):char;cdecl;external External_library name 'NWSToupper';
+  function NWSToupper(ch:AnsiChar):AnsiChar;cdecl;external External_library name 'NWSToupper';
 
-  function NWSIsdigit(ch:char):longbool;cdecl;external External_library name 'NWSIsdigit';
+  function NWSIsdigit(ch:AnsiChar):longbool;cdecl;external External_library name 'NWSIsdigit';
 
-  function NWSIsxdigit(ch:char):longbool;cdecl;external External_library name 'NWSIsxdigit';
+  function NWSIsxdigit(ch:AnsiChar):longbool;cdecl;external External_library name 'NWSIsxdigit';
 
-  function NWSAsciiToInt(data:pchar):longint;cdecl;external External_library name 'NWSAsciiToInt';
+  function NWSAsciiToInt(data:PAnsiChar):longint;cdecl;external External_library name 'NWSAsciiToInt';
 
-  function NWSAsciiToLONG(data:pchar):longint;cdecl;external External_library name 'NWSAsciiToLONG';
+  function NWSAsciiToLONG(data:PAnsiChar):longint;cdecl;external External_library name 'NWSAsciiToLONG';
 
-  function NWSAsciiHexToInt(data:pchar):longint;cdecl;external External_library name 'NWSAsciiHexToInt';
+  function NWSAsciiHexToInt(data:PAnsiChar):longint;cdecl;external External_library name 'NWSAsciiHexToInt';
 
   procedure NWSWaitForEscape(handle:PNUTInfo);cdecl;external External_library name 'NWSWaitForEscape';
 
   function NWSWaitForEscapeOrCancel(handle:PNUTInfo):longint;cdecl;external External_library name 'NWSWaitForEscapeOrCancel';
 
-  procedure NWSGetKey(_type:plongint; value:pchar; handle:PNUTInfo);cdecl;external External_library name 'NWSGetKey';
-  procedure NWSGetKey(var _type:longint; value:pchar; handle:PNUTInfo);cdecl;external External_library name 'NWSGetKey';
+  procedure NWSGetKey(_type:plongint; value:PAnsiChar; handle:PNUTInfo);cdecl;external External_library name 'NWSGetKey';
+  procedure NWSGetKey(var _type:longint; value:PAnsiChar; handle:PNUTInfo);cdecl;external External_library name 'NWSGetKey';
 
   function NWSKeyStatus(handle:PNUTInfo):longint;cdecl;external External_library name 'NWSKeyStatus';
 
@@ -800,9 +800,9 @@ type TInterruptProc = procedure (handle:pointer); cdecl;
 
   procedure NWSEnableInterruptKey(key:longint; interruptProc:TInterruptProc; handle:PNUTInfo);cdecl;external External_library name 'NWSEnableInterruptKey';
 
-  procedure NWSSaveFunctionKeyList(keyList:pchar; handle:PNUTInfo);cdecl;external External_library name 'NWSSaveFunctionKeyList';
+  procedure NWSSaveFunctionKeyList(keyList:PAnsiChar; handle:PNUTInfo);cdecl;external External_library name 'NWSSaveFunctionKeyList';
 
-  procedure NWSEnableFunctionKeyList(keyList:pchar; handle:PNUTInfo);cdecl;external External_library name 'NWSEnableFunctionKeyList';
+  procedure NWSEnableFunctionKeyList(keyList:PAnsiChar; handle:PNUTInfo);cdecl;external External_library name 'NWSEnableFunctionKeyList';
 
   procedure NWSSaveInterruptList(interruptList:PINTERRUPT; handle:PNUTInfo);cdecl;external External_library name 'NWSSaveInterruptList';
 
@@ -814,10 +814,10 @@ type TInterruptProc = procedure (handle:pointer); cdecl;
 
   procedure NWSEnableAllFunctionKeys(handle:PNUTInfo);cdecl;external External_library name 'NWSEnableAllFunctionKeys';
 
-  function NWSDisplayTextInPortal(line,indentLevel:longint; text:pchar; attribute:longint; portal:PPCB):longint;cdecl;external External_library name 'NWSDisplayTextInPortal';
+  function NWSDisplayTextInPortal(line,indentLevel:longint; text:PAnsiChar; attribute:longint; portal:PPCB):longint;cdecl;external External_library name 'NWSDisplayTextInPortal';
 
   function NWSDisplayInformation(header,pauseFlag,centerLine,centerColumn,palette,
-             attribute:longint; displayText:pchar; handle:PNUTInfo):longint;cdecl;external External_library name 'NWSDisplayInformation';
+             attribute:longint; displayText:PAnsiChar; handle:PNUTInfo):longint;cdecl;external External_library name 'NWSDisplayInformation';
 
   procedure NWSStartWait(centerLine,centerColumn:longint; handle:PNUTInfo);cdecl;external External_library name 'NWSStartWait';
 
@@ -832,17 +832,17 @@ type TInterruptProc = procedure (handle:pointer); cdecl;
 
   function NWSAlertWithHelp(centerLine,centerColumn:longint; handle:PNUTInfo; message:longint; helpContext:longint):longint;cdecl;external External_library name 'NWSAlertWithHelp';
 
-  function NWSTrace(handle:PNUTInfo; message:pchar; args:array of const):longint;cdecl;external External_library name 'NWSTrace';
-  function NWSTrace(handle:PNUTInfo; message:pchar):longint;cdecl;external External_library name 'NWSTrace';
+  function NWSTrace(handle:PNUTInfo; message:PAnsiChar; args:array of const):longint;cdecl;external External_library name 'NWSTrace';
+  function NWSTrace(handle:PNUTInfo; message:PAnsiChar):longint;cdecl;external External_library name 'NWSTrace';
 
   procedure NWSDisplayErrorText(message:longint; severity:longint; handle:PNUTInfo; args:array of const);cdecl;external External_library name 'NWSDisplayErrorText';
 
   procedure NWSDisplayErrorText(message:longint; severity:longint; handle:PNUTInfo);cdecl;external External_library name 'NWSDisplayErrorText';
 
-  procedure NWSDisplayErrorCondition(procedureName:pchar; errorCode:longint; severity:longint; errorList:PPROCERROR; handle:PNUTInfo;
+  procedure NWSDisplayErrorCondition(procedureName:PAnsiChar; errorCode:longint; severity:longint; errorList:PPROCERROR; handle:PNUTInfo;
               args:array of const);cdecl;external External_library name 'NWSDisplayErrorCondition';
 
-  procedure NWSDisplayErrorCondition(procedureName:pchar; errorCode:longint; severity:longint; errorList:PPROCERROR; handle:PNUTInfo);cdecl;external External_library name 'NWSDisplayErrorCondition';
+  procedure NWSDisplayErrorCondition(procedureName:PAnsiChar; errorCode:longint; severity:longint; errorList:PPROCERROR; handle:PNUTInfo);cdecl;external External_library name 'NWSDisplayErrorCondition';
 
   function NWSAppendToMenu(message:longint; option:longint; handle:PNUTInfo):PLIST;cdecl;external External_library name 'NWSAppendToMenu';
 
@@ -865,20 +865,20 @@ type TActionFunc = function (option:longint; parameter:pointer) : longint; cdecl
 
   function NWSPopHelpContext(handle:PNUTInfo):longint;cdecl;external External_library name 'NWSPopHelpContext';
 
-type TFormatFunc=function (element:PLIST; skew:longint; displayLine:pchar; width:longint):longint; cdecl;
+type TFormatFunc=function (element:PLIST; skew:longint; displayLine:PAnsiChar; width:longint):longint; cdecl;
      TNWSListActionFunc=function (keyPressed:longint; elementSelected:PPLIST; itemLineNumber:plongint; actionParameter:pointer):longint;  cdecl;
 
   function NWSList(header:longint; centerLine:longint; centerColumn:longint; height:longint; width:longint;
              validKeyFlags:longint; element:PPLIST; handle:PNUTInfo; format:TFormatFunc; action:TNWSListActionFunc;
              actionParameter:pointer):longint;cdecl;external External_library name 'NWSList';
 
-type TInsertFunc = function (text:pchar; otherInfo:Ppointer; parameters:pointer):longint; cdecl;
+type TInsertFunc = function (text:PAnsiChar; otherInfo:Ppointer; parameters:pointer):longint; cdecl;
      TFreeProcedure=function (otherInfo:pointer):longint; cdecl;
 
   function NWSInsertInPortalList(currentElement:PPLIST; currentLine:plongint; InsertProcedure:TInsertFunc; FreeProcedure:TFreeProcedure; handle:PNUTInfo;
              parameters:pointer):longint;cdecl;external External_library name 'NWSInsertInPortalList';
 
-type TModifyProcedure=function (text:pchar; parameters:pointer):longint;  cdecl;
+type TModifyProcedure=function (text:PAnsiChar; parameters:pointer):longint;  cdecl;
 
   function NWSModifyInPortalList(currentElement:PPLIST; currentLine:plongint; ModifyProcedure:TModifyProcedure; handle:PNUTInfo; parameters:pointer):longint;cdecl;external External_library name 'NWSModifyInPortalList';
 
@@ -886,13 +886,13 @@ type TDeleteFunc = function (el:PLIST; handle:PNUTInfo; parameters:pointer):PLIS
   function NWSDeleteFromPortalList(currentElement:PPLIST; currentLine:plongint; DeleteProcedure:TDeleteFunc; deleteCurrentHeader:longint; deleteMarkedHeader:longint;
              handle:PNUTInfo; parameters:pointer):longint;cdecl;external External_library name 'NWSDeleteFromPortalList';
 
-type TNWSEditInsertFunc=function (buffer:pchar; maxLen:longint; parameters:pointer):longint; cdecl;
-     TNWSEditActionFunc=function (action:longint; buffer:pchar; parameters:pointer):longint; cdecl;
+type TNWSEditInsertFunc=function (buffer:PAnsiChar; maxLen:longint; parameters:pointer):longint; cdecl;
+     TNWSEditActionFunc=function (action:longint; buffer:PAnsiChar; parameters:pointer):longint; cdecl;
 
   function NWSEditString(
              centerLine, centerColumn, editHeight, editWidth, header,
              prompt :longint;
-             buf:pchar;
+             buf:PAnsiChar;
              maxLen, _type:longint; handle:PNUTInfo;
              insertProc:TNWSEditInsertFunc;
              actionProc:TNWSEditActionFunc;
@@ -938,7 +938,7 @@ type TNWSEditInsertFunc=function (buffer:pchar; maxLen:longint; parameters:point
               (handle:PNUTInfo);cdecl;external External_library name 'NWSRemovePreHelp';
 
   function  NWSGetADisk
-              (volName,prompt:pchar;
+              (volName,prompt:PAnsiChar;
                handle:PNUTInfo):longint;cdecl;external External_library name 'NWSGetADisk';
 
   procedure NWSInitListPtr(listPtr:PLISTPTR);cdecl;external External_library name 'NWSInitListPtr';
@@ -979,7 +979,7 @@ type TNWSEditInsertFunc=function (buffer:pchar; maxLen:longint; parameters:point
                confirmMessage:longint;
                handle:PNUTInfo):longint;cdecl;external External_library name 'NWSEditPortalForm';
 
-type TfFormat  = procedure (field:Pfielddef; text:pchar; buffLen:longint); cdecl;
+type TfFormat  = procedure (field:Pfielddef; text:PAnsiChar; buffLen:longint); cdecl;
      TfControl = function (field:Pfielddef; selectKey:longint; var fieldChanged:longint; handle:PNUTInfo):longint; cdecl;
      TfVerify  = function (field:Pfielddef; data:pointer; handle:PNUTInfo):longint; cdecl;
      TfRelease = procedure (field:Pfielddef); cdecl;
@@ -1003,14 +1003,14 @@ type TfFormat  = procedure (field:Pfielddef; text:pchar; buffLen:longint); cdecl
 
   function NWSAppendPromptField(line,column,promptnum:longint; handle:PNUTInfo):PFIELD;cdecl;external External_library name 'NWSAppendPromptField';
 
-  function NWSAppendCommentField(line,column:longint; prompt:pchar; handle:PNUTInfo):PFIELD;cdecl;external External_library name 'NWSAppendCommentField';
+  function NWSAppendCommentField(line,column:longint; prompt:PAnsiChar; handle:PNUTInfo):PFIELD;cdecl;external External_library name 'NWSAppendCommentField';
 
   function NWSAppendStringField
             (line,
              column,
              width,
              fflag:longint;
-             data,cset:pchar;
+             data,cset:PAnsiChar;
              help:longint;
              handle:PNUTInfo):PFIELD;cdecl;external External_library name 'NWSAppendStringField';
 
@@ -1036,7 +1036,7 @@ type TfFormat  = procedure (field:Pfielddef; text:pchar; buffLen:longint); cdecl
              fflag:longint;
              data:pointer;
              help:longint;
-             yesString, noString:pchar;
+             yesString, noString:PAnsiChar;
              handle:PNUTInfo):PFIELD;cdecl;external External_library name 'NWSAppendGenericBoolField';
 
   function NWSAppendGenericBoolField
@@ -1045,7 +1045,7 @@ type TfFormat  = procedure (field:Pfielddef; text:pchar; buffLen:longint); cdecl
              fflag:longint;
          var data:longbool;
              help:longint;
-             yesString, noString:pchar;
+             yesString, noString:PAnsiChar;
              handle:PNUTInfo):PFIELD;cdecl;external External_library name 'NWSAppendGenericBoolField';
 
 type TSpotActionFunc = function (fp:PFIELD; selectKey:longint; var changedField:longint; handle:PNUTInfo):longint; cdecl;
@@ -1053,7 +1053,7 @@ type TSpotActionFunc = function (fp:PFIELD; selectKey:longint; var changedField:
             (line,
              column,
              fflag:longint;
-             displayString:pchar;
+             displayString:PAnsiChar;
              SpotAction:TSpotActionFunc;
              handle:PNUTInfo):PFIELD;cdecl;external External_library name 'NWSAppendHotSpotField';
 
@@ -1102,7 +1102,7 @@ type TSpotActionFunc = function (fp:PFIELD; selectKey:longint; var changedField:
              height,
              width,
              headerNumber:longint;
-             textBuffer:pchar;
+             textBuffer:PAnsiChar;
              maxBufferLength,
              confirmMessage,
              forceConfirm:longint;
@@ -1114,7 +1114,7 @@ type TSpotActionFunc = function (fp:PFIELD; selectKey:longint; var changedField:
              height,
              width,
              headerNumber:longint;
-             textBuffer:pchar;
+             textBuffer:PAnsiChar;
              maxBufferLength:longint;
              handle:PNUTInfo):longint;cdecl;external External_library name 'NWSViewText';
 
@@ -1134,7 +1134,7 @@ type TSpotActionFunc = function (fp:PFIELD; selectKey:longint; var changedField:
   // Displays justified text in an existing portal
   function NWSDisplayTextJustifiedInPortal
             (justify,
-             line:longint; column:longint; textWidth:longint; text:pchar;
+             line:longint; column:longint; textWidth:longint; text:PAnsiChar;
              attribute:longint; portal:PPCB):longint;cdecl;external External_library name 'NWSDisplayTextJustifiedInPortal';
 
   function NWSDisplayInformationInPortal
@@ -1154,7 +1154,7 @@ type TSpotActionFunc = function (fp:PFIELD; selectKey:longint; var changedField:
              textTBIndent,
              textAttribute,
              textMinimizeStyle:longint;
-             text:pchar;
+             text:PAnsiChar;
              handle:PNUTInfo):longint;cdecl;external External_library name 'NWSDisplayInformationInPortal';
 
   procedure NWSRestoreNut(handle:PNUTInfo);cdecl;external External_library name 'NWSRestoreNut';
@@ -1165,7 +1165,7 @@ type TSpotActionFunc = function (fp:PFIELD; selectKey:longint; var changedField:
 
 type TSSFEntryProc = procedure (para1:PFIELD; para2:pointer; para3:PNUTInfo); cdecl;
      TSSFCustomDataReleaseProc = procedure (para1:pointer; para2:PNUTInfo); cdecl;
-     TSSFFormat=procedure (para1:PFIELD; text:pchar; para3:longint); cdecl;
+     TSSFFormat=procedure (para1:PFIELD; text:PAnsiChar; para3:longint); cdecl;
      TSSFControlFunc = function (para1:PFIELD; para2:longint; para3:Plongint; para4:PNUTInfo):longint; cdecl;
      TSSFVerifyFunc  = function (para1:PFIELD; para2:pointer; para3:PNUTInfo):longint; cdecl;
      TSSFReleaseProc = procedure (para1:PFIELD); cdecl;
@@ -1229,7 +1229,7 @@ type TcdReleaseProc = procedure (theData:pointer; handle:PNUTInfo); cdecl;
                 line,
                 column,
                 maxPasswordLen : longint;
-                passwordString:pchar;
+                passwordString:PAnsiChar;
                 verifyEntry:longint;
                 handle:PNUTInfo):longint;cdecl;external External_library name 'NWSPromptForPassword';
 
@@ -1238,7 +1238,7 @@ type TcdReleaseProc = procedure (theData:pointer; handle:PNUTInfo); cdecl;
                 column,
                 width,
                 fflag:longint;            // field flags
-                data:pchar;             // ptr to field text
+                data:PAnsiChar;             // ptr to field text
                 maxDataLen,             // including null
                 help,                   // help for field
                 verifyEntry,            // force password verification
@@ -1251,14 +1251,14 @@ type TcdReleaseProc = procedure (theData:pointer; handle:PNUTInfo); cdecl;
                 column,
                 width,
                 fflag:longint;
-                data:pchar;
+                data:PAnsiChar;
                 maxLen:longint;           // max len of data, allowing for null terminator
                 cset:pointer;           // valid characters, if using EF_SET
                 editFlags,              // NWSEditString flags (EF_UPPER etc.)
                 help:longint;
                 handle:PNUTInfo):PFIELD;cdecl;external External_library name 'NWSAppendScrollableStringField';
 
-type TSSFInsertFunc = function (_string:pchar; maxLen:longint; parameters:pointer):longint; cdecl;
+type TSSFInsertFunc = function (_string:PAnsiChar; maxLen:longint; parameters:pointer):longint; cdecl;
   procedure NWSSetScrollableFieldInsertProc(fp:PFIELD; insertProc:TSSFInsertFunc);cdecl;external External_library name 'NWSSetScrollableFieldInsertProc';
 
   { Returns 0 for success, -1 if none selected  }
@@ -1273,12 +1273,12 @@ type TSSFInsertFunc = function (_string:pchar; maxLen:longint; parameters:pointe
 
   procedure NWSShowLineAttribute(line,
                                  column:longint;
-                                 text:pchar;
+                                 text:PAnsiChar;
                                  attribute,
                                  length:longint;
                                  screenID:TScr);cdecl;external External_library name 'NWSShowLineAttribute';
 
-  procedure NWSShowLine(line,column:longint; text:pchar; length:longint; screenID:TScr);cdecl;external External_library name 'NWSShowLine';
+  procedure NWSShowLine(line,column:longint; text:PAnsiChar; length:longint; screenID:TScr);cdecl;external External_library name 'NWSShowLine';
 
   procedure NWSScrollZone
                    (line,
@@ -1339,7 +1339,7 @@ type TSSFInsertFunc = function (_string:pchar; maxLen:longint; parameters:pointe
                  height,
                  width,
                  headerNumber:longint;
-                 textBuffer:pchar;
+                 textBuffer:PAnsiChar;
                  maxBufferLength,
                  scrollBarFlag:longint;
                  handle:PNUTInfo):longint;cdecl;external External_library name 'NWSViewTextWithScrollBars';
@@ -1351,7 +1351,7 @@ type TSSFInsertFunc = function (_string:pchar; maxLen:longint; parameters:pointe
                  height,
                  width,
                  headerNumber:longint;
-                 textBuffer:pchar;
+                 textBuffer:PAnsiChar;
                  maxBufferLength,
                  confirmMessage,
                  forceConfirm,
@@ -1364,7 +1364,7 @@ type TSSFInsertFunc = function (_string:pchar; maxLen:longint; parameters:pointe
                  height,
                  width,
                  headerNumber:longint;
-                 textBuffer:pchar;
+                 textBuffer:PAnsiChar;
                  maxBufferLength,
                  confirmMessage : longint;
                  forceConfirm   : longbool;

+ 37 - 37
rtl/netware/nwsys.inc

@@ -48,7 +48,7 @@ TYPE
                  : unsignedshort; (* inherited rights mask *)
    st_originatingNameSpace
                  : BYTE;          (* namespace of creation       *)
-   st_name       : ARRAY [0..255] OF CHAR;
+   st_name       : ARRAY [0..255] OF AnsiChar;
                                   (* TARGET_NAMESPACE name *)
    st_blksize    : LONGINT;
    st_blocks     : LONGINT;
@@ -56,7 +56,7 @@ TYPE
    st_spare      : ARRAY [0..3] OF LONGINT;
   END;
 
-FUNCTION  _stat  (path : PCHAR; VAR buf : NWStatBufT) : LONGINT; CDECL; EXTERNAL Clib NAME 'stat_411';
+FUNCTION  _stat  (path : PAnsiChar; VAR buf : NWStatBufT) : LONGINT; CDECL; EXTERNAL Clib NAME 'stat_411';
 FUNCTION  _fstat (Fileno : LONGINT; VAR buf : NWStatBufT) : LONGINT; CDECL; EXTERNAL CLib NAME 'fstat_411';
 
 PROCEDURE NWFree   (P : POINTER); CDECL; EXTERNAL Clib NAME 'free';
@@ -75,20 +75,20 @@ procedure _ThreadSwitchWithDelay; cdecl;external ThreadsNlm name 'ThreadSwitchWi
 function _GetThreadName(threadID:longint; var tName):longint; cdecl;external ThreadsNlm name 'GetThreadName';
 function GetNLMHandle:dword;  cdecl;external ThreadsNlm name 'GetNLMHandle';
 (*
-PROCEDURE ConsolePrintf (FormatStr : PCHAR; Param : LONGINT); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
-PROCEDURE ConsolePrintf (FormatStr : PCHAR; Param : pchar); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
-PROCEDURE ConsolePrintf (FormatStr : PCHAR; P1,P2 : LONGINT); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
-PROCEDURE ConsolePrintf (FormatStr : PCHAR; P1,P2,P3 : LONGINT); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
-PROCEDURE ConsolePrintf (FormatStr : PCHAR; P1,P2,P3,P4 : LONGINT); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
-PROCEDURE ConsolePrintf (FormatStr : PCHAR); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
+PROCEDURE ConsolePrintf (FormatStr : PAnsiChar; Param : LONGINT); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
+PROCEDURE ConsolePrintf (FormatStr : PAnsiChar; Param : PAnsiChar); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
+PROCEDURE ConsolePrintf (FormatStr : PAnsiChar; P1,P2 : LONGINT); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
+PROCEDURE ConsolePrintf (FormatStr : PAnsiChar; P1,P2,P3 : LONGINT); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
+PROCEDURE ConsolePrintf (FormatStr : PAnsiChar; P1,P2,P3,P4 : LONGINT); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
+PROCEDURE ConsolePrintf (FormatStr : PAnsiChar); CDecl; EXTERNAL CLib Name 'ConsolePrintf';
 *)
 // this gives internal compiler error 1234124 ??
-//PROCEDURE ConsolePrintf (FormatStr : PCHAR; Param : array of const); CDecl; EXTERNAL CLib;
+//PROCEDURE ConsolePrintf (FormatStr : PAnsiChar; Param : array of const); CDecl; EXTERNAL CLib;
 
-PROCEDURE _printf (FormatStr : PCHAR; Param : LONGINT); CDecl; EXTERNAL CLib;
-PROCEDURE _printf (FormatStr : PCHAR); CDecl; EXTERNAL CLib;
+PROCEDURE _printf (FormatStr : PAnsiChar; Param : LONGINT); CDecl; EXTERNAL CLib;
+PROCEDURE _printf (FormatStr : PAnsiChar); CDecl; EXTERNAL CLib;
 // this gives internet compiler error 1234124 ??
-// PROCEDURE _printf (FormatStr : PCHAR; Param : array of const); CDecl; EXTERNAL CLib;
+// PROCEDURE _printf (FormatStr : PAnsiChar; Param : array of const); CDecl; EXTERNAL CLib;
 
 // values for __action_code used with ExitThread()
 CONST
@@ -102,7 +102,7 @@ FUNCTION _GetStdOut : POINTER; CDECL; EXTERNAL Clib NAME '__get_stdout';
 FUNCTION _GetStdErr : POINTER; CDECL; EXTERNAL Clib NAME '__get_stderr';
 
 // FileIO by Fileno
-FUNCTION _open   (FileName : PCHAR; access, mode : LONGINT) : LONGINT; CDECL; EXTERNAL CLib NAME 'open';
+FUNCTION _open   (FileName : PAnsiChar; access, mode : LONGINT) : LONGINT; CDECL; EXTERNAL CLib NAME 'open';
 FUNCTION _close  (FileNo : LONGINT) : LONGINT; CDECL; EXTERNAL CLib NAME 'close';
 FUNCTION _lseek  (FileNo,Pos,whence :LONGINT) : LONGINT; CDECL; EXTERNAL CLib NAME 'lseek';
 FUNCTION _chsize (FileNo,Pos : LONGINT) : LONGINT; CDECL; EXTERNAL CLib NAME 'chsize';
@@ -116,7 +116,7 @@ FUNCTION _unlock (filedes : LONGINT; Offset, Length : Cardinal) : LONGINT; CDECL
 TYPE
   NWModifyStructure =
     RECORD
-       MModifyName            : PCHAR;
+       MModifyName            : PAnsiChar;
        MFileAttributes        : LONGINT;
        MFileAttributesMask    : LONGINT;
        MCreateDate            : WORD;
@@ -152,11 +152,11 @@ CONST MModifyNameBit                 = $0001;
       MLastUpdatedInSecondsBit       = $4000;
 
 // Directory
-FUNCTION _chdir  (path : PCHAR) : LONGINT; CDECL; EXTERNAL CLib NAME 'chdir';
-FUNCTION _getcwd (path : PCHAR; pathlen : LONGINT) : PCHAR; CDECL; EXTERNAL CLib NAME 'getcwd';
-FUNCTION _mkdir  (path : PCHAR) : LONGINT; CDECL; EXTERNAL CLib NAME 'mkdir';
-FUNCTION _rmdir  (path : PCHAR) : LONGINT; CDECL; EXTERNAL CLib NAME 'rmdir';
-FUNCTION _ChangeDirectoryEntry (PathName : PCHAR; VAR ModyStruct : NWModifyStructure; ModifyBits, AllowWildcard : LONGINT) : LONGINT; CDECL; EXTERNAL CLib NAME 'ChangeDirectoryEntry';
+FUNCTION _chdir  (path : PAnsiChar) : LONGINT; CDECL; EXTERNAL CLib NAME 'chdir';
+FUNCTION _getcwd (path : PAnsiChar; pathlen : LONGINT) : PAnsiChar; CDECL; EXTERNAL CLib NAME 'getcwd';
+FUNCTION _mkdir  (path : PAnsiChar) : LONGINT; CDECL; EXTERNAL CLib NAME 'mkdir';
+FUNCTION _rmdir  (path : PAnsiChar) : LONGINT; CDECL; EXTERNAL CLib NAME 'rmdir';
+FUNCTION _ChangeDirectoryEntry (PathName : PAnsiChar; VAR ModyStruct : NWModifyStructure; ModifyBits, AllowWildcard : LONGINT) : LONGINT; CDECL; EXTERNAL CLib NAME 'ChangeDirectoryEntry';
 
 // get fileno from stream
 FUNCTION _fileno (Handle : LONGINT) : LONGINT; CDECL; EXTERNAL Clib NAME 'fileno';
@@ -179,8 +179,8 @@ CONST O_RDONLY     = $0000;   (* open for read only *)
 
 
 // File Utils
-FUNCTION _unlink (FileName : PCHAR) : LONGINT; CDECL; EXTERNAL CLib NAME 'unlink';
-FUNCTION _rename (oldpath, newpath : PCHAR) : LONGINT; CDECL; EXTERNAL Clib NAME 'rename';
+FUNCTION _unlink (FileName : PAnsiChar) : LONGINT; CDECL; EXTERNAL CLib NAME 'unlink';
+FUNCTION _rename (oldpath, newpath : PAnsiChar) : LONGINT; CDECL; EXTERNAL Clib NAME 'rename';
 
 // Error
 TYPE _PLONGINT = ^LONGINT;
@@ -196,7 +196,7 @@ FUNCTION _stackavail : CARDINAL; CDECL; EXTERNAL CLib NAME 'stackavail';
 PROCEDURE _EnterDebugger; CDECL; EXTERNAL Clib NAME 'EnterDebugger';
 
 // String
-FUNCTION _strlen (P : PCHAR) : LONGINT; CDECL; EXTERNAL Clib NAME 'strlen';
+FUNCTION _strlen (P : PAnsiChar) : LONGINT; CDECL; EXTERNAL Clib NAME 'strlen';
 
 // Time/Date
 TYPE NWTM = RECORD
@@ -227,7 +227,7 @@ FUNCTION  SetFileServerDateAndTime(year:WORD; month:WORD; day:WORD; hour:WORD; m
                second:WORD):longint;cdecl; EXTERNAL CLib Name 'SetFileServerDateAndTime';
 
 TYPE   FILE_SERV_INFO = record
-            serverName              : array[0..47] of char;
+            serverName              : array[0..47] of AnsiChar;
             netwareVersion          : BYTE;
             netwareSubVersion       : BYTE;
             maxConnectionsSupported : WORD;
@@ -268,29 +268,29 @@ TYPE NWDirEnt =
     d_uid                 : LONGINT;        {owner id (object id) }
     d_archivedID          : LONGINT;
     d_updatedID           : LONGINT;
-    d_nameDOS             : ARRAY [0..12] OF CHAR;
+    d_nameDOS             : ARRAY [0..12] OF AnsiChar;
     d_inheritedRightsMask : WORD;
     d_originatingNameSpace: BYTE;
     d_ddatetime           : time_t;         {deleted date time}
     d_deletedID           : LONGINT;
     {---- new fields starting in v4.11 ----}
-    d_name                : ARRAY [0..255] OF CHAR;  { enty's namespace name }
+    d_name                : ARRAY [0..255] OF AnsiChar;  { enty's namespace name }
   END;
   PNWDirEnt = ^NWDirEnt;
 
-  FUNCTION _opendir (pathname : PCHAR) : PNWDirEnt; CDECL; EXTERNAL CLib NAME 'opendir_411';
+  FUNCTION _opendir (pathname : PAnsiChar) : PNWDirEnt; CDECL; EXTERNAL CLib NAME 'opendir_411';
   FUNCTION _closedir (dirH : PNWDirEnt) : LONGINT; CDECL; EXTERNAL CLib NAME 'closedir';
   FUNCTION _readdir  (dirH : PNWDirEnt) : PNWDirEnt; CDECL; EXTERNAL CLib NAME 'readdir';
   FUNCTION _SetReaddirAttribute (dirH : PNWDirEnt; Attribute : LONGINT) : LONGINT; EXTERNAL CLib NAME 'SetReaddirAttribute';
 
 // Environment
-  FUNCTION _getenv (name : PCHAR) : PCHAR; CDECL; EXTERNAL CLib NAME 'getenv';
+  FUNCTION _getenv (name : PAnsiChar) : PAnsiChar; CDECL; EXTERNAL CLib NAME 'getenv';
 
 // Volumes
-  FUNCTION _GetVolumeName (volumeNumber : LONGINT; volumeName : PCHAR) : LONGINT; CDECL; EXTERNAL CLib NAME 'GetVolumeName';
-  FUNCTION _GetVolumeNumber (volumeName : PCHAR; VAR volumeNumber : LONGINT) : LONGINT; CDECL; EXTERNAL CLib NAME 'GetVolumeNumber';
+  FUNCTION _GetVolumeName (volumeNumber : LONGINT; volumeName : PAnsiChar) : LONGINT; CDECL; EXTERNAL CLib NAME 'GetVolumeName';
+  FUNCTION _GetVolumeNumber (volumeName : PAnsiChar; VAR volumeNumber : LONGINT) : LONGINT; CDECL; EXTERNAL CLib NAME 'GetVolumeNumber';
   FUNCTION _GetVolumeInfoWithNumber (VolumeNumber : BYTE;
-                                     VolumeName   : PCHAR;
+                                     VolumeName   : PAnsiChar;
                                  VAR TotalBlocks  : WORD;
                                  VAR SectorsPerBlock : WORD;
                                  VAR availableBlocks : WORD;
@@ -315,7 +315,7 @@ FUNCTION  _wherex : WORD; CDECL; EXTERNAL CLib NAME 'wherex';
 FUNCTION  _wherey : WORD; CDECL; EXTERNAL CLib NAME 'wherey';
 PROCEDURE _clrscr; CDECL; EXTERNAL CLib NAME 'clrscr';
 FUNCTION  _kbhit : LONGINT; CDECL; EXTERNAL Clib NAME 'kbhit';
-FUNCTION  _getch : CHAR; CDECL; EXTERNAL CLib NAME 'getch';
+FUNCTION  _getch : AnsiChar; CDECL; EXTERNAL CLib NAME 'getch';
 PROCEDURE _delay (miliseconds : longint); CDECL; EXTERNAL Clib NAME 'delay';
 FUNCTION  _SetCtrlCharCheckMode (Enabled : BOOLEAN) : BOOLEAN; CDECL; EXTERNAL CLib NAME 'SetCtrlCharCheckMode';
 FUNCTION  _SetAutoScreenDestructionMode (Enabled : BOOLEAN) : BOOLEAN; CDECL; EXTERNAL CLib NAME 'SetAutoScreenDestructionMode';
@@ -348,10 +348,10 @@ CONST
   NW_NS_FTAM    = 3;
   NW_NS_LONG    = 4;
 
-function _NWAddSearchPathAtEnd (searchPath : pchar; var number : longint) : longint; cdecl; external Clib name 'NWAddSearchPathAtEnd';
+function _NWAddSearchPathAtEnd (searchPath : PAnsiChar; var number : longint) : longint; cdecl; external Clib name 'NWAddSearchPathAtEnd';
 function _NWDeleteSearchPath (searchPathNumber : longint) : longint; cdecl; external Clib name 'NWDeleteSearchPath';
-function _NWInsertSearchPath (searchPathNumber : longint; path : pchar) : longint; cdecl; external Clib name 'NWInsertSearchPath';
-function _NWGetSearchPathElement (searchPathNumber : longint; var isDOSSearchPath : longint; searchPath : pchar) : longint; cdecl; external Clib name 'NWGetSearchPathElement';
+function _NWInsertSearchPath (searchPathNumber : longint; path : PAnsiChar) : longint; cdecl; external Clib name 'NWInsertSearchPath';
+function _NWGetSearchPathElement (searchPathNumber : longint; var isDOSSearchPath : longint; searchPath : PAnsiChar) : longint; cdecl; external Clib name 'NWGetSearchPathElement';
 
 
 // values for __mode used with spawnxx()
@@ -363,9 +363,9 @@ CONST
    P_SPAWN_IN_CURRENT_DOMAIN = 8;
 
 
-//function spawnlp(mode:longint; path:Pchar; arg0:Pchar; args:array of const):longint;cdecl;external CLib name 'spawnlp';
-function spawnlp(mode:longint; path:Pchar; arg0:Pchar):longint;cdecl;external Clib name 'spawnlp';
-function spawnvp(mode:longint; path:Pchar; argv:PPchar):longint;cdecl;external Clib name 'spawnvp';
+//function spawnlp(mode:longint; path:PAnsiChar; arg0:PAnsiChar; args:array of const):longint;cdecl;external CLib name 'spawnlp';
+function spawnlp(mode:longint; path:PAnsiChar; arg0:PAnsiChar):longint;cdecl;external Clib name 'spawnlp';
+function spawnvp(mode:longint; path:PAnsiChar; argv:PPAnsiChar):longint;cdecl;external Clib name 'spawnvp';
 
 
 

+ 4 - 4
rtl/netware/sysdir.inc

@@ -22,7 +22,7 @@ var
     Rc : longint;
 begin
   DoDirSeparators(s);
-  Rc := _mkdir(pchar(s));
+  Rc := _mkdir(PAnsiChar(s));
   if Rc <> 0 then
     SetFileError (Rc);
 end;
@@ -37,7 +37,7 @@ begin
       exit;
     end;
   DoDirSeparators(s);
-  Rc := _rmdir(pchar(s));
+  Rc := _rmdir(PAnsiChar(s));
   if Rc <> 0 then
     SetFileError(Rc);
 end;
@@ -47,14 +47,14 @@ procedure do_ChDir(s: rawbytestring);
 var RC: longint;
 begin
   DoDirSeparators(s);
-  RC := _chdir (pchar(s));
+  RC := _chdir (PAnsiChar(s));
   if Rc <> 0 then
     SetFileError(Rc);
 end;
 
 
 procedure do_getdir(drivenr : byte;var dir : rawbytestring);
-VAR P : ARRAY [0..255] OF CHAR;
+VAR P : ARRAY [0..255] OF AnsiChar;
     i : LONGINT;
 begin
   P[0] := #0;

+ 3 - 3
rtl/netware/sysfile.inc

@@ -80,7 +80,7 @@ begin
     InOutRes := 0;
 end;
 
-procedure do_erase(p : pchar; pchangeable: boolean);
+procedure do_erase(p : PAnsiChar; pchangeable: boolean);
 VAR res : LONGINT;
 begin
   res := _unlink (p);
@@ -90,7 +90,7 @@ begin
     InOutRes := 0;
 end;
 
-procedure do_rename(p1,p2 : pchar; p1changeable, p2changeable: boolean);
+procedure do_rename(p1,p2 : PAnsiChar; p1changeable, p2changeable: boolean);
 VAR res : LONGINT;
 begin
   res := _rename (p1,p2);
@@ -189,7 +189,7 @@ begin
 end;
 
 // mostly stolen from syslinux
-procedure do_open(var f;p:pchar;flags:longint; pchangeable: boolean);
+procedure do_open(var f;p:PAnsiChar;flags:longint; pchangeable: boolean);
 {
   filerec and textrec have both handle and mode as the first items so
   they could use the same routine for opening/creating.

+ 13 - 13
rtl/netware/system.pp

@@ -43,8 +43,8 @@ const
  DriveSeparator = ':';
  ExtensionSeparator = '.';
  PathSeparator = ';';
- AllowDirectorySeparators : set of char = ['\','/'];
- AllowDriveSeparators : set of char = [':'];
+ AllowDirectorySeparators : set of AnsiChar = ['\','/'];
+ AllowDriveSeparators : set of AnsiChar = [':'];
 { FileNameCaseSensitive and FileNameCasePreserving are defined separately below!!! }
  maxExitCode = 255;
  MaxPathLen = 256;
@@ -70,22 +70,22 @@ TYPE
 
 VAR
    ArgC   : INTEGER;
-   ArgV   : ppchar;
+   ArgV   : PPAnsiChar;
    NetwareCheckFunction    : TNWCheckFunction;
    NetwareMainThreadGroupID: longint;
    NetwareUnloadProc       : pointer = nil;  {like exitProc but for nlm unload only}
 
 CONST
-   envp   : ppchar = nil;   {dummy to make heaptrc happy}
+   envp   : PPAnsiChar = nil;   {dummy to make heaptrc happy}
 
 
-procedure ConsolePrintf (FormatStr : PCHAR; Param : LONGINT); CDecl; external 'clib' name 'printf';
-procedure ConsolePrintf (FormatStr : PCHAR; Param : pchar); CDecl; external 'clib' name 'printf';
-procedure ConsolePrintf (FormatStr : PCHAR; P1,P2 : LONGINT);  CDecl; external 'clib' name 'printf';
-procedure ConsolePrintf (FormatStr : PCHAR; P1,P2,P3 : LONGINT);  CDecl; external 'clib' name 'printf';
-procedure ConsolePrintf (FormatStr : PCHAR);  CDecl; external 'clib' name 'printf';
+procedure ConsolePrintf (FormatStr : PAnsiChar; Param : LONGINT); CDecl; external 'clib' name 'printf';
+procedure ConsolePrintf (FormatStr : PAnsiChar; Param : PAnsiChar); CDecl; external 'clib' name 'printf';
+procedure ConsolePrintf (FormatStr : PAnsiChar; P1,P2 : LONGINT);  CDecl; external 'clib' name 'printf';
+procedure ConsolePrintf (FormatStr : PAnsiChar; P1,P2,P3 : LONGINT);  CDecl; external 'clib' name 'printf';
+procedure ConsolePrintf (FormatStr : PAnsiChar);  CDecl; external 'clib' name 'printf';
 // this gives internal compiler error 200404181
-// procedure ConsolePrintf (FormatStr : PCHAR; Param : array of const); CDecl; EXTERNAL 'clib' name 'ConsolePrintf';
+// procedure ConsolePrintf (FormatStr : PAnsiChar; Param : array of const); CDecl; EXTERNAL 'clib' name 'ConsolePrintf';
 
 procedure __EnterDebugger; cdecl; external 'clib' name 'EnterDebugger';
 
@@ -120,7 +120,7 @@ procedure fpc_do_exit;external name 'FPC_DO_EXIT';
 *****************************************************************************}
 
 
-PROCEDURE nlm_main (_ArgC : LONGINT; _ArgV : ppchar); CDECL; [public,alias: '_nlm_main'];
+PROCEDURE nlm_main (_ArgC : LONGINT; _ArgV : PPAnsiChar); CDECL; [public,alias: '_nlm_main'];
 BEGIN
   // Initialize of BSS now done in nwpre
   ArgC := _ArgC;
@@ -267,7 +267,7 @@ end;
 
 
 {$ifdef StdErrToConsole}
-var ConsoleBuff : array [0..512] of char;
+var ConsoleBuff : array [0..512] of AnsiChar;
 
 Function ConsoleWrite(Var F: TextRec): Integer;
 var
@@ -320,7 +320,7 @@ var oldTG : longint;
     oldPtr: pointer;
     err   : longint;
     current_exit : procedure;
-    ThreadName   : array [0..20] of char;
+    ThreadName   : array [0..20] of AnsiChar;
     HadExitProc  : boolean;
     Count        : longint;
 begin

+ 3 - 3
rtl/netware/systhrd.inc

@@ -48,7 +48,7 @@ end;
 
 
 {$ifdef DEBUG_MT}
-var dummy_buff : array [0..255] of char;  // to avoid abends (for current compiler error that not all threadvars are initialized)
+var dummy_buff : array [0..255] of AnsiChar;  // to avoid abends (for current compiler error that not all threadvars are initialized)
 {$endif}
 
 function SysRelocateThreadvar (offset : dword) : pointer;
@@ -218,12 +218,12 @@ end;
 
 function GetThreadName  (threadId : longint; var threadName) : longint; cdecl; external 'clib' name 'GetThreadName';
 function CGetThreadID : dword; cdecl; external 'clib' name 'GetThreadID';
-//function __RenameThread (threadId : longint; threadName:pchar) : longint; cdecl; external 'clib' name 'RenameThread';
+//function __RenameThread (threadId : longint; threadName:PAnsiChar) : longint; cdecl; external 'clib' name 'RenameThread';
 
 function  SysWaitForThreadTerminate (threadHandle : dword; TimeoutMs : longint) : dword;
 var
   status : longint;
-  buf : array [0..50] of char;
+  buf : array [0..50] of AnsiChar;
 begin
   {$warning timeout needs to be implemented}
   {$ifdef DEBUG_MT}

+ 13 - 13
rtl/netware/sysutils.pp

@@ -105,7 +105,7 @@ begin
     1 : NWOpenFlags:=NWOpenFlags or O_WRONLY;
     2 : NWOpenFlags:=NWOpenFlags or O_RDWR;
   end;
-  FileOpen := _open (pchar(SystemFileName),NWOpenFlags,0);
+  FileOpen := _open (PAnsiChar(SystemFileName),NWOpenFlags,0);
 
   //!! We need to set locking based on Mode !!
 end;
@@ -115,7 +115,7 @@ Function FileCreate (Const FileName : RawByteString) : THandle;
 VAR SystemFileName: RawByteString;
 begin
   SystemFileName:=ToSingleByteFileSystemEncodedFileName(FileName);
-  FileCreate:=_open(Pchar(SystemFileName),O_RdWr or O_Creat or O_Trunc,0);
+  FileCreate:=_open(PAnsiChar(SystemFileName),O_RdWr or O_Creat or O_Trunc,0);
 end;
 
 Function FileCreate (Const FileName : RawByteString; Rights:longint) : THandle;
@@ -216,7 +216,7 @@ Function FileAge (Const FileName : String): Int64;
 VAR Info : NWStatBufT;
     PTM  : PNWTM;
 begin
-  If _stat (pchar(FileName),Info) <> 0 then
+  If _stat (PAnsiChar(FileName),Info) <> 0 then
     exit(-1)
   else
     begin
@@ -241,7 +241,7 @@ VAR Info : NWStatBufT;
     SystemFileName: RawByteString;
 begin
   SystemFileName:=ToSingleByteFileSystemEncodedFileName(FileName);
-  FileExists:=(_stat(pchar(SystemFileName),Info) = 0);
+  FileExists:=(_stat(PAnsiChar(SystemFileName),Info) = 0);
 end;
 
 Function DirectoryExists (Const Directory : RawByteString; FollowLink : Boolean) : Boolean;
@@ -316,7 +316,7 @@ begin
   IF path = '' then
     exit (18);
   SystemEncodedPath := ToSingleByteFileSystemEncodedFileName(Path);
-  Rslt.FindData.DirP := _opendir (pchar(SystemEncodedPath));
+  Rslt.FindData.DirP := _opendir (PAnsiChar(SystemEncodedPath));
   IF Rslt.FindData.DirP = NIL THEN
     exit (18);
   IF attr <> faAnyFile THEN
@@ -395,7 +395,7 @@ Var Info : NWStatBufT;
     SystemFileName: RawByteString;
 begin
   SystemFileName:=ToSingleByteFileSystemEncodedFileName(FileName);
-  If _stat (pchar(SystemFileName),Info) <> 0 then
+  If _stat (PAnsiChar(SystemFileName),Info) <> 0 then
     Result:=-1
   Else
     Result := Info.st_attr AND $FFFF;
@@ -409,7 +409,7 @@ begin
   { The Attr parameter is not used! }
   SystemFileName:=ToSingleByteFileSystemEncodedFileName(FileName);
   FillChar (MS, SIZEOF (MS), 0);
-  if _ChangeDirectoryEntry (PChar (SystemFilename), MS, MFileAtrributesBit, 0) <> 0 then
+  if _ChangeDirectoryEntry (PAnsiChar (SystemFilename), MS, MFileAtrributesBit, 0) <> 0 then
     result := -1
   else
     result := 0;
@@ -421,7 +421,7 @@ var
   SystemFileName: RawByteString;
 begin
   SystemFileName:=ToSingleByteFileSystemEncodedFileName(FileName);
-  Result:= (_UnLink (pchar(SystemFileName)) = 0);
+  Result:= (_UnLink (PAnsiChar(SystemFileName)) = 0);
 end;
 
 
@@ -431,7 +431,7 @@ var
 begin
   OldSystemFileName:=ToSingleByteFileSystemEncodedFileName(OldName);
   NewSystemFileName:=ToSingleByteFileSystemEncodedFileName(NewName);
-  RenameFile:=(_rename(pchar(OldSystemFileName),pchar(NewSystemFileName)) = 0);
+  RenameFile:=(_rename(PAnsiChar(OldSystemFileName),PAnsiChar(NewSystemFileName)) = 0);
 end;
 
 
@@ -452,7 +452,7 @@ end;
   They both return -1 when a failure occurs.
 }
 Const
-  FixDriveStr : array[0..3] of pchar=(
+  FixDriveStr : array[0..3] of PAnsiChar=(
     '.',
     'a:.',
     'b:.',
@@ -460,7 +460,7 @@ Const
     );
 var
   Drives   : byte;
-  DriveStr : array[4..26] of pchar;
+  DriveStr : array[4..26] of PAnsiChar;
 
 Procedure AddDisk(const path:string);
 begin
@@ -509,7 +509,7 @@ var
   SystemFileName: RawByteString;
 begin
   SystemFileName:=ToSingleByteFileSystemEncodedFileName(Directory);
-  If _stat (pchar(SystemFileName),Info) <> 0 then
+  If _stat (PAnsiChar(SystemFileName),Info) <> 0 then
     exit(false)
   else
     Exit ((Info.st_attr and faDirectory) <> 0);
@@ -580,7 +580,7 @@ end;
 Function GetEnvironmentVariable(Const EnvVar : String) : String;
 
 begin
-  Result:=_getenv(PChar(EnvVar));
+  Result:=_getenv(PAnsiChar(EnvVar));
 end;
 
 Function GetEnvironmentVariableCount : Integer;

+ 7 - 7
rtl/netware/tests/test.pas

@@ -39,7 +39,7 @@ BEGIN
   ErrorCheck ('Create',TestFN);
   FOR I := 1 TO NumBlocks DO
   BEGIN
-    FillChar (Buffer, SIZEOF (Buffer), CHAR(I));
+    FillChar (Buffer, SIZEOF (Buffer), AnsiChar(I));
     Write ('BlockWrite');
     BlockWrite (F,Buffer,SIZEOF(Buffer));
     ErrorCheck ('BlockWrite',TestFN);
@@ -208,7 +208,7 @@ END;
 
 {PROCEDURE VolInfo;
 VAR I : LONGINT;
-    Buf: ARRAY [0..255] OF CHAR;
+    Buf: ARRAY [0..255] OF AnsiChar;
     TotalBlocks  : WORD;
     SectorsPerBlock : WORD;
     availableBlocks : WORD;
@@ -244,11 +244,11 @@ BEGIN
 END;}
 
 PROCEDURE CrtTest;
-VAR C : CHAR;
+VAR C : AnsiChar;
     I : INTEGER;
 
     PROCEDURE KeyTest;
-    VAR C : CHAR;
+    VAR C : AnsiChar;
     BEGIN
       WriteLn ('Key-Test, CR will be converted to ausgegeben, End with ESC');
       Repeat
@@ -341,7 +341,7 @@ Function FileSetAttr (Const Filename : String; Attr: longint) : Longint;
 }
 PROCEDURE SysUtilsTest;
 VAR H,I,Attr : LONGINT;
-    X : ARRAY [0..255] OF CHAR;
+    X : ARRAY [0..255] OF AnsiChar;
     TD: TDateTime;
     SR: TSearchRec;
     ST1,ST2: STRING;
@@ -481,7 +481,7 @@ PROCEDURE VideoTest;
     BEGIN
       W := (TextAttr SHL 8) or byte (S[I]);
       PWord(P)^ := w;
-      INC (PChar(P),2);
+      INC (PAnsiChar(P),2);
     END;
   END;
 
@@ -542,7 +542,7 @@ END;
 
 VAR I : LONGINT;
     S : STRING [255];
-    C : CHAR;
+    C : AnsiChar;
     P : ^Str255;
 BEGIN
   New (P);

Some files were not shown because too many files changed in this diff