Win64 fixes

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6405 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2013-08-07 23:04:23 +00:00
parent 7f103f9e39
commit 942ea1d465
7 changed files with 61 additions and 53 deletions

View file

@ -113,7 +113,9 @@ typedef DWORDLONG ULONGLONG,*PULONGLONG;
// mingw32 and w64-mingw32 do not define ULONG_PTR
// but rather declare ULONG_PTR via typedef (see basetsd.h)
#if !defined(__MINGW32__) && !defined(ULONG_PTR)
# define ULONG_PTR unsigned long
# ifndef _WIN64
# define ULONG_PTR unsigned long
# endif
#endif
#ifdef __cplusplus
@ -248,6 +250,13 @@ typedef DWORDLONG ULONGLONG,*PULONGLONG;
# define ZeroMemory(x, y) memset(x, 0, y)
#endif
#ifndef _WIN64
# ifndef GCLP_HICON
# define GCLP_HICON GCL_HICON
# define SetClassLongPtr SetClassLong
# endif
#endif
// defines
#ifndef MEM_LARGE_PAGES