fixed build with mingw on ubuntu 64-bit

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6432 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2014-01-27 03:34:16 +00:00
parent d229abcf72
commit e798b125ca
2 changed files with 24 additions and 27 deletions

View file

@ -15,32 +15,34 @@
* warranty.
*/
#include <stdint.h>
#ifndef __COMMON_TYPES_H
#define __COMMON_TYPES_H
#ifndef _7ZIP_BYTE_DEFINED
#define _7ZIP_BYTE_DEFINED
typedef unsigned char Byte;
typedef uint8_t Byte;
#endif
#ifndef _7ZIP_INT16_DEFINED
#define _7ZIP_INT16_DEFINED
typedef short Int16;
typedef int16_t Int16;
#endif
#ifndef _7ZIP_UINT16_DEFINED
#define _7ZIP_UINT16_DEFINED
typedef unsigned short UInt16;
typedef uint16_t UInt16;
#endif
#ifndef _7ZIP_INT32_DEFINED
#define _7ZIP_INT32_DEFINED
typedef int Int32;
typedef int32_t Int32;
#endif
#ifndef _7ZIP_UINT32_DEFINED
#define _7ZIP_UINT32_DEFINED
typedef unsigned int UInt32;
typedef uint32_t UInt32;
#endif
#ifdef _MSC_VER
@ -59,12 +61,12 @@ typedef unsigned __int64 UInt64;
#ifndef _7ZIP_INT64_DEFINED
#define _7ZIP_INT64_DEFINED
typedef long long int Int64;
typedef int64_t Int64;
#endif
#ifndef _7ZIP_UINT64_DEFINED
#define _7ZIP_UINT64_DEFINED
typedef unsigned long long int UInt64;
typedef uint64_t UInt64;
#endif
#endif