-diff -ur nsis-2.39-src.orig/Source/DialogTemplate.cpp nsis-2.39-src.64bit/Source/DialogTemplate.cpp
---- nsis-2.39-src.orig/Source/DialogTemplate.cpp 2007-11-30 09:54:13.000000000 +0000
-+++ nsis-2.39-src.64bit/Source/DialogTemplate.cpp 2008-09-22 12:37:11.000000000 +0100
+diff -ur nsis-2.34-src/SCons/Config/gnu nsis-2.34-src-64bit-fixes/SCons/Config/gnu
+--- nsis-2.34-src/SCons/Config/gnu 2007-11-14 07:20:44.000000000 +0100
++++ nsis-2.34-src-64bit-fixes/SCons/Config/gnu 2008-01-13 22:15:21.000000000 +0100
+@@ -85,8 +85,6 @@
+ makensis_env.Append(CXXFLAGS = '-Wno-non-virtual-dtor') # ignore virtual dtor warnings
+
+ conf = FlagsConfigure(makensis_env)
+-conf.CheckCompileFlag('-m32') #
+-conf.CheckLinkFlag('-m32') #
+ conf.CheckLinkFlag('$MAP_FLAG') # generate map file
+ if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']:
+ TestStrip(conf) # strip
+diff -ur nsis-2.34-src/Source/DialogTemplate.cpp nsis-2.34-src-64bit-fixes/Source/DialogTemplate.cpp
+--- nsis-2.34-src/Source/DialogTemplate.cpp 2007-11-30 10:54:13.000000000 +0100
++++ nsis-2.34-src-64bit-fixes/Source/DialogTemplate.cpp 2008-01-13 19:01:02.000000000 +0100