Skip to content

Commit

Permalink
Merge pull request #3060 from rex4539/typos
Browse files Browse the repository at this point in the history
Fix typos
  • Loading branch information
Cyan4973 authored Mar 5, 2022
2 parents d109cef + cf1894b commit 930b5ce
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build/meson/lib/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ libzstd_sources = [join_paths(zstd_rootdir, 'lib/common/entropy_common.c'),

# really we need anything that defines __GNUC__ as that is what ZSTD_ASM_SUPPORTED is gated on
# but these are the two compilers that are supported in tree and actually handle this correctly
# Otherwise, explicitly disable assmebly.
# Otherwise, explicitly disable assembly.
if [compiler_gcc, compiler_clang].contains(cc_id)
libzstd_sources += join_paths(zstd_rootdir, 'lib/decompress/huf_decompress_amd64.S')
else
Expand Down
4 changes: 2 additions & 2 deletions build/single_file_libs/combine.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
# Set of file Path objects previously inlined (and to ignore if reencountering).
found: Set[Path] = set()

# Compiled regex Patern to handle "#pragma once" in various formats:
# Compiled regex Pattern to handle "#pragma once" in various formats:
#
# #pragma once
# #pragma once
Expand All @@ -53,7 +53,7 @@
#
pragma_regex: Pattern = re.compile(r'^\s*#\s*pragma\s*once\s*')

# Compiled regex Patern to handle the following type of file includes:
# Compiled regex Pattern to handle the following type of file includes:
#
# #include "file"
# #include "file"
Expand Down
4 changes: 2 additions & 2 deletions lib/common/portability_macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#define ZSTD_PORTABILITY_MACROS_H

/**
* This header file contains macro defintions to support portability.
* This header file contains macro definitions to support portability.
* This header is shared between C and ASM code, so it MUST only
* contain macro definitions. It MUST not contain any C code.
*
Expand Down Expand Up @@ -88,7 +88,7 @@
#endif

/**
* Only enable assembly for GNUC comptabile compilers,
* Only enable assembly for GNUC compatible compilers,
* because other platforms may not support GAS assembly syntax.
*
* Only enable assembly for Linux / MacOS, other platforms may
Expand Down
4 changes: 2 additions & 2 deletions tests/playTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ ZSTD_CLEVEL=50000000000 zstd -f tmp # numeric value too large, warn and revert t
println "test : override ZSTD_CLEVEL with command line option"
ZSTD_CLEVEL=12 zstd --fast=3 -f tmp # overridden by command line option

# temporary envvar chnages in the above tests would actually persist in macos /bin/sh
# temporary envvar changes in the above tests would actually persist in macos /bin/sh
unset ZSTD_CLEVEL


Expand Down Expand Up @@ -1448,7 +1448,7 @@ then
ZSTD_NBTHREADS=50000000000 zstd -f mt_tmp # numeric value too large, warn and revert to default setting=
ZSTD_NBTHREADS=2 zstd -f mt_tmp # correct usage
ZSTD_NBTHREADS=1 zstd -f mt_tmp # correct usage: single thread
# temporary envvar chnages in the above tests would actually persist in macos /bin/sh
# temporary envvar changes in the above tests would actually persist in macos /bin/sh
unset ZSTD_NBTHREADS
rm -f mt_tmp*

Expand Down

0 comments on commit 930b5ce

Please sign in to comment.