From: Eli Zaretskii Date: Fri, 15 Aug 2008 17:08:58 +0000 (+0000) Subject: [_MSC_VER && _MSC_VER < 1300]: Declare HMONITOR. X-Git-Tag: emacs-pretest-23.0.90~3470 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8e764ce06db3cfc2dc84c0e81c276715a332fe21;p=emacs.git [_MSC_VER && _MSC_VER < 1300]: Declare HMONITOR. --- diff --git a/src/ChangeLog b/src/ChangeLog index 8f99dec139f..d7f5b59387d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2008-08-15 Eli Zaretskii + * w32fns.c [_MSC_VER && _MSC_VER < 1300]: Declare HMONITOR. + * w32.c (_MEMORY_STATUS_EX, MEMORY_STATUS_EX, LPMEMORY_STATUS_EX): Rename from _MEMORYSTATUSEX, MEMORYSTATUSEX, LPMEMORYSTATUSEX. All users changed. diff --git a/src/w32fns.c b/src/w32fns.c index 74cacf34521..c5c4d5d4688 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -242,6 +242,11 @@ struct MONITOR_INFO DWORD dwFlags; }; +/* Reportedly, VS 6 does not have this in its headers. */ +#if defined(_MSC_VER) && _MSC_VER < 1300 +DECLARE_HANDLE(HMONITOR); +#endif + typedef BOOL (WINAPI * TrackMouseEvent_Proc) (IN OUT LPTRACKMOUSEEVENT lpEventTrack); typedef LONG (WINAPI * ImmGetCompositionString_Proc)