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

and fix vc build too now... meh

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6433 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2014-01-27 03:44:52 +00:00
parent e798b125ca
commit 3479c12645
1 changed files with 42 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Source/7zip/Common/Types.h
View file

@ -15,11 +15,51 @@
* warranty. * warranty.
*/ */
#include <stdint.h>
#ifndef __COMMON_TYPES_H #ifndef __COMMON_TYPES_H
#define __COMMON_TYPES_H #define __COMMON_TYPES_H
#ifdef _WIN32
#include <windows.h>
#ifndef _7ZIP_BYTE_DEFINED
#define _7ZIP_BYTE_DEFINED
typedef UINT8 Byte;
#endif
#ifndef _7ZIP_INT16_DEFINED
#define _7ZIP_INT16_DEFINED
typedef INT16 Int16;
#endif
#ifndef _7ZIP_UINT16_DEFINED
#define _7ZIP_UINT16_DEFINED
typedef UINT16 UInt16;
#endif
#ifndef _7ZIP_INT32_DEFINED
#define _7ZIP_INT32_DEFINED
typedef INT32 Int32;
#endif
#ifndef _7ZIP_UINT32_DEFINED
#define _7ZIP_UINT32_DEFINED
typedef UINT32 UInt32;
#endif
#ifndef _7ZIP_INT64_DEFINED
#define _7ZIP_INT64_DEFINED
typedef INT64 Int64;
#endif
#ifndef _7ZIP_UINT64_DEFINED
#define _7ZIP_UINT64_DEFINED
typedef UINT64 UInt64;
#endif
#else // !_WIN32
#include <stdint.h>
#ifndef _7ZIP_BYTE_DEFINED #ifndef _7ZIP_BYTE_DEFINED
#define _7ZIP_BYTE_DEFINED #define _7ZIP_BYTE_DEFINED
typedef uint8_t Byte; typedef uint8_t Byte;
@ -45,20 +85,6 @@ typedef int32_t Int32;
typedef uint32_t UInt32; typedef uint32_t UInt32;
#endif #endif
#ifdef _MSC_VER
#ifndef _7ZIP_INT64_DEFINED
#define _7ZIP_INT64_DEFINED
typedef __int64 Int64;
#endif
#ifndef _7ZIP_UINT64_DEFINED
#define _7ZIP_UINT64_DEFINED
typedef unsigned __int64 UInt64;
#endif
#else
#ifndef _7ZIP_INT64_DEFINED #ifndef _7ZIP_INT64_DEFINED
#define _7ZIP_INT64_DEFINED #define _7ZIP_INT64_DEFINED
typedef int64_t Int64; typedef int64_t Int64;