mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-09 18:07:00 -06:00
Fix linking due to clashing xxhash defines between LZ and Zstd.
Probably would be better to use XXH_PRIVATE_API instead, but that requires xxhash.c to have that exact name without prefixes.
This commit is contained in:
@@ -63,6 +63,7 @@ You can contact the author at :
|
||||
#include "lz4.h"
|
||||
#include "lz4hc.h"
|
||||
#define XXH_STATIC_LINKING_ONLY
|
||||
#define XXH_NAMESPACE lz
|
||||
#include "xxhash.h"
|
||||
|
||||
|
||||
|
||||
@@ -105,6 +105,7 @@ static void XXH_free (void* p) { free(p); }
|
||||
static void* XXH_memcpy(void* dest, const void* src, size_t size) { return memcpy(dest,src,size); }
|
||||
|
||||
#define XXH_STATIC_LINKING_ONLY
|
||||
#define XXH_NAMESPACE lz
|
||||
#include "xxhash.h"
|
||||
|
||||
|
||||
|
||||
@@ -63,6 +63,7 @@ You can contact the author at :
|
||||
#include "lz5frame_static.h"
|
||||
#include "lz5.h"
|
||||
#include "lz5hc.h"
|
||||
#define XXH_NAMESPACE lz
|
||||
#include "xxhash.h"
|
||||
|
||||
|
||||
|
||||
@@ -106,6 +106,7 @@ You can contact the author at :
|
||||
/**************************************
|
||||
* Includes & Memory related functions
|
||||
***************************************/
|
||||
#define XXH_NAMESPACE lz
|
||||
#include "xxhash.h"
|
||||
/* Modify the local functions below should you wish to use some other memory routines */
|
||||
/* for malloc(), free() */
|
||||
|
||||
Reference in New Issue
Block a user