(deps/7zip) Get rid of EXTERN_C_BEGIN/EXTERN_C_END

This commit is contained in:
twinaphex 2015-09-06 15:48:02 +02:00
parent 3072f556f2
commit 56951ba7ee
5 changed files with 28 additions and 18 deletions

8
deps/7zip/7z.h vendored
View File

@ -6,7 +6,9 @@
#include "7zBuf.h"
EXTERN_C_BEGIN
#ifdef __cplusplus
extern "C" {
#endif
#define k7zStartHeaderSize 0x20
#define k7zSignatureSize 6
@ -198,6 +200,8 @@ SZ_ERROR_FAIL
SRes SzArEx_Open(CSzArEx *p, ILookInStream *inStream, ISzAlloc *allocMain, ISzAlloc *allocTemp);
EXTERN_C_END
#ifdef __cplusplus
}
#endif
#endif

8
deps/7zip/7zCrc.h vendored
View File

@ -6,7 +6,9 @@
#include "Types.h"
EXTERN_C_BEGIN
#ifdef __cplusplus
extern "C" {
#endif
extern uint32_t g_CrcTable[];
@ -20,6 +22,8 @@ void MY_FAST_CALL CrcGenerateTable(void);
uint32_t MY_FAST_CALL CrcUpdate(uint32_t crc, const void *data, size_t size);
uint32_t MY_FAST_CALL CrcCalc(const void *data, size_t size);
EXTERN_C_END
#ifdef __cplusplus
}
#endif
#endif

8
deps/7zip/7zFile.h vendored
View File

@ -16,7 +16,9 @@
#include "Types.h"
EXTERN_C_BEGIN
#ifdef __cplusplus
extern "C" {
#endif
/* ---------- File ---------- */
@ -78,6 +80,8 @@ typedef struct
void FileOutStream_CreateVTable(CFileOutStream *p);
EXTERN_C_END
#ifdef __cplusplus
}
#endif
#endif

8
deps/7zip/CpuArch.h vendored
View File

@ -6,7 +6,9 @@
#include "Types.h"
EXTERN_C_BEGIN
#ifdef __cplusplus
extern "C" {
#endif
/*
MY_CPU_LE means that CPU is LITTLE ENDIAN.
@ -120,6 +122,8 @@ Stop_Compiling_Bad_Endian
Bool CPU_Is_InOrder();
EXTERN_C_END
#ifdef __cplusplus
}
#endif
#endif

14
deps/7zip/Types.h vendored
View File

@ -10,17 +10,9 @@
#include <windows.h>
#endif
#ifndef EXTERN_C_BEGIN
#ifdef __cplusplus
#define EXTERN_C_BEGIN extern "C" {
#define EXTERN_C_END }
#else
#define EXTERN_C_BEGIN
#define EXTERN_C_END
extern "C" {
#endif
#endif
EXTERN_C_BEGIN
#define SZ_OK 0
@ -221,6 +213,8 @@ typedef struct
#endif
EXTERN_C_END
#ifdef __cplusplus
}
#endif
#endif