diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-03-01 18:59:49 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-03-01 18:59:49 +0000 |
| commit | 5262e5f1e3349a78468d2f5b05d83a1d3487671d (patch) | |
| tree | ac9539ee93c70b699432fc04b3f34e88e2e3c431 | |
| parent | 9ed5ea6beb085f0e644f228b7da1a00dfa092372 (diff) | |
| download | pango-5262e5f1e3349a78468d2f5b05d83a1d3487671d.tar.gz | |
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)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | tests/cxx-test.C | 8 |
3 files changed, 14 insertions, 4 deletions
@@ -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 () { |