From 5262e5f1e3349a78468d2f5b05d83a1d3487671d Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@novell.com>
Date: Tue, 1 Mar 2005 18:59:49 +0000
Subject: Include pangowin32.h first to avoid a namespace collision. (#163584)

2005-03-01  Tor Lillqvist  <tml@novell.com>

	* tests/cxx-test.C: Include pangowin32.h first to avoid
	a namespace collision. (#163584)
---
 ChangeLog          | 5 +++++
 ChangeLog.pre-1-10 | 5 +++++
 tests/cxx-test.C   | 8 ++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 770aa129..d22170f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-01  Tor Lillqvist  <tml@novell.com>
+
+	* tests/cxx-test.C: Include pangowin32.h first to avoid
+	a namespace collision. (#163584)
+
 2005-02-21  Owen Taylor  <otaylor@redhat.com>
 
 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 770aa129..d22170f1 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+2005-03-01  Tor Lillqvist  <tml@novell.com>
+
+	* tests/cxx-test.C: Include pangowin32.h first to avoid
+	a namespace collision. (#163584)
+
 2005-02-21  Owen Taylor  <otaylor@redhat.com>
 
 
diff --git a/tests/cxx-test.C b/tests/cxx-test.C
index 7142152b..ab9aaa4b 100644
--- a/tests/cxx-test.C
+++ b/tests/cxx-test.C
@@ -6,6 +6,10 @@
 
 #include <pango/pango.h>
 
+#ifdef HAVE_WIN32
+#include <pango/pangowin32.h>
+#endif
+
 #ifdef HAVE_X
 #include <pango/pangox.h>
 #endif
@@ -18,10 +22,6 @@
 #include <pango/pangoft2.h>
 #endif
 
-#ifdef HAVE_WIN32
-#include <pango/pangowin32.h>
-#endif
-
 int
 main ()
 {
-- 
cgit v1.2.1