@@ -63,17 +63,17 @@ interface
6363 sapi_activate: procedure (p : pointer); cdecl;
6464 sapi_deactivate: procedure (p : pointer); cdecl;
6565
66- sapi_add_header_ex: function(header_line : PAnsiChar ; header_line_len : uint; duplicated : zend_bool; replace : zend_bool; TSRMLS_DC : pointer) : integer; cdecl;
66+ sapi_add_header_ex: function(header_line : zend_pchar ; header_line_len : uint; duplicated : zend_bool; replace : zend_bool; TSRMLS_DC : pointer) : integer; cdecl;
6767
6868 php_execute_script : function (primary_file: pointer; TSRMLS_D : pointer) : Integer; cdecl;
6969
7070 php_handle_aborted_connection: procedure; cdecl;
7171
72- php_register_variable: procedure(_var : PAnsiChar ; val: PAnsiChar ; track_vars_array: pointer; TSRMLS_DC : pointer); cdecl;
72+ php_register_variable: procedure(_var : zend_pchar ; val: zend_pchar ; track_vars_array: pointer; TSRMLS_DC : pointer); cdecl;
7373
7474 // binary-safe version
75- php_register_variable_safe: procedure(_var : PAnsiChar ; val : PAnsiChar ; val_len : integer; track_vars_array : pointer; TSRMLS_DC : pointer); cdecl;
76- php_register_variable_ex: procedure(_var : PAnsiChar ; val : pzval; track_vars_array : pointer; TSRMLS_DC : pointer); cdecl;
75+ php_register_variable_safe: procedure(_var : zend_pchar ; val : zend_pchar ; val_len : integer; track_vars_array : pointer; TSRMLS_DC : pointer); cdecl;
76+ php_register_variable_ex: procedure(_var : zend_pchar ; val : pzval; track_vars_array : pointer; TSRMLS_DC : pointer); cdecl;
7777
7878// php_output.h
7979 php_output_startup: procedure(); cdecl;
@@ -84,42 +84,42 @@ interface
8484 { $IFDEF PHP540}
8585 php_output_set_status: procedure(status: integer; TSRMLS_DC : pointer); cdecl;
8686 php_output_get_status: function(TSRMLS_DC : pointer) : integer; cdecl;
87- php_output_get_start_filename: function (TSRMLS_D : pointer) : PAnsiChar ; cdecl;
87+ php_output_get_start_filename: function (TSRMLS_D : pointer) : zend_pchar ; cdecl;
8888 php_output_get_start_lineno: function (TSRMLS_D : pointer) : integer; cdecl;
8989 php_output_start_default: function (TSRMLS_D : pointer) : integer; cdecl;
9090
9191 php_start_ob_buffer: function (output_handler : pzval; chunk_size : uint; flags:uint; TSRMLS_DC : pointer) : integer; cdecl;
92- php_start_ob_buffer_named: function (const output_handler_name : PAnsiChar ; chunk_size : uint; flags:uint; TSRMLS_DC : pointer) : integer; cdecl;
92+ php_start_ob_buffer_named: function (const output_handler_name : zend_pchar ; chunk_size : uint; flags:uint; TSRMLS_DC : pointer) : integer; cdecl;
9393
9494 php_end_ob_buffer: function (TSRMLS_DC : pointer): integer; cdecl;
9595 php_end_ob_buffers: procedure (TSRMLS_DC : pointer); cdecl;
9696 php_ob_get_buffer: function (p : pzval; TSRMLS_DC : pointer) : integer; cdecl;
9797 php_ob_get_length: function (p : pzval; TSRMLS_DC : pointer) : integer; cdecl;
9898
9999 php_output_set_implicit_flush: procedure(flush: uint; TSRMLS_DS: pointer); cdecl;
100- php_get_output_start_filename: function (TSRMLS_D : pointer) : PAnsiChar ; cdecl;
100+ php_get_output_start_filename: function (TSRMLS_D : pointer) : zend_pchar ; cdecl;
101101 php_get_output_start_lineno: function (TSRMLS_D : pointer) : integer; cdecl;
102102
103- php_output_handler_started: function (name : PAnsiChar ; name_len: uint): integer; cdecl;
103+ php_output_handler_started: function (name : zend_pchar ; name_len: uint): integer; cdecl;
104104
105- php_ob_init_conflict: function (handler_new : PAnsiChar ; handler_new_len: uint;
106- handler_set : PAnsiChar ; handler_set_len: uint; TSRMLS_DC : pointer) : integer; cdecl;
105+ php_ob_init_conflict: function (handler_new : zend_pchar ; handler_new_len: uint;
106+ handler_set : zend_pchar ; handler_set_len: uint; TSRMLS_DC : pointer) : integer; cdecl;
107107
108108 { $ELSE}
109109 php_output_set_status: procedure(status: boolean; TSRMLS_DC : pointer); cdecl;
110110 php_output_get_status: function(TSRMLS_DC : pointer) : boolean; cdecl;
111111 php_start_ob_buffer: function (output_handler : pzval; chunk_size : uint; erase : boolean; TSRMLS_DC : pointer) : integer; cdecl;
112- php_start_ob_buffer_named: function (const output_handler_name : PAnsiChar ; chunk_size : uint; erase : boolean; TSRMLS_DC : pointer) : integer; cdecl;
112+ php_start_ob_buffer_named: function (const output_handler_name : zend_pchar ; chunk_size : uint; erase : boolean; TSRMLS_DC : pointer) : integer; cdecl;
113113 php_end_ob_buffer: procedure (send_buffer : boolean; just_flush : boolean; TSRMLS_DC : pointer); cdecl;
114114 php_end_ob_buffers: procedure (send_buffer : boolean; TSRMLS_DC : pointer); cdecl;
115115 php_ob_get_buffer: function (p : pzval; TSRMLS_DC : pointer) : integer; cdecl;
116116 php_ob_get_length: function (p : pzval; TSRMLS_DC : pointer) : integer; cdecl;
117117 php_start_implicit_flush: procedure (TSRMLS_D : pointer); cdecl;
118118 php_end_implicit_flush: procedure (TSRMLS_D : pointer); cdecl;
119- php_get_output_start_filename: function (TSRMLS_D : pointer) : PAnsiChar ; cdecl;
119+ php_get_output_start_filename: function (TSRMLS_D : pointer) : zend_pchar ; cdecl;
120120 php_get_output_start_lineno: function (TSRMLS_D : pointer) : integer; cdecl;
121- php_ob_handler_used: function (handler_name : PAnsiChar ; TSRMLS_DC : pointer) : integer; cdecl;
122- php_ob_init_conflict: function (handler_new : PAnsiChar ; handler_set : PAnsiChar ; TSRMLS_DC : pointer) : integer; cdecl;
121+ php_ob_handler_used: function (handler_name : zend_pchar ; TSRMLS_DC : pointer) : integer; cdecl;
122+ php_ob_init_conflict: function (handler_new : zend_pchar ; handler_set : zend_pchar ; TSRMLS_DC : pointer) : integer; cdecl;
123123 { $ENDIF}
124124
125125// php_output.h
@@ -130,34 +130,34 @@ function GetSymbolsTable : PHashTable;
130130function GetTrackHash (Name : AnsiString) : PHashTable;
131131function GetSAPIGlobals : Psapi_globals_struct; overload;
132132function GetSAPIGlobals (TSRMLS_DC : pointer) : Psapi_globals_struct; overload;
133- // procedure phperror(Error : PAnsiChar );
133+ // procedure phperror(Error : zend_pchar );
134134
135135var
136136
137137php_default_post_reader : procedure;
138138
139139// php_string.h
140- php_strtoupper: function (s : PAnsiChar ; len : size_t) : PAnsiChar ; cdecl;
141- php_strtolower: function (s : PAnsiChar ; len : size_t) : PAnsiChar ; cdecl;
140+ php_strtoupper: function (s : zend_pchar ; len : size_t) : zend_pchar ; cdecl;
141+ php_strtolower: function (s : zend_pchar ; len : size_t) : zend_pchar ; cdecl;
142142
143- php_strtr: function (str : PAnsiChar ; len : Integer; str_from : PAnsiChar ;
144- str_to : PAnsiChar ; trlen : Integer) : PAnsiChar ; cdecl;
143+ php_strtr: function (str : zend_pchar ; len : Integer; str_from : zend_pchar ;
144+ str_to : zend_pchar ; trlen : Integer) : zend_pchar ; cdecl;
145145
146- php_stripcslashes: procedure (str : PAnsiChar ; len : PInteger); cdecl;
146+ php_stripcslashes: procedure (str : zend_pchar ; len : PInteger); cdecl;
147147
148- php_basename: function (str : PAnsiChar ; len : size_t; suffix : PAnsiChar ;
149- sufflen : size_t) : PAnsiChar ; cdecl;
148+ php_basename: function (str : zend_pchar ; len : size_t; suffix : zend_pchar ;
149+ sufflen : size_t) : zend_pchar ; cdecl;
150150
151- php_dirname: procedure (str : PAnsiChar ; len : Integer); cdecl;
151+ php_dirname: procedure (str : zend_pchar ; len : Integer); cdecl;
152152
153- php_stristr: function (s : PByte; t : PByte; s_len : size_t; t_len : size_t) : PAnsiChar ; cdecl;
153+ php_stristr: function (s : PByte; t : PByte; s_len : size_t; t_len : size_t) : zend_pchar ; cdecl;
154154
155- php_str_to_str: function (haystack : PAnsiChar ; length : Integer; needle : PAnsiChar ;
156- needle_len : Integer; str : PAnsiChar ; str_len : Integer;
157- _new_length : PInteger) : PAnsiChar ; cdecl;
155+ php_str_to_str: function (haystack : zend_pchar ; length : Integer; needle : zend_pchar ;
156+ needle_len : Integer; str : zend_pchar ; str_len : Integer;
157+ _new_length : PInteger) : zend_pchar ; cdecl;
158158
159- php_strip_tags: procedure (rbuf : PAnsiChar ; len : Integer; state : PInteger;
160- allow : PAnsiChar ; allow_len : Integer); cdecl;
159+ php_strip_tags: procedure (rbuf : zend_pchar ; len : Integer; state : PInteger;
160+ allow : zend_pchar ; allow_len : Integer); cdecl;
161161
162162php_implode: procedure (var delim : zval; var arr : zval;
163163 var return_value : zval); cdecl;
@@ -168,36 +168,36 @@ function GetSAPIGlobals(TSRMLS_DC : pointer) : Psapi_globals_struct; overload;
168168
169169var
170170
171- php_info_html_esc: function (str : PAnsiChar ; TSRMLS_DC : pointer) : PAnsiChar ; cdecl;
171+ php_info_html_esc: function (str : zend_pchar ; TSRMLS_DC : pointer) : zend_pchar ; cdecl;
172172
173173php_print_info_htmlhead: procedure (TSRMLS_D : pointer); cdecl;
174174
175175
176176
177177
178- php_log_err: procedure (err_msg : PAnsiChar ; TSRMLS_DC : pointer); cdecl;
178+ php_log_err: procedure (err_msg : zend_pchar ; TSRMLS_DC : pointer); cdecl;
179179
180- php_html_puts: procedure (str : PAnsiChar ; str_len : integer; TSRMLS_DC : pointer); cdecl;
180+ php_html_puts: procedure (str : zend_pchar ; str_len : integer; TSRMLS_DC : pointer); cdecl;
181181
182- _php_error_log: function (opt_err : integer; msg : PAnsiChar ; opt: PAnsiChar ; headers: PAnsiChar ; TSRMLS_DC : pointer) : integer; cdecl;
182+ _php_error_log: function (opt_err : integer; msg : zend_pchar ; opt: zend_pchar ; headers: zend_pchar ; TSRMLS_DC : pointer) : integer; cdecl;
183183
184184php_print_credits: procedure (flag : integer); cdecl;
185185
186186php_info_print_css: procedure(); cdecl;
187187
188188php_set_sock_blocking: function (socketd : integer; block : integer; TSRMLS_DC : pointer) : integer; cdecl;
189- php_copy_file: function (src : PAnsiChar ; dest : PAnsiChar ; TSRMLS_DC : pointer) : integer; cdecl;
189+ php_copy_file: function (src : zend_pchar ; dest : zend_pchar ; TSRMLS_DC : pointer) : integer; cdecl;
190190
191191var
192192php_escape_html_entities: function (old : PByte; oldlen : integer; newlen : PINT; all : integer;
193- quote_style : integer; hint_charset: PAnsiChar ; TSRMLS_DC : pointer) : PAnsiChar ; cdecl;
193+ quote_style : integer; hint_charset: zend_pchar ; TSRMLS_DC : pointer) : zend_pchar ; cdecl;
194194
195195var
196- php_ini_long: function (name : PAnsiChar ; name_length : uint; orig : Integer) : Longint; cdecl;
196+ php_ini_long: function (name : zend_pchar ; name_length : uint; orig : Integer) : Longint; cdecl;
197197
198- php_ini_double: function(name : PAnsiChar ; name_length : uint; orig : Integer) : Double; cdecl;
198+ php_ini_double: function(name : zend_pchar ; name_length : uint; orig : Integer) : Double; cdecl;
199199
200- php_ini_string: function(name : PAnsiChar ; name_length : uint; orig : Integer) : PAnsiChar ; cdecl;
200+ php_ini_string: function(name : zend_pchar ; name_length : uint; orig : Integer) : zend_pchar ; cdecl;
201201
202202function zval2variant (value : zval) : variant;
203203procedure variant2zval (value : variant; var z : pzval);
@@ -206,28 +206,28 @@ procedure variant2zval(value : variant; var z : pzval);
206206var
207207
208208php_url_free: procedure (theurl : pphp_url); cdecl;
209- php_url_parse: function (str : PAnsiChar ) : pphp_url; cdecl;
210- php_url_decode: function (str : PAnsiChar ; len : Integer) : Integer; cdecl;
209+ php_url_parse: function (str : zend_pchar ) : pphp_url; cdecl;
210+ php_url_decode: function (str : zend_pchar ; len : Integer) : Integer; cdecl;
211211 { return value: length of decoded string }
212212
213- php_raw_url_decode: function (str : PAnsiChar ; len : Integer) : Integer; cdecl;
213+ php_raw_url_decode: function (str : zend_pchar ; len : Integer) : Integer; cdecl;
214214 { return value: length of decoded string }
215215
216- php_url_encode: function (s : PAnsiChar ; len : Integer; new_length : PInteger) : PAnsiChar ; cdecl;
216+ php_url_encode: function (s : zend_pchar ; len : Integer; new_length : PInteger) : zend_pchar ; cdecl;
217217
218- php_raw_url_encode: function (s : PAnsiChar ; len : Integer; new_length : PInteger) : PAnsiChar ; cdecl;
218+ php_raw_url_encode: function (s : zend_pchar ; len : Integer; new_length : PInteger) : zend_pchar ; cdecl;
219219
220220{ $IFDEF PHP510}
221221php_register_extensions: function (ptr : pointer; count: integer; TSRMLS_DC: pointer) : integer; cdecl;
222222{ $ELSE}
223223php_startup_extensions: function (ptr: pointer; count : integer) : integer; cdecl;
224224{ $ENDIF}
225225
226- php_error_docref0: procedure (const docref : PAnsiChar ; TSRMLS_DC : pointer; _type : integer; const Msg : PAnsiChar ); cdecl;
227- php_error_docref: procedure (const docref : PAnsiChar ; TSRMLS_DC : pointer; _type : integer; const Msg : PAnsiChar ); cdecl;
226+ php_error_docref0: procedure (const docref : zend_pchar ; TSRMLS_DC : pointer; _type : integer; const Msg : zend_pchar ); cdecl;
227+ php_error_docref: procedure (const docref : zend_pchar ; TSRMLS_DC : pointer; _type : integer; const Msg : zend_pchar ); cdecl;
228228
229- php_error_docref1: procedure (const docref : PAnsiChar ; TSRMLS_DC : pointer; const param1 : PAnsiChar ; _type: integer; Msg : PAnsiChar ); cdecl;
230- php_error_docref2: procedure (const docref : PAnsiChar ; TSRMLS_DC : pointer; const param1 : PAnsiChar ; const param2 : PAnsiChar ; _type : integer; Msg : PAnsiChar ); cdecl;
229+ php_error_docref1: procedure (const docref : zend_pchar ; TSRMLS_DC : pointer; const param1 : zend_pchar ; _type: integer; Msg : zend_pchar ); cdecl;
230+ php_error_docref2: procedure (const docref : zend_pchar ; TSRMLS_DC : pointer; const param1 : zend_pchar ; const param2 : zend_pchar ; _type : integer; Msg : zend_pchar ); cdecl;
231231
232232sapi_globals_id : pointer;
233233core_globals_id : pointer;
@@ -242,7 +242,7 @@ function GetPHPGlobals(TSRMLS_DC : pointer) : Pphp_Core_Globals;
242242function PG (TSRMLS_DC : pointer) : Pphp_Core_Globals;
243243
244244
245- procedure PHP_FUNCTION (var AFunction : zend_function_entry; AName : PAnsiChar ; AHandler : pointer);
245+ procedure PHP_FUNCTION (var AFunction : zend_function_entry; AName : zend_pchar ; AHandler : pointer);
246246
247247function LoadPHP (const DllFileName: AnsiString = PHPWin) : boolean;
248248
@@ -263,7 +263,7 @@ function ValueToFloat(Value : AnsiString) : extended;
263263
264264
265265php_info_print_table_colspan_header: procedure (num_cols : Integer;
266- header : PAnsiChar ); cdecl;
266+ header : zend_pchar ); cdecl;
267267
268268php_info_print_box_start: procedure (bg : Integer); cdecl;
269269
@@ -272,21 +272,21 @@ function ValueToFloat(Value : AnsiString) : extended;
272272php_info_print_hr: procedure; cdecl;
273273
274274php_info_print_table_start: procedure; cdecl;
275- php_info_print_table_row1: procedure(n1 : integer; c1: PAnsiChar ); cdecl;
276- php_info_print_table_row2: procedure (n2 : integer; c1, c2 : PAnsiChar ); cdecl;
277- php_info_print_table_row3: procedure (n3 : integer; c1, c2, c3 : PAnsiChar ); cdecl;
278- php_info_print_table_row4: procedure (n4 : integer; c1, c2, c3, c4 : PAnsiChar ); cdecl;
279- php_info_print_table_row : procedure (n2 : integer; c1, c2 : pAnsiChar ); cdecl;
275+ php_info_print_table_row1: procedure(n1 : integer; c1: zend_pchar ); cdecl;
276+ php_info_print_table_row2: procedure (n2 : integer; c1, c2 : zend_pchar ); cdecl;
277+ php_info_print_table_row3: procedure (n3 : integer; c1, c2, c3 : zend_pchar ); cdecl;
278+ php_info_print_table_row4: procedure (n4 : integer; c1, c2, c3, c4 : zend_pchar ); cdecl;
279+ php_info_print_table_row : procedure (n2 : integer; c1, c2 : zend_pchar ); cdecl;
280280
281281php_info_print_table_end: procedure (); cdecl;
282282
283- php_body_write: function (const str : PAnsiChar ; str_length: uint; TSRMLS_DC : pointer) : integer; cdecl;
284- php_header_write: function (const str : PAnsiChar ; str_length: uint; TSRMLS_DC : pointer) : integer; cdecl;
283+ php_body_write: function (const str : zend_pchar ; str_length: uint; TSRMLS_DC : pointer) : integer; cdecl;
284+ php_header_write: function (const str : zend_pchar ; str_length: uint; TSRMLS_DC : pointer) : integer; cdecl;
285285
286286
287287php_header: function() : integer; cdecl;
288- php_setcookie: function (name : PAnsiChar ; name_len : integer; value : PAnsiChar ; value_len: integer;
289- expires : longint; path : PAnsiChar ; path_len : integer; domain : PAnsiChar ; domain_len : integer;
288+ php_setcookie: function (name : zend_pchar ; name_len : integer; value : zend_pchar ; value_len: integer;
289+ expires : longint; path : zend_pchar ; path_len : integer; domain : zend_pchar ; domain_len : integer;
290290 secure : integer; TSRMLS_DC : pointer) : integer; cdecl;
291291
292292
@@ -372,7 +372,7 @@ function GetTrackHash(Name : AnsiString) : PHashTable;
372372 if Assigned(Arr) then
373373 begin
374374 new(data);
375- ret := zend_hash_find(arr, PAnsiChar (Name ), Length(Name )+1 , Data);
375+ ret := zend_hash_find(arr, zend_pchar (Name ), Length(Name )+1 , Data);
376376 if ret = SUCCESS then
377377 begin
378378 Result := data^^^.value .ht;
@@ -495,7 +495,7 @@ procedure variant2zval(value : variant;var z : pzval);
495495 ZVAL_NULL(z);
496496 Exit;
497497 end ;
498- // MessageBoxA(0, PAnsiChar (AnsiString( TVarData(Value).VType.ToString)), '', 0 ) ;
498+ // MessageBoxA(0, zend_pchar (AnsiString( TVarData(Value).VType.ToString)), '', 0 ) ;
499499 case TVarData(Value ).VType of
500500 varString : // Peter Enz
501501 begin
@@ -513,7 +513,7 @@ procedure variant2zval(value : variant;var z : pzval);
513513 begin
514514 S := string(TVarData(Value ).VUString);
515515
516- ZVAL_STRING(z, PAnsiChar (AnsiString(S)), true);
516+ ZVAL_STRING(z, zend_pchar (AnsiString(S)), true);
517517 end ;
518518
519519 varOleStr : // Peter Enz
@@ -573,7 +573,7 @@ function PG(TSRMLS_DC : pointer) : Pphp_Core_Globals;
573573
574574
575575
576- procedure PHP_FUNCTION (var AFunction : zend_function_entry; AName : PAnsiChar ; AHandler : pointer);
576+ procedure PHP_FUNCTION (var AFunction : zend_function_entry; AName : zend_pchar ; AHandler : pointer);
577577begin
578578 AFunction.fname := AName;
579579
@@ -586,7 +586,7 @@ procedure PHP_FUNCTION(var AFunction : zend_function_entry; AName : PAnsiChar; A
586586end ;
587587
588588
589- { procedure phperror(Error : PAnsiChar );
589+ { procedure phperror(Error : zend_pchar );
590590begin
591591 zend_error(E_PARSE, Error);
592592end; }
0 commit comments