Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 1d7313c

Browse files
author
Andrew Zenin
committed
Some L/D changes
1 parent 28036a7 commit 1d7313c

13 files changed

+36
-35
lines changed

‎Source/PHPProjectWizard.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
interface
1717

1818
uses
19-
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
19+
{$IFNDEF FPC}Windows,{$ELSE} LCLType,LCLIntf,dynlibs,libc,{$ENDIF} Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
2020
ToolsAPI,
2121
{$IFDEF VERSION6}
2222
DesignIntf,

‎Source/PHPTypes.pas

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
interface
1717

1818
uses
19-
Windows, ZENDTypes;
19+
{$IFNDEF FPC}Windows{$ELSE} LCLType{$ENDIF}, ZENDTypes;
2020

2121
{$IFDEF PHP4}
2222
const
@@ -254,8 +254,8 @@ interface
254254

255255
sapi_module_struct =
256256
record
257-
name : zend_pchar;
258-
pretty_name : zend_pchar;
257+
name : PAnsiChar;
258+
pretty_name : PAnsiChar;
259259

260260
startup : TModuleStartupFunc;
261261
//int (*startup)(struct _sapi_module_struct *sapi_module);
@@ -288,14 +288,14 @@ interface
288288
get_request_time : pointer;
289289
terminate_process : pointer;
290290

291-
php_ini_path_override : zend_pchar;
291+
php_ini_path_override : PAnsiChar;
292292

293293
block_interruptions : pointer;
294294
unblock_interruptions : pointer;
295295

296296
default_post_reader : pointer;
297297
treat_data : pointer;
298-
executable_location : zend_pchar;
298+
executable_location : PAnsiChar;
299299

300300
php_ini_ignore : Integer;
301301

@@ -313,7 +313,7 @@ interface
313313

314314
phpinfo_as_text : integer;
315315

316-
ini_entries : zend_pchar;
316+
ini_entries : PAnsiChar;
317317

318318
additional_functions: Pointer;
319319
input_filter_init : Pointer;

‎Source/ZENDAPI.pas

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
interface
2121

2222
uses
23-
Windows, SysUtils,
23+
{$IFNDEF FPC}Windows{$ELSE} LCLType,LCLIntf,dynlibs,libc{$ENDIF}, SysUtils,
2424
ZendTypes, Variants,
2525
PHPTypes;
2626
type
@@ -556,7 +556,7 @@ procedure dispose_pzval_array(Params: pzval_array);
556556
var
557557
_zend_bailout : procedure (filename : zend_pchar; lineno : uint); cdecl;
558558

559-
zend_alter_ini_entry : function(name: zend_pchar; name_length: uint; new_value: zend_pchar; new_value_length: uint; modify_type: Integer; stage: Integer): Integer; cdecl;
559+
zend_alter_ini_entry : function(name: PAnsiChar; name_length: uint; new_value: PAnsiChar; new_value_length: uint; modify_type: Integer; stage: Integer): Integer; cdecl;
560560
zend_alter_ini_entry_ex : function(name: zend_pchar; name_length: uint; new_value: zend_pchar; new_value_length: uint; modify_type: Integer; stage: Integer; force_change: integer): Integer; cdecl;
561561

562562
zend_restore_ini_entry : function(name: zend_pchar; name_length: uint; stage: Integer): Integer; cdecl;

‎Source/ZendTypes.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
interface
1717

1818
uses
19-
Windows, SysUtils;
19+
{$IFNDEF FPC}Windows{$ELSE} LCLType{$ENDIF}, SysUtils;
2020

2121
const
2222
//zend.h

‎Source/php4DelphiD2010.dproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,16 @@
136136
<Platform value="Win32">True</Platform>
137137
</Platforms>
138138
<Deployment Version="3">
139-
<DeployClass Name="ProjectiOSDeviceResourceRules"/>
139+
<DeployClass Name="DependencyModule">
140+
<Platform Name="Win32">
141+
<Operation>0</Operation>
142+
<Extensions>.dll;.bpl</Extensions>
143+
</Platform>
144+
<Platform Name="OSX32">
145+
<Operation>1</Operation>
146+
<Extensions>.dylib</Extensions>
147+
</Platform>
148+
</DeployClass>
140149
<DeployClass Name="ProjectOSXResource">
141150
<Platform Name="OSX32">
142151
<RemoteDir>Contents\Resources</RemoteDir>
@@ -475,16 +484,7 @@
475484
<Operation>1</Operation>
476485
</Platform>
477486
</DeployClass>
478-
<DeployClass Name="DependencyModule">
479-
<Platform Name="Win32">
480-
<Operation>0</Operation>
481-
<Extensions>.dll;.bpl</Extensions>
482-
</Platform>
483-
<Platform Name="OSX32">
484-
<Operation>1</Operation>
485-
<Extensions>.dylib</Extensions>
486-
</Platform>
487-
</DeployClass>
487+
<DeployClass Name="ProjectiOSDeviceResourceRules"/>
488488
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
489489
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
490490
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>

