diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-10-27 20:28:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-27 20:28:59 +0200 |
| commit | 568e9056043dd57cc0fbb937bf7c963530b35452 (patch) | |
| tree | a142fabfdd99a75bb4b6060bff959d901726d043 /thirdparty/zstd/common/zstd_common.c | |
| parent | 6fc2fffb459e8c6deb87fe795e8103747f09b077 (diff) | |
| parent | f3436a841a3b59fc3a9deb94d5fdfd1e550d0351 (diff) | |
Merge pull request #12423 from tagcup/zstd_1.3.2
Update zstd to 1.3.2.
Diffstat (limited to 'thirdparty/zstd/common/zstd_common.c')
| -rw-r--r-- | thirdparty/zstd/common/zstd_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/thirdparty/zstd/common/zstd_common.c b/thirdparty/zstd/common/zstd_common.c index 08384cabf5..c2041053be 100644 --- a/thirdparty/zstd/common/zstd_common.c +++ b/thirdparty/zstd/common/zstd_common.c @@ -5,6 +5,7 @@ * This source code is licensed under both the BSD-style license (found in the * LICENSE file in the root directory of this source tree) and the GPLv2 (found * in the COPYING file in the root directory of this source tree). + * You may select, at your option, one of the above-listed licenses. */ @@ -15,8 +16,7 @@ #include <stdlib.h> /* malloc, calloc, free */ #include <string.h> /* memset */ #include "error_private.h" -#define ZSTD_STATIC_LINKING_ONLY -#include "zstd.h" +#include "zstd_internal.h" /*-**************************************** |