--- Merging r14311 into '.':

U    rtl/objpas/classes/classesh.inc
--- Merging r14311 into 'packages/unzip/src/unzip51g.pp':
 G   packages/unzip/src/unzip51g.pp
--- Merging r14311 into '.':
 G   .

git-svn-id: tags/release_2_4_0@14312 -

rtl/objpas/classes/classesh.inc

@@ -25,7 +25,7 @@
 
 type
    { extra types to compile with FPC }
-   HRSRC = longint;
+   HRSRC =  TFPResourceHandle {$ifndef ver2_2} deprecated {$endif};
    TComponentName = string;
    THandle = System.THandle;
 
@@ -849,7 +849,7 @@ type
 {$ifdef UNICODE}
   TResourceStream = class(TCustomMemoryStream)
   private
-    Res: HRSRC;
+    Res: TFPResourceHandle;
     Handle: THandle;
     procedure Initialize(Instance: THandle; Name, ResType: PWideChar);
   public
@@ -860,7 +860,7 @@ type
 {$else}
   TResourceStream = class(TCustomMemoryStream)
   private
-    Res: HRSRC;
+    Res: TFPResourceHandle;
     Handle: THandle;
     procedure Initialize(Instance: THandle; Name, ResType: PChar);
   public