From 7e112cfa5cd3dfb6d6df97e31c5d68bff4ec0713 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 21 Oct 2016 09:49:30 -0700 Subject: fixes static compilation under Windows (#246) --- .gitignore | 1 + lib/lz4.h | 8 ++------ programs/.gitignore | 3 +++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 106915f..cd47ddd 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ *.so *.so.* *.dylib +*.dSYM # apple # Executables *.exe diff --git a/lib/lz4.h b/lib/lz4.h index dfe6f2a..3ece4dd 100644 --- a/lib/lz4.h +++ b/lib/lz4.h @@ -55,12 +55,8 @@ extern "C" { * LZ4_DLL_EXPORT : * Enable exporting of functions when building a Windows DLL */ -#if defined(_WIN32) -# if defined(LZ4_DLL_EXPORT) && (LZ4_DLL_EXPORT==1) -# define LZ4LIB_API __declspec(dllexport) -# else -# define LZ4LIB_API __declspec(dllimport) -# endif +#if defined(_WIN32) && defined(LZ4_DLL_EXPORT) && (LZ4_DLL_EXPORT==1) +# define LZ4LIB_API __declspec(dllexport) #else # define LZ4LIB_API #endif diff --git a/programs/.gitignore b/programs/.gitignore index 7110922..df3423e 100644 --- a/programs/.gitignore +++ b/programs/.gitignore @@ -13,3 +13,6 @@ fuzzer32 # tests files tmp* + +# artefacts +*.dSYM -- cgit v0.12