Skip to content

Commit 978b112

Browse files
Lev ZeninLev Zenin
Lev Zenin
authored and
Lev Zenin
committed
Some small fixes
One more step #7 to remove assembler
1 parent a5a7b69 commit 978b112

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

β€ŽSource/Demos/psvPHP/console/phpcon.dpr

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var
4242
begin
4343
if zend_parse_method_parameters(1, TSRMLS_DC, this_ptr, 'z', @p) = 0 then
4444
begin
45-
ZVAL_STRING(z,'πŸ†πŸ†πŸ† .-=WPD=-. πŸ†πŸ†πŸ†',true);
45+
ZVAL_STRINGW(p,'πŸ†πŸ†πŸ† .-=WPD=-. πŸ†πŸ†πŸ†',true);
4646
end;
4747
end;
4848
begin

β€ŽSource/ZENDAPI.pas

-1
Original file line numberDiff line numberDiff line change
@@ -1530,7 +1530,6 @@ procedure VariantToZend(const Value:Variant;z:pzval;
15301530
cobj: TObjectAConvertMethod=nil);
15311531
var
15321532
W : WideString;
1533-
S: String;
15341533
begin
15351534
if VarIsEmpty(value) or VarIsNull(Value) then
15361535
begin

β€ŽSource/php4delphi.pas

+1-4
Original file line numberDiff line numberDiff line change
@@ -1616,10 +1616,7 @@ procedure TPHPEngine.PrepareIniEntry;
16161616

16171617
if FHandleErrors then
16181618
begin
1619-
// p := integer(GetProcAddress(PHPLib, 'zend_do_print'));
1620-
p := GetProcAddress(PHPLib, 'zend_error_cb');
1621-
p2 := @delphi_error_cb;
1622-
Move(p, p2, 1);
1619+
ppointer(GetProcAddress(PHPLib, 'zend_error_cb'))^ := @delphi_error_cb;
16231620
end;
16241621
{$IFNDEF PHP540}
16251622
if FSafeMode then

0 commit comments

Comments
Β (0)