Retire MINGW32_FIX. It was a fix for a blatant bug in MinGW's windres, which

was fixed in CVS in 2000 (I think); and we now depend on MinGW much more
recent than that for various other reasons. I've tested with my current
MinGW (around 2.0.0 vintage) and the original symptoms (dodgy characters in
edit boxes) don't appear to show up.

git-svn-id: svn://svn.tartarus.org/sgt/putty@5491 cda61777-01e9-0310-a592-d414129be87e

diff --git a/mkfiles.pl b/mkfiles.pl
index b48c0a7..7881832 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -396,7 +396,7 @@ if (defined $makefiles{'cygwin'}) {
               "\n".
     "LDFLAGS = -mno-cygwin -s\n".
     &splitline("RCFLAGS = \$(RCINC) --define WIN32=1 --define _WIN32=1".
-      " --define WINVER=0x0400 --define MINGW32_FIX=1")."\n".
+      " --define WINVER=0x0400")."\n".
     "\n".
     $makefile_extra{'cygwin'}->{'vars'} .
     "\n".

diff --git a/windows/rcstuff.h b/windows/rcstuff.h
index 5b2fc3b..1936f7d 100644 (file)
--- a/windows/rcstuff.h
+++ b/windows/rcstuff.h
@@ -30,8 +30,4 @@
 #define RT_MANIFEST 24
 #endif
 
-#ifdef MINGW32_FIX
-#define EDITTEXT     EDITTEXT "",
-#endif
-
 #endif /* PUTTY_RCSTUFF_H */