A bunch of "{Mac} OS X" -> "macOS" changes.

Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X
10.0", for example.  It was "Mac OS X" until 10.8 (although 10.7 was
sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS
X" from 10.8 to 10.11.

Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3
Reviewed-on: https://code.wireshark.org/review/20933
Reviewed-by: Guy Harris <guy@alum.mit.edu>

6 files changed, 11 insertions, 11 deletions

diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 9982f0dd0b..e9a4ed100d 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -163,7 +163,7 @@ endif()
 
 if(APPLE)
 	#
-	# We assume that APPLE means OS X so that we have the OS X
+	# We assume that APPLE means macOS so that we have the macOS
 	# frameworks.
 	#
 	FIND_LIBRARY (APPLE_CORE_FOUNDATION_LIBRARY CoreFoundation)
diff --git a/wsutil/crash_info.c b/wsutil/crash_info.c
index 28352d50f8..7952c4c1b1 100644
--- a/wsutil/crash_info.c
+++ b/wsutil/crash_info.c
@@ -111,7 +111,7 @@ __private_extern__ char *__crashreporter_info__ = NULL;
  *
  * backtrace is reported under "Application Specific Backtrace".
  *
- * Dunno which versions are supported by which versions of OS X.
+ * Dunno which versions are supported by which versions of macOS.
  */
 struct crashreporter_annotations_t {
 	uint64_t version;		/* unsigned long */
diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c
index 2b402f14cf..aa8a5bcafd 100644
--- a/wsutil/filesystem.c
+++ b/wsutil/filesystem.c
@@ -1955,7 +1955,7 @@ file_open_error_message(int err, gboolean for_writing)
          * Either you have a fixed swap partition or a fixed swap file,
          * and it needs to be made bigger.
          *
-         * This is UN*X, but it's not OS X, so we assume the user is
+         * This is UN*X, but it's not macOS, so we assume the user is
          * *somewhat* nerdy.
          */
 #define ENOMEM_REASON "your system is out of swap space"
diff --git a/wsutil/os_version_info.c b/wsutil/os_version_info.c
index 90291ade8e..0c8b955676 100644
--- a/wsutil/os_version_info.c
+++ b/wsutil/os_version_info.c
@@ -46,7 +46,7 @@ typedef void (WINAPI *nativesi_func_ptr)(LPSYSTEM_INFO);
 
 /*
  * Handles the rather elaborate process of getting OS version information
- * from OS X (we want the OS X version, not the Darwin version, the latter
+ * from macOS (we want the macOS version, not the Darwin version, the latter
  * being easy to get with uname()).
  */
 #ifdef HAVE_OS_X_FRAMEWORKS
@@ -71,7 +71,7 @@ get_string_from_dictionary(CFPropertyListRef dict, CFStringRef key)
 }
 
 /*
- * Get the OS X version information, and append it to the GString.
+ * Get the macOS version information, and append it to the GString.
  * Return TRUE if we succeed, FALSE if we fail.
  */
 static gboolean
@@ -87,7 +87,7 @@ get_os_x_version_info(GString *str)
 	char *string;
 
 	/*
-	 * On OS X, report the OS X version number as the OS, and put
+	 * On macOS, report the macOS version number as the OS, and put
 	 * the Darwin information in parentheses.
 	 *
 	 * Alas, Gestalt() is deprecated in Mountain Lion, so the build
@@ -431,13 +431,13 @@ get_os_version_info(GString *str)
 		 * On Solaris, it's some kind of build information.
 		 * On HP-UX, it appears to be some sort of subrevision
 		 * thing.
-		 * On *BSD and Darwin/OS X, it's a long string giving
+		 * On *BSD and Darwin/macOS, it's a long string giving
 		 * a build date, config file name, etc., etc., etc..
 		 */
 #ifdef HAVE_OS_X_FRAMEWORKS
 		/*
-		 * On Mac OS X, report the Mac OS X version number as
-		 * the OS version if we can, and put the Darwin information
+		 * On macOS, report the macOS version number as the OS
+		 * version if we can, and put the Darwin information
 		 * in parentheses.
 		 */
 		if (get_os_x_version_info(str)) {
diff --git a/wsutil/privileges.c b/wsutil/privileges.c
index 3fee9d7927..46f43dcfae 100644
--- a/wsutil/privileges.c
+++ b/wsutil/privileges.c
@@ -246,7 +246,7 @@ relinquish_special_privs_perm(void)
 	 * real and effective group and user IDs to the original
 	 * values of the real and effective group and user IDs.
 	 * If we're not, don't bother - doing so seems to mung
-	 * our group set, at least in OS X 10.5.
+	 * our group set, at least in Mac OS X 10.5.
 	 *
 	 * (Set the effective UID last - that takes away our
 	 * rights to set anything else.)
diff --git a/wsutil/utf8_entities.h b/wsutil/utf8_entities.h
index 952d277906..f73e693d09 100644
--- a/wsutil/utf8_entities.h
+++ b/wsutil/utf8_entities.h
@@ -57,7 +57,7 @@
 #define UTF8_RIGHTWARDS_ARROW           "\xe2\x86\x92"      /*  8594 / 0x2192 */
 #define UTF8_LEFT_RIGHT_ARROW           "\xe2\x86\x94"      /*  8596 / 0x2194 */
 
-/* OS X command key */
+/* macOS command key */
 #define UTF8_PLACE_OF_INTEREST_SIGN     "\xe2\x8c\x98"      /*  8984 / 0x2318 */
 
 #define UTF8_SYMBOL_FOR_NULL            "\xe2\x90\x80"      /*  9216 / 0x2400 */