summaryrefslogtreecommitdiffstats
path: root/lz4.h
diff options
context:
space:
mode:
authoryann.collet.73@gmail.com <yann.collet.73@gmail.com@650e7d94-2a16-8b24-b05c-7c0b3f6821cd>2013-02-19 20:52:50 (GMT)
committeryann.collet.73@gmail.com <yann.collet.73@gmail.com@650e7d94-2a16-8b24-b05c-7c0b3f6821cd>2013-02-19 20:52:50 (GMT)
commite898c9a79a91083805e9a733c2c0917aa7d24820 (patch)
treed196b25953d902f8c212a542273ae43082187089 /lz4.h
parentc1d7e4f67598d8a86ff5a912730f47f65c9cb8db (diff)
downloadlz4-e898c9a79a91083805e9a733c2c0917aa7d24820.zip
lz4-e898c9a79a91083805e9a733c2c0917aa7d24820.tar.gz
lz4-e898c9a79a91083805e9a733c2c0917aa7d24820.tar.bz2
Corrected issue 59 in lz4hc.c, reported by Masafumi Kiribayashi
Corrected issue 60 in lz4.h, reported by Takayuki Matsuoka Added : a cmake/pack installer, by Dmitry Cherepanov git-svn-id: https://lz4.googlecode.com/svn/trunk@89 650e7d94-2a16-8b24-b05c-7c0b3f6821cd
Diffstat (limited to 'lz4.h')
-rw-r--r--lz4.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lz4.h b/lz4.h
index 3680121..4897eb2 100644
--- a/lz4.h
+++ b/lz4.h
@@ -41,7 +41,7 @@ extern "C" {
//**************************************
// Compiler Options
//**************************************
-#ifdef _MSC_VER // Visual Studio
+#if defined(_MSC_VER) && !defined(__cplusplus) // Visual Studio
# define inline __inline // Visual is not C99, but supports some kind of inline
#endif