Fix name of macOS

diff --git a/Makefile b/Makefile
index 785fbbb2c1ed087aed08d0399f848053bcded68f..7dc64953e635e0432bd2b1578abbef3280b8617a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,7 @@ clean:
        @echo Cleaning completed
 
 #------------------------------------------------------------------------------
-# make install is validated only for Linux, OSX, Hurd and some BSD targets
+# make install is validated only for Linux, macOS, Hurd and some BSD targets
 #------------------------------------------------------------------------------
 ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly NetBSD MSYS_NT))
 

diff --git a/TESTING.md b/TESTING.md
index 1fa5fe8c2d69f99afa7ac13d1e322de96a56505c..551981b140534731c26235891e7c4bdc51c07d21 100644 (file)
--- a/TESTING.md
+++ b/TESTING.md
@@ -41,4 +41,4 @@ They consist of the following tests:
 - `pzstd` with asan and tsan, as well as in 32-bits mode
 - Testing `zstd` with legacy mode off
 - Testing `zbuff` (old streaming API)
-- Entire test suite and make install on OS X
+- Entire test suite and make install on macOS

diff --git a/contrib/adaptive-compression/Makefile b/contrib/adaptive-compression/Makefile
index c64fce95412647746b99d3458344b6b11c6a667a..5a746dcd42da83b5276ed9348c683772ffeefa0d 100644 (file)
--- a/contrib/adaptive-compression/Makefile
+++ b/contrib/adaptive-compression/Makefile
@@ -48,7 +48,7 @@ clean:
        @echo "finished cleaning"
 
 #-----------------------------------------------------------------------------
-# make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets
+# make install is validated only for Linux, macOS, BSD, Hurd and Solaris targets
 #-----------------------------------------------------------------------------
 ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS))
 

diff --git a/contrib/seekable_format/zstdseek_decompress.c b/contrib/seekable_format/zstdseek_decompress.c
index 966617a8c8fae95a5a4217090402b06987e9b493..b006ff834f6a8cba6549cad617c3cca0b427dfdb 100644 (file)
--- a/contrib/seekable_format/zstdseek_decompress.c
+++ b/contrib/seekable_format/zstdseek_decompress.c
@@ -24,7 +24,7 @@
 #endif
 
 /* ************************************************************
-* Avoid fseek()'s 2GiB barrier with MSVC, MacOS, *BSD, MinGW
+* Avoid fseek()'s 2GiB barrier with MSVC, macOS, *BSD, MinGW
 ***************************************************************/
 #if defined(_MSC_VER) && _MSC_VER >= 1400
 #   define LONG_SEEK _fseeki64

diff --git a/lib/Makefile b/lib/Makefile
index 701cf7e9f758b722b37374e6067963574a49f0fb..9cedd53b72160a7470ff4c9608183b0e6768ce8c 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -77,7 +77,7 @@ CPPFLAGS  += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
 
 ZSTD_OBJ   := $(patsubst %.c,%.o,$(ZSTD_FILES))
 
-# OS X linker doesn't support -soname, and use different extension
+# macOS linker doesn't support -soname, and use different extension
 # see : https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html
 ifeq ($(shell uname), Darwin)
        SHARED_EXT = dylib
@@ -145,14 +145,14 @@ libzstd-nomt: $(ZSTD_NOMT_FILES)
        @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
 
 clean:
-       @$(RM) -r *.dSYM   # Mac OS-X specific
+       @$(RM) -r *.dSYM   # macOS-specific
        @$(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
        @$(RM) dll/libzstd.dll dll/libzstd.lib libzstd-nomt*
        @$(RM) common/*.o compress/*.o decompress/*.o dictBuilder/*.o legacy/*.o deprecated/*.o
        @echo Cleaning library completed
 
 #-----------------------------------------------------------------------------
-# make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets
+# make install is validated only for Linux, macOS, BSD, Hurd and Solaris targets
 #-----------------------------------------------------------------------------
 ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS))
 

diff --git a/programs/Makefile b/programs/Makefile
index be666b4ef054737ae3a1e2918e44d84329c8e467..4202764c2e0fa629863cec6a87df50a35d0a384a 100644 (file)
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -243,7 +243,7 @@ preview-man: clean-man man
        man ./zstd.1
 
 #-----------------------------------------------------------------------------
-# make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets
+# make install is validated only for Linux, macOS, BSD, Hurd and Solaris targets
 #-----------------------------------------------------------------------------
 ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS))
 

diff --git a/programs/fileio.c b/programs/fileio.c
index b1d2a24159683db5ca6a5b5adc3ec84daa2576bb..e8d25ab9d2687d2e82ea5841cf6de669f79aa445 100644 (file)
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -172,7 +172,7 @@ static void clearHandler(void)
 
 
 /* ************************************************************
-* Avoid fseek()'s 2GiB barrier with MSVC, MacOS, *BSD, MinGW
+* Avoid fseek()'s 2GiB barrier with MSVC, macOS, *BSD, MinGW
 ***************************************************************/
 #if defined(_MSC_VER) && _MSC_VER >= 1400
 #   define LONG_SEEK _fseeki64

diff --git a/programs/util.h b/programs/util.h
index 3e69745793e4eb2c7e92ea65135c6c8a42db9df7..e88d20146e6726451aa511ba4b3da772f87377a2 100644 (file)
--- a/programs/util.h
+++ b/programs/util.h
@@ -40,7 +40,7 @@ extern "C" {
 
 
 /* ************************************************************
-* Avoid fseek()'s 2GiB barrier with MSVC, MacOS, *BSD, MinGW
+* Avoid fseek()'s 2GiB barrier with MSVC, macOS, *BSD, MinGW
 ***************************************************************/
 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
 #   define UTIL_fseek _fseeki64

diff --git a/tests/Makefile b/tests/Makefile
index c4cbe1bdfcd8f555d29867a41198a444d93ffe10..febd8eb94bfaa341aa91fab7aa3d842285bd42c1 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -260,7 +260,7 @@ clean:
 
 
 #----------------------------------------------------------------------------------
-#make valgrindTest is validated only for Linux, OSX, BSD, Hurd and Solaris targets
+#make valgrindTest is validated only for Linux, macOS, BSD, Hurd and Solaris targets
 #----------------------------------------------------------------------------------
 ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS))
 HOST_OS = POSIX

diff --git a/tests/gzip/Makefile b/tests/gzip/Makefile
index 40a0ba97d2b3774f50d486e5629c066a40256532..c5d67206b99d95e5e4cec731aff35d6a977e9e48 100644 (file)
--- a/tests/gzip/Makefile
+++ b/tests/gzip/Makefile
@@ -33,7 +33,7 @@ clean:
 
 
 #------------------------------------------------------------------------------
-# validated only for Linux, OSX, Hurd and some BSD targets
+# validated only for Linux, macOS, Hurd and some BSD targets
 #------------------------------------------------------------------------------
 ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly NetBSD))