diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-10-09 17:12:26 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-10-09 17:12:26 +0200 |
| commit | cfeedbfd3e292f61c7da8f0a7f86307cbeeddb64 (patch) | |
| tree | 3629d1de148b14915a35a21f809e1a2ea6a08619 /win | |
| parent | bff1af983ad7b0bed6c3973e4d13297df5fe2791 (diff) | |
| parent | 16c4b3c68b06653592a9500050ad977a38f4ebae (diff) | |
| download | mariadb-git-cfeedbfd3e292f61c7da8f0a7f86307cbeeddb64.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/ca/CustomAction.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/win/packaging/ca/CustomAction.cpp b/win/packaging/ca/CustomAction.cpp index 17bfca1debb..3cb8520b65d 100644 --- a/win/packaging/ca/CustomAction.cpp +++ b/win/packaging/ca/CustomAction.cpp @@ -17,6 +17,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define UNICODE #endif +#undef NOMINMAX + #include <winsock2.h> #include <windows.h> #include <winreg.h> |