summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/gui/textfield.cpp2
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d2d6221..d51050c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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;