Mercurial > mxe-octave

comparison src/nsis-1-fixes.patch @ 3526:60cd6f076a3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 a1d474da2036
children d76aee4b2c2b
comparison
equal deleted inserted replaced
3525:7e203439d0a9 3526:60cd6f076a3d
584 SetLastError( 0 ); 584 SetLastError( 0 );
585 return dwResult; 585 return dwResult;
586 -- 586 --
587 1.8.2.1 587 1.8.2.1
588 588
589 diff -ur a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
590 --- a/Contrib/InstallOptions/InstallerOptions.cpp 2009-02-04 09:08:31.000000000 -0500
591 +++ b/Contrib/InstallOptions/InstallerOptions.cpp 2014-02-14 18:14:18.638628714 -0500
592 @@ -33,6 +33,7 @@
593 #define strdup(x) STRDUP(x)
594 #define stricmp(x,y) lstrcmpi(x,y)
595 //#define abs(x) ((x) < 0 ? -(x) : (x))
596 +#define min(x,y) ((x) < (y) ? (x) : (y))
597
598 char *WINAPI STRDUP(const char *c)
599 {