summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Collet <cyan@fb.com>2016-10-21 16:49:30 (GMT)
committerYann Collet <cyan@fb.com>2016-10-21 16:49:30 (GMT)
commit7e112cfa5cd3dfb6d6df97e31c5d68bff4ec0713 (patch)
treef6c91975bbfb25747a8c096478660b398d8e8a74
parente64a926924e31ce16d4de05a810bb2cef8624fa2 (diff)
downloadlz4-7e112cfa5cd3dfb6d6df97e31c5d68bff4ec0713.zip
lz4-7e112cfa5cd3dfb6d6df97e31c5d68bff4ec0713.tar.gz
lz4-7e112cfa5cd3dfb6d6df97e31c5d68bff4ec0713.tar.bz2
fixes static compilation under Windows (#246)
-rw-r--r--.gitignore1
-rw-r--r--lib/lz4.h8
-rw-r--r--programs/.gitignore3
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