--- Merging r14953 into '.':

U    rtl/win/wininc/base.inc
--- Merging r14954 into '.':
U    packages/winunits-base/src/multimon.pp

# revisions: 14953,14954
------------------------------------------------------------------------
r14953 | marco | 2010-02-28 13:38:17 +0100 (Sun, 28 Feb 2010) | 2 lines
Changed paths:
   M /trunk/rtl/win/wininc/base.inc

 * fix for mantis 15865 add hmonitor

------------------------------------------------------------------------
------------------------------------------------------------------------
r14954 | marco | 2010-02-28 16:56:42 +0100 (Sun, 28 Feb 2010) | 4 lines
Changed paths:
   M /trunk/packages/winunits-base/src/multimon.pp

 * alias hmonitor to windows.hmonitor. This handle moved from 
   windows unit to multimon in later delphi versions. An alias solution provides
   compat to both.

------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@14978 -

packages/winunits-base/src/multimon.pp

@@ -50,7 +50,7 @@ const
 // HMONITOR is already declared if WINVER >= 0x0500 in windef.h
 // This is for components built with an older version number.
 type
-  HMONITOR = HANDLE;
+  HMONITOR = Windows.HMonitor;
 
 const
   MONITOR_DEFAULTTONULL    = $00000000;

rtl/win/wininc/base.inc

@@ -130,6 +130,7 @@
      HMENU = HANDLE;
      HMETAFILE = HANDLE;
      HMODULE = HANDLE;
+     HMONITOR = HANDLE;
      HPALETTE = HANDLE;
      HPEN = HANDLE;
      HRASCONN = HANDLE;