diff options
| author | Philipp Sehmisch <tmw@crushnet.org> | 2007-10-28 02:55:43 +0000 |
|---|---|---|
| committer | Philipp Sehmisch <tmw@crushnet.org> | 2007-10-28 02:55:43 +0000 |
| commit | b755a9b46325d96b8f74e0cb05bb350f2f4681d0 (patch) | |
| tree | 42f23f641c6e2a9342fe13e6eadfede048d6851a | |
| parent | 97bbe57e21a28544646da087e2a522390bf2ce5c (diff) | |
| download | mana-b755a9b46325d96b8f74e0cb05bb350f2f4681d0.tar.gz mana-b755a9b46325d96b8f74e0cb05bb350f2f4681d0.tar.bz2 mana-b755a9b46325d96b8f74e0cb05bb350f2f4681d0.tar.xz mana-b755a9b46325d96b8f74e0cb05bb350f2f4681d0.zip | |
Fixed a windows compilation problem caused by a define macro of the Windows API that conflicts with a guichan identifier.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/gui/textfield.cpp | 2 |
2 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,9 @@ +2007-10-28 Philipp Sehmisch <tmw@crushnet.org> + + * src/gui/textfield.cpp: Fixed a windows compilation problem + caused by a define macro of the Windows API that conflicts + with a guichan identifier. + 2007-10-27 Guillaume Melquiond <guillaume.melquiond@gmail.com> * src/properties.h, src/game.cpp, src/channel.h, src/log.cpp, diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp index 81b1a0ab..11659b8b 100644 --- a/src/gui/textfield.cpp +++ b/src/gui/textfield.cpp @@ -36,6 +36,8 @@ #include "../utils/dtor.h" +#undef DELETE //Win32 compatibility hack + int TextField::instances = 0; ImageRect TextField::skin; |