dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Reorganized defines

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6137 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2011-03-01 17:31:02 +00:00
parent d95c0ecbd8
commit e46b9b0801
1 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Source/Platform.h
View file

@ -107,9 +107,15 @@ typedef DWORDLONG ULONGLONG,*PULONGLONG;
#define _strdup strdup #define _strdup strdup
#define _snprintf snprintf #define _snprintf snprintf
#define _vsnprintf vsnprintf #define _vsnprintf vsnprintf
#endif #endif
// 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
#endif
#ifdef _countof #ifdef _countof
#define COUNTOF _countof #define COUNTOF _countof
@ -230,16 +236,6 @@ typedef DWORDLONG ULONGLONG,*PULONGLONG;
// defines // defines
#ifndef FOF_NOERRORUI
# define FOF_NOERRORUI 0x0400
#endif
// 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
#endif
#ifndef IDC_HAND #ifndef IDC_HAND
# define IDC_HAND MAKEINTRESOURCE(32649) # define IDC_HAND MAKEINTRESOURCE(32649)
#endif #endif
@ -426,6 +422,10 @@ typedef DWORDLONG ULONGLONG,*PULONGLONG;
# define CSIDL_CDBURN_AREA 0x3B # define CSIDL_CDBURN_AREA 0x3B
#endif #endif
#ifndef SHGFP_TYPE_CURRENT
#define SHGFP_TYPE_CURRENT 0
#endif
// other shell stuff // other shell stuff
#ifndef SHACF_FILESYSTEM #ifndef SHACF_FILESYSTEM
@ -579,6 +579,13 @@ typedef DWORDLONG ULONGLONG,*PULONGLONG;
# define KEY_WOW64_64KEY 0x100 # define KEY_WOW64_64KEY 0x100
#endif #endif
#ifndef REG_SZ
# define REG_SZ 1
# define REG_EXPAND_SZ 2
# define REG_BINARY 3
# define REG_DWORD 4
#endif
// show modes // show modes
#ifndef SW_SHOWNORMAL #ifndef SW_SHOWNORMAL
@ -649,6 +656,9 @@ typedef DWORDLONG ULONGLONG,*PULONGLONG;
# define FOF_SIMPLEPROGRESS 256 # define FOF_SIMPLEPROGRESS 256
# define FOF_NOCONFIRMMKDIR 512 # define FOF_NOCONFIRMMKDIR 512
#endif #endif
#ifndef FOF_NOERRORUI
# define FOF_NOERRORUI 0x0400
#endif
// file attribs // file attribs
@ -662,14 +672,6 @@ typedef DWORDLONG ULONGLONG,*PULONGLONG;
# define FILE_ATTRIBUTE_OFFLINE 0x00001000 # define FILE_ATTRIBUTE_OFFLINE 0x00001000
#endif #endif
// registry
#ifndef REG_SZ
# define REG_SZ 1
# define REG_EXPAND_SZ 2
# define REG_BINARY 3
# define REG_DWORD 4
#endif
// fopen // fopen
#ifndef GENERIC_READ #ifndef GENERIC_READ
@ -895,8 +897,4 @@ typedef struct tagVS_FIXEDFILEINFO {
# pragma pack() # pragma pack()
#endif #endif
#ifndef SHGFP_TYPE_CURRENT
#define SHGFP_TYPE_CURRENT 0
#endif
#endif #endif