# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1392591742 18000
# Node ID 60cd6f076a3d7344a30f3d1728b5c19ad6c6e061
# Parent  7e203439d0a996b826b486c3838a5aa032030313
allow nsis to compile with 32-bit mingw-w64

diff -r 7e203439d0a9 -r 60cd6f076a3d src/nsis-1-fixes.patch
--- a/src/nsis-1-fixes.patch	Sun Feb 16 18:02:15 2014 -0500
+++ b/src/nsis-1-fixes.patch	Sun Feb 16 18:02:22 2014 -0500
@@ -586,3 +586,14 @@
 -- 
 1.8.2.1
 
+diff -ur a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
+--- a/Contrib/InstallOptions/InstallerOptions.cpp	2009-02-04 09:08:31.000000000 -0500
++++ b/Contrib/InstallOptions/InstallerOptions.cpp	2014-02-14 18:14:18.638628714 -0500
+@@ -33,6 +33,7 @@
+ #define strdup(x) STRDUP(x)
+ #define stricmp(x,y) lstrcmpi(x,y)
+ //#define abs(x) ((x) < 0 ? -(x) : (x))
++#define min(x,y) ((x) < (y) ? (x) : (y))
+ 
+ char *WINAPI STRDUP(const char *c)
+ {