summaryrefslogtreecommitdiff
path: root/thirdparty/zstd/common/compiler.h
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-04-18 15:01:32 +0200
committerGitHub <noreply@github.com>2019-04-18 15:01:32 +0200
commit4f22fde635928735366ab656cd52ba3c6a791161 (patch)
tree6451f953f76525a3c4182c0a3d20867d20051e5d /thirdparty/zstd/common/compiler.h
parent2dee231c8e229c93ba0979d8bee9559b571b9462 (diff)
parent20265879e2d34b1d6e38942173ff08c270284796 (diff)
Merge pull request #28158 from akien-mga/zstd-1.4.0
zstd: Update to upstream 1.4.0, remove call to experimental API
Diffstat (limited to 'thirdparty/zstd/common/compiler.h')
-rw-r--r--thirdparty/zstd/common/compiler.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/thirdparty/zstd/common/compiler.h b/thirdparty/zstd/common/compiler.h
index 7f561282ca..0836e3ed27 100644
--- a/thirdparty/zstd/common/compiler.h
+++ b/thirdparty/zstd/common/compiler.h
@@ -40,7 +40,7 @@
/**
* FORCE_INLINE_TEMPLATE is used to define C "templates", which take constant
- * parameters. They must be inlined for the compiler to elimininate the constant
+ * parameters. They must be inlined for the compiler to eliminate the constant
* branches.
*/
#define FORCE_INLINE_TEMPLATE static INLINE_KEYWORD FORCE_INLINE_ATTR