Mercurial > mxe-octave
changeset 3526:60cd6f076a3d
allow nsis to compile with 32-bit mingw-w64
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 16 Feb 2014 18:02:22 -0500 |
| parents | 7e203439d0a9 |
| children | b111822b0bf0 |
| files | src/nsis-1-fixes.patch |
| diffstat | 1 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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) + {