applied patch #1714416 - patch to build on hpux
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5181 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
3aa59a650a
commit
81afed0591
6 changed files with 144 additions and 3 deletions
|
@ -69,7 +69,7 @@ size_t file_size(ifstream& file) {
|
|||
file.seekg(0, ios::end);
|
||||
|
||||
ifstream::pos_type result = file.tellg();
|
||||
assert(result >= 0);
|
||||
assert(result >= (ifstream::pos_type)0);
|
||||
|
||||
file.seekg(pos);
|
||||
|
||||
|
|
|
@ -27,6 +27,12 @@ using namespace std;
|
|||
#define ALIGN(dwToAlign, dwAlignOn) dwToAlign = (dwToAlign%dwAlignOn == 0) ? dwToAlign : dwToAlign - (dwToAlign%dwAlignOn) + dwAlignOn
|
||||
#define RALIGN(dwToAlign, dwAlignOn) ((dwToAlign%dwAlignOn == 0) ? dwToAlign : dwToAlign - (dwToAlign%dwAlignOn) + dwAlignOn)
|
||||
|
||||
#ifndef _WIN32
|
||||
static inline ULONG ConvertEndianness(ULONG u) {
|
||||
return FIX_ENDIAN_INT32(u);
|
||||
}
|
||||
#endif
|
||||
|
||||
static inline DWORD ConvertEndianness(DWORD d) {
|
||||
return FIX_ENDIAN_INT32(d);
|
||||
}
|
||||
|
|
|
@ -245,6 +245,12 @@ static int change_to_script_dir(CEXEBuild& build, string& script)
|
|||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
|
||||
#ifdef __ALLOW_UNALIGNED_DATA_ACCESS__
|
||||
extern "C" void allow_unaligned_data_access();
|
||||
allow_unaligned_data_access();
|
||||
#endif
|
||||
|
||||
CEXEBuild build;
|
||||
int do_cd=1;
|
||||
int outputtried=0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue