intpr

Author: Lev Zenin

Source/PHPAPI.pas

@@ -345,7 +345,7 @@ function GetSAPIGlobals : Psapi_globals_struct;
 begin
   Result := nil;
   if Assigned(sapi_globals_id) then
-     Result := __asm_fetchval(integer(sapi_globals_id^), tsrmls_fetch);
+     Result := __asm_fetchval(IntPtr(sapi_globals_id^), tsrmls_fetch);
 end;
 function GetSAPIGlobals(TSRMLS_DC : pointer) : Psapi_globals_struct;
 var
@@ -354,7 +354,7 @@ function GetSAPIGlobals(TSRMLS_DC : pointer) : Psapi_globals_struct;
   Result := nil;
   sapi_global_id := GetProcAddress(PHPLib, 'sapi_globals_id');
   if Assigned(sapi_global_id) then
-     Result := __asm_fetchval(integer(sapi_globals_id^), TSRMLS_DC);
+     Result := __asm_fetchval(IntPtr(sapi_globals_id^), TSRMLS_DC);
 end;
 
 function GetStringOf(const V: TVarData): string;
@@ -407,7 +407,7 @@ function GetPHPGlobals(TSRMLS_DC : pointer) : Pphp_Core_Globals;
 begin
   Result := nil;
   if Assigned(core_globals_id) then
-     Result := Pphp_Core_Globals(__asm_fetchval(integer(core_globals_id^), TSRMLS_DC));
+     Result := Pphp_Core_Globals(__asm_fetchval(IntPtr(core_globals_id^), TSRMLS_DC));
 end;
 
 

Source/ZENDAPI.pas

@@ -3301,12 +3301,7 @@ function zend_register_functions(functions : {$IFDEF PHP7}P_zend_function_entry{
 
 end;
 
-function __asm_fetchval
-{$IFDEF CPUX64}
-(val_id: int64; tsrmls_dc_p: pointer)
-{$ELSE}
-(val_id: integer; tsrmls_dc_p: pointer)
-{$ENDIF}
+function __asm_fetchval(val_id: IntPtr; tsrmls_dc_p: pointer)
 : pointer; assembler; register;
 {$IFDEF CPUX64}
 asm
@@ -3335,7 +3330,7 @@ function GetGlobalResource(resource_name: AnsiString) : pointer;
     global_id := GetProcAddress(PHPLib, zend_pchar(resource_name));
     if Assigned(global_id) then
      begin
-       Result := __asm_fetchval(integer(global_id^), tsrmls_fetch);
+       Result := __asm_fetchval(IntPtr(global_id^), tsrmls_fetch);
      end;
   except
     Result := nil;
@@ -3351,7 +3346,7 @@ function GetGlobalResourceDC(resource_name: AnsiString;TSRMLS_DC:pointer) : poin
     global_id := GetProcAddress(PHPLib, zend_pchar(resource_name));
     if Assigned(global_id) then
      begin
-       Result := __asm_fetchval(integer(global_id^), TSRMLS_DC);
+       Result := __asm_fetchval(IntPtr(global_id^), TSRMLS_DC);
      end;
   except
     Result := nil;