Mantis #5945: Cannot complete installation (RAD Studio XE2) [define I…

…NTERNET_COMPONENT set]
project-jedi · Aug 19, 2012 · 1a0f9e3 · 1a0f9e3
1 parent dfb1d74
commit 1a0f9e3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/jvcl/run/JvInterpreter_httpapp.pas b/jvcl/run/JvInterpreter_httpapp.pas
@@ -52,8 +52,12 @@ procedure RegisterJvInterpreterAdapter(JvInterpreterAdapter: TJvInterpreterAdapt
 implementation
 
 uses
-  SysUtils, Classes,
-  HTTPApp;
+  {$IFDEF HAS_UNITSCOPE}
+  Web.HTTPApp,
+  {$ELSE}
+  HTTPApp,
+  {$ENDIF HAS_UNITSCOPE}
+  SysUtils, Classes;
 
 { function ReadClient(var Buffer; Count: Integer): Integer; }
 

diff --git a/jvcl/run/JvgHTTPVersionInfo.pas b/jvcl/run/JvgHTTPVersionInfo.pas
@@ -51,7 +51,7 @@   TJvgHTTPVersionInfo = class(TJvComponent)
     function GetProgramURL: string;
     function GetComments: string;
     procedure OnLoadVersionInfo(Sender: TObject; const PDisp: IDispatch;
-      var URL: OleVariant);
+      {$IFDEF COMPILER16_UP}const{$ELSE}var{$ENDIF} URL: OleVariant);
   public
     property VersionInfo: TStrings read GetVersionInfoProperty;
     function GetVersionInfo(WinControl: TWinControl): Boolean;
@@ -142,7 +142,7 @@ function TJvgHTTPVersionInfo.GetVersionInfo(WinControl: TWinControl): Boolean;
 end;
 
 procedure TJvgHTTPVersionInfo.OnLoadVersionInfo(Sender: TObject;
-  const PDisp: IDispatch; var URL: OleVariant);
+  const PDisp: IDispatch; {$IFDEF COMPILER16_UP}const{$ELSE}var{$ENDIF} URL: OleVariant);
 var
   Doc: Variant;
 begin