- updated the makefiles and code to allow compliation with MinGW once again (some of patch #875485 by perditionc)
- fixed errors and warnings given by gcc git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3513 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
2b3da85bae
commit
f4a1f17299
43 changed files with 323 additions and 252 deletions
|
@ -4,6 +4,9 @@
|
|||
// includes
|
||||
|
||||
#ifdef _WIN32
|
||||
# ifndef _WIN32_IE
|
||||
# define _WIN32_IE 0x0400
|
||||
# endif
|
||||
# include <Windows.h>
|
||||
# include <commctrl.h>
|
||||
#else
|
||||
|
@ -27,6 +30,27 @@
|
|||
# endif
|
||||
#endif
|
||||
|
||||
// Added by Dave Laundon 19th August 2002
|
||||
// For all internal functions, use of stdcall calling convention moves the
|
||||
// responsibility for tidying the stack to callee from caller, reducing the code
|
||||
// involved considerably. Gives an instant saving of 0.5K.
|
||||
// NB - the zlib and bzip2 portions have been given the same treatment, but with
|
||||
// project compiler-options settings and/or project-wide defines.
|
||||
// NB - safer for NSIS's routines to be defined explicitly to avoid problems
|
||||
// calling DLL functions.
|
||||
#if defined(_WIN32) && ((_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED))
|
||||
# define NSISCALL __stdcall // Ordinary functions
|
||||
# define NSISCALLV __cdecl // Variable-argument-list functions
|
||||
#else
|
||||
# ifdef __GNUC__
|
||||
# define NSISCALL __attribute__((__stdcall__)) // Ordinary functions
|
||||
# define NSISCALLV __attribute__((__cdecl__)) // Variable-argument-list functions
|
||||
# else
|
||||
# define NSISCALL
|
||||
# define NSISCALLV
|
||||
# endif
|
||||
#endif
|
||||
|
||||
// defines
|
||||
|
||||
#ifndef FOF_NOERRORUI
|
||||
|
@ -69,8 +93,15 @@
|
|||
#define LVS_EX_LABELTIP 0x00004000
|
||||
#endif
|
||||
|
||||
#ifndef INVALID_FILE_ATTRIBUTES
|
||||
#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
|
||||
#ifdef __GNUC__ // ((DWORD)-1) may cause parsing errors with MinGW
|
||||
# ifdef INVALID_FILE_ATTRIBUTES // updated win32api may also set as (DWORD)-1
|
||||
# undef INVALID_FILE_ATTRIBUTES
|
||||
# endif
|
||||
# define INVALID_FILE_ATTRIBUTES ((unsigned long)-1)
|
||||
#else
|
||||
# ifndef INVALID_FILE_ATTRIBUTES
|
||||
# define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef CSIDL_FLAG_CREATE
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue