aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2008-08-15 17:08:58 +0000
committerEli Zaretskii2008-08-15 17:08:58 +0000
commit8e764ce06db3cfc2dc84c0e81c276715a332fe21 (patch)
tree78eb3926060e8e5e7310e5139642a0059f167226 /src
parentf8b35b24ae6fa411f0dad2fb04c25ecd7dfc4f52 (diff)
downloademacs-8e764ce06db3cfc2dc84c0e81c276715a332fe21.tar.gz
emacs-8e764ce06db3cfc2dc84c0e81c276715a332fe21.zip
[_MSC_VER && _MSC_VER < 1300]: Declare HMONITOR.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/w32fns.c5
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8f99dec139f..d7f5b59387d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12008-08-15 Eli Zaretskii <eliz@gnu.org> 12008-08-15 Eli Zaretskii <eliz@gnu.org>
2 2
3 * w32fns.c [_MSC_VER && _MSC_VER < 1300]: Declare HMONITOR.
4
3 * w32.c (_MEMORY_STATUS_EX, MEMORY_STATUS_EX, LPMEMORY_STATUS_EX): 5 * w32.c (_MEMORY_STATUS_EX, MEMORY_STATUS_EX, LPMEMORY_STATUS_EX):
4 Rename from _MEMORYSTATUSEX, MEMORYSTATUSEX, LPMEMORYSTATUSEX. 6 Rename from _MEMORYSTATUSEX, MEMORYSTATUSEX, LPMEMORYSTATUSEX.
5 All users changed. 7 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
242 DWORD dwFlags; 242 DWORD dwFlags;
243}; 243};
244 244
245/* Reportedly, VS 6 does not have this in its headers. */
246#if defined(_MSC_VER) && _MSC_VER < 1300
247DECLARE_HANDLE(HMONITOR);
248#endif
249
245typedef BOOL (WINAPI * TrackMouseEvent_Proc) 250typedef BOOL (WINAPI * TrackMouseEvent_Proc)
246 (IN OUT LPTRACKMOUSEEVENT lpEventTrack); 251 (IN OUT LPTRACKMOUSEEVENT lpEventTrack);
247typedef LONG (WINAPI * ImmGetCompositionString_Proc) 252typedef LONG (WINAPI * ImmGetCompositionString_Proc)