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>

7 files changed, 10 insertions, 10 deletions

diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 3f09388691..d174944154 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -39,7 +39,7 @@
  * are most likely to take a long time, given the way address-to-name
  * lookups are done over NBNS).
  *
- * Mac OS X does have SIGALRM, but if you longjmp() out of a name resolution
+ * macOS does have SIGALRM, but if you longjmp() out of a name resolution
  * call in a signal handler, you might crash, because the state of the
  * resolution code that sends messages to lookupd might be inconsistent
  * if you jump out of it in middle of a call.
diff --git a/epan/aftypes.h b/epan/aftypes.h
index c0de5a15ce..cfc384bb95 100644
--- a/epan/aftypes.h
+++ b/epan/aftypes.h
@@ -43,7 +43,7 @@ extern "C" {
 #define BSD_AF_IPX		23
 #define BSD_AF_INET6_BSD	24	/* NetBSD, OpenBSD, BSD/OS */
 #define BSD_AF_INET6_FREEBSD	28	/* FreeBSD, DragonFly BSD */
-#define BSD_AF_INET6_DARWIN	30	/* OS X, iOS, anything else Darwin-based */
+#define BSD_AF_INET6_DARWIN	30	/* macOS, iOS, anything else Darwin-based */
 
 /* Linux AF_ values. */
 #define LINUX_AF_UNSPEC		 0
diff --git a/epan/dissectors/packet-corosync-totemsrp.c b/epan/dissectors/packet-corosync-totemsrp.c
index 1b65a4ae2d..b50db3ef68 100644
--- a/epan/dissectors/packet-corosync-totemsrp.c
+++ b/epan/dissectors/packet-corosync-totemsrp.c
@@ -186,7 +186,7 @@ static const value_string corosync_totemsrp_ip_address_family[] = {
   { COMMON_AF_INET,       "AF_INET"  },
   { BSD_AF_INET6_BSD,     "AF_INET6 (most BSD)" },
   { BSD_AF_INET6_FREEBSD, "AF_INET6 (FreeBSD)" },
-  { BSD_AF_INET6_DARWIN,  "AF_INET6 (OS X and iOS)" },
+  { BSD_AF_INET6_DARWIN,  "AF_INET6 (macOS and iOS)" },
   { LINUX_AF_INET6,       "AF_INET6 (Linux)" },
   { SOLARIS_AF_INET6,     "AF_INET6 (Solaris)" },
   { WINSOCK_AF_INET6,     "AF_INET6 (Windows)" },
diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c
index 073d6179b1..e520704d08 100644
--- a/epan/dissectors/packet-ieee80211-radiotap.c
+++ b/epan/dissectors/packet-ieee80211-radiotap.c
@@ -1008,7 +1008,7 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* u
 			/*
 			 * XXX On FreeBSD rate & 0x80 means we have an MCS. On
 			 * Linux and AirPcap it does not.  (What about
-			 * Mac OS X, NetBSD, OpenBSD, and DragonFly BSD?)
+			 * macOS, NetBSD, OpenBSD, and DragonFly BSD?)
 			 *
 			 * This is an issue either for proprietary extensions
 			 * to 11a or 11g, which do exist, or for 11n
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index bbda7d561b..eb5fefcc65 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -1658,7 +1658,7 @@ get_conversation_for_call(packet_info *pinfo)
 	 * there's no guarantee that the reply will come from the
 	 * address to which the call was sent.  We also don't
 	 * worry about the port *from* which the call was sent,
-	 * because some clients (*cough* OS X NFS client *cough*)
+	 * because some clients (*cough* macOS NFS client *cough*)
 	 * might send retransmissions from a different port from
 	 * the original request.
 	 */
@@ -1710,7 +1710,7 @@ find_conversation_for_reply(packet_info *pinfo)
 	 * because there's no guarantee that the call was sent
 	 * to the address from which the reply came.  We also
 	 * don't worry about the port *to* which the reply was
-	 * sent, because some clients (*cough* OS X NFS client
+	 * sent, because some clients (*cough* macOS NFS client
 	 * *cough*) might send call retransmissions from a
 	 * different port from the original request, so replies
 	 * to the original call and a retransmission of the call
@@ -2114,7 +2114,7 @@ looks_like_rpc_reply(tvbuff_t *tvb, packet_info *pinfo, int offset)
 	   because there's no guarantee that the call was sent
 	   to the address from which the reply came.  We also
 	   don't worry about the port *to* which the reply was
-	   sent, because some clients (*cough* OS X NFS client
+	   sent, because some clients (*cough* macOS NFS client
 	   *cough*) might send retransmissions from a
 	   different port from the original request, so replies
 	   to the original call and a retransmission of the call
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c
index 563dcebdc6..69cf7b6c10 100644
--- a/epan/dissectors/packet-smb2.c
+++ b/epan/dissectors/packet-smb2.c
@@ -11175,7 +11175,7 @@ proto_register_smb2(void)
 		},
 
 		{ &hf_smb2_aapl_server_query_caps_supports_osx_copyfile,
-			{ "Supports OS X copyfile", "smb2.aapl.caps.supports_osx_copyfile", FT_BOOLEAN, 64,
+			{ "Supports macOS copyfile", "smb2.aapl.caps.supports_osx_copyfile", FT_BOOLEAN, 64,
 			NULL, SMB2_AAPL_SUPPORTS_OSX_COPYFILE, NULL, HFILL }
 		},
 
diff --git a/epan/prefs.c b/epan/prefs.c
index 32462e20a8..f2cee4aa88 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -3174,8 +3174,8 @@ prefs_register_modules(void)
 
     /* GTK+ only */
     prefs_register_bool_preference(gui_module, "macosx_style",
-                                   "Use OS X style",
-                                   "Use OS X style (OS X with native GTK only)?",
+                                   "Use macOS style",
+                                   "Use macOS style (macOS with native GTK only)?",
                                    &prefs.gui_macosx_style);
 
     prefs_register_obsolete_preference(gui_module, "geometry.main.x");