‎Source/php4DelphiD2010.identcache

0 Bytes
Binary file not shown.

‎Source/php4DelphiD2010.stat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[Stats]
2-
EditorSecs=287
2+
EditorSecs=235
33
DesignerSecs=1
44
InspectorSecs=1
5-
CompileSecs=15416
6-
OtherSecs=107
5+
CompileSecs=43212
6+
OtherSecs=247
77
StartTime=04.03.2019 21:55:53
88
RealKeys=0
99
EffectiveKeys=0

‎Source/php4DelphiR2010.identcache

0 Bytes
Binary file not shown.

‎Source/php4DelphiR2010.stat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[Stats]
2-
EditorSecs=3026
2+
EditorSecs=4128
33
DesignerSecs=1
44
InspectorSecs=3
5-
CompileSecs=87688
6-
OtherSecs=331
5+
CompileSecs=112868
6+
OtherSecs=370
77
StartTime=29.07.4016 22:02:01
88
RealKeys=0
99
EffectiveKeys=0

‎Source/php4delphi.pas

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ TCustomPHPLibrary = class(TPHPComponent)
197197

198198
TPHPEngine = class(TPHPComponent, IUnknown, IPHPEngine)
199199
private
200-
FINIPath : zend_ustr;
200+
FINIPath : AnsiString;
201201
FOnEngineStartup : TNotifyEvent;
202202
FOnEngineShutdown : TNotifyEvent;
203203
FEngineActive : boolean;
@@ -261,7 +261,7 @@ TPHPEngine = class(TPHPComponent, IUnknown, IPHPEngine)
261261
property OnEngineShutdown : TNotifyEvent read FOnEngineShutdown write FOnEngineShutdown;
262262
property OnScriptError : TPHPErrorEvent read FOnScriptError write FOnScriptError;
263263
property OnLogMessage : TPHPLogMessage read FOnLogMessage write FOnLogMessage;
264-
property IniPath : zend_ustr read FIniPath write FIniPath;
264+
property IniPath : AnsiString read FIniPath write FIniPath;
265265
{$IFNDEF PHP540}
266266
property SafeMode : boolean read FSafeMode write FSafeMode default false;
267267
property SafeModeGid : boolean read FSafeModeGid write FSafeModeGid default false;
@@ -1617,8 +1617,7 @@ procedure TPHPEngine.PrepareIniEntry;
16171617
zend_alter_ini_entry('html_errors', 12, '0', 1, ZEND_INI_SYSTEM, ZEND_INI_STAGE_ACTIVATE);
16181618

16191619
zend_alter_ini_entry('implicit_flush', 15, '1', 1, ZEND_INI_SYSTEM, ZEND_INI_STAGE_ACTIVATE);
1620-
1621-
TimeStr := IntToStr(FMaxInputTime);
1620+
TimeStr := IntToStr(FMaxInputTime);
16221621
zend_alter_ini_entry('max_input_time', 15, zend_pchar(TimeStr), Length(TimeStr), ZEND_INI_SYSTEM, ZEND_INI_STAGE_ACTIVATE);
16231622
end;
16241623

@@ -1643,7 +1642,7 @@ procedure TPHPEngine.PrepareEngine;
16431642
delphi_sapi_module.register_server_variables := @php_delphi_register_variables;
16441643
delphi_sapi_module.log_message := @php_delphi_log_message;
16451644
if FIniPath <> '' then
1646-
delphi_sapi_module.php_ini_path_override := zend_pchar(FIniPath)
1645+
delphi_sapi_module.php_ini_path_override := PAnsiChar(FIniPath)
16471646
else
16481647
delphi_sapi_module.php_ini_path_override := nil;
16491648
delphi_sapi_module.block_interruptions := nil;

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /