* PChar -> PAnsichar

packages/httpd20/examples/minimain.pas

@@ -13,7 +13,7 @@ implementation
  
 function DefaultHandler(r: Prequest_rec): Integer; cdecl;
 var
-  RequestedHandler: string;
+  RequestedHandler: ;
 begin 
   RequestedHandler := r^.handler;
 

packages/httpd20/examples/mod_example.pp

@@ -83,8 +83,8 @@ type
                                  * here?
                                  }
     congenital: Integer;             { Boolean: did we inherit an "Example"? }
-    trace: PChar;                { Pointer to trace string. }
-    loc: PChar;                  { Location to which this record applies. }
+    trace: PAnsiChar;                { Pointer to trace string. }
+    loc: PAnsiChar;                  { Location to which this record applies. }
   end;
 
   Px_cfg = ^x_cfg;
@@ -98,7 +98,7 @@ type
  * the same routine/environment.
  }
 var
-  trace: PChar = nil;
+  trace: PAnsiChar = nil;
   static_calls_made: Papr_table_t = nil;
 
 {
@@ -126,7 +126,7 @@ var
  * list with
  *   AP_INIT_NO_ARGS("directive", function, mconfig, where, help)
  *
- * static const char *handle_NO_ARGS(cmd_parms *cmd, void *mconfig);
+ * static const AnsiChar *handle_NO_ARGS(cmd_parms *cmd, void *mconfig);
  }
 
 {
@@ -135,8 +135,8 @@ var
  * command_rec list with
  *   AP_INIT_RAW_ARGS("directive", function, mconfig, where, help)
  *
- * static const char *handle_RAW_ARGS(cmd_parms *cmd, void *mconfig,
- *                                    const char *args);
+ * static const AnsiChar *handle_RAW_ARGS(cmd_parms *cmd, void *mconfig,
+ *                                    const AnsiChar *args);
  }
 
 {
@@ -145,7 +145,7 @@ var
  * Declared in the command_rec list with
  *   AP_INIT_FLAG("directive", function, mconfig, where, help)
  *
- * static const char *handle_FLAG(cmd_parms *cmd, void *mconfig, int bool);
+ * static const AnsiChar *handle_FLAG(cmd_parms *cmd, void *mconfig, int bool);
  }
 
 {
@@ -153,8 +153,8 @@ var
  * "word1".  Declared in the command_rec list with
  *   AP_INIT_TAKE1("directive", function, mconfig, where, help)
  *
- * static const char *handle_TAKE1(cmd_parms *cmd, void *mconfig,
- *                                 char *word1);
+ * static const AnsiChar *handle_TAKE1(cmd_parms *cmd, void *mconfig,
+ *                                 AnsiChar *word1);
  }
 
 {
@@ -162,8 +162,8 @@ var
  * exactly two arguments.  Declared in the command_rec list with
  *   AP_INIT_TAKE2("directive", function, mconfig, where, help)
  *
- * static const char *handle_TAKE2(cmd_parms *cmd, void *mconfig,
- *                                 char *word1, char *word2);
+ * static const AnsiChar *handle_TAKE2(cmd_parms *cmd, void *mconfig,
+ *                                 AnsiChar *word1, AnsiChar *word2);
  }
 
 {
@@ -172,8 +172,8 @@ var
  * Declared in the command_rec list with
  *   AP_INIT_TAKE3("directive", function, mconfig, where, help)
  *
- * static const char *handle_TAKE3(cmd_parms *cmd, void *mconfig,
- *                                 char *word1, char *word2, char *word3);
+ * static const AnsiChar *handle_TAKE3(cmd_parms *cmd, void *mconfig,
+ *                                 AnsiChar *word1, AnsiChar *word2, AnsiChar *word3);
  }
 
 {
@@ -183,8 +183,8 @@ var
  * Declared in the command_rec list with
  *   AP_INIT_TAKE12("directive", function, mconfig, where, help)
  *
- * static const char *handle_TAKE12(cmd_parms *cmd, void *mconfig,
- *                                  char *word1, char *word2);
+ * static const AnsiChar *handle_TAKE12(cmd_parms *cmd, void *mconfig,
+ *                                  AnsiChar *word1, AnsiChar *word2);
  }
 
 {
@@ -195,8 +195,8 @@ var
  * Declared in the command_rec list with
  *   AP_INIT_TAKE123("directive", function, mconfig, where, help)
  *
- * static const char *handle_TAKE123(cmd_parms *cmd, void *mconfig,
- *                                   char *word1, char *word2, char *word3);
+ * static const AnsiChar *handle_TAKE123(cmd_parms *cmd, void *mconfig,
+ *                                   AnsiChar *word1, AnsiChar *word2, AnsiChar *word3);
  }
 
 {
@@ -206,8 +206,8 @@ var
  * Declared in the command_rec list with
  *   AP_INIT_TAKE13("directive", function, mconfig, where, help)
  *
- * static const char *handle_TAKE13(cmd_parms *cmd, void *mconfig,
- *                                  char *word1, char *word2, char *word3);
+ * static const AnsiChar *handle_TAKE13(cmd_parms *cmd, void *mconfig,
+ *                                  AnsiChar *word1, AnsiChar *word2, AnsiChar *word3);
  }
 
 {
@@ -217,8 +217,8 @@ var
  * Declared in the command_rec list with
  *   AP_INIT_TAKE23("directive", function, mconfig, where, help)
  *
- * static const char *handle_TAKE23(cmd_parms *cmd, void *mconfig,
- *                                  char *word1, char *word2, char *word3);
+ * static const AnsiChar *handle_TAKE23(cmd_parms *cmd, void *mconfig,
+ *                                  AnsiChar *word1, AnsiChar *word2, AnsiChar *word3);
  }
 
 {
@@ -228,8 +228,8 @@ var
  * Declared in the command_rec list with
  *   AP_INIT_ITERATE("directive", function, mconfig, where, help)
  *
- * static const char *handle_ITERATE(cmd_parms *cmd, void *mconfig,
- *                                   char *word1);
+ * static const AnsiChar *handle_ITERATE(cmd_parms *cmd, void *mconfig,
+ *                                   AnsiChar *word1);
  }
 
 {
@@ -242,8 +242,8 @@ var
  * Declared in the command_rec list with
  *   AP_INIT_ITERATE2("directive", function, mconfig, where, help)
  *
- * static const char *handle_ITERATE2(cmd_parms *cmd, void *mconfig,
- *                                    char *word1, char *word2);
+ * static const AnsiChar *handle_ITERATE2(cmd_parms *cmd, void *mconfig,
+ *                                    AnsiChar *word1, AnsiChar *word2);
  }
 
 {--------------------------------------------------------------------------}
@@ -328,9 +328,9 @@ const
 
   EXAMPLE_LOG_EACH = 0;
 
-procedure trace_add(s: Pserver_rec; r: Prequest_rec; mconfig: Px_cfg; const note: PChar); cdecl;
+procedure trace_add(s: Pserver_rec; r: Prequest_rec; mconfig: Px_cfg; const note: PAnsiChar); cdecl;
 var
-  sofar, addon, where, trace_copy, key: PChar;
+  sofar, addon, where, trace_copy, key: PAnsiChar;
   p: Papr_pool_t;
 begin
     {
@@ -391,7 +391,7 @@ begin
      }
     if (r = nil) then
     begin
-        key := apr_pstrcat(p, [note, PChar(':'), where, nil]);
+        key := apr_pstrcat(p, [note, PAnsiChar(':'), where, nil]);
 
         if (apr_table_get(static_calls_made, key) <> nil) then
             {
@@ -406,10 +406,10 @@ begin
             apr_table_set(static_calls_made, key, 'been here');
     end;
     addon := apr_pstrcat(p, [
-                        PChar('   <li>' + LineEnding +
+                        PAnsiChar('   <li>' + LineEnding +
                         '    <dl>' + LineEnding +
-                        '     <dt><samp>'), note, PChar('</samp></dt>' + LineEnding +
-                        '     <dd><samp>['), where, PChar(']</samp></dd>' + LineEnding +
+                        '     <dt><samp>'), note, PAnsiChar('</samp></dt>' + LineEnding +
+                        '     <dd><samp>['), where, PAnsiChar(']</samp></dd>' + LineEnding +
                         '    </dl>' + LineEnding +
                         '   </li>' + LineEnding),
                         nil]);
@@ -453,7 +453,7 @@ end;
  * call in the trace log, and flag the applicability of the directive to the
  * current location in that location's configuration record.
  }
-function cmd_example(cmd: Pcmd_parms; mconfig: Pointer): PChar; cdecl;
+function cmd_example(cmd: Pcmd_parms; mconfig: Pointer): PAnsiChar; cdecl;
 var
   cfg: Px_cfg;
 begin
@@ -492,7 +492,7 @@ end;
 function x_handler(r: Prequest_rec): Integer; cdecl;
 var
   dcfg: Px_cfg;
-  tempstr: PChar;
+  tempstr: PAnsiChar;
 begin
     tempstr := 'Undefined';
 
@@ -666,10 +666,10 @@ end;
  * The return value is a pointer to the created module-specific
  * structure.
  }
-function x_create_dir_config(p: Papr_pool_t; dirspec: PChar): Pointer; cdecl;
+function x_create_dir_config(p: Papr_pool_t; dirspec: PAnsiChar): Pointer; cdecl;
 var
   cfg: Px_cfg;
-  dname: PChar;
+  dname: PAnsiChar;
 begin
   dname := dirspec;
 
@@ -688,7 +688,7 @@ begin
      * Finally, add our trace to the callback list.
      }
     if dname = nil then dname := '';
-    cfg^.loc := apr_pstrcat(p, [PChar('DIR('), dname, PChar(')'), nil]);
+    cfg^.loc := apr_pstrcat(p, [PAnsiChar('DIR('), dname, PAnsiChar(')'), nil]);
     trace_add(nil, nil, cfg, 'x_create_dir_config()');
     Result := Pointer(cfg);
 end;
@@ -712,7 +712,7 @@ function x_merge_dir_config(p: Papr_pool_t;
  parent_conf, newloc_conf: Pointer): Pointer; cdecl;
 var
   merged_config, pconf, nconf: Px_cfg;
-  note: PChar;
+  note: PAnsiChar;
 begin
     merged_config := Px_cfg(apr_pcalloc(p, sizeof(x_cfg)));
     pconf := Px_cfg(parent_conf);
@@ -742,8 +742,8 @@ begin
      * Now just record our being called in the trace list.  Include the
      * locations we were asked to merge.
      }
-    note := apr_pstrcat(p, [PChar('x_merge_dir_config("'), pconf^.loc, PChar('","'),
-     nconf^.loc, PChar('")'), nil]);
+    note := apr_pstrcat(p, [PAnsiChar('x_merge_dir_config("'), pconf^.loc, PAnsiChar('","'),
+     nconf^.loc, PAnsiChar('")'), nil]);
     trace_add(nil, nil, merged_config, note);
     Result := Pointer(merged_config);
 end;
@@ -758,7 +758,7 @@ end;
 function x_create_server_config(p: Papr_pool_t; s: Pserver_rec): Pointer; cdecl;
 var
   cfg: Px_cfg;
-  sname: PChar;
+  sname: PAnsiChar;
 begin
     sname := s^.server_hostname;
 
@@ -774,7 +774,7 @@ begin
      * Note that we were called in the trace list.
      }
     if sname = nil then sname := '';
-    cfg^.loc := apr_pstrcat(p, [PChar('SVR('), sname, PChar(')'), nil]);
+    cfg^.loc := apr_pstrcat(p, [PAnsiChar('SVR('), sname, PAnsiChar(')'), nil]);
     trace_add(s, nil, cfg, 'x_create_server_config()');
     Result := Pointer(cfg);
 end;
@@ -796,7 +796,7 @@ function x_merge_server_config(p: Papr_pool_t;
  server1_conf, server2_conf: Pointer): Pointer; cdecl;
 var
   merged_config, s1conf, s2conf: Px_cfg;
-  note: PChar;
+  note: PAnsiChar;
 begin
     merged_config := Px_cfg(apr_pcalloc(p, sizeof(x_cfg)));
     s1conf := Px_cfg(server1_conf);
@@ -816,8 +816,8 @@ begin
     {
      * Trace our call, including what we were asked to merge.
      }
-    note := apr_pstrcat(p, [PChar('x_merge_server_config("'), s1conf^.loc, PChar('","'),
-     s2conf^.loc, PChar('")'), nil]);
+    note := apr_pstrcat(p, [PAnsiChar('x_merge_server_config("'), s1conf^.loc, PAnsiChar('","'),
+     s2conf^.loc, PAnsiChar('")'), nil]);
     trace_add(nil, nil, merged_config, note);
     Result := Pointer(merged_config);
 end;
@@ -875,7 +875,7 @@ end;
  }
 function x_child_exit(data: Pointer): apr_status_t; cdecl;
 var
-  note, sname: PChar;
+  note, sname: PAnsiChar;
   s: Pserver_rec;
 begin
     s := data;
@@ -886,7 +886,7 @@ begin
      * we're being called.
      }
     if sname = nil then sname := '';
-    note := apr_pstrcat(s^.process^.pool, [PChar('x_child_exit('), sname, PChar(')'), nil]);
+    note := apr_pstrcat(s^.process^.pool, [PAnsiChar('x_child_exit('), sname, PAnsiChar(')'), nil]);
     trace_add(s, nil, nil, note);
     Result := APR_SUCCESS;
 end;
@@ -896,7 +896,7 @@ end;
  }
 procedure x_child_init(p: Papr_pool_t; s: Pserver_rec); cdecl;
 var
-  note, sname: PChar;
+  note, sname: PAnsiChar;
 begin
   sname := s^.server_hostname;
 
@@ -909,7 +909,7 @@ begin
      * we're being called.
      }
     if sname = nil then sname := '';
-    note := apr_pstrcat(p, [PChar('x_child_init('), sname, PChar(')'), nil]);
+    note := apr_pstrcat(p, [PAnsiChar('x_child_init('), sname, PAnsiChar(')'), nil]);
     trace_add(s, nil, nil, note);
 
     apr_pool_cleanup_register(p, s, @x_child_exit, @x_child_exit);
@@ -923,7 +923,7 @@ end;
  * phase.
  }
 //#if 0
-function x_http_method(const r: Prequest_rec): PChar; cdecl;
+function x_http_method(const r: Prequest_rec): PAnsiChar; cdecl;
 var
   cfg: Px_cfg;
 begin

packages/httpd20/examples/mod_hello.pp

@@ -39,7 +39,7 @@ exports
 *******************************************************************}
 function DefaultHandler(r: Prequest_rec): Integer; cdecl;
 var
-  RequestedHandler: string;
+  RequestedHandler: ;
   
 begin
   RequestedHandler := r^.handler;
@@ -54,7 +54,7 @@ begin
   { The following line just prints a message to the errorlog }
   ap_log_error(MODULE_NAME, 54, APLOG_NOERRNO or APLOG_NOTICE,
    {$ifndef Apache1_3}0,{$endif} r^.server,
-   'mod_hello: %s', [PChar('Before content is output')]);
+   'mod_hello: %s', [PAnsiChar('Before content is output')]);
 
   { We set the content type before doing anything else }
   {$ifdef Apache1_3}

packages/httpd20/examples/mod_spelling.pp

@@ -111,7 +111,7 @@ end;
 {
  * Respond to a callback to create a config record for a specific directory.
  }
-function create_mconfig_for_directory(p: Papr_pool_t; dir: PChar): Pointer; cdecl;
+function create_mconfig_for_directory(p: Papr_pool_t; dir: PAnsiChar): Pointer; cdecl;
 begin
   Result := mkconfig(p);
 end;
@@ -119,7 +119,7 @@ end;
 {
  * Handler for the CheckSpelling directive, which is FLAG.
  }
-function set_speling(cmd: Pcmd_parms; mconfig: Pointer; arg: Integer): PChar; cdecl;
+function set_speling(cmd: Pcmd_parms; mconfig: Pointer; arg: Integer): PAnsiChar; cdecl;
 var
   cfg: Pspconfig;
 begin
@@ -146,7 +146,7 @@ type
   );
 
 const
-  sp_reason_str: array [0..7] of PChar =
+  sp_reason_str: array [0..7] of PAnsiChar =
   (
     'identical',
     'miscapitalized',
@@ -160,7 +160,7 @@ const
 
 type
   misspelled_file = record
-    name: PChar;
+    name: PAnsiChar;
     quality: sp_reason;
   end;
   
@@ -178,8 +178,8 @@ type
  * thus, it was exactly backwards in the old version. -- PWP
  *
  * This routine was taken out of tcsh's spelling correction code
- * (tcsh-6.07.04) and re-converted to apache data types ("char" type
- * instead of tcsh's NLS'ed "Char"). Plus it now ignores the case
+ * (tcsh-6.07.04) and re-converted to apache data types ("AnsiChar" type
+ * instead of tcsh's NLS'ed "AnsiChar"). Plus it now ignores the case
  * during comparisons, so is a "approximate strcasecmp()".
  * NOTE that is still allows only _one_ real "typo",
  * it does NOT try to correct multiple errors.
@@ -191,9 +191,9 @@ type
   
   * s
 }
-function spdist(const cs, ct: PChar): sp_reason;
+function spdist(const cs, ct: PAnsiChar): sp_reason;
 var
-  s, t, i, j: PChar;
+  s, t, i, j: PAnsiChar;
 begin
   s := cs;
   t := ct;
@@ -237,7 +237,7 @@ begin
       
       if (stricomp(i, j) = 0) then
       begin
-        Result := SP_SIMPLETYPO;   { 1 char mismatch }
+        Result := SP_SIMPLETYPO;   { 1 AnsiChar mismatch }
         Exit;
       end;
     end;
@@ -267,14 +267,14 @@ end;
 function check_speling(r: Prequest_rec): Integer; cdecl;
 var
   cfg: Pspconfig;
-  good, bad, postgood, url: PChar;
+  good, bad, postgood, url: PAnsiChar;
   dirent: apr_finfo_t;
   filoc, dotloc, urlen, pglen: Integer;
   candidates: Papr_array_header_t = nil;
   dir: Papr_dir_t;
   q: sp_reason;
   sp_new, variant_, nvariant_: Pmisspelled_file;
-  nuri, ref, vuri, reason: PChar;
+  nuri, ref, vuri, reason: PAnsiChar;
   i, entloc: Integer;
   p, sub_pool: Papr_pool_t;
   notes: Papr_table_t;
@@ -396,7 +396,7 @@ begin
 
     {
      * simple typing errors are checked next (like, e.g.,
-     * missing/extra/transposed char)
+     * missing/extra/transposed AnsiChar)
      }
     else if (spdist(bad, dirent.name) <> SP_VERYDIFFERENT) then
     begin
@@ -494,7 +494,7 @@ begin
 						     variant_^.name,
 						     r^.path_info, nil]));
       if (r^.parsed_uri.query^ <> #0) then
-       nuri := apr_pstrcat(r^.pool, [nuri, PChar('?'), r^.parsed_uri.query, nil]);
+       nuri := apr_pstrcat(r^.pool, [nuri, PAnsiChar('?'), r^.parsed_uri.query, nil]);
 
       apr_table_setn(r^.headers_out, 'Location',
 			  ap_construct_url(r^.pool, nuri, r));
@@ -532,14 +532,14 @@ begin
         Exit;
       end;
           
-      t := apr_array_make(sub_pool, candidates^.nelts * 8 + 8, sizeof(PChar));
-      v := apr_array_make(sub_pool, candidates^.nelts * 5, sizeof(PChar));
+      t := apr_array_make(sub_pool, candidates^.nelts * 8 + 8, sizeof(PAnsiChar));
+      v := apr_array_make(sub_pool, candidates^.nelts * 5, sizeof(PAnsiChar));
 
        { Generate the response text. }
 
-      PPChar(apr_array_push(t))^ := 'The document name you requested (<code>';
-      PPChar(apr_array_push(t))^ := ap_escape_html(sub_pool, r^.uri);
-      PPChar(apr_array_push(t))^ :=
+      PPAnsiChar(apr_array_push(t))^ := 'The document name you requested (<code>';
+      PPAnsiChar(apr_array_push(t))^ := ap_escape_html(sub_pool, r^.uri);
+      PPAnsiChar(apr_array_push(t))^ :=
 		   '</code>) could not be found on this server.' + LineEnding +
 		   'However, we found documents with names similar ' +
 		   'to the one you requested.<p>' +
@@ -553,21 +553,21 @@ begin
                  vuri := apr_pstrcat(sub_pool, [url, variant_[i].name, r^.path_info,
                   '?', r^.parsed_uri.query, nil])
                 else vuri := apr_pstrcat(sub_pool, [url, variant_[i].name, r^.path_info,
-		 PChar(''), PChar(''), nil]);
+		 PAnsiChar(''), PAnsiChar(''), nil]);
    
-		PPChar(apr_array_push(v))^ := '"';
-		PPChar(apr_array_push(v))^ := ap_escape_uri(sub_pool, vuri);
-		PPChar(apr_array_push(v))^ := '";"';
-		PPChar(apr_array_push(v))^ := reason;
-		PPChar(apr_array_push(v))^ := '"';
-
-		PPChar(apr_array_push(t))^ := '<li><a href="';
-		PPChar(apr_array_push(t))^ := ap_escape_uri(sub_pool, vuri);
-		PPChar(apr_array_push(t))^ := '">';
-		PPChar(apr_array_push(t))^ := ap_escape_html(sub_pool, vuri);
-		PPChar(apr_array_push(t))^ := '</a> (';
-		PPChar(apr_array_push(t))^ := reason;
-		PPChar(apr_array_push(t))^ := ')' + LineEnding;
+		PPAnsiChar(apr_array_push(v))^ := '"';
+		PPAnsiChar(apr_array_push(v))^ := ap_escape_uri(sub_pool, vuri);
+		PPAnsiChar(apr_array_push(v))^ := '";"';
+		PPAnsiChar(apr_array_push(v))^ := reason;
+		PPAnsiChar(apr_array_push(v))^ := '"';
+
+		PPAnsiChar(apr_array_push(t))^ := '<li><a href="';
+		PPAnsiChar(apr_array_push(t))^ := ap_escape_uri(sub_pool, vuri);
+		PPAnsiChar(apr_array_push(t))^ := '">';
+		PPAnsiChar(apr_array_push(t))^ := ap_escape_html(sub_pool, vuri);
+		PPAnsiChar(apr_array_push(t))^ := '</a> (';
+		PPAnsiChar(apr_array_push(t))^ := reason;
+		PPAnsiChar(apr_array_push(t))^ := ')' + LineEnding;
 
                 {
                  * when we have printed the "close matches" and there are
@@ -579,20 +579,20 @@ begin
                 if (i > 0) and (i < candidates^.nelts - 1)
                     and (variant_[i].quality <> SP_VERYDIFFERENT)
                     and (variant_[i + 1].quality = SP_VERYDIFFERENT) then
-                 PPChar(apr_array_push(t))^ :=
+                 PPAnsiChar(apr_array_push(t))^ :=
 		  '</ul>' + LineEnding + 'Furthermore, the following related ' +
                   'documents were found:' + LineEnding + '<ul>' + LineEnding;
             end;
             
-	    PPChar(apr_array_push(t))^ := '</ul>' + LineEnding;
+	    PPAnsiChar(apr_array_push(t))^ := '</ul>' + LineEnding;
 
             { If we know there was a referring page, add a note: }
             if (ref <> nil) then
             begin
-              PPChar(apr_array_push(t))^ :=
+              PPAnsiChar(apr_array_push(t))^ :=
 	       'Please consider informing the owner of the <a href="';
-	      PPChar(apr_array_push(t))^ := ap_escape_uri(sub_pool, ref);
-              PPChar(apr_array_push(t))^ := '">referring page</a> about the broken link.' + LineEnding;
+	      PPAnsiChar(apr_array_push(t))^ := ap_escape_uri(sub_pool, ref);
+              PPAnsiChar(apr_array_push(t))^ := '">referring page</a> about the broken link.' + LineEnding;
             end;
 
             { Pass our apr_table_t to http_protocol.c (see mod_negotiation): }

packages/httpd20/src/ap_mpm.inc

@@ -106,7 +106,7 @@ function ap_graceful_stop_signalled: Integer;
 function ap_os_create_privileged_process(
  const r: Prequest_rec;
  newproc: Papr_proc_t;
- const progname, args, env: PChar;
+ const progname, args, env: PAnsiChar;
  attr: Papr_procattr_t; p: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_os_create_privileged_process' + LibSuff28;

packages/httpd20/src/ap_provider.inc

@@ -31,7 +31,7 @@
  * @return APR_SUCCESS if all went well
  }
 function ap_register_provider(pool: Papr_pool_t;
- const provider_group, provider_name, provider_version: PChar;
+ const provider_group, provider_name, provider_version: PAnsiChar;
  const provider: Pointer): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_register_provider' + LibSuff20;
@@ -44,7 +44,7 @@ function ap_register_provider(pool: Papr_pool_t;
  * @param provider_version The version for the provider
  * @return provider pointer to provider if found, NULL otherwise
  }
-function ap_lookup_provider(provider_group, provider_name, provider_version: PChar): Pointer;
+function ap_lookup_provider(provider_group, provider_name, provider_version: PAnsiChar): Pointer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_lookup_provider' + LibSuff12;
 

packages/httpd20/src/apr/apr.pas

@@ -126,7 +126,7 @@ type
   
   sockaddr = record
     sa_family: cushort;    // address family, AF_xxx
-    sa_data: array [1..14] of Char;  // (NBO) 14 bytes of protocol address
+    sa_data: array [1..14] of AnsiChar;  // (NBO) 14 bytes of protocol address
   end;
   
 {$ifndef windows}
@@ -141,7 +141,7 @@ type
     sin_family: cshort;    // e.g. AF_INET
     sin_port: cushort;     // e.g. htons(3490)
     sin_addr: in_addr;     // see struct in_addr, below
-    sin_zero: array [1..8] of Char;  // zero this if you want to
+    sin_zero: array [1..8] of AnsiChar;  // zero this if you want to
   end;
   
 {$endif}
@@ -179,7 +179,7 @@ type
     /// byte count to read/write
     iov_len: culong;
     /// data to be read/written
-    iov_base: PChar;
+    iov_base: PAnsiChar;
   end;
   
   Piovec = ^iovec;
@@ -229,9 +229,9 @@ end;
 
 { apr_lib.inc }
 
-function apr_tolower(c: Char): Char;
+function apr_tolower(c: AnsiChar): AnsiChar;
 var
-  buf: array[0..1] of Char;
+  buf: array[0..1] of AnsiChar;
 begin
   buf[0] := c;
   buf[1] := #0;
@@ -241,9 +241,9 @@ begin
   Result := buf[0];
 end;
 
-function apr_toupper(c: Char): Char;
+function apr_toupper(c: AnsiChar): AnsiChar;
 var
-  buf: array[0..1] of Char;
+  buf: array[0..1] of AnsiChar;
 begin
   buf[0] := c;
   buf[1] := #0;

packages/httpd20/src/apr/apr_allocator.inc

@@ -47,8 +47,8 @@ type
     ref: PPapr_memnode_t;            {< reference to self }
     index: apr_uint32_t;             {< size }
     free_index: apr_uint32_t;        {< how much free }
-    first_avail: PChar;              {< pointer to first free memory }
-    endp: PChar;                     {< pointer to end of free memory }
+    first_avail: PAnsiChar;              {< pointer to first free memory }
+    endp: PAnsiChar;                     {< pointer to end of free memory }
   end;
 
 { The base size of a memory node - aligned.  }

packages/httpd20/src/apr/apr_buckets.inc

@@ -131,7 +131,7 @@ type
   
   destroy_t = procedure (data: Pointer);
 
-  read_t = function (b: Papr_bucket; const str: PPChar; len: Papr_size_t;
+  read_t = function (b: Papr_bucket; const str: PPAnsiChar; len: Papr_size_t;
    block: apr_read_type_e): apr_status_t;
                          
   setaside_t = function (e: Papr_bucket; pool: Papr_pool_t): apr_status_t;
@@ -146,7 +146,7 @@ type
     {
      * The name of the bucket type
      }
-    name: PChar;
+    name: PAnsiChar;
     {
      * The number of functions this bucket understands.  Can not be less than
      * five.
@@ -615,7 +615,7 @@ type
     { The start of the data actually allocated.  This should never be
      * modified, it is only used to free the bucket.
      }
-    base: PChar;
+    base: PAnsiChar;
     { how much memory was allocated }
     alloc_len: apr_size_t;
     { function to use to delete the data }
@@ -645,7 +645,7 @@ type
      * the start and length of the apr_bucket accordingly.
      * This will be NULL after the pool gets cleaned up.
      }
-    base: PChar;
+    base: PAnsiChar;
     { The pool the data was allocated from.  When the pool
      * is cleaned up, this gets set to NULL as an indicator
      * to pool_read() that the data is now on the heap and
@@ -795,25 +795,25 @@ type
                                              apr_off_t *length);
 }
 {
- * Take a bucket brigade and store the data in a flat char*
- * @param bb The bucket brigade to create the char* from
- * @param c The char* to write into
- * @param len The maximum length of the char array. On return, it is the
- *            actual length of the char array.
+ * Take a bucket brigade and store the data in a flat AnsiChar*
+ * @param bb The bucket brigade to create the AnsiChar* from
+ * @param c The AnsiChar* to write into
+ * @param len The maximum length of the AnsiChar array. On return, it is the
+ *            actual length of the AnsiChar array.
  }
 {APU_DECLARE(apr_status_t) apr_brigade_flatten(apr_bucket_brigade *bb,
-                                              char *c,
+                                              AnsiChar *c,
                                               apr_size_t *len);
 }
 {
  * Creates a pool-allocated string representing a flat bucket brigade
- * @param bb The bucket brigade to create the char array from
- * @param c On return, the allocated char array
- * @param len On return, the length of the char array.
+ * @param bb The bucket brigade to create the AnsiChar array from
+ * @param c On return, the allocated AnsiChar array
+ * @param len On return, the length of the AnsiChar array.
  * @param pool The pool to allocate the string from.
  }
 {APU_DECLARE(apr_status_t) apr_brigade_pflatten(apr_bucket_brigade *bb,
-                                               char **c,
+                                               AnsiChar **c,
                                                apr_size_t *len,
                                                apr_pool_t *pool);
 }
@@ -866,7 +866,7 @@ type
  }
 {APU_DECLARE(apr_status_t) apr_brigade_write(apr_bucket_brigade *b,
                                             apr_brigade_flush flush, void *ctx,
-                                            const char *str, apr_size_t nbyte);
+                                            const AnsiChar *str, apr_size_t nbyte);
 }
 {
  * This function writes multiple strings into a bucket brigade.
@@ -893,7 +893,7 @@ type
  }
 {APU_DECLARE(apr_status_t) apr_brigade_puts(apr_bucket_brigade *bb,
                                            apr_brigade_flush flush, void *ctx,
-                                           const char *str);
+                                           const AnsiChar *str);
 }
 {
  * This function writes a character into a bucket brigade.
@@ -905,7 +905,7 @@ type
  }
 {APU_DECLARE(apr_status_t) apr_brigade_putc(apr_bucket_brigade *b,
                                            apr_brigade_flush flush, void *ctx,
-                                           const char c);
+                                           const AnsiChar c);
 }
 {
  * This function writes an unspecified number of strings into a bucket brigade.
@@ -932,7 +932,7 @@ type
 {APU_DECLARE_NONSTD(apr_status_t) apr_brigade_printf(apr_bucket_brigade *b,
                                                     apr_brigade_flush flush,
                                                     void *ctx,
-                                                    const char *fmt, ...)
+                                                    const AnsiChar *fmt, ...)
         __attribute__((format(printf,4,5)));
 }
 {
@@ -948,7 +948,7 @@ type
 {APU_DECLARE(apr_status_t) apr_brigade_vprintf(apr_bucket_brigade *b,
                                               apr_brigade_flush flush,
                                               void *ctx,
-                                              const char *fmt, va_list va);
+                                              const AnsiChar *fmt, va_list va);
 }
 {  *****  Bucket freelist functions *****  }
 {
@@ -1316,7 +1316,7 @@ type
  * @param list The freelist from which this bucket should be allocated
  * @return The new bucket, or NULL if allocation failed
  }
-{APU_DECLARE(apr_bucket *) apr_bucket_immortal_create(const char *buf,
+{APU_DECLARE(apr_bucket *) apr_bucket_immortal_create(const AnsiChar *buf,
                                                      apr_size_t nbyte,
                                                      apr_bucket_alloc_t *list);
 }
@@ -1328,7 +1328,7 @@ type
  * @return The new bucket, or NULL if allocation failed
  }
 {APU_DECLARE(apr_bucket *) apr_bucket_immortal_make(apr_bucket *b,
-                                                   const char *buf, 
+                                                   const AnsiChar *buf, 
                                                    apr_size_t nbyte);
 }
 {
@@ -1338,7 +1338,7 @@ type
  * @param list The freelist from which this bucket should be allocated
  * @return The new bucket, or NULL if allocation failed
  }
-{APU_DECLARE(apr_bucket *) apr_bucket_transient_create(const char *buf,
+{APU_DECLARE(apr_bucket *) apr_bucket_transient_create(const AnsiChar *buf,
                                                       apr_size_t nbyte,
                                                       apr_bucket_alloc_t *list);
 }
@@ -1350,7 +1350,7 @@ type
  * @return The new bucket, or NULL if allocation failed
  }
 {APU_DECLARE(apr_bucket *) apr_bucket_transient_make(apr_bucket *b,
-                                                    const char *buf,
+                                                    const AnsiChar *buf,
                                                     apr_size_t nbyte);
 }
 {
@@ -1367,7 +1367,7 @@ type
  * @param list The freelist from which this bucket should be allocated
  * @return The new bucket, or NULL if allocation failed
  }
-{APU_DECLARE(apr_bucket *) apr_bucket_heap_create(const char *buf,
+{APU_DECLARE(apr_bucket *) apr_bucket_heap_create(const AnsiChar *buf,
                                                  apr_size_t nbyte,
                                                  void ( *free_func)(void *data),
                                                  apr_bucket_alloc_t *list);}
@@ -1380,7 +1380,7 @@ type
  *                  bucket should make a copy of the data
  * @return The new bucket, or NULL if allocation failed
  }
-{APU_DECLARE(apr_bucket *) apr_bucket_heap_make(apr_bucket *b, const char *buf,
+{APU_DECLARE(apr_bucket *) apr_bucket_heap_make(apr_bucket *b, const AnsiChar *buf,
                                                apr_size_t nbyte,
                                                void ( *free_func)(void *data));}
 
@@ -1393,7 +1393,7 @@ type
  * @param list The freelist from which this bucket should be allocated
  * @return The new bucket, or NULL if allocation failed
  }
-{APU_DECLARE(apr_bucket *) apr_bucket_pool_create(const char *buf,
+{APU_DECLARE(apr_bucket *) apr_bucket_pool_create(const AnsiChar *buf,
                                                  apr_size_t length,
                                                  apr_pool_t *pool,
                                                  apr_bucket_alloc_t *list);}
@@ -1406,7 +1406,7 @@ type
  * @param pool The pool the memory was allocated from
  * @return The new bucket, or NULL if allocation failed
  }
-{APU_DECLARE(apr_bucket *) apr_bucket_pool_make(apr_bucket *b, const char *buf,
+{APU_DECLARE(apr_bucket *) apr_bucket_pool_make(apr_bucket *b, const AnsiChar *buf,
                                                apr_size_t length, 
                                                apr_pool_t *pool);}
 

packages/httpd20/src/apr/apr_dso.inc

@@ -56,7 +56,7 @@ type
  * @bug We aught to provide an alternative to RTLD_GLOBAL, which
  * is the only supported method of loading DSOs today.
  }
-function apr_dso_load(res_handle: PPapr_dso_handle_t; const path: PChar;
+function apr_dso_load(res_handle: PPapr_dso_handle_t; const path: PAnsiChar;
  ctx: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_dso_load' + LibSuff12;
@@ -76,7 +76,7 @@ function apr_dso_unload(handle: Papr_dso_handle_t): apr_status_t;
  * @param symname Name of the symbol to load.
  }
 function apr_dso_sym(ressym: Papr_dso_handle_t; handle: Papr_dso_handle_t;
- const symname: PChar): apr_status_t;
+ const symname: PAnsiChar): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_dso_sym' + LibSuff12;
 
@@ -86,8 +86,8 @@ function apr_dso_sym(ressym: Papr_dso_handle_t; handle: Papr_dso_handle_t;
  * @param buf Location to store the dso error
  * @param bufsize The size of the provided buffer
  }
-function apr_dso_error(dso: Papr_dso_handle_t; buf: PChar;
- bufsize: apr_size_t): PChar;
+function apr_dso_error(dso: Papr_dso_handle_t; buf: PAnsiChar;
+ bufsize: apr_size_t): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_dso_error' + LibSuff12;
 

packages/httpd20/src/apr/apr_errno.inc

@@ -43,7 +43,7 @@ type
  * @param buf A buffer to hold the error string.
  * @param bufsize Size of the buffer to hold the string.
  }
-function apr_strerror(statcode: apr_status_t; buf: PChar; bufsize: apr_size_t): PChar;
+function apr_strerror(statcode: apr_status_t; buf: PAnsiChar; bufsize: apr_size_t): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_strerror' + LibSuff12;
 

packages/httpd20/src/apr/apr_file_info.inc

@@ -191,9 +191,9 @@ type
     { The time the file was last changed }
     ctime: apr_time_t;
     { The pathname of the file (possibly unrooted) }
-    fname: PChar;
+    fname: PAnsiChar;
     { The file's name (no path) in filesystem case }
-    name: PChar;
+    name: PAnsiChar;
     { The file's handle, if accessed (can be submitted to apr_duphandle) }
     filehand: Papr_file_t;
   end;
@@ -214,7 +214,7 @@ type
  *       not be filled in, and you need to check the @c finfo->valid bitmask
  *       to verify that what you're looking for is there.
  }
-function apr_stat(finfo: Papr_finfo_t; const fname: PChar;
+function apr_stat(finfo: Papr_finfo_t; const fname: PAnsiChar;
  wanted: apr_int32_t; cont: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_stat' + LibSuff16;
@@ -231,7 +231,7 @@ function apr_stat(finfo: Papr_finfo_t; const fname: PChar;
  * @deprecated This function is deprecated, it's equivalent to calling apr_stat with 
  * the wanted flag value APR_FINFO_LINK
  }
-function apr_lstat(finfo: Papr_finfo_t; const fname: PChar;
+function apr_lstat(finfo: Papr_finfo_t; const fname: PAnsiChar;
  wanted: apr_int32_t; cont: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_lstat' + LibSuff16;
@@ -246,7 +246,7 @@ function apr_lstat(finfo: Papr_finfo_t; const fname: PChar;
  * @param dirname The full path to the directory (use / on all systems)
  * @param cont The pool to use.
  }
-function apr_dir_open(new_dir: PPapr_dir_t; const dirname: PChar;
+function apr_dir_open(new_dir: PPapr_dir_t; const dirname: PAnsiChar;
  cont: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_dir_open' + LibSuff12;
@@ -339,7 +339,7 @@ const
  * the drive letter), or APR_EBADPATH if the root is simply invalid.
  * APR_SUCCESS is returned if filepath is an absolute path.
  }
-function apr_filepath_root(const rootpath, filepath: PPChar;
+function apr_filepath_root(const rootpath, filepath: PPAnsiChar;
  flags: apr_int32_t; p: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_filepath_root' + LibSuff16;
@@ -357,7 +357,7 @@ function apr_filepath_root(const rootpath, filepath: PPChar;
  * result code will be APR_EPATHWILD, and all further segments will not
  * reflect the true filenames including the wildcard and following segments.
  }
-function apr_filepath_merge(newpath: PPChar; const rootpath, addpath: PPChar;
+function apr_filepath_merge(newpath: PPAnsiChar; const rootpath, addpath: PPAnsiChar;
  flags: apr_int32_t; p: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_filepath_merge' + LibSuff20;
@@ -372,7 +372,7 @@ function apr_filepath_merge(newpath: PPChar; const rootpath, addpath: PPChar;
  * e.g., ':' on Unix, ';' on Windows, etc.
  }
 function apr_filepath_list_split(pathelts: PPapr_array_header_t;
- const liststr: PChar; p: Papr_pool_t): apr_status_t;
+ const liststr: PAnsiChar; p: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_filepath_list_split' + LibSuff12;
 
@@ -385,7 +385,7 @@ function apr_filepath_list_split(pathelts: PPapr_array_header_t;
  * @remark the path separator in @a liststr is system specific;
  * e.g., ':' on Unix, ';' on Windows, etc.
  }
-function apr_filepath_list_merge(liststr: PPChar;
+function apr_filepath_list_merge(liststr: PPAnsiChar;
  pathelts: Papr_array_header_t; p: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_filepath_list_merge' + LibSuff12;
@@ -397,7 +397,7 @@ function apr_filepath_list_merge(liststr: PPChar;
  *              default file path in os-native format.
  * @param p the pool to allocate the default path string from
  }
-function apr_filepath_get(path: PPChar; flags: apr_int32_t;
+function apr_filepath_get(path: PPAnsiChar; flags: apr_int32_t;
  p: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_filepath_get' + LibSuff12;
@@ -407,7 +407,7 @@ function apr_filepath_get(path: PPChar; flags: apr_int32_t;
  * @param path the default path returned
  * @param p the pool to allocate any working storage
  }
-function apr_filepath_set(const path: PChar; p: Papr_pool_t): apr_status_t;
+function apr_filepath_set(const path: PAnsiChar; p: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_filepath_set' + LibSuff8;
 

packages/httpd20/src/apr/apr_file_io.inc

@@ -158,7 +158,7 @@ const
  *      default permissions will be used.  *arg1 must point to a valid file_t, 
  *      or NULL (in which case it will be allocated)
  }
-function apr_file_open(newf: PPapr_file_t; const fname: PChar;
+function apr_file_open(newf: PPapr_file_t; const fname: PAnsiChar;
  flag: apr_int32_t; perm: apr_fileperms_t;
  pool: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
@@ -178,7 +178,7 @@ function apr_file_close(file_: Papr_file_t): apr_status_t;
  * @param cont The pool to use.
  * @remark If the file is open, it won't be removed until all instances are closed.
  }
-function apr_file_remove(const path: PChar; cont: Papr_pool_t): apr_status_t;
+function apr_file_remove(const path: PAnsiChar; cont: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_file_remove' + LibSuff8;
 
@@ -190,7 +190,7 @@ function apr_file_remove(const path: PChar; cont: Papr_pool_t): apr_status_t;
  * @warning If a file exists at the new location, then it will be overwritten.  
  *      Moving files or directories across devices may not be possible.
  }
-function apr_file_rename(const from_path, to_path: PChar; pool: Papr_pool_t): apr_status_t;
+function apr_file_rename(const from_path, to_path: PAnsiChar; pool: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_file_rename' + LibSuff12;
 
@@ -206,7 +206,7 @@ function apr_file_rename(const from_path, to_path: PChar; pool: Papr_pool_t): ap
  * @remark The new file does not need to exist, it will be created if required.
  * @warning If the new file already exists, its contents will be overwritten.
  }
-function apr_file_copy(const from_path, to_path: PChar;
+function apr_file_copy(const from_path, to_path: PAnsiChar;
  perms: apr_fileperms_t; pool: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_file_copy' + LibSuff16;
@@ -222,7 +222,7 @@ function apr_file_copy(const from_path, to_path: PChar;
  * @param pool The pool to use.
  * @remark The new file does not need to exist, it will be created if required.
  }
-function apr_file_append(const from_path, to_path: PChar;
+function apr_file_append(const from_path, to_path: PAnsiChar;
  perms: apr_fileperms_t; pool: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_file_append' + LibSuff16;
@@ -304,7 +304,7 @@ function apr_file_open_stdin(thefile: PPapr_file_t;
  * @remark apr_file_read will read up to the specified number of bytes, but 
  *         never more.  If there isn't enough data to fill that number of 
  *         bytes, all of the available data is read.  The third argument is 
- *         modified to reflect the number of bytes read.  If a char was put 
+ *         modified to reflect the number of bytes read.  If a AnsiChar was put 
  *         back into the stream via ungetc, it will be the first character 
  *         returned. 
  *
@@ -368,7 +368,7 @@ function apr_file_writev(thefile: Papr_file_t; const vec: Piovec;
  * @remark apr_file_read will read up to the specified number of bytes, but never 
  *      more.  If there isn't enough data to fill that number of bytes, 
  *      then the process/thread will block until it is available or EOF 
- *      is reached.  If a char was put back into the stream via ungetc, 
+ *      is reached.  If a AnsiChar was put back into the stream via ungetc, 
  *      it will be the first character returned. 
  *
  *      It is possible for both bytes to be read and an error to be 
@@ -410,7 +410,7 @@ function apr_file_write_full(thefile: Papr_file_t; buf: Pointer;
  * @param ch The character to write.
  * @param thefile The file descriptor to write to
  }
-function apr_file_putc(ch: Char; thefile: Papr_file_t): apr_status_t;
+function apr_file_putc(ch: AnsiChar; thefile: Papr_file_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_file_putc' + LibSuff8;
 
@@ -419,7 +419,7 @@ function apr_file_putc(ch: Char; thefile: Papr_file_t): apr_status_t;
  * @param ch The character to read into
  * @param thefile The file descriptor to read from
  }
-function apr_file_getc(ch: PChar; thefile: Papr_file_t): apr_status_t;
+function apr_file_getc(ch: PAnsiChar; thefile: Papr_file_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_file_getc' + LibSuff8;
 
@@ -428,7 +428,7 @@ function apr_file_getc(ch: PChar; thefile: Papr_file_t): apr_status_t;
  * @param ch The character to write.
  * @param thefile The file descriptor to write to
  }
-function apr_file_ungetc(ch: Char; thefile: PPapr_file_t): apr_status_t;
+function apr_file_ungetc(ch: AnsiChar; thefile: PPapr_file_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_file_ungetc' + LibSuff8;
 
@@ -439,7 +439,7 @@ function apr_file_ungetc(ch: Char; thefile: PPapr_file_t): apr_status_t;
  * @param thefile The file descriptor to read from
  * @remark The buffer will be '\0'-terminated if any characters are stored.
  }
-function apr_file_gets(str: PChar; len: Integer;
+function apr_file_gets(str: PAnsiChar; len: Integer;
  thefile: Papr_file_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_file_gets' + LibSuff12;
@@ -449,7 +449,7 @@ function apr_file_gets(str: PChar; len: Integer;
  * @param str The string to write. 
  * @param thefile The file descriptor to write to
  }
-function apr_file_puts(const str: PChar; thefile: Papr_file_t): apr_status_t;
+function apr_file_puts(const str: PAnsiChar; thefile: Papr_file_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_file_puts' + LibSuff8;
 
@@ -537,7 +537,7 @@ function apr_file_pipe_create(in_: PPapr_file_t; out_: PPapr_file_t;
  * @param perm The permissions for the newly created pipe.
  * @param cont The pool to operate on.
  }
-function apr_file_namedpipe_create(const filename: PChar;
+function apr_file_namedpipe_create(const filename: PAnsiChar;
  perm: apr_fileperms_t; cont: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_file_namedpipe_create' + LibSuff12;
@@ -593,7 +593,7 @@ function apr_file_unlock(thefile: Papr_file_t): apr_status_t;
  * @param new_path The path of the file.  
  * @param thefile The currently open file.
  }
-function apr_file_name_get(const newpath: PPChar; thefile: Papr_file_t): apr_status_t;
+function apr_file_name_get(const newpath: PPAnsiChar; thefile: Papr_file_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_file_name_get' + LibSuff8;
 
@@ -603,7 +603,7 @@ function apr_file_name_get(const newpath: PPChar; thefile: Papr_file_t): apr_sta
  * @param key The key to use for retreiving data associated with this file.
  * @param file The currently open file.
  }
-function apr_file_data_get(data: PPointer; const key: PChar;
+function apr_file_data_get(data: PPointer; const key: PAnsiChar;
  file_: Papr_file_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_file_data_get' + LibSuff12;
@@ -615,11 +615,11 @@ function apr_file_data_get(data: PPointer; const key: PChar;
  * @param key The key to use for assocaiteing data with the file.
  * @param cleanup The cleanup routine to use when the file is destroyed.
  }
-//function apr_file_data_set(ch: Char; thefile: PPapr_file_t): apr_status_t;
+//function apr_file_data_set(ch: AnsiChar; thefile: PPapr_file_t): apr_status_t;
 // {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 // external LibAPR name LibNamePrefix + 'apr_file_data_set' + LibSuff4;
 //APR_DECLARE(apr_status_t) (apr_file_t *file, void *data,
-//                                           const char *key,
+//                                           const AnsiChar *key,
 //                                           apr_status_t (*cleanup)(void *));
 
 {
@@ -629,7 +629,7 @@ function apr_file_data_get(data: PPointer; const key: PChar;
  * @param ... The values to substitute in the format string
  * @return The number of bytes written
  }
-function apr_file_printf(fptr: Papr_file_t; const format: PChar;
+function apr_file_printf(fptr: Papr_file_t; const format: PAnsiChar;
  othres: array of const): Integer;
  cdecl; external LibAPR name 'apr_file_printf';
 
@@ -643,7 +643,7 @@ function apr_file_printf(fptr: Papr_file_t; const format: PChar;
  *
  *      Platforms which do not implement this feature will return APR_ENOTIMPL.
  }
-function apr_file_perms_set(const fname: PChar;
+function apr_file_perms_set(const fname: PAnsiChar;
  perms: apr_fileperms_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_file_perms_set' + LibSuff8;
@@ -666,7 +666,7 @@ function apr_file_perms_set(const fname: PChar;
  * @warning Platforms which do not implement this feature will return
  *      APR_ENOTIMPL.
  }
-function apr_file_attrs_set(const fname: PChar;
+function apr_file_attrs_set(const fname: PAnsiChar;
  attributes, attr_mask: apr_fileattrs_t;
  cont: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
@@ -680,7 +680,7 @@ function apr_file_attrs_set(const fname: PChar;
  * @warning Platforms which do not implement this feature will return
  *      APR_ENOTIMPL.
  }
-function apr_file_mtime_set(const fname: PChar;
+function apr_file_mtime_set(const fname: PAnsiChar;
  mtime: apr_time_t; pool: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_file_mtime_set' + LibSuff16;
@@ -691,7 +691,7 @@ function apr_file_mtime_set(const fname: PChar;
  * @param perm Permissions for the new direcoty.
  * @param cont the pool to use.
  }
-function apr_dir_make(const path: PChar; perm: apr_fileperms_t;
+function apr_dir_make(const path: PAnsiChar; perm: apr_fileperms_t;
  cont: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_dir_make' + LibSuff12;
@@ -703,7 +703,7 @@ function apr_dir_make(const path: PChar; perm: apr_fileperms_t;
  * @param perm Permissions for the new direcoty.
  * @param pool the pool to use.
  }
-function apr_dir_make_recursive(const path: PChar;
+function apr_dir_make_recursive(const path: PAnsiChar;
  perm: apr_fileperms_t; pool: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_dir_make_recursive' + LibSuff12;
@@ -713,7 +713,7 @@ function apr_dir_make_recursive(const path: PChar;
  * @param path the path for the directory to be removed.  (use / on all systems)
  * @param cont the pool to use.
  }
-function apr_dir_remove(const path: PChar; cont: Papr_pool_t): apr_status_t;
+function apr_dir_remove(const path: PAnsiChar; cont: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_dir_remove' + LibSuff8;
 
@@ -784,7 +784,7 @@ function apr_file_flags_get(f: Papr_file_t): apr_int32_t;
  * array.  
  *
  }
-function apr_file_mktemp(fp: PPapr_file_t; templ: PChar;
+function apr_file_mktemp(fp: PPapr_file_t; templ: PAnsiChar;
  flags: apr_int32_t; p: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_file_mktemp' + LibSuff16;
@@ -801,7 +801,7 @@ function apr_file_mktemp(fp: PPapr_file_t; templ: PChar;
  * is successful.
  *
  }
-function apr_temp_dir_get(const temp_dir: PPChar; p: Papr_pool_t): apr_status_t;
+function apr_temp_dir_get(const temp_dir: PPAnsiChar; p: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_temp_dir_get' + LibSuff8;
 

packages/httpd20/src/apr/apr_general.inc

@@ -78,7 +78,7 @@ type
 //#else { ! (CRAY || __arm) }
 
 //#define APR_OFFSET(p_type,field) \
-//        ((long) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
+//        ((long) (((AnsiChar *) (&(((p_type)NULL)->field))) - ((AnsiChar *) NULL)))
 
 //#endif { !CRAY }
 
@@ -108,13 +108,13 @@ type
 {#if (!APR_HAVE_STRCASECMP) && (APR_HAVE_STRICMP)
 #define strcasecmp(s1, s2) stricmp(s1, s2)
 #elif (!APR_HAVE_STRCASECMP)
-int strcasecmp(const char *a, const char *b);
+int strcasecmp(const AnsiChar *a, const AnsiChar *b);
 #endif
 
 #if (!APR_HAVE_STRNCASECMP) && (APR_HAVE_STRNICMP)
 #define strncasecmp(s1, s2, n) strnicmp(s1, s2, n)
 #elif (!APR_HAVE_STRNCASECMP)
-int strncasecmp(const char *a, const char *b, size_t n);
+int strncasecmp(const AnsiChar *a, const AnsiChar *b, size_t n);
 #endif}
 
 {$endif}
@@ -174,7 +174,7 @@ function apr_initialize: apr_status_t;
  * Otherwise, this call is identical to apr_initialize, and must be closed
  * with a call to apr_terminate at the end of program execution.
  }
-function apr_app_initialize(argc: PInteger; argv, env: PPChar): apr_status_t;
+function apr_app_initialize(argc: PInteger; argv, env: PPAnsiChar): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_app_initialize' + LibSuff12;
 
@@ -215,11 +215,11 @@ procedure apr_terminate2;
  * @param length Length of buffer in bytes (becomes apr_size_t in APR 1.0)
  }
 {$ifdef APR_ENABLE_FOR_1_0}
-function apr_generate_random_bytes(buf: PChar; length: apr_size_t): apr_status_t;
+function apr_generate_random_bytes(buf: PAnsiChar; length: apr_size_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_generate_random_bytes' + LibSuff8;
 {$else}
-function apr_generate_random_bytes(buf: PChar; length: Integer): apr_status_t;
+function apr_generate_random_bytes(buf: PAnsiChar; length: Integer): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_generate_random_bytes' + LibSuff8;
 {$endif}

packages/httpd20/src/apr/apr_lib.inc

@@ -56,9 +56,9 @@ type
  }
   apr_vformatter_buff_t = record
     { The current position }
-    curpos: PChar;
+    curpos: PAnsiChar;
     { The end position of the format string }
-    endpos: PChar;
+    endpos: PAnsiChar;
   end;
 
 {
@@ -74,12 +74,12 @@ type
  *                 "bs\\path\\stuff" -> "stuff"
  * </PRE>
  }
-function apr_filepath_name_get(const pathname: PChar): PChar;
+function apr_filepath_name_get(const pathname: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_filepath_name_get' + LibSuff4;
 
 { @deprecated @see apr_filepath_name_get }
-function apr_filename_of_pathname(const pathname: PChar): PChar;
+function apr_filename_of_pathname(const pathname: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_filename_of_pathname' + LibSuff4;
 
@@ -164,7 +164,7 @@ type
   flush_func_t = function (b: Papr_vformatter_buff_t): Integer;
   
 function apr_vformatter(flush_func: flush_func_t;
- c: Papr_vformatter_buff_t; const fmt: PChar; ap: va_list): Integer;
+ c: Papr_vformatter_buff_t; const fmt: PAnsiChar; ap: va_list): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_vformatter' + LibSuff16;
 
@@ -174,8 +174,8 @@ function apr_vformatter(flush_func: flush_func_t;
  * @param pwbuf Buffer to store the password
  * @param bufsize The length of the password buffer.
  }
-function apr_password_get(const prompt: PChar;
- pwbuf: PChar; bufsize: Papr_size_t): apr_status_t;
+function apr_password_get(const prompt: PAnsiChar;
+ pwbuf: PAnsiChar; bufsize: Papr_size_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_password_get' + LibSuff12;
 
@@ -187,35 +187,35 @@ function apr_password_get(const prompt: PChar;
  * the standard macros do.  Tough.
  }
 { @see isalnum }
-//#define apr_isalnum(c) (isalnum(((unsigned char)(c))))
+//#define apr_isalnum(c) (isalnum(((unsigned AnsiChar)(c))))
 { @see isalpha }
-//#define apr_isalpha(c) (isalpha(((unsigned char)(c))))
+//#define apr_isalpha(c) (isalpha(((unsigned AnsiChar)(c))))
 { @see iscntrl }
-//#define apr_iscntrl(c) (iscntrl(((unsigned char)(c))))
+//#define apr_iscntrl(c) (iscntrl(((unsigned AnsiChar)(c))))
 { @see isdigit }
-//#define apr_isdigit(c) (isdigit(((unsigned char)(c))))
+//#define apr_isdigit(c) (isdigit(((unsigned AnsiChar)(c))))
 { @see isgraph }
-//#define apr_isgraph(c) (isgraph(((unsigned char)(c))))
+//#define apr_isgraph(c) (isgraph(((unsigned AnsiChar)(c))))
 { @see islower}
-//#define apr_islower(c) (islower(((unsigned char)(c))))
+//#define apr_islower(c) (islower(((unsigned AnsiChar)(c))))
 { @see isascii }
 {#ifdef isascii
-#define apr_isascii(c) (isascii(((unsigned char)(c))))
+#define apr_isascii(c) (isascii(((unsigned AnsiChar)(c))))
 #else
 #define apr_isascii(c) (((c) & ~0x7f)==0)
 #endif}
 { @see isprint }
-//#define apr_isprint(c) (isprint(((unsigned char)(c))))
+//#define apr_isprint(c) (isprint(((unsigned AnsiChar)(c))))
 { @see ispunct }
-//#define apr_ispunct(c) (ispunct(((unsigned char)(c))))
+//#define apr_ispunct(c) (ispunct(((unsigned AnsiChar)(c))))
 { @see isspace }
-//#define apr_isspace(c) (isspace(((unsigned char)(c))))
+//#define apr_isspace(c) (isspace(((unsigned AnsiChar)(c))))
 { @see isupper }
-//#define apr_isupper(c) (isupper(((unsigned char)(c))))
+//#define apr_isupper(c) (isupper(((unsigned AnsiChar)(c))))
 { @see isxdigit }
-//#define apr_isxdigit(c) (isxdigit(((unsigned char)(c))))
+//#define apr_isxdigit(c) (isxdigit(((unsigned AnsiChar)(c))))
 { @see tolower }
-function apr_tolower(c: Char): Char;
+function apr_tolower(c: AnsiChar): AnsiChar;
 { @see toupper }
-function apr_toupper(c: Char): Char;
+function apr_toupper(c: AnsiChar): AnsiChar;
 

packages/httpd20/src/apr/apr_network_io.inc

@@ -208,9 +208,9 @@ type
     { The pool to use... }
     pool: Papr_pool_t;
     { The hostname }
-    hostname: PChar;
+    hostname: PAnsiChar;
     { Either a string of the port number or the service name for the port }
-    servname: PChar;
+    servname: PAnsiChar;
     { The numeric port }
     port: apr_port_t;
     { The family }
@@ -409,7 +409,7 @@ function apr_socket_connect(sock: Papr_socket_t; sa: Papr_sockaddr_t): apr_statu
  * @param p The pool for the apr_sockaddr_t and associated storage.
  }
 function apr_sockaddr_info_get(sa: PPapr_socket_t;
- const hostname: PChar; family: apr_int32_t;
+ const hostname: PAnsiChar; family: apr_int32_t;
  port: apr_port_t; flags: apr_int32_t; p: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_sockaddr_info_get' + LibSuff24;
@@ -420,7 +420,7 @@ function apr_sockaddr_info_get(sa: PPapr_socket_t;
  * @param sa The apr_sockaddr_t.
  * @param flags Special processing flags.
  }
-function apr_getnameinfo(hostname: PPChar; sa: Papr_socket_t; flags: apr_int32_t): apr_status_t;
+function apr_getnameinfo(hostname: PPAnsiChar; sa: Papr_socket_t; flags: apr_int32_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_getnameinfo' + LibSuff12;
 
@@ -454,8 +454,8 @@ function apr_getnameinfo(hostname: PPChar; sa: Papr_socket_t; flags: apr_int32_t
  *         required, check for addr == NULL in addition to checking the 
  *         return code.
  }
-function apr_parse_addr_port(addr, scope_id: PPChar; port: Papr_port_t;
- const str: PChar; p: Papr_pool_t): apr_status_t;
+function apr_parse_addr_port(addr, scope_id: PPAnsiChar; port: Papr_port_t;
+ const str: PAnsiChar; p: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_parse_addr_port' + LibSuff20;
 
@@ -467,7 +467,7 @@ function apr_parse_addr_port(addr, scope_id: PPChar; port: Papr_port_t;
  * @param cont The pool to use.
  * @remark If the buffer was not large enough, an error will be returned.
  }
-function apr_gethostname(buf: PChar; len: Integer; cont: Papr_pool_t): apr_status_t;
+function apr_gethostname(buf: PAnsiChar; len: Integer; cont: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_gethostname' + LibSuff12;
 
@@ -477,7 +477,7 @@ function apr_gethostname(buf: PChar; len: Integer; cont: Papr_pool_t): apr_statu
  * @param key The key to associate with the user data.
  * @param sock The currently open socket.
  }
-function apr_socket_data_get(data: PPointer; const key: PChar;
+function apr_socket_data_get(data: PPointer; const key: PAnsiChar;
  sock: Papr_sockaddr_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_socket_data_get' + LibSuff12;
@@ -493,7 +493,7 @@ type
   cleanup_t = function (param: Pointer): apr_status_t;
   
 function apr_socket_data_set(sock: Papr_socket_t; data: Pointer;
- const key: PChar; cleanup: cleanup_t): apr_status_t;
+ const key: PAnsiChar; cleanup: cleanup_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_socket_data_set' + LibSuff16;
 
@@ -513,13 +513,13 @@ function apr_socket_data_set(sock: Papr_socket_t; data: Pointer;
  * APR_EINTR is never returned.
  * </PRE>
  }
-function apr_socket_send(sock: Papr_socket_t; const buf: PChar;
+function apr_socket_send(sock: Papr_socket_t; const buf: PAnsiChar;
  len: Papr_size_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_socket_send' + LibSuff12;
 
 { @deprecated @see apr_socket_send }
-{APR_DECLARE(apr_status_t) apr_send(apr_socket_t *sock, const char *buf,
+{APR_DECLARE(apr_status_t) apr_send(apr_socket_t *sock, const AnsiChar *buf,
                                    apr_size_t *len);}
 
 {
@@ -557,13 +557,13 @@ function apr_socket_sendv(sock: Papr_socket_t; const vec: Piovec;
  * @param len  The length of the data to send
  }
 function apr_socket_sendto(sock: Papr_socket_t; where: Papr_sockaddr_t;
- flags: apr_int32_t; const buf: PChar; len: Papr_size_t): apr_status_t;
+ flags: apr_int32_t; const buf: PAnsiChar; len: Papr_size_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_socket_sendto' + LibSuff20;
 
 { @deprecated @see apr_socket_sendto }
 {APR_DECLARE(apr_status_t) apr_sendto(apr_socket_t *sock, apr_sockaddr_t *where,
-                                     apr_int32_t flags, const char *buf, 
+                                     apr_int32_t flags, const AnsiChar *buf, 
                                      apr_size_t *len);}
 
 {
@@ -574,13 +574,13 @@ function apr_socket_sendto(sock: Papr_socket_t; where: Papr_sockaddr_t;
  * @param len  The length of the available buffer
  }
 function apr_socket_recvfrom(from: Papr_sockaddr_t; sock: Papr_socket_t;
- flags: apr_int32_t; buf: PChar; len: Papr_size_t): apr_status_t;
+ flags: apr_int32_t; buf: PAnsiChar; len: Papr_size_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_socket_recvfrom' + LibSuff20;
 
 { @deprecated @see apr_socket_recvfrom }
 {APR_DECLARE(apr_status_t) apr_recvfrom(apr_sockaddr_t *from, apr_socket_t *sock,
-                                       apr_int32_t flags, char *buf, 
+                                       apr_int32_t flags, AnsiChar *buf, 
                                        apr_size_t *len);}
 
 {$if defined(APR_HAS_SENDFILE) or defined(DOXYGEN)}
@@ -631,13 +631,13 @@ function apr_socket_sendfile(sock: Papr_socket_t; file_: Papr_file_t;
  * APR_EINTR is never returned.
  * </PRE>
  }
-function apr_socket_recv(sock: Papr_socket_t; buf: PChar; len: Papr_size_t): apr_status_t;
+function apr_socket_recv(sock: Papr_socket_t; buf: PAnsiChar; len: Papr_size_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_socket_recv' + LibSuff12;
 
 { @deprecated @see apr_socket_recv }
 {APR_DECLARE(apr_status_t) apr_recv(apr_socket_t *sock,
-                                   char *buf, apr_size_t *len);}
+                                   AnsiChar *buf, apr_size_t *len);}
 
 {
  * Setup socket options for the specified socket
@@ -763,7 +763,7 @@ function apr_sockaddr_port_get(port: Papr_port_t; sockaddr: Papr_sockaddr_t): ap
  *             Use APR_ANYADDR to use any IP addr on the machine.
  * @deprecated @see apr_sockaddr_info_get
  }
-function apr_sockaddr_ip_set(sockaddr: Papr_sockaddr_t; const addr: PChar): apr_status_t;
+function apr_sockaddr_ip_set(sockaddr: Papr_sockaddr_t; const addr: PAnsiChar): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_sockaddr_ip_set' + LibSuff8;
 
@@ -774,7 +774,7 @@ function apr_sockaddr_ip_set(sockaddr: Papr_sockaddr_t; const addr: PChar): apr_
  * @param addr The IP address.
  * @param sockaddr The socket address to reference.
  }
-function apr_sockaddr_ip_get(addr: PPChar; sockaddr: Papr_sockaddr_t): apr_status_t;
+function apr_sockaddr_ip_get(addr: PPAnsiChar; sockaddr: Papr_sockaddr_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_sockaddr_ip_get' + LibSuff8;
 
@@ -815,7 +815,7 @@ function apr_socket_from_file(newsock: Papr_socket_t; file_: Papr_file_t): apr_s
  * @param sockaddr The apr_sockaddr_t that will have its port set
  * @param servname The name of the service you wish to use
  }
-function apr_getservbyname(sockaddr: Papr_sockaddr_t; const servname: PChar): apr_status_t;
+function apr_getservbyname(sockaddr: Papr_sockaddr_t; const servname: PAnsiChar): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_getservbyname' + LibSuff8;
 
@@ -828,7 +828,7 @@ function apr_getservbyname(sockaddr: Papr_sockaddr_t; const servname: PChar): ap
  * @param p The pool to allocate from
  }
 function apr_ipsubnet_create(ipsub: PPapr_ipsubnet_t;
- const ipstr, mask_or_numbits: PChar; p: Papr_pool_t): apr_status_t;
+ const ipstr, mask_or_numbits: PAnsiChar; p: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_ipsubnet_create' + LibSuff16;
 
@@ -851,7 +851,7 @@ function apr_ipsubnet_test(ipsub: Papr_ipsubnet_t; sa: Papr_sockaddr_t): Integer
  * @param args Any extra args to the accept filter.  Passing NULL here removes
  *             the accept filter. 
  }
-function apr_socket_accept_filter(sock: Papr_socket_t; name, args: PChar): apr_status_t;
+function apr_socket_accept_filter(sock: Papr_socket_t; name, args: PAnsiChar): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_socket_accept_filter' + LibSuff12;
 

packages/httpd20/src/apr/apr_pools.inc

@@ -204,7 +204,7 @@ function apr_pool_create_ex(newpool: PPapr_pool_t;
  }
 function apr_pool_create_ex_debug(newpool: PPapr_pool_t;
  parent: Papr_pool_t; abort_fn: apr_abortfunc_t;
- allocator: Papr_allocator_t; const file_line: PChar): apr_status_t;
+ allocator: Papr_allocator_t; const file_line: PAnsiChar): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_pool_create_ex_debug' + LibSuff20;
 
@@ -281,7 +281,7 @@ procedure apr_pool_clear(p: Papr_pool_t);
  *         apr_pool_clear in a wrapper, trust the macro
  *         and don't call apr_pool_destroy_clear directly.
  }
-procedure apr_pool_clear_debug(p: Papr_pool_t; const file_line: PChar);
+procedure apr_pool_clear_debug(p: Papr_pool_t; const file_line: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_pool_clear_debug' + LibSuff8;
 
@@ -313,7 +313,7 @@ procedure apr_pool_destroy(p: Papr_pool_t);
  *         apr_pool_destroy in a wrapper, trust the macro
  *         and don't call apr_pool_destroy_debug directly.
  }
-procedure apr_pool_destroy_debug(p: Papr_pool_t; const file_line: PChar);
+procedure apr_pool_destroy_debug(p: Papr_pool_t; const file_line: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_pool_destroy_debug' + LibSuff8;
 
@@ -346,7 +346,7 @@ function apr_palloc(p: Papr_pool_t; size: apr_size_t): Pointer;
  * @return See: apr_palloc
  }
 function apr_palloc_debug(p: Papr_pool_t; size: apr_size_t;
- const file_line: PChar): Pointer;
+ const file_line: PAnsiChar): Pointer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_palloc_debug' + LibSuff12;
 
@@ -380,7 +380,7 @@ function apr_pcalloc(p: Papr_pool_t; size: apr_size_t): Pointer;
  * @return See: apr_pcalloc
  }
 {APR_DECLARE(void *) apr_pcalloc_debug(apr_pool_t *p, apr_size_t size,
-                                      const char *file_line);
+                                      const AnsiChar *file_line);
 
 #if APR_POOL_DEBUG
 #define apr_pcalloc(p, size) \
@@ -448,7 +448,7 @@ function apr_pool_is_ancestor(a, b: Papr_pool_t): Integer;
  * @param pool The pool to tag
  * @param tag  The tag
  }
-procedure apr_pool_tag(pool: Papr_pool_t; tag: PChar);
+procedure apr_pool_tag(pool: Papr_pool_t; tag: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_pool_tag' + LibSuff8;
 
@@ -475,7 +475,7 @@ procedure apr_pool_tag(pool: Papr_pool_t; tag: PChar);
  *      key names is a typical way to help ensure this uniqueness.
  }
 //function apr_pool_userdata_set(
-// const data: Pointer; const key: PChar;
+// const data: Pointer; const key: PAnsiChar;
 // cleanup: function(param: Pointer): apr_status_t,
 // pool: Papr_pool_t): apr_status_t;
 // {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
@@ -501,7 +501,7 @@ procedure apr_pool_tag(pool: Papr_pool_t; tag: PChar);
  *
  }
 //function apr_pool_userdata_setn(
-// const data: Pointer; const key: PChar;
+// const data: Pointer; const key: PAnsiChar;
 // cleanup: function(param: Pointer): apr_status_t,
 // pool: Papr_pool_t): apr_status_t;
 // {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
@@ -513,7 +513,7 @@ procedure apr_pool_tag(pool: Papr_pool_t; tag: PChar);
  * @param key The key for the data to retrieve
  * @param pool The current pool.
  }
-function apr_pool_userdata_get(data: PPointer; const key: PChar;
+function apr_pool_userdata_get(data: PPointer; const key: PAnsiChar;
  pool: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_pool_userdata_get' + LibSuff12;

packages/httpd20/src/apr/apr_portable.inc

@@ -512,7 +512,7 @@ function apr_os_dso_handle_get(dso: Papr_os_dso_handle_t;
 {
  * Private: apr-util's apr_uuid module when supported by the platform
  }
-function apr_os_uuid_get(uuid_data: PChar): apr_status_t;
+function apr_os_uuid_get(uuid_data: PAnsiChar): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_os_uuid_get' + LibSuff8;
 {$endif}
@@ -524,7 +524,7 @@ function apr_os_uuid_get(uuid_data: PChar): apr_status_t;
  * Get the name of the system default characer set.
  * @param pool the pool to allocate the name from, if needed
  }
-function apr_os_default_encoding(pool: Papr_pool_t): PChar;
+function apr_os_default_encoding(pool: Papr_pool_t): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_os_default_encoding' + LibSuff4;
 
@@ -534,7 +534,7 @@ function apr_os_default_encoding(pool: Papr_pool_t): PChar;
  * @remark Defers to apr_os_default_encoding if the current locale's
  * data can't be retreved on this system.
  }
-function apr_os_locale_encoding(pool: Papr_pool_t): PChar;
+function apr_os_locale_encoding(pool: Papr_pool_t): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_os_locale_encoding' + LibSuff4;
 

packages/httpd20/src/apr/apr_signal.inc

@@ -71,12 +71,12 @@ function apr_signal(signo: Integer; func: apr_sigfunc_t): Papr_sigfunc_t;
  * @param signum The signal number
  * @return The description of the signal
  }
-function apr_signal_description_get(signo: Integer): PChar;
+function apr_signal_description_get(signo: Integer): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_signal_description_get' + LibSuff4;
 
 { @deprecated @see apr_signal_description_get }
-function apr_signal_get_description(signo: Integer): PChar;
+function apr_signal_get_description(signo: Integer): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_signal_get_description' + LibSuff4;
 

packages/httpd20/src/apr/apr_strings.inc

@@ -65,7 +65,7 @@
  *          this returns <0, if they are equivalent it returns 0, and if the
  *          first string is greater than second string it retuns >0.
  }
-function apr_strnatcmp(a, b: PChar): Integer;
+function apr_strnatcmp(a, b: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_strnatcmp' + LibSuff8;
 
@@ -78,7 +78,7 @@ function apr_strnatcmp(a, b: PChar): Integer;
  *         this returns <0, if they are equivalent it returns 0, and if the
  *         first string is greater than second string it retuns >0.
  }
-function apr_strnatcasecmp(a, b: PChar): Integer;
+function apr_strnatcasecmp(a, b: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_strnatcasecmp' + LibSuff8;
 
@@ -88,7 +88,7 @@ function apr_strnatcasecmp(a, b: PChar): Integer;
  * @param s The string to duplicate
  * @return The new string
  }
-function apr_pstrdup(p: Papr_pool_t; s: PChar): PChar;
+function apr_pstrdup(p: Papr_pool_t; s: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_pstrdup' + LibSuff8;
 
@@ -104,7 +104,7 @@ function apr_pstrdup(p: Papr_pool_t; s: PChar): PChar;
  *         has 'n' or more characters.  If the string might contain
  *         fewer characters, use apr_pstrndup.
  }
-function apr_pstrmemdup(p: Papr_pool_t; s: PChar; n: apr_size_t): PChar;
+function apr_pstrmemdup(p: Papr_pool_t; s: PAnsiChar; n: apr_size_t): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_pstrmemdup' + LibSuff12;
 
@@ -116,7 +116,7 @@ function apr_pstrmemdup(p: Papr_pool_t; s: PChar; n: apr_size_t): PChar;
  * @param n The number of characters to duplicate
  * @return The new string
  }
-function apr_pstrndup(p: Papr_pool_t; s: PChar; n: apr_size_t): PChar;
+function apr_pstrndup(p: Papr_pool_t; s: PAnsiChar; n: apr_size_t): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_pstrndup' + LibSuff12;
 
@@ -138,7 +138,7 @@ function apr_pmemdup(p: Papr_pool_t; m: Pointer; n: apr_size_t): Pointer;
  * @param ... The strings to concatenate.  The final string must be NULL
  * @return The new string
  }
-function apr_pstrcat(p: Papr_pool_t; others: array of const): PChar;
+function apr_pstrcat(p: Papr_pool_t; others: array of const): PAnsiChar;
  cdecl; external LibAPR name 'apr_pstrcat';
 
 {
@@ -150,7 +150,7 @@ function apr_pstrcat(p: Papr_pool_t; others: array of const): PChar;
  * @return The new string
  }
 function apr_pstrcatv(p: Papr_pool_t; const vec: Piovec;
- nvec: apr_size_t; nbytes: Papr_size_t): PChar;
+ nvec: apr_size_t; nbytes: Papr_size_t): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_pstrcatv' + LibSuff16;
 
@@ -162,7 +162,7 @@ function apr_pstrcatv(p: Papr_pool_t; const vec: Piovec;
  * @param ap The arguments to use while printing the data
  * @return The new string
  }
-function apr_pvsprintf(p: Papr_pool_t; const fmt: PChar; ap: va_list): PChar;
+function apr_pvsprintf(p: Papr_pool_t; const fmt: PAnsiChar; ap: va_list): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_pvsprintf' + LibSuff12;
 
@@ -174,7 +174,7 @@ function apr_pvsprintf(p: Papr_pool_t; const fmt: PChar; ap: va_list): PChar;
  * @param ... The arguments to use while printing the data
  * @return The new string
  }
-function apr_psprintf(p: Papr_pool_t; const fmt: PChar; others: array of const): PChar;
+function apr_psprintf(p: Papr_pool_t; const fmt: PAnsiChar; others: array of const): PAnsiChar;
  cdecl; external LibAPR name 'apr_psprintf';
 
 {
@@ -196,8 +196,8 @@ function apr_psprintf(p: Papr_pool_t; const fmt: PChar; others: array of const):
  *          to allow us to check for truncation.
  * </PRE>
  }
-function apr_cpystrn(dst: PChar; const src: PChar;
- dst_size: apr_size_t): PChar;
+function apr_cpystrn(dst: PAnsiChar; const src: PAnsiChar;
+ dst_size: apr_size_t): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_cpystrn' + LibSuff12;
 
@@ -207,7 +207,7 @@ function apr_cpystrn(dst: PChar; const src: PChar;
  *             in place.  Namely dest == src
  * @param src The string to rid the spaces from.
  }
-function apr_collapse_spaces(dst: PChar; const src: PChar): PChar;
+function apr_collapse_spaces(dst: PAnsiChar; const src: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_collapse_spaces' + LibSuff8;
 
@@ -218,8 +218,8 @@ function apr_collapse_spaces(dst: PChar; const src: PChar): PChar;
  * @param argv_out Output location.  This is a pointer to an array of strings.
  * @param token_context Pool to use.
  }
-function apr_tokenize_to_argv(const arg_str: PChar;
- var argv_out: PPChar; token_context: Papr_pool_t): apr_status_t;
+function apr_tokenize_to_argv(const arg_str: PAnsiChar;
+ var argv_out: PPAnsiChar; token_context: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_tokenize_to_argv' + LibSuff12;
 
@@ -234,8 +234,8 @@ function apr_tokenize_to_argv(const arg_str: PChar;
  * @param last Internal state saved by apr_strtok() between calls.
  * @return The next token from the string
  }
-function apr_strtok(str: PChar;
- const sep: PChar; last: PPChar): PChar;
+function apr_strtok(str: PAnsiChar;
+ const sep: PAnsiChar; last: PPAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_strtok' + LibSuff12;
 
@@ -269,8 +269,8 @@ function apr_strtok(str: PChar;
  * @param format The format string
  * @param ... The arguments to use to fill out the format string.
  }
-function apr_snprintf(buf: PChar; len: apr_size_t;
- const format: PChar; others: array of const): PChar;
+function apr_snprintf(buf: PAnsiChar; len: apr_size_t;
+ const format: PAnsiChar; others: array of const): PAnsiChar;
  cdecl; external LibAPR name 'apr_snprintf';
 
 {
@@ -281,8 +281,8 @@ function apr_snprintf(buf: PChar; len: apr_size_t;
  * @param format The format string
  * @param ap The arguments to use to fill out the format string.
  }
-function apr_vsnprintf(buf: PChar; len: apr_size_t;
- const format: PChar; ap: va_list): Integer;
+function apr_vsnprintf(buf: PAnsiChar; len: apr_size_t;
+ const format: PAnsiChar; ap: va_list): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_vsnprintf' + LibSuff16;
 
@@ -292,7 +292,7 @@ function apr_vsnprintf(buf: PChar; len: apr_size_t;
  * @param n The number to format
  * @return The string representation of the number
  }
-function apr_itoa(p: Papr_pool_t; n: Integer): PChar;
+function apr_itoa(p: Papr_pool_t; n: Integer): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_itoa' + LibSuff8;
 
@@ -302,7 +302,7 @@ function apr_itoa(p: Papr_pool_t; n: Integer): PChar;
  * @param n The number to format
  * @return The string representation of the number
  }
-function apr_ltoa(p: Papr_pool_t; n: Integer): PChar;
+function apr_ltoa(p: Papr_pool_t; n: Integer): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_ltoa' + LibSuff8;
 
@@ -312,7 +312,7 @@ function apr_ltoa(p: Papr_pool_t; n: Integer): PChar;
  * @param n The number to format
  * @return The string representation of the number
  }
-function apr_off_t_toa(p: Papr_pool_t; n: apr_off_t): PChar;
+function apr_off_t_toa(p: Papr_pool_t; n: apr_off_t): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_off_t_toa' + LibSuff12;
 
@@ -330,17 +330,17 @@ function apr_off_t_toa(p: Papr_pool_t; n: apr_off_t): PChar;
  *   base 16.
  * @return The numeric value of the string.
  }
-function apr_strtoi64(const buf: PChar; end_: PPChar; base: Integer): apr_int64_t;
+function apr_strtoi64(const buf: PAnsiChar; end_: PPAnsiChar; base: Integer): apr_int64_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_strtoi64' + LibSuff12;
 
 {
  * parse a base-10 numeric string into a 64-bit numeric value.
- * Equivalent to apr_strtoi64(buf, (char**)NULL, 10).
+ * Equivalent to apr_strtoi64(buf, (AnsiChar**)NULL, 10).
  * @param buf The string to parse
  * @return The numeric value of the string
  }
-function apr_atoi64(const buf: PChar): apr_int64_t;
+function apr_atoi64(const buf: PAnsiChar): apr_int64_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_atoi64' + LibSuff4;
 
@@ -352,7 +352,7 @@ function apr_atoi64(const buf: PChar): apr_int64_t;
  * @return The buf passed to apr_strfsize()
  * @remark All negative sizes report '  - ', apr_strfsize only formats positive values.
  }
-function apr_strfsize(size: apr_off_t; buf: PChar): PChar;
+function apr_strfsize(size: apr_off_t; buf: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_strfsize' + LibSuff12;
 

packages/httpd20/src/apr/apr_tables.inc

@@ -43,7 +43,7 @@ type
     { The number of elements allocated in the array }
     nalloc: Integer;
     { The elements in the array }
-    elts: PChar;
+    elts: PAnsiChar;
   end;
   Papr_array_header_t = ^apr_array_header_t;
   PPapr_array_header_t = ^Papr_array_header_t;
@@ -55,11 +55,11 @@ type
 { The type for each entry in a string-content table }
   apr_table_entry_t = record
     { The key for the current table entry }
-    key: PChar;          { maybe NULL in future;
+    key: PAnsiChar;          { maybe NULL in future;
                          * check when iterating thru table_elts
                          }
     { The value for the current table entry }
-    val: PChar;
+    val: PAnsiChar;
 
     { A checksum for the key, for use by the apr_table internals }
     key_checksum: apr_uint32_t;
@@ -187,7 +187,7 @@ function apr_array_append(p: Papr_pool_t;
  * @return A string containing all of the data in the array.
  }
 function apr_array_pstrcat(p: Papr_pool_t;
- const arr: Papr_array_header_t; sep: Char): PChar;
+ const arr: Papr_array_header_t; sep: AnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_array_pstrcat' + LibSuff12;
 
@@ -227,7 +227,7 @@ procedure apr_table_clear(t: Papr_table_t);
  * @param key The key to search for
  * @return The value associated with the key
  }
-function apr_table_get(t: Papr_table_t; key: PChar): PChar;
+function apr_table_get(t: Papr_table_t; key: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_table_get' + LibSuff8;
 
@@ -240,7 +240,7 @@ function apr_table_get(t: Papr_table_t; key: PChar): PChar;
  * @remark When adding data, this function makes a copy of both the key and the
  *         value.
  }
-procedure apr_table_set(t: Papr_table_t; const key, val: PChar);
+procedure apr_table_set(t: Papr_table_t; const key, val: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_table_set' + LibSuff12;
 
@@ -254,7 +254,7 @@ procedure apr_table_set(t: Papr_table_t; const key, val: PChar);
  *          the value, so care should be taken to ensure that the values will
  *          not change after they have been added..
  }
-procedure apr_table_setn(t: Papr_table_t; const key, val: PChar);
+procedure apr_table_setn(t: Papr_table_t; const key, val: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_table_setn' + LibSuff12;
 
@@ -263,7 +263,7 @@ procedure apr_table_setn(t: Papr_table_t; const key, val: PChar);
  * @param t The table to remove data from
  * @param key The key of the data being removed
  }
-procedure apr_table_unset(t: Papr_table_t; const key: PChar);
+procedure apr_table_unset(t: Papr_table_t; const key: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_table_unset' + LibSuff8;
 
@@ -275,7 +275,7 @@ procedure apr_table_unset(t: Papr_table_t; const key: PChar);
  * @param val The data to add
  * @remark If the key is not found, then this function acts like apr_table_add
  }
-procedure apr_table_merge(t: Papr_table_t; const key, val: PChar);
+procedure apr_table_merge(t: Papr_table_t; const key, val: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_table_merge' + LibSuff12;
 
@@ -287,7 +287,7 @@ procedure apr_table_merge(t: Papr_table_t; const key, val: PChar);
  * @param val The data to add
  * @remark If the key is not found, then this function acts like apr_table_addn
  }
-procedure apr_table_mergen(t: Papr_table_t; const key, val: PChar);
+procedure apr_table_mergen(t: Papr_table_t; const key, val: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_table_mergen' + LibSuff12;
 
@@ -300,7 +300,7 @@ procedure apr_table_mergen(t: Papr_table_t; const key, val: PChar);
  * @remark When adding data, this function makes a copy of both the key and the
  *         value.
  }
-procedure apr_table_add(t: Papr_table_t; const key, val: PChar);
+procedure apr_table_add(t: Papr_table_t; const key, val: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_table_add' + LibSuff12;
 
@@ -314,7 +314,7 @@ procedure apr_table_add(t: Papr_table_t; const key, val: PChar);
  *         value, so care should be taken to ensure that the values will not
  *         change after they have been added..
  }
-procedure apr_table_addn(t: Papr_table_t; const key, val: PChar);
+procedure apr_table_addn(t: Papr_table_t; const key, val: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_table_addn' + LibSuff12;
 
@@ -342,7 +342,7 @@ function apr_table_overlay(t: Papr_table_t;
  }
 type
   apr_table_do_callback_fn_t = function (rec: Pointer;
-   const key, value: PChar): Integer;
+   const key, value: PAnsiChar): Integer;
    
   Papr_table_do_callback_fn_t = ^apr_table_do_callback_fn_t;
 

packages/httpd20/src/apr/apr_thread_proc.inc

@@ -129,7 +129,7 @@ type
      * builds - since it breaks binary compatibility.  We may enable
      * it always in APR 1.0 yet leave it undefined in most cases.
      }
-    invoked: PChar;
+    invoked: PAnsiChar;
 {$endif}
 {$if defined(WINDOWS) or defined(DOXYGEN)}
     { (Win32 only) Creator's handle granting access to the process
@@ -155,7 +155,7 @@ type
  * @param description Text description of type of processing which failed
  }
   apr_child_errfn_t = procedure (proc: Papr_pool_t;
-   err: apr_status_t; const description: PChar);
+   err: apr_status_t; const description: PAnsiChar);
 
 { Opaque Thread structure. }
   apr_thread_t = record end;
@@ -318,7 +318,7 @@ function apr_thread_detach(thd: Papr_thread_t): apr_status_t;
  * @param key The key to associate with the data
  * @param thread The currently open thread.
  }
-function apr_thread_data_get(data: PPointer; const key: PChar;
+function apr_thread_data_get(data: PPointer; const key: PAnsiChar;
  thread: Papr_thread_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_thread_data_get' + LibSuff12;
@@ -330,7 +330,7 @@ function apr_thread_data_get(data: PPointer; const key: PChar;
  * @param cleanup The cleanup routine to use when the thread is destroyed.
  * @param thread The currently open thread.
  }
-function apr_thread_data_set(data: Pointer; const key: PChar;
+function apr_thread_data_set(data: Pointer; const key: PAnsiChar;
  cleanup: cleanup_t; thread: Papr_thread_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_thread_data_set' + LibSuff16;
@@ -381,7 +381,7 @@ function apr_threadkey_private_delete(key: Papr_threadkey_t): apr_status_t;
  * @param key The key associated with the data
  * @param threadkey The currently open threadkey.
  }
-function apr_threadkey_data_get(data: PPointer; const key: PChar;
+function apr_threadkey_data_get(data: PPointer; const key: PAnsiChar;
  threadkey: Papr_threadkey_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_threadkey_data_get' + LibSuff12;
@@ -393,7 +393,7 @@ function apr_threadkey_data_get(data: PPointer; const key: PChar;
  * @param cleanup The cleanup routine to use when the file is destroyed.
  * @param threadkey The currently open threadkey.
  }
-function apr_threadkey_data_set(data: Pointer; const key: PChar;
+function apr_threadkey_data_set(data: Pointer; const key: PAnsiChar;
  cleanup: cleanup_t; threadkey: Papr_threadkey_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_threadkey_data_set' + LibSuff16;
@@ -476,7 +476,7 @@ function apr_procattr_child_err_set(attr: Papr_procattr_t;
  *            the parent currently resides in, when the createprocess call
  *            is made. 
  }
-function apr_procattr_dir_set(attr: Papr_procattr_t; const dir: PChar): apr_status_t;
+function apr_procattr_dir_set(attr: Papr_procattr_t; const dir: PAnsiChar): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_procattr_dir_set' + LibSuff8;
 
@@ -594,7 +594,7 @@ function apr_proc_fork(proc: Papr_proc_t; cont: Papr_pool_t): apr_status_t;
  * @param cont The pool to use. 
  }
 function apr_proc_create(new_proc: Papr_proc_t;
- const progname: PChar; args, arnv: PPChar;
+ const progname: PAnsiChar; args, arnv: PPAnsiChar;
  attr: Papr_procattr_t;
  cont: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}

packages/httpd20/src/apr/apr_time.inc

@@ -29,9 +29,9 @@
  }
 
 { month names }
-//APR_DECLARE_DATA extern const char apr_month_snames[12][4];
+//APR_DECLARE_DATA extern const AnsiChar apr_month_snames[12][4];
 { day names }
-//APR_DECLARE_DATA extern const char apr_day_snames[7][4];
+//APR_DECLARE_DATA extern const AnsiChar apr_day_snames[7][4];
 
 
 { number of microseconds since 00:00:00 january 1, 1970 UTC }
@@ -216,7 +216,7 @@ const APR_RFC822_DATE_LEN = (30);
  * @param date_str String to write to.
  * @param t the time to convert 
  }
-function apr_rfc822_date(date_str: PChar; t: apr_time_t): apr_status_t;
+function apr_rfc822_date(date_str: PAnsiChar; t: apr_time_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_rfc822_date' + LibSuff12;
 
@@ -232,7 +232,7 @@ const APR_CTIME_LEN = (25);
  * @param date_str String to write to.
  * @param t the time to convert 
  }
-function apr_ctime(date_str: PChar; t: apr_time_t): apr_status_t;
+function apr_ctime(date_str: PAnsiChar; t: apr_time_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_ctime' + LibSuff12;
 
@@ -244,8 +244,8 @@ function apr_ctime(date_str: PChar; t: apr_time_t): apr_status_t;
  * @param format The format for the time string
  * @param tm The time to convert
  }
-function apr_strftime(s: PChar; retsize: apr_size_t;
- max: apr_size_t; const format: PChar;
+function apr_strftime(s: PAnsiChar; retsize: apr_size_t;
+ max: apr_size_t; const format: PAnsiChar;
  tm: Papr_time_exp_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_strftime' + LibSuff20;

packages/httpd20/src/apr/apr_user.inc

@@ -78,13 +78,13 @@ function apr_uid_current(userid: Papr_uid_t; groupid: Papr_gid_t;
  * @param p The pool from which to allocate the string
  * @remark This function is available only if APR_HAS_USER is defined.
  }
-function apr_uid_name_get(username: PPChar; userid: apr_uid_t;
+function apr_uid_name_get(username: PPAnsiChar; userid: apr_uid_t;
  p: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_uid_name_get' + LibSuff12;
 
 { @deprecated @see apr_uid_name_get }
-{APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid,
+{APR_DECLARE(apr_status_t) apr_get_username(AnsiChar **username, apr_uid_t userid,
                                            apr_pool_t *p);}
 {
  * Get the userid (and groupid) for the specified username
@@ -95,13 +95,13 @@ function apr_uid_name_get(username: PPChar; userid: apr_uid_t;
  * @remark This function is available only if APR_HAS_USER is defined.
  }
 function apr_uid_get(userid: Papr_uid_t; groupid: Papr_gid_t;
- const username: PChar; p: Papr_pool_t): apr_status_t;
+ const username: PAnsiChar; p: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_uid_get' + LibSuff16;
 
 { @deprecated @see apr_uid_get }
 {APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *userid, apr_gid_t *groupid,
-                                         const char *username, apr_pool_t *p);}
+                                         const AnsiChar *username, apr_pool_t *p);}
 
 {
  * Get the home directory for the named user
@@ -110,14 +110,14 @@ function apr_uid_get(userid: Papr_uid_t; groupid: Papr_gid_t;
  * @param p The pool from which to allocate the string
  * @remark This function is available only if APR_HAS_USER is defined.
  }
-function apr_uid_homepath_get(dirname: PPChar; const username: PChar;
+function apr_uid_homepath_get(dirname: PPAnsiChar; const username: PAnsiChar;
  p: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_uid_homepath_get' + LibSuff12;
 
 { @deprecated @see apr_uid_homepath_get }
-{APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname,
-                                                 const char *username,
+{APR_DECLARE(apr_status_t) apr_get_home_directory(AnsiChar **dirname,
+                                                 const AnsiChar *username,
                                                  apr_pool_t *p);}
 
 {
@@ -146,17 +146,17 @@ function apr_uid_homepath_get(dirname: PPChar; const username: PChar;
  * @param p The pool from which to allocate the string
  * @remark This function is available only if APR_HAS_USER is defined.
  }
-function apr_gid_name_get(groupname: PPChar; groupid: apr_gid_t;
+function apr_gid_name_get(groupname: PPAnsiChar; groupid: apr_gid_t;
  p: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_gid_name_get' + LibSuff12;
 
 { @deprecated @see apr_gid_name_get }
-{APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname,
+{APR_DECLARE(apr_status_t) apr_group_name_get(AnsiChar **groupname,
                                              apr_gid_t groupid, apr_pool_t *p);}
 
 { @deprecated @see apr_gid_name_get }
-{APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname,
+{APR_DECLARE(apr_status_t) apr_get_groupname(AnsiChar **groupname,
                                             apr_gid_t groupid, apr_pool_t *p);}
 
 {
@@ -166,14 +166,14 @@ function apr_gid_name_get(groupname: PPChar; groupid: apr_gid_t;
  * @param p The pool from which to allocate the string
  * @remark This function is available only if APR_HAS_USER is defined.
  }
-function apr_gid_get(groupid: Papr_gid_t; const groupname: PChar;
+function apr_gid_get(groupid: Papr_gid_t; const groupname: PAnsiChar;
  p: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_gid_get' + LibSuff12;
 
 { @deprecated @see apr_gid_get }
 {APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid,
-                                          const char *groupname, apr_pool_t *p);}
+                                          const AnsiChar *groupname, apr_pool_t *p);}
 
 {
  * Compare two group identifiers for equality.

packages/httpd20/src/apr/apr_version.inc

@@ -97,7 +97,7 @@ procedure apr_version(pvsn: Papr_version_t);
  external LibAPR name LibNamePrefix + 'apr_version' + LibSuff4;
 
 { Return APR's version information as a string. }
-function apr_version_string: PChar;
+function apr_version_string: PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPR name LibNamePrefix + 'apr_version_string' + LibSuff0;
 

packages/httpd20/src/apriconv/api_version.inc

@@ -84,7 +84,7 @@ const
 // external LibAPRIconv name LibNamePrefix + 'api_version' + LibSuff4;
 
 { Return API's version information as a string. }
-//function api_version_string: PChar;
+//function api_version_string: PAnsiChar;
 // {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 // external LibAPRIconv name LibNamePrefix + 'api_version_string' + LibSuff0;
 

packages/httpd20/src/apriconv/apr_iconv.inc

@@ -94,13 +94,13 @@ type
 
 { __BEGIN_DECLS }
 
-function apr_iconv_open(const param1, param2: PChar;
+function apr_iconv_open(const param1, param2: PAnsiChar;
  param3: Papr_pool_t; param4: Papr_iconv_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRIconv name LibNamePrefix + 'apr_iconv_open' + LibSuff16;
 
-function apr_iconv(param1: apr_iconv_t; const param2: PPChar;
- param3: Papr_pool_t; param4: PPchar;
+function apr_iconv(param1: apr_iconv_t; const param2: PPAnsiChar;
+ param3: Papr_pool_t; param4: PPAnsiChar;
  param5, param6: Papr_size_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRIconv name LibNamePrefix + 'apr_iconv' + LibSuff24;

packages/httpd20/src/aprutil/apr_md5.inc

@@ -64,7 +64,7 @@ const
 
 { @see apr_md5_ctx_t }
 type
-  TDigestArray = array [0..APR_MD5_DIGESTSIZE] of Char;
+  TDigestArray = array [0..APR_MD5_DIGESTSIZE] of AnsiChar;
 
   Papr_md5_ctx_t = ^apr_md5_ctx_t;
 
@@ -75,7 +75,7 @@ type
     { number of bits, modulo 2^64 (lsb first) }
     count: array [1..2] of apr_uint32_t;
     { input buffer }
-    buffer: array [1..64] of Char;
+    buffer: array [1..64] of AnsiChar;
     { translation handle
      *  ignored if xlate is unsupported
      }
@@ -142,8 +142,8 @@ function apr_md5(digest: TDigestArray;
  * @param result The string to store the encoded password in
  * @param nbytes The length of the string
  }
-function apr_md5_encode(const password, salt: PChar;
- result: PChar; nbytes: apr_size_t): apr_status_t;
+function apr_md5_encode(const password, salt: PAnsiChar;
+ result: PAnsiChar; nbytes: apr_size_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRUtil name LibNamePrefix + 'apr_md5_encode' + LibSuff16;
 
@@ -152,7 +152,7 @@ function apr_md5_encode(const password, salt: PChar;
  * @param passwd The password to validate
  * @param hash The password to validate against
  }
-function apr_password_validate(const passwd, hash: PChar): apr_status_t;
+function apr_password_validate(const passwd, hash: PAnsiChar): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRUtil name LibNamePrefix + 'apr_password_validate' + LibSuff8;
 

packages/httpd20/src/aprutil/apr_uri.inc

@@ -76,23 +76,23 @@ type
  }
   apr_uri_t = record
     { scheme ("http"/"ftp"/...) }
-    scheme: PChar;
+    scheme: PAnsiChar;
     { combined [user[:password]\@]host[:port] }
-    hostinfo: PChar;
+    hostinfo: PAnsiChar;
     { user name, as in http://user:passwd\@host:port/ }
-    user: PChar;
+    user: PAnsiChar;
     { password, as in http://user:passwd\@host:port/ }
-    password: PChar;
+    password: PAnsiChar;
     { hostname from URI (or from Host: header) }
-    hostname: PChar;
+    hostname: PAnsiChar;
     { port string (integer representation is in "port") }
-    port_str: PChar;
+    port_str: PAnsiChar;
     { the request path (or "/" if only scheme://host was given) }
-    path: PChar;
+    path: PAnsiChar;
     { Everything after a '?' in the path, if present }
-    query: PChar;
+    query: PAnsiChar;
     { Trailing "#fragment" string, if present }
-    fragment: PChar;
+    fragment: PAnsiChar;
 
     { structure returned from gethostbyname() }
     hostent: Pointer;
@@ -116,12 +116,12 @@ type
  * @param scheme_str The string that contains the current scheme
  * @return The default port for this scheme
  }
-function apr_uri_port_of_scheme(const scheme_str: PChar): apr_port_t;
+function apr_uri_port_of_scheme(const scheme_str: PAnsiChar): apr_port_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRUtil name LibNamePrefix + 'apr_uri_port_of_scheme' + LibSuff4;
 
 { @deprecated @see apr_uri_port_of_scheme }
-function apr_uri_default_port_for_scheme(const scheme_str: PChar): apr_port_t;
+function apr_uri_default_port_for_scheme(const scheme_str: PAnsiChar): apr_port_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRUtil name LibNamePrefix + 'apr_uri_default_port_for_scheme' + LibSuff4;
 
@@ -143,7 +143,7 @@ function apr_uri_default_port_for_scheme(const scheme_str: PChar): apr_port_t;
  * @return The uri as a string
  }
 function apr_uri_unparse(p: Papr_pool_t; const uptr: Papr_uri_t;
- flags: cuint): PChar;
+ flags: cuint): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRUtil name LibNamePrefix + 'apr_uri_unparse' + LibSuff12;
 
@@ -156,7 +156,7 @@ function apr_uri_unparse(p: Papr_pool_t; const uptr: Papr_uri_t;
  * @param uptr The apr_uri_t to fill out
  * @return APR_SUCCESS for success or error code
  }
-function apr_uri_parse(p: Papr_pool_t; const uri: PChar;
+function apr_uri_parse(p: Papr_pool_t; const uri: PAnsiChar;
  uptr: Papr_uri_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRUtil name LibNamePrefix + 'apr_uri_parse' + LibSuff12;
@@ -169,7 +169,7 @@ function apr_uri_parse(p: Papr_pool_t; const uri: PChar;
  * @return APR_SUCCESS for success or error code
  }
 function apr_uri_parse_hostinfo(p: Papr_pool_t;
- const hostinfo: PChar; uptr: Papr_uri_t): apr_status_t;
+ const hostinfo: PAnsiChar; uptr: Papr_uri_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRUtil name LibNamePrefix + 'apr_uri_parse_hostinfo' + LibSuff12;
 

packages/httpd20/src/aprutil/apr_xlate.inc

@@ -58,7 +58,7 @@ type
  *  apr-util at all (i.e., APR_HAS_XLATE is undefined).
  }
 function apr_xlate_open(convset: PPapr_xlate_t;
- const topage, frompage: PChar; pool: Papr_pool_t): apr_status_t;
+ const topage, frompage: PAnsiChar; pool: Papr_pool_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRUtil name LibNamePrefix + 'apr_xlate_open' + LibSuff16;
 
@@ -69,11 +69,11 @@ function apr_xlate_open(convset: PPapr_xlate_t;
  * strings in the source code which must be translated
  * according to the charset of the source code.
  }
-//#define APR_DEFAULT_CHARSET (const char *)0
+//#define APR_DEFAULT_CHARSET (const AnsiChar *)0
 {
  * To indicate charset names of the current locale 
  }
-//#define APR_LOCALE_CHARSET (const char *)1
+//#define APR_LOCALE_CHARSET (const AnsiChar *)1
 
 {
  * Find out whether or not the specified conversion is single-byte-only.
@@ -107,8 +107,8 @@ function apr_xlate_get_sb(convset: Papr_xlate_t; onoff: PInteger): apr_status_t;
  *  Return APR_ENOTIMPL if charset transcoding is not available
  *  in this instance of apr-util (i.e., APR_HAS_XLATE is undefined).
  }
-function apr_xlate_conv_buffer(convset: Papr_xlate_t; const inbuf: PChar;
- inbytes_left: Papr_size_t; outbuf: PChar; outbytes_left: Papr_size_t): apr_status_t;
+function apr_xlate_conv_buffer(convset: Papr_xlate_t; const inbuf: PAnsiChar;
+ inbytes_left: Papr_size_t; outbuf: PAnsiChar; outbytes_left: Papr_size_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRUtil name LibNamePrefix + 'apr_xlate_conv_buffer' + LibSuff20;
 
@@ -124,7 +124,7 @@ function apr_xlate_conv_buffer(convset: Papr_xlate_t; const inbuf: PChar;
  * @param outchar The converted character
  }
 APU_DECLARE(apr_status_t) apr_xlate_conv_char(apr_xlate_t *convset, 
-                                              char inchar, char outchar);
+                                              AnsiChar inchar, AnsiChar outchar);
 {$endif}
 
 {
@@ -135,7 +135,7 @@ APU_DECLARE(apr_status_t) apr_xlate_conv_char(apr_xlate_t *convset,
  * @warning This only works when converting between single-byte character sets.
  *          -1 will be returned if the conversion can't be performed.
  }
-function apr_xlate_conv_byte(convset: Papr_xlate_t; inchar: Char): apr_int32_t;
+function apr_xlate_conv_byte(convset: Papr_xlate_t; inchar: AnsiChar): apr_int32_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRUtil name LibNamePrefix + 'apr_xlate_conv_byte' + LibSuff8;
 

packages/httpd20/src/aprutil/apr_xml.inc

@@ -44,7 +44,7 @@ type
 
   apr_text = record
     { The current piece of text }
-    text: PChar;
+    text: PAnsiChar;
     { a pointer to the next piece of text }
     next: Papr_text;
   end;
@@ -67,7 +67,7 @@ type
  * @param text The new text to append
  }
 procedure apr_text_append(p: Papr_pool_t; hdr: Papr_text_header;
- const text: PChar);
+ const text: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRUtil name LibNamePrefix + 'apr_text_append' + LibSuff12;
 
@@ -143,12 +143,12 @@ type
 { apr_xml_attr: holds a parsed XML attribute }
   apr_xml_attr = record
     { attribute name }
-    name: PChar;
+    name: PAnsiChar;
     { index into namespace array }
     ns: Integer;
 
     { attribute value }
-    value: PChar;
+    value: PAnsiChar;
 
     { next attribute }
     next: Papr_xml_attr;
@@ -157,11 +157,11 @@ type
 { apr_xml_elem: holds a parsed XML element }
   apr_xml_elem = record
     { element name }
-    name: PChar;
+    name: PAnsiChar;
     { index into namespace array }
     ns: Integer;
     { xml:lang for attrs/contents }
-    lang: PChar;
+    lang: PAnsiChar;
 
     { cdata right after start tag }
     first_cdata: apr_text_header;
@@ -239,7 +239,7 @@ function apr_xml_parse_file(p: Papr_pool_t;
  * @remark Use apr_xml_parser_geterror() to get more error information.
  }
 function apr_xml_parser_feed(parser: Papr_xml_parser;
- const data: PChar; len: apr_size_t): apr_status_t;
+ const data: PAnsiChar; len: apr_size_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRUtil name LibNamePrefix + 'apr_xml_parser_feed' + LibSuff12;
 
@@ -264,7 +264,7 @@ function apr_xml_parser_done(parser: Papr_xml_parser;
  * @return The error buffer
  }
 function apr_xml_parser_geterror(parser: Papr_xml_parser;
- errbuf: PChar; errbufsize: apr_size_t): PChar;
+ errbuf: PAnsiChar; errbufsize: apr_size_t): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRUtil name LibNamePrefix + 'apr_xml_parser_geterror' + LibSuff12;
 
@@ -286,7 +286,7 @@ function apr_xml_parser_geterror(parser: Papr_xml_parser;
  }
 procedure apr_xml_to_text(p: Papr_pool_t; const elem: Papr_xml_elem;
  style: Integer; namespaces: Papr_array_header_t;
- ns_map: PInteger; const pbuf: PPChar; psize: Papr_size_t);
+ ns_map: PInteger; const pbuf: PPAnsiChar; psize: Papr_size_t);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRUtil name LibNamePrefix + 'apr_xml_to_text' + LibSuff28;
 
@@ -303,7 +303,7 @@ const
  * @param elem The XML element to empty
  * @return the string that was stored in the XML element
  }
-function apr_xml_empty_elem(p: Papr_pool_t; const elem: Papr_xml_elem): PChar;
+function apr_xml_empty_elem(p: Papr_pool_t; const elem: Papr_xml_elem): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRUtil name LibNamePrefix + 'apr_xml_empty_elem' + LibSuff8;
 
@@ -317,8 +317,8 @@ function apr_xml_empty_elem(p: Papr_pool_t; const elem: Papr_xml_elem): PChar;
  * @note If the string does not contain special characters, it is not
  * duplicated into the pool and the original string is returned.
  }
-function apr_xml_quote_string(p: Papr_pool_t; const s: PChar;
- quotes: Integer): PChar;
+function apr_xml_quote_string(p: Papr_pool_t; const s: PAnsiChar;
+ quotes: Integer): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRUtil name LibNamePrefix + 'apr_xml_quote_string' + LibSuff12;
 
@@ -340,10 +340,10 @@ procedure apr_xml_quote_elem(p: Papr_pool_t; elem: Papr_xml_elem);
  * @return int The uri's index
  }
 function apr_xml_insert_uri(uri_array: Papr_array_header_t;
- const uri: PChar): Integer;
+ const uri: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibAPRUtil name LibNamePrefix + 'apr_xml_insert_uri' + LibSuff8;
 
 { Get the URI item for this XML element }
-//#define APR_XML_GET_URI_ITEM(ary, i) (((const char * const *)(ary)->elts)[i])
+//#define APR_XML_GET_URI_ITEM(ary, i) (((const AnsiChar * const *)(ary)->elts)[i])
 

packages/httpd20/src/http_config.inc

@@ -121,17 +121,17 @@ type
  }
 
   { function to call for a no-args }
-  no_args_t = function (parms: Pcmd_parms; mconfig: Pointer): PChar; cdecl;
+  no_args_t = function (parms: Pcmd_parms; mconfig: Pointer): PAnsiChar; cdecl;
   { function to call for a raw-args }
-  raw_args_t = function (parms: Pcmd_parms; mconfig: Pointer; const args: PChar): Pchar; cdecl;
+  raw_args_t = function (parms: Pcmd_parms; mconfig: Pointer; const args: PAnsiChar): PAnsiChar; cdecl;
   { function to call for a take1 }
-  take1_t = function (parms: Pcmd_parms; mconfig: Pointer; const w: PChar): PChar; cdecl;
+  take1_t = function (parms: Pcmd_parms; mconfig: Pointer; const w: PAnsiChar): PAnsiChar; cdecl;
   { function to call for a take2 }
-  take2_t = function (parms: Pcmd_parms; mconfig: Pointer; const w, w2: PChar): PChar; cdecl;
+  take2_t = function (parms: Pcmd_parms; mconfig: Pointer; const w, w2: PAnsiChar): PAnsiChar; cdecl;
   { function to call for a take3 }
-  take3_t = function (parms: Pcmd_parms; mconfig: Pointer; const w, w2, w3: PChar): PChar; cdecl;
+  take3_t = function (parms: Pcmd_parms; mconfig: Pointer; const w, w2, w3: PAnsiChar): PAnsiChar; cdecl;
   { function to call for a flag }
-  flag_t = function (parms: Pcmd_parms; mconfig: Pointer; on_: Integer): PChar; cdecl;
+  flag_t = function (parms: Pcmd_parms; mconfig: Pointer; on_: Integer): PAnsiChar; cdecl;
 
   cmd_func_kind = ( cfk_no_args, cfk_raw_args, cfk_take1, cfk_take2, cfk_take3, cfk_flag);
   cmd_func = record
@@ -198,7 +198,7 @@ type
 
 //#else { AP_HAVE_DESIGNATED_INITIALIZER }
 
-//typedef const char *( *cmd_func) ();
+//typedef const AnsiChar *( *cmd_func) ();
 
 //# define AP_NO_ARGS  func
 //# define AP_RAW_ARGS func
@@ -240,7 +240,7 @@ type
  }
   command_struct = record
     { Name of this command }
-    name: PChar;
+    name: PAnsiChar;
     { The function to be called when this directive is parsed }
     func: cmd_func;
     { Extra data, for functions which implement multiple commands... }
@@ -252,7 +252,7 @@ type
     args_how: cmd_how;
 
     { 'usage' message, in case of syntax errors }
-    errmsg: PChar;
+    errmsg: PAnsiChar;
   end;
   command_rec = command_struct;
   Pcommand_rec = ^command_rec;
@@ -272,7 +272,7 @@ type
     getstr: getstr_t;  {< a fgets()-like function }
     close: close_t;    {< a close handler function }
     param: Pointer;    {< the argument passed to getch/getstr/close }
-    name: PChar;       {< the filename / description }
+    name: PAnsiChar;       {< the filename / description }
     line_number: cuint;{< current line number, starting at 1 }
   end;
   
@@ -314,7 +314,7 @@ type
      * derived from this field is whether a command is being called in a 
      * server context (path == NULL) or being called in a dir context 
      * (path != NULL).  }
-    path: PChar;
+    path: PAnsiChar;
     { configuration command }
     cmd: Pcommand_rec;
 
@@ -346,7 +346,7 @@ type
     module_index: Integer;
 
     { The name of the module's C file }
-    name: PChar;
+    name: PAnsiChar;
     { The handle for the DSO.  Internal use only }
     dynamic_load_handle: Pointer;
 
@@ -370,7 +370,7 @@ type
      *  @param dir The directory currently being processed.
      *  @return The per-directory structure created
      }
-    create_dir_config: function(p: Papr_pool_t; dir: PChar): Pointer; cdecl;
+    create_dir_config: function(p: Papr_pool_t; dir: PAnsiChar): Pointer; cdecl;
 
     { Function to allow all modules to merge the per directory configuration
      *  structures for two directories.
@@ -492,7 +492,7 @@ procedure ap_set_module_config(v: Pap_conf_vector_t; m: Pmodule; val: Pap_conf_v
  * @param arg The argument to the directive
  * @return An error string or NULL on success
  }
-function ap_set_string_slot(cmd: Pcmd_parms; struct_ptr: Pointer; const arg: PChar): PChar;
+function ap_set_string_slot(cmd: Pcmd_parms; struct_ptr: Pointer; const arg: PAnsiChar): PAnsiChar;
  cdecl; external LibHTTPD name 'ap_set_string_slot';
 
 {
@@ -502,7 +502,7 @@ function ap_set_string_slot(cmd: Pcmd_parms; struct_ptr: Pointer; const arg: PCh
  * @param arg The argument to the directive
  * @return An error string or NULL on success
  }
-function ap_set_int_slot(cmd: Pcmd_parms; struct_ptr: Pointer; const arg: PChar): PChar;
+function ap_set_int_slot(cmd: Pcmd_parms; struct_ptr: Pointer; const arg: PAnsiChar): PAnsiChar;
  cdecl; external LibHTTPD name 'ap_set_int_slot';
 
 {
@@ -515,7 +515,7 @@ function ap_set_int_slot(cmd: Pcmd_parms; struct_ptr: Pointer; const arg: PChar)
  *                  directive handler.
  * @return  0 if the method is not limited in the current scope
  }
-function ap_method_is_limited(cmd: Pcmd_parms; const method: PChar): Integer;
+function ap_method_is_limited(cmd: Pcmd_parms; const method: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_method_is_limited' + LibSuff8;
 
@@ -527,7 +527,7 @@ function ap_method_is_limited(cmd: Pcmd_parms; const method: PChar): Integer;
  * @param arg The argument to the directive
  * @return An error string or NULL on success
  }
-function ap_set_string_slot_lower(cmd: Pcmd_parms; struct_ptr: Pointer; const arg: PChar): PChar;
+function ap_set_string_slot_lower(cmd: Pcmd_parms; struct_ptr: Pointer; const arg: PAnsiChar): PAnsiChar;
  cdecl; external LibHTTPD name 'ap_set_string_slot_lower';
 
 {
@@ -537,7 +537,7 @@ function ap_set_string_slot_lower(cmd: Pcmd_parms; struct_ptr: Pointer; const ar
  * @param arg The argument to the directive (either 1 or 0)
  * @return An error string or NULL on success
  }
-function ap_set_flag_slot(cmd: Pcmd_parms; struct_ptr: Pointer; const arg: PChar): PChar;
+function ap_set_flag_slot(cmd: Pcmd_parms; struct_ptr: Pointer; const arg: PAnsiChar): PAnsiChar;
  cdecl; external LibHTTPD name 'ap_set_flag_slot';
 
 {
@@ -547,7 +547,7 @@ function ap_set_flag_slot(cmd: Pcmd_parms; struct_ptr: Pointer; const arg: PChar
  * @param arg The argument to the directive
  * @return An error string or NULL on success
  }
-function ap_set_file_slot(cmd: Pcmd_parms; struct_ptr: Pointer; const arg: PChar): PChar;
+function ap_set_file_slot(cmd: Pcmd_parms; struct_ptr: Pointer; const arg: PAnsiChar): PAnsiChar;
  cdecl; external LibHTTPD name 'ap_set_file_slot';
 
 {
@@ -562,7 +562,7 @@ function ap_set_file_slot(cmd: Pcmd_parms; struct_ptr: Pointer; const arg: PChar
  *         "The Foo directive is no longer supported, use Bar"),
  * </pre>
  }
-function ap_set_deprecated(cmd: Pcmd_parms; struct_ptr: Pointer; const arg: PChar): PChar;
+function ap_set_deprecated(cmd: Pcmd_parms; struct_ptr: Pointer; const arg: PAnsiChar): PAnsiChar;
  cdecl; external LibHTTPD name 'ap_set_deprecated';
 
 {
@@ -571,7 +571,7 @@ function ap_set_deprecated(cmd: Pcmd_parms; struct_ptr: Pointer; const arg: PCha
  * @param p pool to allocate data from
  * @param fname The file name
  }
-function ap_server_root_relative(p: Papr_pool_t; const fname: PChar): PChar;
+function ap_server_root_relative(p: Papr_pool_t; const fname: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_server_root_relative' + LibSuff8;
 
@@ -622,7 +622,7 @@ procedure ap_remove_loaded_module(m: Pmodule);
  * @param p The pool valid for the lifetime of the module
  * @return 1 on success, 0 on failure
  }
-function ap_add_named_module(const name: PChar; p: Papr_pool_t): Integer;
+function ap_add_named_module(const name: PAnsiChar; p: Papr_pool_t): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_add_named_module' + LibSuff8;
 
@@ -631,7 +631,7 @@ function ap_add_named_module(const name: PChar; p: Papr_pool_t): Integer;
  * @param m The module to get the name for
  * @return the name of the module
  }
-function ap_find_module_name(m: Pmodule): PChar;
+function ap_find_module_name(m: Pmodule): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_find_module_name' + LibSuff4;
 
@@ -640,7 +640,7 @@ function ap_find_module_name(m: Pmodule): PChar;
  * @param name the name of the module
  * @return the module structure if found, NULL otherwise
  }
-function ap_find_linked_module(const name: PChar): Pmodule;
+function ap_find_linked_module(const name: PAnsiChar): Pmodule;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_find_linked_module' + LibSuff4;
 
@@ -651,7 +651,7 @@ function ap_find_linked_module(const name: PChar): Pmodule;
  * @param name the name of the file to open
  }
 function ap_pcfg_openfile(ret_cfg: PPap_configfile_t;
- p: Papr_pool_t; const name: PChar): apr_status_t;
+ p: Papr_pool_t; const name: PAnsiChar): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_pcfg_openfile' + LibSuff12;
 
@@ -670,7 +670,7 @@ type
   close_func_t = function (param: Pointer): Integer;
 
 function ap_pcfg_open_custom(p: Papr_pool_t;
- const descr: PChar; param: Pointer;
+ const descr: PAnsiChar; param: Pointer;
  getc_func: getc_func_t; gets_func: gets_func_t;
  close_func: close_func_t): Pap_configfile_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
@@ -683,13 +683,13 @@ function ap_pcfg_open_custom(p: Papr_pool_t;
  * @param cfp File to read from
  * @return 1 on success, 0 on failure
  }
-function ap_cfg_getline(bug: PChar;
+function ap_cfg_getline(bug: PAnsiChar;
  bufsize: size_t; cfp: Pap_configfile_t): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_cfg_getline' + LibSuff12;
 
 {
- * Read one char from open configfile_t, increase line number upon LF 
+ * Read one AnsiChar from open configfile_t, increase line number upon LF 
  * @param cfp The file to read from
  * @return the character read
  }
@@ -713,7 +713,7 @@ function ap_cfg_closefile(cfp: Pap_configfile_t): Integer;
  * @param directive The directive name to read until
  * @return Error string on failure, NULL on success
  }
-function ap_soak_end_container(cmd: Pcmd_parms; directive: PChar): PChar;
+function ap_soak_end_container(cmd: Pcmd_parms; directive: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_soak_end_container' + LibSuff8;
 
@@ -730,7 +730,7 @@ function ap_soak_end_container(cmd: Pcmd_parms; directive: PChar): PChar;
 }
 function ap_build_cont_config(p, temp_pool: Papr_pool_t;
  parms: Pcmd_parms; current, curr_parent: PPap_directive_t;
- orig_directive: PChar): PChar;
+ orig_directive: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_build_cont_config' + LibSuff24;
 
@@ -743,7 +743,7 @@ function ap_build_cont_config(p, temp_pool: Papr_pool_t;
  * @return Error string on erro, NULL otherwise
  }
 function ap_build_config(parms: Pcmd_parms;
- conf_pool, temp_pool: Papr_pool_t; conftree: PPap_directive_t): PChar;
+ conf_pool, temp_pool: Papr_pool_t; conftree: PPap_directive_t): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_build_config' + LibSuff16;
 
@@ -755,7 +755,7 @@ function ap_build_config(parms: Pcmd_parms;
  * @return Error string on error, NULL otherwise
  }
 function ap_walk_config(conftree: Pap_directive_t;
- parms: Pcmd_parms; section_vector: Pap_conf_vector_t): PChar;
+ parms: Pcmd_parms; section_vector: Pap_conf_vector_t): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_walk_config' + LibSuff12;
 
@@ -769,7 +769,7 @@ function ap_walk_config(conftree: Pap_directive_t;
  * @return Error string on error, NULL on success
  }
 function ap_check_cmd_context(cmd: Pcmd_parms;
- forbidden: cuint): PChar;
+ forbidden: cuint): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_check_cmd_context' + LibSuff8;
 
@@ -848,7 +848,7 @@ procedure ap_show_modules;
  * Show the MPM name.  Used in reporting modules such as mod_info to
  * provide extra information to the user
  }
-function ap_show_mpm: PChar;
+function ap_show_mpm: PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_show_mpm' + LibSuff0;
 
@@ -861,7 +861,7 @@ function ap_show_mpm: PChar;
  * @return The setup server_rec list.
  }
 function ap_read_config(process: Pprocess_rec;
- temp_pool: Papr_pool_t; const config_name: PChar;
+ temp_pool: Papr_pool_t; const config_name: PAnsiChar;
  conftree: PPap_directive_t): Pserver_rec;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_read_config' + LibSuff16;
@@ -946,7 +946,7 @@ function ap_create_conn_config(p: Papr_pool_t): Pap_conf_vector_t;
  }
 function ap_parse_htaccess(result: PPap_conf_vector_t;
  r: Prequest_rec; override_: Integer;
- const path, access_name: PChar): Integer;
+ const path, access_name: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_parse_htaccess' + LibSuff20;
 
@@ -959,8 +959,8 @@ function ap_parse_htaccess(result: PPap_conf_vector_t;
  * return Error string on error, NULL on success
  }
 function ap_init_virtual_host(p: Papr_pool_t;
- const hostname: PChar; main_server: Pserver_rec;
- m: PPserver_rec): PChar;
+ const hostname: PAnsiChar; main_server: Pserver_rec;
+ m: PPserver_rec): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_init_virtual_host' + LibSuff16;
 
@@ -973,7 +973,7 @@ function ap_init_virtual_host(p: Papr_pool_t;
  * @param ptem Pool for temporary allocation
  }
 procedure ap_process_resource_config(s: Pserver_rec;
- const fname: PChar; conftree: PPap_directive_t;
+ const fname: PAnsiChar; conftree: PPap_directive_t;
  p, ptemp: Papr_pool_t);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_process_resource_config' + LibSuff20;
@@ -1009,7 +1009,7 @@ function ap_invoke_handler(r: Prequest_rec): Integer;
  * @param cmds The table to search
  * @return The directive definition of the specified directive
  }
-function ap_find_command(const name: PChar;
+function ap_find_command(const name: PAnsiChar;
  const cmds: Pcommand_rec): Pcommand_rec;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_find_command' + LibSuff8;
@@ -1020,7 +1020,7 @@ function ap_find_command(const name: PChar;
  * @param mod The module list to search
  * @return The directive definition of the specified directive
  }
-function ap_find_command_in_modules(const cmd_name: PChar;
+function ap_find_command_in_modules(const cmd_name: PAnsiChar;
  mod_: PPmodule): Pcommand_rec;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_find_command_in_modules' + LibSuff8;
@@ -1037,7 +1037,7 @@ function ap_find_command_in_modules(const cmd_name: PChar;
  * @return The (new) per-section config data.
  }
 function ap_set_config_vectors(server: Pserver_rec;
- ection_vector: Pap_conf_vector_t; const section: PChar;
+ ection_vector: Pap_conf_vector_t; const section: PAnsiChar;
  mod_: Pmodule; pconf: Papr_pool_t): Pointer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_set_config_vectors' + LibSuff20;
@@ -1055,8 +1055,8 @@ type
   ap_HOOK_header_parser_t = function(r: Prequest_rec): Integer; cdecl;
 
 procedure ap_hook_header_parser(pf: ap_HOOK_header_parser_t;
- const aszPre: PPChar; const aszSucc:
- PPChar; nOrder: Integer);
+ const aszPre: PPAnsiChar; const aszSucc:
+ PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_header_parser' + LibSuff16;
 
@@ -1071,8 +1071,8 @@ type
   ap_HOOK_pre_config_t = function(pconf: Papr_pool_t; plog: Papr_pool_t;
     ptemp: Papr_pool_t): Integer; cdecl;
 
-procedure ap_hook_pre_config(pf: ap_HOOK_pre_config_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_pre_config(pf: ap_HOOK_pre_config_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_pre_config' + LibSuff16;
 
@@ -1087,8 +1087,8 @@ procedure ap_hook_pre_config(pf: ap_HOOK_pre_config_t; const aszPre: PPChar;
 type
   ap_HOOK_post_config_t = function(pconf, plog, ptemp: Papr_pool_t; s: Pserver_rec): Integer; cdecl;
 
-procedure ap_hook_post_config(pf: ap_HOOK_post_config_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_post_config(pf: ap_HOOK_post_config_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_post_config' + LibSuff16;
 
@@ -1104,8 +1104,8 @@ type
   ap_HOOK_open_logs_t = function(pconf: Papr_pool_t; plog: Papr_pool_t;
     ptemp: Papr_pool_t; s: Pserver_rec): Integer; cdecl;
 
-procedure ap_hook_open_logs(pf: ap_HOOK_open_logs_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_open_logs(pf: ap_HOOK_open_logs_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_open_logs' + LibSuff16;
 
@@ -1117,8 +1117,8 @@ procedure ap_hook_open_logs(pf: ap_HOOK_open_logs_t; const aszPre: PPChar;
 type
   ap_HOOK_child_init_t = procedure(pchild: Papr_pool_t; s: Pserver_rec); cdecl;
 
-procedure ap_hook_child_init(pf: ap_HOOK_child_init_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_child_init(pf: ap_HOOK_child_init_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_child_init' + LibSuff16;
 
@@ -1130,8 +1130,8 @@ procedure ap_hook_child_init(pf: ap_HOOK_child_init_t; const aszPre: PPChar;
 type
   ap_HOOK_handler_t = function(r: Prequest_rec): Integer; cdecl;
 
-procedure ap_hook_handler(pf: ap_HOOK_handler_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_handler(pf: ap_HOOK_handler_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_handler' + LibSuff16;
 
@@ -1151,7 +1151,7 @@ type
     lookup_uri: Integer): Integer; cdecl;
 
 procedure ap_hook_quick_handler(pf: ap_HOOK_quick_handler_t;
- const aszPre: PPChar; const aszSucc: PPChar; nOrder: Integer);
+ const aszPre: PPAnsiChar; const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_quick_handler' + LibSuff16;
 
@@ -1164,7 +1164,7 @@ type
   ap_HOOK_optional_fn_retrieve_t = procedure; cdecl;
 
 procedure ap_hook_optional_fn_retrieve(pf: ap_HOOK_optional_fn_retrieve_t;
- const aszPre: PPChar; const aszSucc: PPChar; nOrder: Integer);
+ const aszPre: PPAnsiChar; const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_optional_fn_retrieve' + LibSuff16;
 

packages/httpd20/src/http_connection.inc

@@ -81,8 +81,8 @@ type
    csd: Papr_socket_t; conn_id: cLong; sbh: Pointer;
    alloc: Papr_bucket_alloc_t): Pconn_rec; cdecl;
 
-procedure ap_hook_create_connection(pf: ap_HOOK_create_connection_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_create_connection(pf: ap_HOOK_create_connection_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_create_connection' + LibSuff16;
 
@@ -100,8 +100,8 @@ procedure ap_hook_create_connection(pf: ap_HOOK_create_connection_t; const aszPr
 type
   ap_HOOK_pre_connection_t = function (c: Pconn_rec; csd: Pointer): Integer; cdecl;
 
-procedure ap_hook_pre_connection(pf: ap_HOOK_pre_connection_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_pre_connection(pf: ap_HOOK_pre_connection_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_pre_connection' + LibSuff16;
 
@@ -117,8 +117,8 @@ procedure ap_hook_pre_connection(pf: ap_HOOK_pre_connection_t; const aszPre: PPC
 type
   ap_HOOK_process_connection_t = function (c: Pconn_rec): Integer; cdecl;
 
-procedure ap_hook_process_connection(pf: ap_HOOK_process_connection_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_process_connection(pf: ap_HOOK_process_connection_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_process_connection' + LibSuff16;
 

packages/httpd20/src/http_core.inc

@@ -115,9 +115,9 @@ function ap_allow_overrides(r: Prequest_rec): Integer;
  * Retrieve the value of the DefaultType directive, or text/plain if not set
  * @param r The current request
  * @return The default type
- * @deffunc const char *ap_default_type(request_rec *r)
+ * @deffunc const AnsiChar *ap_default_type(request_rec *r)
  }
-function ap_default_type(r: Prequest_rec): PChar;
+function ap_default_type(r: Prequest_rec): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_default_type' + LibSuff4;
 
@@ -127,9 +127,9 @@ function ap_default_type(r: Prequest_rec): PChar;
  * @warning Don't use this!  If your request went through a Userdir, or 
  * something like that, it'll screw you.  But it's back-compatible...
  * @return The document root
- * @deffunc const char *ap_document_root(request_rec *r)
+ * @deffunc const AnsiChar *ap_document_root(request_rec *r)
  }
-function ap_document_root(r: Prequest_rec): PChar;
+function ap_document_root(r: Prequest_rec): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_document_root' + LibSuff4;
 
@@ -155,10 +155,10 @@ function ap_document_root(r: Prequest_rec): PChar;
  * @param str_is_ip unless NULL is passed, this will be set to non-zero on output when an IP address 
  *        string is returned
  * @return The remote hostname
- * @deffunc const char *ap_get_remote_host(conn_rec *conn, void *dir_config, int type, int *str_is_ip)
+ * @deffunc const AnsiChar *ap_get_remote_host(conn_rec *conn, void *dir_config, int type, int *str_is_ip)
  }
 function ap_get_remote_host(conn: Pconn_rec; dir_config: Pointer;
-  _type: Integer; str_is_ip: PInteger): PChar;
+  _type: Integer; str_is_ip: PInteger): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_get_remote_host' + LibSuff16;
 
@@ -167,9 +167,9 @@ function ap_get_remote_host(conn: Pconn_rec; dir_config: Pointer;
  * determined
  * @param r The current request
  * @return The user logged in to the client machine
- * @deffunc const char *ap_get_remote_logname(request_rec *r)
+ * @deffunc const AnsiChar *ap_get_remote_logname(request_rec *r)
  }
-function ap_get_remote_logname(r: Prequest_rec): PChar;
+function ap_get_remote_logname(r: Prequest_rec): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_get_remote_logname' + LibSuff4;
 
@@ -182,9 +182,9 @@ function ap_get_remote_logname(r: Prequest_rec): PChar;
  * @param uri The path to the requested file
  * @param r The current request
  * @return A fully qualified URL
- * @deffunc char *ap_construct_url(apr_pool_t *p, const char *uri, request_rec *r)
+ * @deffunc AnsiChar *ap_construct_url(apr_pool_t *p, const AnsiChar *uri, request_rec *r)
  }
-function ap_construct_url(p: Papr_pool_t; const uri: PChar; r: Prequest_rec): PChar;
+function ap_construct_url(p: Papr_pool_t; const uri: PAnsiChar; r: Prequest_rec): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_construct_url' + LibSuff12;
 
@@ -192,9 +192,9 @@ function ap_construct_url(p: Papr_pool_t; const uri: PChar; r: Prequest_rec): PC
  * Get the current server name from the request
  * @param r The current request
  * @return the server name
- * @deffunc const char *ap_get_server_name(request_rec *r)
+ * @deffunc const AnsiChar *ap_get_server_name(request_rec *r)
  }
-function ap_get_server_name(r: Prequest_rec): PChar;
+function ap_get_server_name(r: Prequest_rec): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_get_server_name' + LibSuff4;
 
@@ -235,7 +235,7 @@ function ap_get_limit_xml_body(r: Prequest_rec): size_t;
  * @param string The custom response.  This can be a static string, a file
  *               or a URL
  }
-procedure ap_custom_response(r: Prequest_rec; status: Integer; const str: PChar);
+procedure ap_custom_response(r: Prequest_rec; status: Integer; const str: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_custom_response' + LibSuff12;
 
@@ -253,9 +253,9 @@ function ap_is_recursion_limit_exceeded(r: Prequest_rec): Integer;
  * Check for a definition from the server command line
  * @param name The define to check for
  * @return 1 if defined, 0 otherwise
- * @deffunc int ap_exists_config_define(const char *name)
+ * @deffunc int ap_exists_config_define(const AnsiChar *name)
  }
-function ap_exists_config_define(name: PChar): Integer;
+function ap_exists_config_define(name: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_exists_config_define' + LibSuff4;
 
@@ -276,16 +276,16 @@ type
     { Where the require line is in the config file. }
     method_mask: apr_int64_t;
     { The complete string from the command line }
-    requirement: PChar;
+    requirement: PAnsiChar;
   end;
      
 {
  * Return the type of authorization required for this request
  * @param r The current request
  * @return The authorization required
- * @deffunc const char *ap_auth_type(request_rec *r)
+ * @deffunc const AnsiChar *ap_auth_type(request_rec *r)
  }
-function ap_auth_type(r: Prequest_rec): PChar;
+function ap_auth_type(r: Prequest_rec): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_auth_type' + LibSuff4;
 
@@ -293,9 +293,9 @@ function ap_auth_type(r: Prequest_rec): PChar;
  * Return the current Authorization realm
  * @param r The current request
  * @return The current authorization realm
- * @deffunc const char *ap_auth_name(request_rec *r)
+ * @deffunc const AnsiChar *ap_auth_name(request_rec *r)
  }
-function ap_auth_name(r: Prequest_rec): PChar;
+function ap_auth_name(r: Prequest_rec): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_auth_name' + LibSuff4;
 
@@ -362,7 +362,7 @@ type
     { Custom response strings registered via ap_custom_response(),
      * or NULL; check per-dir config if nothing found here
      }
-    response_code_strings: PPChar; { from ap_custom_response(), not from
+    response_code_strings: PPAnsiChar; { from ap_custom_response(), not from
                                    * ErrorDocument
                                    }
     { Should addition of charset= be suppressed for this request?
@@ -417,7 +417,7 @@ type
 
 {
  * Bits of info that go into making an ETag for a file
- * document.  Why a long?  Because char historically
+ * document.  Why a long?  Because AnsiChar historically
  * proved too short for Options, and int can be different
  * sizes on different platforms.
  }
@@ -475,7 +475,7 @@ type
   core_dir_config = record
 
     { path of the directory/regex/etc. see also d_is_fnmatch/absolute below }
-    d: PChar;
+    d: PAnsiChar;
     { the number of slashes in d }
     d_components: Cardinal;
 
@@ -496,22 +496,22 @@ type
      * goes untyped by other mechanisms before it slips out the door...
      }
     
-    ap_default_type: PChar;
+    ap_default_type: PAnsiChar;
   
     { Authentication stuff.  Groan... }
     
     satisfy: PInteger; { for every method one }
-    ap_auth_type: PChar;
-    ap_auth_name: PChar;
+    ap_auth_type: PAnsiChar;
+    ap_auth_name: PAnsiChar;
     ap_requires: Papr_array_header_t;
 
     { Custom response config. These can contain text or a URL to redirect to.
      * if response_code_strings is NULL then there are none in the config,
-     * if it's not null then it's allocated to sizeof(char*)*RESPONSE_CODES.
+     * if it's not null then it's allocated to sizeof(AnsiChar*)*RESPONSE_CODES.
      * This lets us do quick merges in merge_core_dir_configs().
      }
   
-    response_code_strings: PPChar; { from ErrorDocument, not from
+    response_code_strings: PPAnsiChar; { from ErrorDocument, not from
                                    * ap_custom_response() }
 
     { Hostname resolution etc }
@@ -533,7 +533,7 @@ type
      * if so, which charset?
      }
 {    unsigned add_default_charset : 2; }
-    add_default_charset_name: PChar;
+    add_default_charset_name: PAnsiChar;
 
     { System Resource Control }
 {$ifdef RLIMIT_CPU}
@@ -558,10 +558,10 @@ type
     sec_file: Papr_array_header_t;
     r: Pregex_t;
 
-    mime_type: PChar;       { forced with ForceType  }
-    handler: PChar;         { forced with SetHandler }
-    output_filters: PChar;  { forced with SetOutputFilters }
-    input_filters: PChar;   { forced with SetInputFilters }
+    mime_type: PAnsiChar;       { forced with ForceType  }
+    handler: PAnsiChar;         { forced with SetHandler }
+    output_filters: PAnsiChar;  { forced with SetOutputFilters }
+    input_filters: PAnsiChar;   { forced with SetInputFilters }
     accept_path_info: Integer;        { forced with AcceptPathInfo }
 
     ct_output_filters: Papr_hash_t; { added with AddOutputFilterByType }
@@ -597,18 +597,18 @@ type
    core_server_config = record
   
 {$ifdef GPROF}
-    gprof_dir: PChar;
+    gprof_dir: PAnsiChar;
 {$endif}
 
     { Name translations --- we want the core to be able to do *something*
      * so it's at least a minimally functional web server on its own (and
      * can be tested that way).  But let's keep it to the bare minimum:
      }
-    ap_document_root: PChar;
+    ap_document_root: PAnsiChar;
   
     { Access control }
 
-    access_name: PChar;
+    access_name: PAnsiChar;
     sec_dir: Papr_array_header_t;
     sec_url: Papr_array_header_t;
 
@@ -630,7 +630,7 @@ type
 {AP_CORE_DECLARE(void) ap_add_per_dir_conf(server_rec *s, void *dir_config);
 AP_CORE_DECLARE(void) ap_add_per_url_conf(server_rec *s, void *url_config);
 AP_CORE_DECLARE(void) ap_add_file_conf(core_dir_config *conf, void *url_config);
-AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section(cmd_parms *cmd, void *dummy, const char *arg);}
+AP_CORE_DECLARE_NONSTD(const AnsiChar *) ap_limit_section(cmd_parms *cmd, void *dummy, const AnsiChar *arg);}
 
 //#endif COREPRIVATE
 
@@ -649,14 +649,14 @@ type
 
   ap_mgmt_value = record
     case Integer of
-     0: (s_value: PChar);
+     0: (s_value: PAnsiChar);
      1: (i_value: cLong);
      2: (h_value: Papr_hash_t);
   end;
 
   ap_mgmt_item_t = record
-    description: PChar;
-    name: PChar;
+    description: PAnsiChar;
+    name: PAnsiChar;
     vtype: ap_mgmt_type_e;
     v: ap_mgmt_value;
   end;
@@ -682,11 +682,11 @@ extern AP_DECLARE_DATA ap_filter_rec_t *ap_core_input_filter_handle;}
  * @ingroup hooks
  }
 type
-  ap_HOOK_get_mgmt_items_t = function(p: Papr_pool_t; const val: PChar;
+  ap_HOOK_get_mgmt_items_t = function(p: Papr_pool_t; const val: PAnsiChar;
     ht: Papr_hash_t): Integer; cdecl;
 
 procedure ap_hook_get_mgmt_items(pf: ap_HOOK_get_mgmt_items_t;
- const aszPre: PPChar; const aszSucc: PPChar; nOrder: Integer);
+ const aszPre: PPAnsiChar; const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_get_mgmt_items' + LibSuff16;
 

packages/httpd20/src/http_log.inc

@@ -79,7 +79,7 @@ procedure ap_open_stderr_log(p: Papr_pool_t);
  * @param file Name of the file to log stderr output
  }
 function ap_replace_stderr_log(p: Papr_pool_t;
- file_: PChar): apr_status_t;
+ file_: PAnsiChar): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_replace_stderr_log' + LibSuff8;
 
@@ -141,12 +141,12 @@ function ap_replace_stderr_log(p: Papr_pool_t;
  * denial-of-service attack and other messy behavior.  Instead, use a 
  * simple format string like "%s", followed by the string containing the 
  * untrusted data.
- * @deffunc void ap_log_error(const char *file, int line, int level, apr_status_t status, const server_rec *s, const char *fmt, ...) 
+ * @deffunc void ap_log_error(const AnsiChar *file, int line, int level, apr_status_t status, const server_rec *s, const AnsiChar *fmt, ...) 
  }
 procedure ap_log_error(
- const file_: PChar; line, level: Integer;
+ const file_: PAnsiChar; line, level: Integer;
  status: apr_status_t; const s: Pserver_rec;
- const fmt: PChar; others: array of const);
+ const fmt: PAnsiChar; others: array of const);
  cdecl; external LibHTTPD name 'ap_log_error';
 
 //			    __attribute__((format(printf,6,7)));
@@ -169,12 +169,12 @@ procedure ap_log_error(
  * denial-of-service attack and other messy behavior.  Instead, use a 
  * simple format string like "%s", followed by the string containing the 
  * untrusted data.
- * @deffunc void ap_log_perror(const char *file, int line, int level, apr_status_t status, apr_pool_t *p, const char *fmt, ...) 
+ * @deffunc void ap_log_perror(const AnsiChar *file, int line, int level, apr_status_t status, apr_pool_t *p, const AnsiChar *fmt, ...) 
  }
 procedure ap_log_perror(
- const file_: PChar; line, level: Integer;
+ const file_: PAnsiChar; line, level: Integer;
  status: apr_status_t; p: Papr_pool_t;
- const fmt: PChar; others: array of const);
+ const fmt: PAnsiChar; others: array of const);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name 'ap_log_perror';
 
@@ -198,12 +198,12 @@ procedure ap_log_perror(
  * denial-of-service attack and other messy behavior.  Instead, use a 
  * simple format string like "%s", followed by the string containing the 
  * untrusted data.
- * @deffunc void ap_log_rerror(const char *file, int line, int level, apr_status_t status, const request_rec *r, const char *fmt, ...)
+ * @deffunc void ap_log_rerror(const AnsiChar *file, int line, int level, apr_status_t status, const request_rec *r, const AnsiChar *fmt, ...)
  }
 procedure ap_log_rerror(
- const file_: PChar; line, level: Integer;
+ const file_: PAnsiChar; line, level: Integer;
  status: apr_status_t; const r: Prequest_rec;
- const fmt: PChar; others: array of const);
+ const fmt: PAnsiChar; others: array of const);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name 'ap_log_rerror';
 
@@ -230,12 +230,12 @@ procedure ap_log_rerror(
  * simple format string like "%s", followed by the string containing the 
  * untrusted data.
  * @note ap_log_cerror() is available starting with Apache 2.0.55.
- * @deffunc void ap_log_cerror(const char *file, int line, int level, apr_status_t status, const conn_rec *c, const char *fmt, ...)
+ * @deffunc void ap_log_cerror(const AnsiChar *file, int line, int level, apr_status_t status, const conn_rec *c, const AnsiChar *fmt, ...)
  }
 procedure ap_log_cerror(
- const file_: PChar; line, level: Integer;
+ const file_: PAnsiChar; line, level: Integer;
  status: apr_status_t; const c: Pconn_rec;
- const fmt: PChar; others: array of const);
+ const fmt: PAnsiChar; others: array of const);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name 'ap_log_cerror';
 
@@ -255,7 +255,7 @@ procedure ap_error_log2stderr(s: Pserver_rec);
  * @param p The pool to use for logging
  * @param fname The name of the file to log to
  }
-procedure ap_log_pid(p: Papr_pool_t; const fname: PChar);
+procedure ap_log_pid(p: Papr_pool_t; const fname: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_log_pid' + LibSuff8;
 
@@ -265,7 +265,7 @@ procedure ap_log_pid(p: Papr_pool_t; const fname: PChar);
  * @param filename The name of the file containing the pid
  * @param mypid Pointer to pid_t (valid only if return APR_SUCCESS)
  }
-function ap_read_pid(p: Papr_pool_t; const filename: PChar; mypid: Ppid_t): apr_status_t;
+function ap_read_pid(p: Papr_pool_t; const filename: PAnsiChar; mypid: Ppid_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_read_pid' + LibSuff12;
 
@@ -283,7 +283,7 @@ type
      * be hard }
 {$ifdef AP_HAVE_RELIABLE_PIPED_LOGS}
     { The name of the program the logging process is running }
-    program: PChar;
+    program: PAnsiChar;
     { The pid of the logging process }
     pid: Papr_proc_t;
 {$endif}
@@ -294,9 +294,9 @@ type
  * @param p The pool to allocate out of
  * @param program The program to run in the logging process
  * @return The piped log structure
- * @deffunc piped_log *ap_open_piped_log(apr_pool_t *p, const char *program)
+ * @deffunc piped_log *ap_open_piped_log(apr_pool_t *p, const AnsiChar *program)
  }
-function ap_open_piped_log(p: Papr_pool_t; const program_: PChar): Ppiped_log;
+function ap_open_piped_log(p: Papr_pool_t; const program_: PAnsiChar): Ppiped_log;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_open_piped_log' + LibSuff8;
 
@@ -326,12 +326,12 @@ procedure ap_close_piped_log(pl: Ppiped_log);
 //#define ap_piped_log_write_fd(pl)	((pl)->fds[1])
 
 type
-  ap_HOOK_error_log_t = procedure(const _file: PChar; line: Integer;
+  ap_HOOK_error_log_t = procedure(const _file: PAnsiChar; line: Integer;
     level: Integer; status: apr_status_t; const s: Pserver_rec;
-    const r: Prequest_rec; p: Papr_pool_t; const errstr: PChar); cdecl;
+    const r: Prequest_rec; p: Papr_pool_t; const errstr: PAnsiChar); cdecl;
 
-procedure ap_hook_error_log(pf: ap_HOOK_error_log_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_error_log(pf: ap_HOOK_error_log_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_error_log' + LibSuff16;
 

packages/httpd20/src/http_main.inc

@@ -28,9 +28,9 @@ const
  }
 
 { The name of the Apache executable }
-//AP_DECLARE_DATA extern const char *ap_server_argv0;
+//AP_DECLARE_DATA extern const AnsiChar *ap_server_argv0;
 { The global server's ServerRoot }
-//AP_DECLARE_DATA extern const char *ap_server_root;
+//AP_DECLARE_DATA extern const AnsiChar *ap_server_root;
 
 { for -C, -c and -D switches }
 { An array of all -C directives.  These are processed before the server's

packages/httpd20/src/http_protocol.inc

@@ -33,8 +33,8 @@
 type
   ap_HOOK_insert_error_filter_t = procedure(r: Prequest_rec); cdecl;
 
-procedure ap_hook_insert_error_filter(pf: ap_HOOK_insert_error_filter_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_insert_error_filter(pf: ap_HOOK_insert_error_filter_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_insert_error_filter' + LibSuff16;
 
@@ -147,9 +147,9 @@ function ap_rationalize_mtime(r: Prequest_rec; mtime: apr_time_t): apr_time_t;
  *    - return type
  * @param r The current request
  * @return The content-type
- * @deffunc const char *ap_make_content_type(request_rec *r, const char *type);
+ * @deffunc const AnsiChar *ap_make_content_type(request_rec *r, const AnsiChar *type);
  }
-function ap_make_content_type(r: Prequest_rec; type_: PChar): PChar;
+function ap_make_content_type(r: Prequest_rec; type_: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_make_content_type' + LibSuff8;
 
@@ -172,9 +172,9 @@ procedure ap_setup_make_content_type(pool: Papr_pool_t);
  * @param force_weak Force the entity tag to be weak - it could be modified
  *                   again in as short an interval.
  * @return The entity tag
- * @deffunc char *ap_make_etag(request_rec *r, int force_weak)
+ * @deffunc AnsiChar *ap_make_etag(request_rec *r, int force_weak)
  }
-function ap_make_etag(r: Prequest_rec; force_weak: Integer): PChar;
+function ap_make_etag(r: Prequest_rec; force_weak: Integer): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_make_etag' + LibSuff8;
 
@@ -260,7 +260,7 @@ function ap_send_mmap(mm: Papr_mmap_t; r: Prequest_rec; offset, length: size_t):
  * @param methname The name of the new method to register.
  * @return         Ab int value representing an offset into a bitmask.
  }
-function ap_method_register(p: Papr_pool_t; methname: PChar): Integer;
+function ap_method_register(p: Papr_pool_t; methname: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_method_register' + LibSuff8;
 
@@ -299,14 +299,14 @@ procedure ap_copy_method_list(dest, src: Pap_method_list_t);
  external LibHTTPD name LibNamePrefix + 'ap_copy_method_list' + LibSuff8;
 
 type
-  comp_t = procedure (urec: Pointer; const mname: PChar; mnum: Integer);
+  comp_t = procedure (urec: Pointer; const mname: PAnsiChar; mnum: Integer);
   
 procedure ap_method_list_do(
  comp: comp_t; rec: Pointer; ml: Pap_method_list_t; others: array of const);
  cdecl; external LibHTTPD name 'ap_method_list_do';
 
 type
-  ap_method_list_vdo_t = function (urec: Pointer; const mname: PChar;
+  ap_method_list_vdo_t = function (urec: Pointer; const mname: PAnsiChar;
    mnum: Integer): Integer; cdecl;
 
 procedure ap_method_list_vdo(comp: ap_method_list_vdo_t;
@@ -321,9 +321,9 @@ procedure ap_method_list_vdo(comp: ap_method_list_vdo_t;
  * @param   method  String containing the name of the method to check.
  * @param   l       Pointer to a method list, such as cmd->methods_limited.
  * @return  1 if method is in the list, otherwise 0
- * @deffunc int ap_method_in_list(const char *method, ap_method_list_t *l)
+ * @deffunc int ap_method_in_list(const AnsiChar *method, ap_method_list_t *l)
  }
-function ap_method_in_list(l: Pap_method_list_t; const method: PChar): Integer;
+function ap_method_in_list(l: Pap_method_list_t; const method: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_method_in_list' + LibSuff8;
 
@@ -334,9 +334,9 @@ function ap_method_in_list(l: Pap_method_list_t; const method: PChar): Integer;
  * @param   method  String containing the name of the method to check.
  * @param   l       Pointer to a method list, such as cmd->methods_limited.
  * @return  None.
- * @deffunc void ap_method_in_list(ap_method_list_t *l, const char *method)
+ * @deffunc void ap_method_in_list(ap_method_list_t *l, const AnsiChar *method)
  }
-procedure ap_method_list_add(l: Pap_method_list_t; const method: PChar);
+procedure ap_method_list_add(l: Pap_method_list_t; const method: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_method_list_add' + LibSuff8;
 
@@ -346,9 +346,9 @@ procedure ap_method_list_add(l: Pap_method_list_t; const method: PChar);
  * @param   l       Pointer to a method list, such as cmd->methods_limited.
  * @param   method  String containing the name of the method to remove.
  * @return  None.
- * @deffunc void ap_method_list_remove(ap_method_list_t *l, const char *method)
+ * @deffunc void ap_method_list_remove(ap_method_list_t *l, const AnsiChar *method)
  }
-procedure ap_method_list_remove(l: Pap_method_list_t; const method: PChar);
+procedure ap_method_list_remove(l: Pap_method_list_t; const method: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_method_list_remove' + LibSuff8;
 
@@ -367,11 +367,11 @@ procedure ap_clear_method_list(l: Pap_method_list_t);
  * Set the content type for this request (r->content_type). 
  * @param r The current request
  * @param ct The new content type
- * @deffunc void ap_set_content_type(request_rec *r, const char* ct)
+ * @deffunc void ap_set_content_type(request_rec *r, const AnsiChar* ct)
  * @warning This function must be called to set r->content_type in order 
  * for the AddOutputFilterByType directive to work correctly.
  }
-procedure ap_set_content_type(r: Prequest_rec; const ct: PChar);
+procedure ap_set_content_type(r: Prequest_rec; const ct: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_set_content_type' + LibSuff8;
 
@@ -395,9 +395,9 @@ function ap_rputc(c: Integer; r: Prequest_rec): Integer;
  * @param str The string to output
  * @param r The current request
  * @return The number of bytes sent
- * @deffunc int ap_rputs(const char *str, request_rec *r)
+ * @deffunc int ap_rputs(const AnsiChar *str, request_rec *r)
  }
-function ap_rputs(const str: PChar; r: Prequest_rec): Integer;
+function ap_rputs(const str: PAnsiChar; r: Prequest_rec): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_rputs' + LibSuff8;
 
@@ -431,9 +431,9 @@ function ap_rvputs(r: Prequest_rec; others: array of const): Integer;
  * @param fmt The format string
  * @param vlist The arguments to use to fill out the format string
  * @return The number of bytes sent
- * @deffunc int ap_vrprintf(request_rec *r, const char *fmt, va_list vlist)
+ * @deffunc int ap_vrprintf(request_rec *r, const AnsiChar *fmt, va_list vlist)
  }
-function ap_vrprintf(r: Prequest_rec; const fmt: PChar; vlist: va_list): Integer;
+function ap_vrprintf(r: Prequest_rec; const fmt: PAnsiChar; vlist: va_list): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_vrprintf' + LibSuff12;
 
@@ -443,12 +443,12 @@ function ap_vrprintf(r: Prequest_rec; const fmt: PChar; vlist: va_list): Integer
  * @param fmt The format string
  * @param ... The arguments to use to fill out the format string
  * @return The number of bytes sent
- * @deffunc int ap_rprintf(request_rec *r, const char *fmt, ...)
+ * @deffunc int ap_rprintf(request_rec *r, const AnsiChar *fmt, ...)
  }
-function ap_rprintf(r: Prequest_rec; const fmt: PChar; others: array of const): Integer;
+function ap_rprintf(r: Prequest_rec; const fmt: PAnsiChar; others: array of const): Integer;
  cdecl; external LibHTTPD name 'ap_rprintf';
 
-//AP_DECLARE_NONSTD(int) ap_rprintf(request_rec *r, const char *fmt,...)
+//AP_DECLARE_NONSTD(int) ap_rprintf(request_rec *r, const AnsiChar *fmt,...)
 //				__attribute__((format(printf,2,3)));
 
 {
@@ -478,9 +478,9 @@ function ap_index_of_response(status: Integer): Integer;
  * passed, "500 Internal Server Error" will be returned. 
  * @param status The HTTP status code
  * @return The Status-Line
- * @deffunc const char *ap_get_status_line(int status)
+ * @deffunc const AnsiChar *ap_get_status_line(int status)
  }
-function ap_get_status_line(status: Integer): PChar;
+function ap_get_status_line(status: Integer): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_get_status_line' + LibSuff4;
 
@@ -523,9 +523,9 @@ function ap_should_client_block(r: Prequest_rec): Integer;
  * @param bufsiz The size of the buffer
  * @return Number of bytes inserted into the buffer.  When done reading, 0
  *         if EOF, or -1 if there was an error
- * @deffunc long ap_get_client_block(request_rec *r, char *buffer, apr_size_t bufsiz)
+ * @deffunc long ap_get_client_block(request_rec *r, AnsiChar *buffer, apr_size_t bufsiz)
  }
-function ap_get_client_block(r: Prequest_rec; buffer: PChar; bufsiz: apr_size_t): cLong;
+function ap_get_client_block(r: Prequest_rec; buffer: PAnsiChar; bufsiz: apr_size_t): cLong;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_get_client_block' + LibSuff12;
 
@@ -588,9 +588,9 @@ procedure ap_note_digest_auth_failure(r: Prequest_rec);
  *         seemed to be in use, or DECLINED if there was authentication but 
  *         it wasn't Basic (in which case, the caller should presumably 
  *         decline as well).
- * @deffunc int ap_get_basic_auth_pw(request_rec *r, const char **pw)
+ * @deffunc int ap_get_basic_auth_pw(request_rec *r, const AnsiChar **pw)
  }
-function ap_get_basic_auth_pw(r: Prequest_rec; pw: PPChar): Integer;
+function ap_get_basic_auth_pw(r: Prequest_rec; pw: PPAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_get_basic_auth_pw' + LibSuff8;
 
@@ -603,9 +603,9 @@ function ap_get_basic_auth_pw(r: Prequest_rec; pw: PPChar): Integer;
  * </pre>
  * @param r The current request
  * @param uri The uri to break apart
- * @deffunc void ap_parse_uri(request_rec *r, const char *uri)
+ * @deffunc void ap_parse_uri(request_rec *r, const AnsiChar *uri)
  }
-procedure ap_parse_uri(r: Prequest_rec; const uri: PChar);
+procedure ap_parse_uri(r: Prequest_rec; const uri: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_parse_uri' + LibSuff8;
 
@@ -618,9 +618,9 @@ procedure ap_parse_uri(r: Prequest_rec; const uri: PChar);
  * @return The length of the line, if successful
  *         n, if the line is too big to fit in the buffer
  *         -1 for miscellaneous errors
- * @deffunc int ap_method_number_of(const char *method)
+ * @deffunc int ap_method_number_of(const AnsiChar *method)
  }
-function ap_getline(s: PChar; n: Integer; r: Prequest_rec; fold: Integer): Integer;
+function ap_getline(s: PAnsiChar; n: Integer; r: Prequest_rec; fold: Integer): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_getline' + LibSuff16;
 
@@ -647,7 +647,7 @@ function ap_getline(s: PChar; n: Integer; r: Prequest_rec; fold: Integer): Integ
  *         Other errors where appropriate
  }
 {#if APR_CHARSET_EBCDIC
-AP_DECLARE(apr_status_t) ap_rgetline(char **s, apr_size_t n, 
+AP_DECLARE(apr_status_t) ap_rgetline(AnsiChar **s, apr_size_t n, 
                                      apr_size_t *read,
                                      request_rec *r, int fold,
                                      apr_bucket_brigade *bb);
@@ -656,7 +656,7 @@ AP_DECLARE(apr_status_t) ap_rgetline(char **s, apr_size_t n,
         ap_rgetline_core((s), (n), (read), (r), (fold), (bb))
 #endif}
 
-{AP_DECLARE(apr_status_t) ap_rgetline_core(char **s, apr_size_t n,
+{AP_DECLARE(apr_status_t) ap_rgetline_core(AnsiChar **s, apr_size_t n,
                                           apr_size_t *read,
                                           request_rec *r, int fold,
                                           apr_bucket_brigade *bb);}
@@ -667,7 +667,7 @@ AP_DECLARE(apr_status_t) ap_rgetline(char **s, apr_size_t n,
  * @param method A string containing a valid HTTP method
  * @return The method number
  }
-function ap_method_number_of(const method: PChar): Integer;
+function ap_method_number_of(const method: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_method_number_of' + LibSuff4;
 
@@ -678,7 +678,7 @@ function ap_method_number_of(const method: PChar): Integer;
  * @param methnum An integer value corresponding to an internal method number
  * @return The name corresponding to the method number
  }
-function ap_method_name_of(p: Papr_pool_t; methnum: Integer): PChar;
+function ap_method_name_of(p: Papr_pool_t; methnum: Integer): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_method_name_of' + LibSuff8;
 
@@ -700,7 +700,7 @@ type
   ap_HOOK_post_read_request_t = function(r: Prequest_rec): Integer; cdecl;
 
 procedure ap_hook_post_read_request(pf: ap_HOOK_post_read_request_t;
- const aszPre: PPChar; const aszSucc: PPChar; nOrder: Integer);
+ const aszPre: PPAnsiChar; const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_post_read_request' + LibSuff16;
 
@@ -715,7 +715,7 @@ type
   ap_HOOK_log_transaction_t = function(r: Prequest_rec): Integer; cdecl;
 
 procedure ap_hook_log_transaction(pf: ap_HOOK_log_transaction_t;
- const aszPre: PPChar; const aszSucc: PPChar; nOrder: Integer);
+ const aszPre: PPAnsiChar; const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_log_transaction' + LibSuff16;
 
@@ -724,13 +724,13 @@ procedure ap_hook_log_transaction(pf: ap_HOOK_log_transaction_t;
  * allows Apache modules to easily extend the methods that Apache understands
  * @param r The current request
  * @return The http method from the request
- * @deffunc const char *ap_run_http_method(const request_rec *r)
+ * @deffunc const AnsiChar *ap_run_http_method(const request_rec *r)
  }
 type
-  ap_HOOK_http_method_t = function(const r: Prequest_rec): PChar; cdecl;
+  ap_HOOK_http_method_t = function(const r: Prequest_rec): PAnsiChar; cdecl;
 
 procedure ap_hook_http_method(pf: ap_HOOK_http_method_t;
- const aszPre: PPChar; const aszSucc: PPChar; nOrder: Integer);
+ const aszPre: PPAnsiChar; const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_http_method' + LibSuff16;
 
@@ -744,7 +744,7 @@ type
   ap_HOOK_default_port_t = function(const r: Prequest_rec): apr_port_t; cdecl;
 
 procedure ap_hook_default_port(pf: ap_HOOK_default_port_t;
- const aszPre: PPChar; const aszSucc: PPChar; nOrder: Integer);
+ const aszPre: PPAnsiChar; const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_default_port' + LibSuff16;
 
@@ -762,7 +762,7 @@ type
     { The error code }
     status: Integer;
     { The error string }
-    data: PChar;
+    data: PAnsiChar;
   end;
   Pap_bucket_error = ^ap_bucket_error;
 
@@ -782,10 +782,10 @@ type
  * @param buf An optional error string to put in the bucket.
  * @param p A pool to allocate out of.
  * @return The new bucket, or NULL if allocation failed
- * @deffunc apr_bucket *ap_bucket_error_make(apr_bucket *b, int error, const char *buf, apr_pool_t *p)
+ * @deffunc apr_bucket *ap_bucket_error_make(apr_bucket *b, int error, const AnsiChar *buf, apr_pool_t *p)
  }
 function ap_bucket_error_make(b: Papr_bucket; error: Integer;
- const buf: PChar; p: Papr_pool_t): Papr_bucket;
+ const buf: PAnsiChar; p: Papr_pool_t): Papr_bucket;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_bucket_error_make' + LibSuff16;
 
@@ -796,9 +796,9 @@ function ap_bucket_error_make(b: Papr_bucket; error: Integer;
  * @param p A pool to allocate the error string out of.
  * @param list The bucket allocator from which to allocate the bucket
  * @return The new bucket, or NULL if allocation failed
- * @deffunc apr_bucket *ap_bucket_error_create(int error, const char *buf, apr_pool_t *p, apr_bucket_alloc_t *list)
+ * @deffunc apr_bucket *ap_bucket_error_create(int error, const AnsiChar *buf, apr_pool_t *p, apr_bucket_alloc_t *list)
  }
-function ap_bucket_error_create(error: Integer; const buf: PChar;
+function ap_bucket_error_create(error: Integer; const buf: PAnsiChar;
  p: Papr_pool_t; list: Papr_bucket_alloc_t): Papr_bucket;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_bucket_error_create' + LibSuff16;

packages/httpd20/src/http_request.inc

@@ -64,9 +64,9 @@ function ap_process_request_internal(r: Prequest_rec): Integer;
  * @param next_filter The first filter the sub_request should use.  If this is
  *                    NULL, it defaults to the first filter for the main request
  * @return The new request record
- * @deffunc request_rec * ap_sub_req_lookup_uri(const char *new_uri, const request_rec *r)
+ * @deffunc request_rec * ap_sub_req_lookup_uri(const AnsiChar *new_uri, const request_rec *r)
  }
-function ap_sub_req_lookup_uri(const new_uri: PChar;
+function ap_sub_req_lookup_uri(const new_uri: PAnsiChar;
  const r: Prequest_rec; next_filter: Pap_filter_t): Prequest_rec;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_sub_req_lookup_uri' + LibSuff12;
@@ -79,9 +79,9 @@ function ap_sub_req_lookup_uri(const new_uri: PChar;
  * @param next_filter The first filter the sub_request should use.  If this is
  *                    NULL, it defaults to the first filter for the main request
  * @return The new request record
- * @deffunc request_rec * ap_sub_req_lookup_file(const char *new_file, const request_rec *r)
+ * @deffunc request_rec * ap_sub_req_lookup_file(const AnsiChar *new_file, const request_rec *r)
  }
-function ap_sub_req_lookup_file(const new_file: PChar;
+function ap_sub_req_lookup_file(const new_file: PAnsiChar;
  const r: Prequest_rec; next_filter: Pap_filter_t): Prequest_rec;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_sub_req_lookup_file' + LibSuff12;
@@ -119,9 +119,9 @@ function ap_sub_req_lookup_dirent(const finfo: Papr_finfo_t;
  * @param next_filter The first filter the sub_request should use.  If this is
  *                    NULL, it defaults to the first filter for the main request
  * @return The new request record
- * @deffunc request_rec * ap_sub_req_method_uri(const char *method, const char *new_uri, const request_rec *r)
+ * @deffunc request_rec * ap_sub_req_method_uri(const AnsiChar *method, const AnsiChar *new_uri, const request_rec *r)
  }
-function ap_sub_req_method_uri(const method, new_uri: PChar;
+function ap_sub_req_method_uri(const method, new_uri: PAnsiChar;
  const r: Prequest_rec; next_filter: Pap_filter_t): Prequest_rec;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_sub_req_method_uri' + LibSuff16;
@@ -166,9 +166,9 @@ procedure ap_destroy_sub_req(r: Prequest_rec);
  * Redirect the current request to some other uri
  * @param new_uri The URI to replace the current request with
  * @param r The current request
- * @deffunc void ap_internal_redirect(const char *new_uri, request_rec *r)
+ * @deffunc void ap_internal_redirect(const AnsiChar *new_uri, request_rec *r)
  }
-procedure ap_internal_redirect(const new_uri: PChar; r: Prequest_rec);
+procedure ap_internal_redirect(const new_uri: PAnsiChar; r: Prequest_rec);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_internal_redirect' + LibSuff8;
 
@@ -178,9 +178,9 @@ procedure ap_internal_redirect(const new_uri: PChar; r: Prequest_rec);
  * an internal redirect.
  * @param new_uri The URI to replace the current request with.
  * @param r The current request
- * @deffunc void ap_internal_redirect_handler(const char *new_uri, request_rec *r)
+ * @deffunc void ap_internal_redirect_handler(const AnsiChar *new_uri, request_rec *r)
  }
-procedure ap_internal_redirect_handler(const new_uri: PChar; r: Prequest_rec);
+procedure ap_internal_redirect_handler(const new_uri: PAnsiChar; r: Prequest_rec);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_internal_redirect_handler' + LibSuff8;
 
@@ -303,8 +303,8 @@ procedure ap_die(type_: Integer; r: Prequest_rec);
 type
   ap_HOOK_create_request_t = function (r: Prequest_rec): Integer; cdecl;
 
-procedure ap_hook_create_request(pf: ap_HOOK_create_request_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_create_request(pf: ap_HOOK_create_request_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_create_request' + LibSuff16;
 
@@ -319,8 +319,8 @@ procedure ap_hook_create_request(pf: ap_HOOK_create_request_t; const aszPre: PPC
 type
   ap_HOOK_translate_name_t = function (r: Prequest_rec): Integer; cdecl;
 
-procedure ap_hook_translate_name(pf: ap_HOOK_translate_name_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_translate_name(pf: ap_HOOK_translate_name_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_translate_name' + LibSuff16;
 
@@ -340,8 +340,8 @@ procedure ap_hook_translate_name(pf: ap_HOOK_translate_name_t; const aszPre: PPC
 type
   ap_HOOK_map_to_storage_t = function (r: Prequest_rec): Integer; cdecl;
 
-procedure ap_hook_map_to_storage(pf: ap_HOOK_map_to_storage_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_map_to_storage(pf: ap_HOOK_map_to_storage_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_map_to_storage' + LibSuff16;
 
@@ -360,8 +360,8 @@ procedure ap_hook_map_to_storage(pf: ap_HOOK_map_to_storage_t; const aszPre: PPC
 type
   ap_HOOK_check_user_id_t = function (r: Prequest_rec): Integer; cdecl;
 
-procedure ap_hook_check_user_id(pf: ap_HOOK_check_user_id_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_check_user_id(pf: ap_HOOK_check_user_id_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_check_user_id' + LibSuff16;
 
@@ -375,8 +375,8 @@ procedure ap_hook_check_user_id(pf: ap_HOOK_check_user_id_t; const aszPre: PPCha
 type
   ap_HOOK_fixups_t = function (r: Prequest_rec): Integer; cdecl;
 
-procedure ap_hook_fixups(pf: ap_HOOK_fixups_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_fixups(pf: ap_HOOK_fixups_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_fixups' + LibSuff16;
 
@@ -391,8 +391,8 @@ procedure ap_hook_fixups(pf: ap_HOOK_fixups_t; const aszPre: PPChar;
 type
   ap_HOOK_type_checker_t = function (r: Prequest_rec): Integer; cdecl;
 
-procedure ap_hook_type_checker(pf: ap_HOOK_type_checker_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_type_checker(pf: ap_HOOK_type_checker_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_type_checker' + LibSuff16;
 
@@ -409,8 +409,8 @@ procedure ap_hook_type_checker(pf: ap_HOOK_type_checker_t; const aszPre: PPChar;
 type
   ap_HOOK_access_checker_t = function (r: Prequest_rec): Integer; cdecl;
 
-procedure ap_hook_access_checker(pf: ap_HOOK_access_checker_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_access_checker(pf: ap_HOOK_access_checker_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_access_checker' + LibSuff16;
 
@@ -428,8 +428,8 @@ procedure ap_hook_access_checker(pf: ap_HOOK_access_checker_t; const aszPre: PPC
 type
   ap_HOOK_auth_checker_t = function (r: Prequest_rec): Integer; cdecl;
 
-procedure ap_hook_auth_checker(pf: ap_HOOK_auth_checker_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_auth_checker(pf: ap_HOOK_auth_checker_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_auth_checker' + LibSuff16;
 
@@ -441,8 +441,8 @@ procedure ap_hook_auth_checker(pf: ap_HOOK_auth_checker_t; const aszPre: PPChar;
 type
   ap_HOOK_insert_filter_t = procedure (r: Prequest_rec); cdecl;
 
-procedure ap_hook_insert_filter(pf: ap_HOOK_insert_filter_t; const aszPre: PPChar;
- const aszSucc: PPChar; nOrder: Integer);
+procedure ap_hook_insert_filter(pf: ap_HOOK_insert_filter_t; const aszPre: PPAnsiChar;
+ const aszSucc: PPAnsiChar; nOrder: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_hook_insert_filter' + LibSuff16;
 

packages/httpd20/src/http_vhost.inc

@@ -43,11 +43,11 @@ procedure ap_fini_vhost_config(p: Papr_pool_t; main_server: Pserver_rec);
  * @param hostname The hostname in the VirtualHost statement
  * @param s The list of Virtual Hosts.
  }
-//const char *ap_parse_vhost_addrs(apr_pool_t *p, const char *hostname, server_rec *s);
+//const AnsiChar *ap_parse_vhost_addrs(apr_pool_t *p, const AnsiChar *hostname, server_rec *s);
 
 { handle NameVirtualHost directive }
-//const char *ap_set_name_virtual_host (cmd_parms *cmd, void *dummy,
-//				      const char *arg);
+//const AnsiChar *ap_set_name_virtual_host (cmd_parms *cmd, void *dummy,
+//				      const AnsiChar *arg);
 
 {
  * given an ip address only, give our best guess as to what vhost it is 
@@ -74,9 +74,9 @@ procedure ap_update_vhost_from_headers(r: Prequest_rec);
  * @param port The port from the headers
  * @return return 1 if the host:port matches any of the aliases of r->server,
  * return 0 otherwise
- * @deffunc int ap_matches_request_vhost(request_rec *r, const char *host, apr_port_t port)
+ * @deffunc int ap_matches_request_vhost(request_rec *r, const AnsiChar *host, apr_port_t port)
  }
-function ap_matches_request_vhost(r: Prequest_rec; const host: PChar;
+function ap_matches_request_vhost(r: Prequest_rec; const host: PAnsiChar;
  port: apr_port_t): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_matches_request_vhost' + LibSuff12;

packages/httpd20/src/httpd.inc

@@ -312,7 +312,7 @@ type
     major: Integer;              {< major number }
     minor: Integer;              {< minor number }
     patch: Integer;              {< patch number }
-    add_string: PChar; {< additional string like "-dev" }
+    add_string: PAnsiChar; {< additional string like "-dev" }
   end;
   
   Pap_version_t = ^ap_version_t;
@@ -331,7 +331,7 @@ procedure ap_get_server_revision(version: Pap_version_t);
  * Get the server version string
  * @return The server version string
  }
-function ap_get_server_version: PChar;
+function ap_get_server_version: PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_get_server_version' + LibSuff0;
 
@@ -340,7 +340,7 @@ function ap_get_server_version: PChar;
  * @param pconf The pool to allocate the component from
  * @param component The string to add
 }
-procedure ap_add_version_component(pconf: Papr_pool_t; const component: PChar);
+procedure ap_add_version_component(pconf: Papr_pool_t; const component: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_add_version_component' + LibSuff8;
 
@@ -348,7 +348,7 @@ procedure ap_add_version_component(pconf: Papr_pool_t; const component: PChar);
  * Get the date a time that the server was built
  * @return The server build time string
 }
-function ap_get_server_built: PChar;
+function ap_get_server_built: PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_get_server_built' + LibSuff0;
 
@@ -580,7 +580,7 @@ type
   Phtaccess_result = ^htaccess_result;
   htaccess_result = record
     { the directory to which this applies }
-    dir: PChar;
+    dir: PAnsiChar;
     { the overrides allowed for the .htaccess file }
     override_: Integer;
     { the configuration directives }
@@ -619,9 +619,9 @@ type
     { Number of command line arguments passed to the program }
     argc: Integer;
     { The command line arguments }
-    argv: PChar;
+    argv: PAnsiChar;
     { The program name used to execute the program }
-    short_name: PChar;
+    short_name: PAnsiChar;
   end;
 
   { A structure that represents the current request }
@@ -646,7 +646,7 @@ type
      * protocol.c should ever touch...
     }
     { First line of request }
-    the_request: PChar;
+    the_request: PAnsiChar;
     { HTTP/0.9, "simple" request (e.g. GET /foo\n w/no headers) }
     assbackwards: Integer;
     { A proxy request (calculated during post_read_request/translate_name)
@@ -657,17 +657,17 @@ type
     { HEAD request, as opposed to GET }
     header_only: Integer;
     { Protocol string, as given to us, or HTTP/0.9 }
-    protocol: PChar;
+    protocol: PAnsiChar;
     { Protocol version number of protocol; 1.1 = 1001 }
     proto_num: Integer;
     { Host, as set by full URI or Host: }
-    hostname: PChar;
+    hostname: PAnsiChar;
 
     { Time when the request started }
     request_time: apr_time_t;
 
     { Status line, if set by script }
-    status_line: PChar;
+    status_line: PAnsiChar;
     { Status line }
     status: Integer;
 
@@ -676,7 +676,7 @@ type
      }
 
     { Request method (eg. GET, HEAD, POST, etc.) }
-    method: PChar;
+    method: PAnsiChar;
     { M_GET, M_POST, etc. }
     method_number: Integer;
 
@@ -718,7 +718,7 @@ type
     { sending chunked transfer-coding }
     chunked: Integer;
     { The Range: header }
-    range: PChar;
+    range: PAnsiChar;
     { The "real" content length }
     clength: apr_off_t;
 
@@ -764,22 +764,22 @@ type
      * they should not be modified in place.
      }
     { The content-type for the current request }
-    content_type: PChar;	// Break these out --- we dispatch on 'em
+    content_type: PAnsiChar;	// Break these out --- we dispatch on 'em
     { The handler string that we use to call a handler function }
-    handler: PChar;	// What we *really* dispatch on
+    handler: PAnsiChar;	// What we *really* dispatch on
 
     { How to encode the data }
-    content_encoding: PChar;
+    content_encoding: PAnsiChar;
     { Array of strings representing the content languages }
     content_languages: Papr_array_header_t;
 
     { variant list validator (if negotiated) }
-    vlist_validator: PChar;
+    vlist_validator: PAnsiChar;
 
     { If an authentication check was made, this gets set to the user name. }
-    user: PChar;
+    user: PAnsiChar;
     { If an authentication check was made, this gets set to the auth type. }
-    ap_auth_type: PChar;
+    ap_auth_type: PAnsiChar;
 
     { This response can not be cached }
     no_cache: Integer;
@@ -791,18 +791,18 @@ type
      }
 
     { The URI without any parsing performed }
-    unparsed_uri: PChar;
+    unparsed_uri: PAnsiChar;
     { The path portion of the URI }
-    uri: PChar;
+    uri: PAnsiChar;
     { The filename on disk corresponding to this response }
-    filename: PChar;
+    filename: PAnsiChar;
     { XXX: What does this mean? Please define "canonicalize" -aaron }
     { The true filename, we canonicalize r->filename if these don't match }
-    canonical_filename: PChar;
+    canonical_filename: PAnsiChar;
     { The PATH_INFO extracted from this request }
-    path_info: PChar;
+    path_info: PAnsiChar;
     { The QUERY_ARGS extracted from this request }
-    args: PChar;
+    args: PAnsiChar;
     {  finfo.protection (st_mode) set to zero if no such file }
     finfo: apr_finfo_t;
     { A struct containing the components of URI }
@@ -885,14 +885,14 @@ type
     remote_addr: Papr_sockaddr_t;
 
     { Client's IP address }
-    remote_ip: PChar;
+    remote_ip: PAnsiChar;
     { Client's DNS name, if known.  NULL if DNS hasn't been checked,
      *  "" if it has and no address was found.  N.B. Only access this though
      * get_remote_host() }
-    remote_host: PChar;
+    remote_host: PAnsiChar;
     { Only ever set if doing rfc1413 lookups.  N.B. Only access this through
      *  get_remote_logname() }
-    remote_logname: PChar;
+    remote_logname: PAnsiChar;
 
     { Are we still talking? }
     flags: Cardinal;
@@ -914,10 +914,10 @@ type
     { How many times have we used it? }
     keepalives: Integer;
     { server IP address }
-    local_ip: PChar;
+    local_ip: PAnsiChar;
     { used for ap_get_server_name when UseCanonicalName is set to DNS
      *  (ignores setting of HostnameLookups) }
-    local_host: PChar;
+    local_host: PAnsiChar;
 
     { ID of this connection; unique at any point in time }
     id: Integer; // long
@@ -949,7 +949,7 @@ type
     { The bound port, for this server }
     host_port: apr_port_t;
     { The name given in <VirtualHost> }
-    virthost: PChar;
+    virthost: PAnsiChar;
   end;
 
   { A structure to store information for each virtual server }
@@ -960,23 +960,23 @@ type
     next: Pserver_rec;
 
     { The name of the server }
-    defn_name: PChar;
+    defn_name: PAnsiChar;
     { The line of the config file that the server was defined on }
     defn_line_number: Integer;
 
     { Contact information }
 
     { The admin's contact information }
-    server_admin: PChar;
+    server_admin: PAnsiChar;
     { The server hostname }
-    server_hostname: PChar;
+    server_hostname: PAnsiChar;
     { for redirects, etc. }
     port: apr_port_t;
 
     { Log files --- note that transfer log is now in the modules... }
 
     { The name of the error log }
-    error_fname: PChar;
+    error_fname: PAnsiChar;
     { A file descriptor that references the error log }
     error_log: Papr_file_t;
     { The log level for this server }
@@ -1006,7 +1006,7 @@ type
     keep_alive: Integer;
 
     { Pathname for ServerPath }
-    path: PChar;
+    path: PAnsiChar;
     { Length of path }
     pathlen: Integer;
 
@@ -1075,7 +1075,7 @@ const DEFAULT_VHOST_ADDR = $ffffffff;//ul
  * @param intype The field to examine
  * @return A copy of the field minus any parameters
 }
-function ap_field_noparam(p: Papr_pool_t; const intype: PChar): PChar;
+function ap_field_noparam(p: Papr_pool_t; const intype: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_field_noparam' + LibSuff8;
 
@@ -1087,13 +1087,13 @@ function ap_field_noparam(p: Papr_pool_t; const intype: PChar): PChar;
  * @param gmt Convert the time for GMT?
  * @return The string that represents the specified time
 }
-function ap_ht_time(p: Papr_pool_t; t: apr_time_t; const fmt: PChar; gmt: Integer): PChar;
+function ap_ht_time(p: Papr_pool_t; t: apr_time_t; const fmt: PAnsiChar; gmt: Integer): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_ht_time' + LibSuff20;
 
-{ String handling. The *_nc variants allow you to use non-const char **s as
-   arguments (unfortunately C won't automatically convert a char ** to a const
-   char **) }
+{ String handling. The *_nc variants allow you to use non-const AnsiChar **s as
+   arguments (unfortunately C won't automatically convert a AnsiChar ** to a const
+   AnsiChar **) }
 
 {
  * Get the characters until the first occurance of a specified character
@@ -1102,7 +1102,7 @@ function ap_ht_time(p: Papr_pool_t; t: apr_time_t; const fmt: PChar; gmt: Intege
  * @param stop The character to stop at
  * @return A copy of the characters up to the first stop character
 }
-function ap_getword(p: Papr_pool_t; const line: PPChar; stop: Char): PChar;
+function ap_getword(p: Papr_pool_t; const line: PPAnsiChar; stop: AnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_getword' + LibSuff12;
 
@@ -1112,9 +1112,9 @@ function ap_getword(p: Papr_pool_t; const line: PPChar; stop: Char): PChar;
  * @param line The string to get the characters from
  * @param stop The character to stop at
  * @return A copy of the characters up to the first stop character
- * @note This is the same as ap_getword(), except it doesn't use const char **.
+ * @note This is the same as ap_getword(), except it doesn't use const AnsiChar **.
 }
-function ap_getword_nc(p: Papr_pool_t; const line: PPChar; stop: Char): PChar;
+function ap_getword_nc(p: Papr_pool_t; const line: PPAnsiChar; stop: AnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_getword_nc' + LibSuff12;
 
@@ -1125,7 +1125,7 @@ function ap_getword_nc(p: Papr_pool_t; const line: PPChar; stop: Char): PChar;
  * @param line The string to traverse
  * @return The first word in the line
 }
-function ap_getword_white(p: Papr_pool_t; const line: PPChar): PChar;
+function ap_getword_white(p: Papr_pool_t; const line: PPAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_getword_white' + LibSuff8;
 
@@ -1135,9 +1135,9 @@ function ap_getword_white(p: Papr_pool_t; const line: PPChar): PChar;
  * @param p The pool to allocate memory from
  * @param line The string to traverse
  * @return The first word in the line
- * @note The same as ap_getword_white(), except it doesn't use const char **.
+ * @note The same as ap_getword_white(), except it doesn't use const AnsiChar **.
 }
-function ap_getword_white_nc(p: Papr_pool_t; const line: PPChar): PChar;
+function ap_getword_white_nc(p: Papr_pool_t; const line: PPAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_getword_white_nc' + LibSuff8;
 
@@ -1149,7 +1149,7 @@ function ap_getword_white_nc(p: Papr_pool_t; const line: PPChar): PChar;
  * @return A copy of all caracters after the first occurance of the specified
  *         character
 }
-function ap_getword_nulls(p: Papr_pool_t; const line: PPChar; stop: Char): PChar;
+function ap_getword_nulls(p: Papr_pool_t; const line: PPAnsiChar; stop: AnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_getword_nulls' + LibSuff12;
 
@@ -1160,9 +1160,9 @@ function ap_getword_nulls(p: Papr_pool_t; const line: PPChar; stop: Char): PChar
  * @param stop The character to start at
  * @return A copy of all caracters after the first occurance of the specified
  *         character
- * @note The same as ap_getword_nulls(), except it doesn't use const char **.
+ * @note The same as ap_getword_nulls(), except it doesn't use const AnsiChar **.
 }
-function ap_getword_nulls_nc(p: Papr_pool_t; const line: PPChar; stop: Char): PChar;
+function ap_getword_nulls_nc(p: Papr_pool_t; const line: PPAnsiChar; stop: AnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_getword_nulls_nc' + LibSuff12;
 
@@ -1172,7 +1172,7 @@ function ap_getword_nulls_nc(p: Papr_pool_t; const line: PPChar; stop: Char): PC
  * @param line The line to traverse
  * @return A copy of the string
 }
-function ap_getword_conf(p: Papr_pool_t; const line: PPChar): PChar;
+function ap_getword_conf(p: Papr_pool_t; const line: PPAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_getword_conf' + LibSuff8;
 
@@ -1181,9 +1181,9 @@ function ap_getword_conf(p: Papr_pool_t; const line: PPChar): PChar;
  * @param p The pool to allocate from
  * @param line The line to traverse
  * @return A copy of the string
- * @note The same as ap_getword_conf(), except it doesn't use const char **.
+ * @note The same as ap_getword_conf(), except it doesn't use const AnsiChar **.
 }
-function ap_getword_conf_nc(p: Papr_pool_t; const line: PPChar): PChar;
+function ap_getword_conf_nc(p: Papr_pool_t; const line: PPAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_getword_conf_nc' + LibSuff8;
 
@@ -1196,7 +1196,7 @@ function ap_getword_conf_nc(p: Papr_pool_t; const line: PPChar): PChar;
  * @param word The string to check
  * @return The string with the replaced environment variables
 }
-function ap_resolve_env(p: Papr_pool_t; const word_: PChar; accept_white: Integer): PChar;
+function ap_resolve_env(p: Papr_pool_t; const word_: PAnsiChar; accept_white: Integer): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_resolve_env' + LibSuff8;
 
@@ -1209,7 +1209,7 @@ function ap_resolve_env(p: Papr_pool_t; const word_: PChar; accept_white: Intege
  * address of field is shifted to the next non-comma, non-whitespace
  * character.  len is the length of the item excluding any beginning whitespace.
 }
-function ap_size_list_item(const field: PPChar; len: Integer): PChar;
+function ap_size_list_item(const field: PPAnsiChar; len: Integer): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_size_list_item' + LibSuff8;
 
@@ -1223,7 +1223,7 @@ function ap_size_list_item(const field: PPChar; len: Integer): PChar;
  *         item (or NULL if none) and the address pointed to by field is
  *         shifted to the next non-comma, non-whitespace.
 }
-function ap_get_list_item(p: Papr_pool_t; const field: PPChar): PChar;
+function ap_get_list_item(p: Papr_pool_t; const field: PPAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_get_list_item' + LibSuff8;
 
@@ -1235,7 +1235,7 @@ function ap_get_list_item(p: Papr_pool_t; const field: PPChar): PChar;
  * @param tok The token to search for
  * @return 1 if found, 0 if not found.
 }
-function ap_find_list_item(p: Papr_pool_t; const line, tok: PChar): Integer;
+function ap_find_list_item(p: Papr_pool_t; const line, tok: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_find_list_item' + LibSuff12;
 
@@ -1249,7 +1249,7 @@ function ap_find_list_item(p: Papr_pool_t; const line, tok: PChar): Integer;
  * @param accept_white Is it delimited by whitespace
  * @return the first non-white byte after the token
 }
-function ap_get_token(p: Papr_pool_t; const accept_line: PPChar; accept_white: Integer): PChar;
+function ap_get_token(p: Papr_pool_t; const accept_line: PPAnsiChar; accept_white: Integer): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_get_token' + LibSuff12;
 
@@ -1260,7 +1260,7 @@ function ap_get_token(p: Papr_pool_t; const accept_line: PPChar; accept_white: I
  * @param tok The token to find
  * @return 1 if the token is found, 0 otherwise
 }
-function ap_find_token(p: Papr_pool_t; const line, tok: PChar): Integer;
+function ap_find_token(p: Papr_pool_t; const line, tok: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_find_token' + LibSuff12;
 
@@ -1271,7 +1271,7 @@ function ap_find_token(p: Papr_pool_t; const line, tok: PChar): Integer;
  * @param tok The token to find
  * @return 1 if the token is found, 0 otherwise
 }
-function ap_find_last_token(p: Papr_pool_t; const line, tok: PChar): Integer;
+function ap_find_last_token(p: Papr_pool_t; const line, tok: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_find_last_token' + LibSuff12;
 
@@ -1280,7 +1280,7 @@ function ap_find_last_token(p: Papr_pool_t; const line, tok: PChar): Integer;
  * @param u The string to check
  * @return 1 if URI, 0 otherwise
 }
-function ap_is_url(const u: PChar): Integer;
+function ap_is_url(const u: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_is_url' + LibSuff4;
 
@@ -1289,7 +1289,7 @@ function ap_is_url(const u: PChar): Integer;
  * @param url The url to unescape
  * @return 0 on success, non-zero otherwise
 }
-function ap_unescape_url(url: PChar): Integer;
+function ap_unescape_url(url: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_unescape_url' + LibSuff4;
 
@@ -1298,7 +1298,7 @@ function ap_unescape_url(url: PChar): Integer;
  * @param url The url to unescape
  * @return 0 on success, non-zero otherwise
 }
-function ap_unescape_url_keep2f(url: PChar): Integer;
+function ap_unescape_url_keep2f(url: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_unescape_url_keep2f' + LibSuff4;
 
@@ -1306,7 +1306,7 @@ function ap_unescape_url_keep2f(url: PChar): Integer;
  * Convert all double slashes to single slashes
  * @param name The string to convert
 }
-procedure ap_no2slash(name: PChar);
+procedure ap_no2slash(name: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_no2slash' + LibSuff4;
 
@@ -1315,7 +1315,7 @@ procedure ap_no2slash(name: PChar);
  * any leading ../ or /../ substrings.
  * @param name the file name to parse
 }
-procedure ap_getparents(name: PChar);
+procedure ap_getparents(name: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_getparents' + LibSuff4;
 
@@ -1325,7 +1325,7 @@ procedure ap_getparents(name: PChar);
  * @param s The path to convert
  * @return The converted URL
 }
-function ap_escape_path_segment(p: Papr_pool_t; const s: PChar): PChar;
+function ap_escape_path_segment(p: Papr_pool_t; const s: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_escape_path_segment' + LibSuff8;
 
@@ -1337,12 +1337,12 @@ function ap_escape_path_segment(p: Papr_pool_t; const s: PChar): PChar;
  *        with a '/' in it (and thus does not prefix "./")
  * @return The converted URL
 }
-function ap_os_escape_path(p: Papr_pool_t; const path: PChar; partial: Integer): PChar;
+function ap_os_escape_path(p: Papr_pool_t; const path: PAnsiChar; partial: Integer): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_os_escape_path' + LibSuff12;
 
 { @see ap_os_escape_path }
-function ap_escape_uri(p: Papr_pool_t; const path: PChar): PChar;
+function ap_escape_uri(p: Papr_pool_t; const path: PAnsiChar): PAnsiChar;
 
 {
  * Escape an html string
@@ -1350,7 +1350,7 @@ function ap_escape_uri(p: Papr_pool_t; const path: PChar): PChar;
  * @param s The html to escape
  * @return The escaped string
  }
-function ap_escape_html(p: Papr_pool_t; const s: PChar): PChar;
+function ap_escape_html(p: Papr_pool_t; const s: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_escape_html' + LibSuff8;
 
@@ -1360,7 +1360,7 @@ function ap_escape_html(p: Papr_pool_t; const s: PChar): PChar;
  * @param str The string to escape
  * @return The escaped string
  }
-function ap_escape_logitem(p: Papr_pool_t; const str: PChar): PChar;
+function ap_escape_logitem(p: Papr_pool_t; const str: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_escape_logitem' + LibSuff8;
 
@@ -1371,7 +1371,7 @@ function ap_escape_logitem(p: Papr_pool_t; const str: PChar): PChar;
  * @param buflen The buffer size for the escaped string (including \0)
  * @return The len of the escaped string (always < maxlen)
  }
-function ap_escape_errorlog_item(dest, source: PChar;
+function ap_escape_errorlog_item(dest, source: PAnsiChar;
  buflen: apr_size_t): apr_size_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_escape_errorlog_item' + LibSuff12;
@@ -1384,8 +1384,8 @@ function ap_escape_errorlog_item(dest, source: PChar;
  * @param r The current request
  * @return The server's hostname
  }
-function ap_construct_server(p: Papr_pool_t; const hostname: PChar;
- port: Papr_port_t; const r: Prequest_rec): PChar;
+function ap_construct_server(p: Papr_pool_t; const hostname: PAnsiChar;
+ port: Papr_port_t; const r: Prequest_rec): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_construct_server' + LibSuff16;
 
@@ -1395,7 +1395,7 @@ function ap_construct_server(p: Papr_pool_t; const hostname: PChar;
  * @param s The command to escape
  * @return The escaped shell command
  }
-function ap_escape_shell_cmd(p: Papr_pool_t; const s: PChar): PChar;
+function ap_escape_shell_cmd(p: Papr_pool_t; const s: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_escape_shell_cmd' + LibSuff8;
 
@@ -1404,7 +1404,7 @@ function ap_escape_shell_cmd(p: Papr_pool_t; const s: PChar): PChar;
  * @param path The path to count
  * @return The number of directories
  }
-function ap_count_dirs(const path: PChar): Integer;
+function ap_count_dirs(const path: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_count_dirs' + LibSuff4;
 
@@ -1419,7 +1419,7 @@ function ap_count_dirs(const path: PChar): Integer;
  * @note on platforms with drive letters, n = 0 returns the "/" root,
  * whereas n = 1 returns the "d:/" root.  On all other platforms, n = 0
  * returns the empty string.  }
-function ap_make_dirstr_prefix(const d, s: PChar; n: Integer): PChar;
+function ap_make_dirstr_prefix(const d, s: PAnsiChar; n: Integer): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_make_dirstr_prefix' + LibSuff12;
 
@@ -1430,7 +1430,7 @@ function ap_make_dirstr_prefix(const d, s: PChar; n: Integer): PChar;
  * @param s The file to get the parent of
  * @return A copy of the file's parent directory
  }
-function ap_make_dirstr_parent(p: Papr_pool_t; const s: PChar): PChar;
+function ap_make_dirstr_parent(p: Papr_pool_t; const s: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_make_dirstr_parent' + LibSuff8;
 
@@ -1446,7 +1446,7 @@ function ap_make_dirstr_parent(p: Papr_pool_t; const s: PChar): PChar;
  * names that need to remain canonical, unless you are merging an apr_dir_read
  * path and returned filename.  Otherwise, the result is not canonical.
  }
-function ap_make_full_path(a: Papr_pool_t; const dir, f: PChar): PChar;
+function ap_make_full_path(a: Papr_pool_t; const dir, f: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_make_full_path' + LibSuff12;
 
@@ -1458,7 +1458,7 @@ function ap_make_full_path(a: Papr_pool_t; const dir, f: PChar): PChar;
  * multiple forms of absolute paths.  This only reports if the path is absolute
  * in a canonical sense.
  }
-function ap_os_is_path_absolute(p: Papr_pool_t; const dir: PChar): Integer;
+function ap_os_is_path_absolute(p: Papr_pool_t; const dir: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_os_is_path_absolute' + LibSuff8;
 
@@ -1469,7 +1469,7 @@ function ap_os_is_path_absolute(p: Papr_pool_t; const dir: PChar): Integer;
  * @param str The string to check
  * @return 1 if the string has wildcards, 0 otherwise
  }
-function ap_is_matchexp(const str: PChar): Integer;
+function ap_is_matchexp(const str: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_is_matchexp' + LibSuff4;
 
@@ -1479,7 +1479,7 @@ function ap_is_matchexp(const str: PChar): Integer;
  * @param expected The pattern to match against
  * @return 1 if the two strings match, 0 otherwise
  }
-function ap_strcmp_match(const str, expected: PChar): Integer;
+function ap_strcmp_match(const str, expected: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_strcmp_match' + LibSuff8;
 
@@ -1490,7 +1490,7 @@ function ap_strcmp_match(const str, expected: PChar): Integer;
  * @param expected The pattern to match against
  * @return 1 if the two strings match, 0 otherwise
  }
-function ap_strcasecmp_match(const str, expected: PChar): Integer;
+function ap_strcasecmp_match(const str, expected: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_strcasecmp_match' + LibSuff8;
 
@@ -1501,7 +1501,7 @@ function ap_strcasecmp_match(const str, expected: PChar): Integer;
  * @return A pointer to the beginning of the substring
  * @remark See apr_strmatch() for a faster alternative
  }
-function ap_strcasestr(const s1, s2: PChar): PChar;
+function ap_strcasestr(const s1, s2: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_strcasestr' + LibSuff8;
 
@@ -1511,7 +1511,7 @@ function ap_strcasestr(const s1, s2: PChar): PChar;
  * @param prefix The prefix to strip away
  * @return A pointer relative to bigstring after prefix
  }
-function ap_stripprefix(const bigstring, prefix: PChar): PChar;
+function ap_stripprefix(const bigstring, prefix: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_stripprefix' + LibSuff8;
 
@@ -1521,7 +1521,7 @@ function ap_stripprefix(const bigstring, prefix: PChar): PChar;
  * @param bufcoded The encoded string
  * @return The decoded string
  }
-function ap_pbase64decode(p: Papr_pool_t; const bufcoded: PChar): PChar;
+function ap_pbase64decode(p: Papr_pool_t; const bufcoded: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_pbase64decode' + LibSuff8;
 
@@ -1531,7 +1531,7 @@ function ap_pbase64decode(p: Papr_pool_t; const bufcoded: PChar): PChar;
  * @param strin The plaintext string
  * @return The encoded string
  }
-function ap_pbase64encode(p: Papr_pool_t; string_: PChar): PChar;
+function ap_pbase64encode(p: Papr_pool_t; string_: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_pbase64encode' + LibSuff8;
 
@@ -1547,7 +1547,7 @@ function ap_pbase64encode(p: Papr_pool_t; string_: PChar): PChar;
  *   @li #REG_NEWLINE  - Match-any-character operators don't match new-line
  * @return The compiled regular expression
  }
-function ap_pregcomp(p: Papr_pool_t; const pattern: PChar; cflags: Integer): Pregex_t;
+function ap_pregcomp(p: Papr_pool_t; const pattern: PAnsiChar; cflags: Integer): Pregex_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_pregcomp' + LibSuff12;
 
@@ -1572,7 +1572,7 @@ procedure ap_pregfree(p: Papr_pool_t; reg: Pregex_t);
  *   @li #REG_NOTEOL - match-end-of-line operator always fails to match
  * @return 0 for successful match, #REG_NOMATCH otherwise
  }
-function ap_regexec(preg: Pregex_t; const string_: PChar;
+function ap_regexec(preg: Pregex_t; const string_: PAnsiChar;
  nmatch: size_t; pmatch: array of regmatch_t; eflags: Integer): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_regexec' + LibSuff20;
@@ -1585,7 +1585,7 @@ function ap_regexec(preg: Pregex_t; const string_: PChar;
  * @param errbuf_size The size of the buffer
 }
 function ap_regerror(errcode: Integer; preg: Pregex_t;
- errbuf: PChar; errbuf_size: size_t): size_t;
+ errbuf: PAnsiChar; errbuf_size: size_t): size_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_regerror' + LibSuff16;
 
@@ -1600,8 +1600,8 @@ function ap_regerror(errcode: Integer; preg: Pregex_t;
  * @param nmatch the nmatch returned from ap_pregex
  * @param pmatch the pmatch array returned from ap_pregex
 }
-function ap_pregsub(p: Papr_pool_t; const input, source: PChar;
- nmatch: size_t; pmatch: array of regmatch_t): PChar;
+function ap_pregsub(p: Papr_pool_t; const input, source: PAnsiChar;
+ nmatch: size_t; pmatch: array of regmatch_t): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_pregsub' + LibSuff20;
 
@@ -1610,7 +1610,7 @@ function ap_pregsub(p: Papr_pool_t; const input, source: PChar;
  * but nothing else because ;parameter=foo values are case sensitive.
  * @param s The content-type to convert to lowercase
 }
-procedure ap_content_type_tolower(s: PChar);
+procedure ap_content_type_tolower(s: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_content_type_tolower' + LibSuff4;
 
@@ -1618,7 +1618,7 @@ procedure ap_content_type_tolower(s: PChar);
  * convert a string to all lowercase
  * @param s The string to convert to lowercase
 }
-procedure ap_str_tolower(s: PChar);
+procedure ap_str_tolower(s: PAnsiChar);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_str_tolower' + LibSuff4;
 
@@ -1629,7 +1629,7 @@ procedure ap_str_tolower(s: PChar);
  * @param c The character to search for
  * @return The index of the first occurrence of c in str
 }
-function ap_ind(str: PChar; c: Char): Integer;
+function ap_ind(str: PAnsiChar; c: AnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_ind' + LibSuff8;
 
@@ -1640,7 +1640,7 @@ function ap_ind(str: PChar; c: Char): Integer;
  * @param c The character to search for
  * @return The index of the first occurrence of c in str
 }
-function ap_rind(str: PChar; c: Char): Integer;
+function ap_rind(str: PAnsiChar; c: AnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_rind' + LibSuff8;
 
@@ -1650,7 +1650,7 @@ function ap_rind(str: PChar; c: Char): Integer;
  * @param instring The string to search for "
  * @return A copy of the string with escaped quotes
 }
-function ap_escape_quotes(p: Papr_pool_t; const instring: PChar): PChar;
+function ap_escape_quotes(p: Papr_pool_t; const instring: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_escape_quotes' + LibSuff8;
 
@@ -1661,7 +1661,7 @@ function ap_escape_quotes(p: Papr_pool_t; const instring: PChar): PChar;
  * @param name The name of the object to check
  * @return 1 if it is a directory, 0 otherwise
 }
-function ap_is_rdirectory(p: Papr_pool_t; const name: PChar): Integer;
+function ap_is_rdirectory(p: Papr_pool_t; const name: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_is_rdirectory' + LibSuff8;
 
@@ -1671,13 +1671,13 @@ function ap_is_rdirectory(p: Papr_pool_t; const name: PChar): Integer;
  * @param name The name of the object to check
  * @return 1 if it is a directory, 0 otherwise
 }
-function ap_is_directory(p: Papr_pool_t; const name: PChar): Integer;
+function ap_is_directory(p: Papr_pool_t; const name: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_is_directory' + LibSuff8;
 
 {#ifdef _OSD_POSIX
-extern const char *os_set_account(apr_pool_t *p, const char *account);
-extern int os_init_job_environment(server_rec *s, const char *user_name, int one_process);
+extern const AnsiChar *os_set_account(apr_pool_t *p, const AnsiChar *account);
+extern int os_init_job_environment(server_rec *s, const AnsiChar *user_name, int one_process);
 #endif} { _OSD_POSIX }
 
 {
@@ -1685,7 +1685,7 @@ extern int os_init_job_environment(server_rec *s, const char *user_name, int one
  * @param p The pool to allocate from
  * @return A copy of the local host name
 }
-//char *ap_get_local_host(apr_pool_t *p);
+//AnsiChar *ap_get_local_host(apr_pool_t *p);
 
 {
  * Log an assertion to the error log
@@ -1693,7 +1693,7 @@ extern int os_init_job_environment(server_rec *s, const char *user_name, int one
  * @param szFile The file the assertion is in
  * @param nLine The line the assertion is defined on
 }
-procedure ap_log_assert(szExp, szFile: PChar; nLine: Integer);
+procedure ap_log_assert(szExp, szFile: PAnsiChar; nLine: Integer);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_log_assert' + LibSuff12;
 
@@ -1749,7 +1749,7 @@ extern int raise_sigstop_flags;
  * @param r The request_rec
  * @return HTML describing the server, allocated in @a r's pool.
  }
-function ap_psignature(prefix: PChar; r: Prequest_rec): PChar;
+function ap_psignature(prefix: PAnsiChar; r: Prequest_rec): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_psignature' + LibSuff8;
 

packages/httpd20/src/httpd.pas

@@ -121,7 +121,7 @@ begin
   Result := number mod 1000;
 end;
 
-function ap_escape_uri(p: Papr_pool_t; const path: PChar): PChar;
+function ap_escape_uri(p: Papr_pool_t; const path: PAnsiChar): PAnsiChar;
 begin
   Result := ap_os_escape_path(p, path, 1);
 end;
@@ -134,7 +134,7 @@ begin
   mod_.version := MODULE_MAGIC_NUMBER_MAJOR;
   mod_.minor_version := MODULE_MAGIC_NUMBER_MINOR;
   mod_.module_index := -1;
-//  mod_.name: PChar;
+//  mod_.name: PAnsiChar;
   mod_.dynamic_load_handle := nil;
   mod_.next := nil;
   mod_.magic := MODULE_MAGIC_COOKIE;
@@ -147,7 +147,7 @@ begin
   mod_.version := MODULE_MAGIC_NUMBER_MAJOR;
   mod_.minor_version := MODULE_MAGIC_NUMBER_MINOR;
   mod_.module_index := -1;
-//  mod_.name: PChar;
+//  mod_.name: PAnsiChar;
   mod_.dynamic_load_handle := nil;
   mod_.next := nil;
   mod_.magic := MODULE_MAGIC_COOKIE;

packages/httpd20/src/pcreposix.inc

@@ -78,8 +78,8 @@ type
 
 { The functions }
 
-{extern int regcomp(regex_t *, const char *, int);
-extern int regexec(regex_t *, const char *, size_t, regmatch_t *, int);
-extern size_t regerror(int, const regex_t *, char *, size_t);
+{extern int regcomp(regex_t *, const AnsiChar *, int);
+extern int regexec(regex_t *, const AnsiChar *, size_t, regmatch_t *, int);
+extern size_t regerror(int, const regex_t *, AnsiChar *, size_t);
 extern void regfree(regex_t *);}
 

packages/httpd20/src/util_cfgtree.inc

@@ -33,10 +33,10 @@ type
  }
   ap_directive_t = record
     { The current directive }
-    directive: PChar;
+    directive: PAnsiChar;
     { The arguments for the current directive, stored as a space
      *  separated list }
-    args: PChar;
+    args: PAnsiChar;
     { The next directive node in the tree
      *  @defvar ap_directive_t *next }
     next: Pap_directive_t;
@@ -52,7 +52,7 @@ type
 
     { ### these may go away in the future, but are needed for now }
     { The name of the file this directive was found in }
-    filename: PChar;
+    filename: PAnsiChar;
     { The line number the directive was on }
     line_num: Integer;
   end;

packages/httpd20/src/util_filter.inc

@@ -203,7 +203,7 @@ type
  }
   ap_filter_rec_t = record
     { The registered name for this filter }
-    name: PChar;
+    name: PAnsiChar;
     { The function to call when this filter is invoked. }
     filter_func: ap_filter_func;
     { The function to call before the handlers are invoked. Notice
@@ -297,7 +297,7 @@ function ap_pass_brigade(filter: Pap_filter_t;
  *              ::AP_FTYPE_CONNECTION
  * @see add_input_filter()
  }
-function ap_register_input_filter(const name: PChar;
+function ap_register_input_filter(const name: PAnsiChar;
  filter_func: ap_in_filter_func; filter_init: ap_init_filter_func;
  ftype: ap_filter_type): Pap_filter_rec_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
@@ -317,7 +317,7 @@ function ap_register_input_filter(const name: PChar;
  *              ::AP_FTYPE_CONNECTION
  * @see ap_add_output_filter()
  }
-function ap_register_output_filter(const name: PChar;
+function ap_register_output_filter(const name: PAnsiChar;
  filter_func: ap_out_filter_func; filter_init: ap_init_filter_func;
  ftype: ap_filter_type): Pap_filter_rec_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
@@ -341,7 +341,7 @@ function ap_register_output_filter(const name: PChar;
  * @param r The request to add this filter for (or NULL if it isn't associated with a request)
  * @param c The connection to add the fillter for
  }
-function ap_add_input_filter(const name: PChar; ctx: Pointer;
+function ap_add_input_filter(const name: PAnsiChar; ctx: Pointer;
  r: Prequest_rec; c: Pconn_rec): Pap_filter_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_add_input_filter' + LibSuff16;
@@ -365,7 +365,7 @@ function ap_add_input_filter_handle(f: Pap_filter_t;
  *
  * @param name The filter name to look up
  }
-function ap_get_input_filter_handle(const name: PChar): Pap_filter_rec_t;
+function ap_get_input_filter_handle(const name: PAnsiChar): Pap_filter_rec_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_get_input_filter_handle' + LibSuff4;
 
@@ -377,7 +377,7 @@ function ap_get_input_filter_handle(const name: PChar): Pap_filter_rec_t;
  * @param r The request to add this filter for (or NULL if it isn't associated with a request)
  * @param c The connection to add this filter for
  }
-function ap_add_output_filter(const name: PChar; ctx: Pointer;
+function ap_add_output_filter(const name: PAnsiChar; ctx: Pointer;
  r: Prequest_rec; c: Pconn_rec): Pap_filter_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_add_output_filter' + LibSuff16;
@@ -400,7 +400,7 @@ function ap_add_output_filter_handle(f: Pap_filter_rec_t;
  *
  * @param name The filter name to look up
  }
-function ap_get_output_filter_handle(const name: PChar): Pap_filter_rec_t;
+function ap_get_output_filter_handle(const name: PAnsiChar): Pap_filter_rec_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_get_output_filter_handle' + LibSuff4;
 
@@ -516,7 +516,7 @@ function ap_fputstrs(f: Pap_filter_t; bb: Papr_bucket_brigade;
  * @param ... The argumets to use to fill out the format string
  }
 function ap_fprintf(f: Pap_filter_t; bb: Papr_bucket_brigade;
- const fmt: PChar; others: array of const): apr_status_t;
+ const fmt: PAnsiChar; others: array of const): apr_status_t;
  cdecl; external LibHTTPD name 'ap_fputstrs';
 
 {        __attribute__((format(printf,3,4)));}

packages/httpd20/src/util_md5.inc

@@ -25,9 +25,9 @@
  * @param a Pool to allocate out of
  * @param string String to get the checksum of
  * @return The checksum
- * @deffunc char *ap_md5(apr_pool_t *a, const unsigned char *string)
+ * @deffunc AnsiChar *ap_md5(apr_pool_t *a, const unsigned AnsiChar *string)
  }
-function ap_md5(p: Papr_pool_t; const string_: PChar): PChar;
+function ap_md5(p: Papr_pool_t; const string_: PAnsiChar): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_md5' + LibSuff8;
 
@@ -37,9 +37,9 @@ function ap_md5(p: Papr_pool_t; const string_: PChar): PChar;
  * @param buf Buffer to generate checksum for
  * @param len The length of the buffer
  * @return The checksum
- * @deffunc char *ap_md5_binary(apr_pool_t *a, const unsigned char *buf, int len)
+ * @deffunc AnsiChar *ap_md5_binary(apr_pool_t *a, const unsigned AnsiChar *buf, int len)
  }
-function ap_md5_binary(a: Papr_pool_t; const buf: PChar; len: Integer): PChar;
+function ap_md5_binary(a: Papr_pool_t; const buf: PAnsiChar; len: Integer): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_md5_binary' + LibSuff12;
 
@@ -48,9 +48,9 @@ function ap_md5_binary(a: Papr_pool_t; const buf: PChar; len: Integer): PChar;
  * @param p The pool to allocate out of
  * @param context The context to convert
  * @return The converted encoding
- * @deffunc char *ap_md5contextTo64(apr_pool_t *p, apr_md5_ctx_t *context)
+ * @deffunc AnsiChar *ap_md5contextTo64(apr_pool_t *p, apr_md5_ctx_t *context)
  }
-function ap_md5contextTo64(a: Papr_pool_t; context: Papr_md5_ctx_t): PChar;
+function ap_md5contextTo64(a: Papr_pool_t; context: Papr_md5_ctx_t): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_md5contextTo64' + LibSuff8;
 
@@ -58,9 +58,9 @@ function ap_md5contextTo64(a: Papr_pool_t; context: Papr_md5_ctx_t): PChar;
  * Create an MD5 Digest for a given file
  * @param p The pool to allocate out of
  * @param infile The file to create the digest for
- * @deffunc char *ap_md5digest(apr_pool_t *p, apr_file_t *infile)
+ * @deffunc AnsiChar *ap_md5digest(apr_pool_t *p, apr_file_t *infile)
  }
-function ap_md5digest(p: Papr_pool_t; infile: Papr_file_t): PChar;
+function ap_md5digest(p: Papr_pool_t; infile: Papr_file_t): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_md5digest' + LibSuff8;
 

packages/httpd20/src/util_script.inc

@@ -29,9 +29,9 @@ const
  * @param t Apache table of key-value pairs
  * @return An array containing the same key-value pairs suitable for
  *         use with an exec call.
- * @deffunc char **ap_create_environment(apr_pool_t *p, apr_table_t *t)
+ * @deffunc AnsiChar **ap_create_environment(apr_pool_t *p, apr_table_t *t)
  }
-function ap_create_environment(p: Papr_pool_t; t: Papr_table_t): PPChar;
+function ap_create_environment(p: Papr_pool_t; t: Papr_table_t): PPAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_create_environment' + LibSuff8;
 
@@ -42,9 +42,9 @@ function ap_create_environment(p: Papr_pool_t; t: Papr_table_t): PPChar;
  * @param uri The uri we are currently parsing
  * @param path_info The current path info
  * @return The length of the path info
- * @deffunc int ap_find_path_info(const char *uri, const char *path_info)
+ * @deffunc int ap_find_path_info(const AnsiChar *uri, const AnsiChar *path_info)
  }
-function ap_find_path_info(const uri, path_info: PChar): Integer;
+function ap_find_path_info(const uri, path_info: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_find_path_info' + LibSuff8;
 
@@ -76,10 +76,10 @@ procedure ap_add_common_vars(r: Prequest_rec);
  * @param buffer Empty when calling the function.  On output, if there was an
  *               error, the string that cause the error is stored here. 
  * @return HTTP_OK on success, HTTP_INTERNAL_SERVER_ERROR otherwise
- * @deffunc int ap_scan_script_header_err(request_rec *r, apr_file_t *f, char *buffer)
+ * @deffunc int ap_scan_script_header_err(request_rec *r, apr_file_t *f, AnsiChar *buffer)
  }
 function ap_scan_script_header_err(r: Prequest_rec;
- f: Papr_file_t; buffer: PChar): Integer;
+ f: Papr_file_t; buffer: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_scan_script_header_err' + LibSuff12;
 
@@ -92,10 +92,10 @@ function ap_scan_script_header_err(r: Prequest_rec;
  * @param buffer Empty when calling the function.  On output, if there was an
  *               error, the string that cause the error is stored here. 
  * @return HTTP_OK on success, HTTP_INTERNAL_SERVER_ERROR otherwise
- * @deffunc int ap_scan_script_header_err_brigade(request_rec *r, apr_bucket_brigade *bb, char *buffer)
+ * @deffunc int ap_scan_script_header_err_brigade(request_rec *r, apr_bucket_brigade *bb, AnsiChar *buffer)
  }
 function ap_scan_script_header_err_brigade(r: Prequest_rec;
- bb: Papr_bucket_brigade; buffer: PChar): Integer;
+ bb: Papr_bucket_brigade; buffer: PAnsiChar): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_scan_script_header_err_brigade' + LibSuff12;
 
@@ -111,10 +111,10 @@ function ap_scan_script_header_err_brigade(r: Prequest_rec;
  * @param args   String arguments to parse consecutively for headers, 
  *               a NULL argument terminates the list.
  * @return HTTP_OK on success, HTTP_INTERNAL_SERVER_ERROR otherwise
- * @deffunc int ap_scan_script_header_err_core(request_rec *r, char *buffer, int (*getsfunc)(char *, int, void *), void *getsfunc_data)
+ * @deffunc int ap_scan_script_header_err_core(request_rec *r, AnsiChar *buffer, int (*getsfunc)(AnsiChar *, int, void *), void *getsfunc_data)
  }
-function ap_scan_script_header_err_strs(buffer: PChar;
- termch: PPChar; termarg: PInteger; others: array of const): Integer;
+function ap_scan_script_header_err_strs(buffer: PAnsiChar;
+ termch: PPAnsiChar; termarg: PInteger; others: array of const): Integer;
  cdecl; external LibHTTPD name 'ap_scan_script_header_err_strs';
 
 {
@@ -128,13 +128,13 @@ function ap_scan_script_header_err_strs(buffer: PChar;
                    act like gets()
  * @param getsfunc_data The place to read from
  * @return HTTP_OK on success, HTTP_INTERNAL_SERVER_ERROR otherwise
- * @deffunc int ap_scan_script_header_err_core(request_rec *r, char *buffer, int (*getsfunc)(char *, int, void *), void *getsfunc_data)
+ * @deffunc int ap_scan_script_header_err_core(request_rec *r, AnsiChar *buffer, int (*getsfunc)(AnsiChar *, int, void *), void *getsfunc_data)
  }
 type
-  getsfunc_t = function(p1: PChar; p2: Integer; p3: Pointer): Integer;
+  getsfunc_t = function(p1: PAnsiChar; p2: Integer; p3: Pointer): Integer;
   
 function ap_scan_script_header_err_core(r: Prequest_rec;
- buffer: PChar; getsfunc: getsfunc_t; getsfunc_data: Pointer): Integer;
+ buffer: PAnsiChar; getsfunc: getsfunc_t; getsfunc_data: Pointer): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_scan_script_header_err_core' + LibSuff16;
 

packages/httpd20/src/util_time.inc

@@ -63,7 +63,7 @@ function ap_explode_recent_gmt(tm: Papr_time_exp_t; t: apr_time_t): apr_status_t
  * @param date_str String to write to.
  * @param t the time to convert 
  }
-function ap_recent_ctime(date_str: PChar; t: apr_time_t): apr_status_t;
+function ap_recent_ctime(date_str: PAnsiChar; t: apr_time_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_recent_ctime' + LibSuff12;
 
@@ -72,7 +72,7 @@ function ap_recent_ctime(date_str: PChar; t: apr_time_t): apr_status_t;
  * @param date_str String to write to (must have length >= APR_RFC822_DATE_LEN)
  * @param t the time to convert 
  }
-function ap_recent_rfc822_date(date_str: PChar; t: apr_time_t): apr_status_t;
+function ap_recent_rfc822_date(date_str: PAnsiChar; t: apr_time_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
  external LibHTTPD name LibNamePrefix + 'ap_recent_rfc822_date' + LibSuff12;