From b567ce9d68575a6fcaf1dee15330717bdee8632f Mon Sep 17 00:00:00 2001 From: Ryan Schmidt Date: Sat, 9 Jun 2018 14:31:17 -0500 Subject: [PATCH] Fix name of macOS --- Makefile | 2 +- TESTING.md | 2 +- contrib/adaptive-compression/Makefile | 2 +- contrib/seekable_format/zstdseek_decompress.c | 2 +- lib/Makefile | 6 +++--- programs/Makefile | 2 +- programs/fileio.c | 2 +- programs/util.h | 2 +- tests/Makefile | 2 +- tests/gzip/Makefile | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 785fbbb2c..7dc64953e 100644 --- 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 1fa5fe8c2..551981b14 100644 --- 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 c64fce954..5a746dcd4 100644 --- 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 966617a8c..b006ff834 100644 --- 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 701cf7e9f..9cedd53b7 100644 --- 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 be666b4ef..4202764c2 100644 --- 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 b1d2a2415..e8d25ab9d 100644 --- 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 3e6974579..e88d20146 100644 --- 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 c4cbe1bdf..febd8eb94 100644 --- 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 40a0ba97d..c5d67206b 100644 --- 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))