From dfddc2062865c901d7ab9de90214f3aed89bd4eb Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Mon, 8 Dec 2003 22:43:51 +0000
Subject: [PATCH] Use <multimon.h> when compiling with MSVC and old headers.
 (#126933, John

2003-12-08  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkdisplay-win32.c: Use <multimon.h> when compiling
	with MSVC and old headers. (#126933, John Ehresman)
---
 ChangeLog                    | 5 +++++
 ChangeLog.pre-2-10           | 5 +++++
 ChangeLog.pre-2-4            | 5 +++++
 ChangeLog.pre-2-6            | 5 +++++
 ChangeLog.pre-2-8            | 5 +++++
 gdk/win32/gdkdisplay-win32.c | 4 ++++
 6 files changed, 29 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f0d745803b..964ad1fdff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-08  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkdisplay-win32.c: Use <multimon.h> when compiling
+	with MSVC and old headers. (#126933, John Ehresman)
+
 Mon Dec  8 10:54:44 2003  Owen Taylor  <otaylor@redhat.com>
 	 
 	* === Released 2.3.1 ===
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f0d745803b..964ad1fdff 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-12-08  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkdisplay-win32.c: Use <multimon.h> when compiling
+	with MSVC and old headers. (#126933, John Ehresman)
+
 Mon Dec  8 10:54:44 2003  Owen Taylor  <otaylor@redhat.com>
 	 
 	* === Released 2.3.1 ===
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f0d745803b..964ad1fdff 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-12-08  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkdisplay-win32.c: Use <multimon.h> when compiling
+	with MSVC and old headers. (#126933, John Ehresman)
+
 Mon Dec  8 10:54:44 2003  Owen Taylor  <otaylor@redhat.com>
 	 
 	* === Released 2.3.1 ===
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f0d745803b..964ad1fdff 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-12-08  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkdisplay-win32.c: Use <multimon.h> when compiling
+	with MSVC and old headers. (#126933, John Ehresman)
+
 Mon Dec  8 10:54:44 2003  Owen Taylor  <otaylor@redhat.com>
 	 
 	* === Released 2.3.1 ===
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f0d745803b..964ad1fdff 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-12-08  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkdisplay-win32.c: Use <multimon.h> when compiling
+	with MSVC and old headers. (#126933, John Ehresman)
+
 Mon Dec  8 10:54:44 2003  Owen Taylor  <otaylor@redhat.com>
 	 
 	* === Released 2.3.1 ===
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 80441ca35a..546339d9c2 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -21,6 +21,10 @@
 #include "gdk.h"
 #include "gdkprivate-win32.h"
 
+#if defined(_MSC_VER) && (WINVER < 0x500)
+#include <multimon.h>
+#endif
+
 typedef BOOL (WINAPI *t_EnumDisplayMonitors)(HDC, LPCRECT, MONITORENUMPROC, LPARAM);
 typedef BOOL (WINAPI *t_GetMonitorInfoA)(HMONITOR, LPMONITORINFO);