diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-05 12:15:27 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-05 19:16:22 +0000 |
| commit | 357cfd3b035d1ba6438e82cc1cbec105874206b6 (patch) | |
| tree | 58a77b4dc8e1192db6278716b320bf42a18ded8f /caputils | |
| parent | 1f94d34f43055ea47fc9426e1720bdb4b7397dd9 (diff) | |
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>
Diffstat (limited to 'caputils')
| -rw-r--r-- | caputils/capture-pcap-util-unix.c | 4 | ||||
| -rw-r--r-- | caputils/capture-pcap-util.c | 4 | ||||
| -rw-r--r-- | caputils/iface_monitor.c | 2 | ||||
| -rw-r--r-- | caputils/iface_monitor.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/caputils/capture-pcap-util-unix.c b/caputils/capture-pcap-util-unix.c index 7dd49a1b30..9319d55a5d 100644 --- a/caputils/capture-pcap-util-unix.c +++ b/caputils/capture-pcap-util-unix.c @@ -356,14 +356,14 @@ request_high_resolution_timestamp(pcap_t *pcap_h) { #ifdef __APPLE__ /* - * On OS X, if you build with a newer SDK, pcap_set_tstamp_precision() + * On macOS, if you build with a newer SDK, pcap_set_tstamp_precision() * is available, so the code will be built with it. * * However, if you then try to run on an older release that * doesn't have pcap_set_tstamp_precision(), the dynamic linker * will fail, as it won't find pcap_set_tstamp_precision(). * - * libpcap doesn't use OS X "weak linking" for new routines, + * libpcap doesn't use macOS "weak linking" for new routines, * so we can't just check whether a pointer to * pcap_set_tstamp_precision() is null and, if it is, not * call it. We have to, instead, use dlopen() to load diff --git a/caputils/capture-pcap-util.c b/caputils/capture-pcap-util.c index 1499607692..01241158fa 100644 --- a/caputils/capture-pcap-util.c +++ b/caputils/capture-pcap-util.c @@ -109,7 +109,7 @@ static const char please_report[] = #include <wsutil/cfutils.h> /* - * On OS X, we get the "friendly name" and interface type for the interface + * On macOS, we get the "friendly name" and interface type for the interface * from the System Configuration framework. * * To find the System Configuration framework information for the @@ -127,7 +127,7 @@ static const char please_report[] = * an SNMP MIB-II ifType value. * * However, it's IFT_ETHER, i.e. Ethernet, for AirPort interfaces, - * not IFT_IEEE80211 (which isn't defined in OS X in any case). + * not IFT_IEEE80211 (which isn't defined in macOS in any case). * * Perhaps some other BSD-flavored OSes won't make this mistake; * however, FreeBSD 7.0 and OpenBSD 4.2, at least, appear to have diff --git a/caputils/iface_monitor.c b/caputils/iface_monitor.c index 3d7c251e92..6ff5b54c54 100644 --- a/caputils/iface_monitor.c +++ b/caputils/iface_monitor.c @@ -177,7 +177,7 @@ iface_mon_stop(void) #elif defined(__APPLE__) /* - * OS X. + * macOS. */ #include <stddef.h> diff --git a/caputils/iface_monitor.h b/caputils/iface_monitor.h index 12de37c902..abb55b332e 100644 --- a/caputils/iface_monitor.h +++ b/caputils/iface_monitor.h @@ -37,7 +37,7 @@ extern "C" { * * XXX - we really want "gone", not "down", where "gone" may include * "down" if the OS requires an interface to be up in order to start - * a capture on it (as is the case in Linux and in OS X prior to + * a capture on it (as is the case in Linux and in macOS prior to * Lion), but should also include *gone*, as in "there is no longer * an interface with this name, so it's neither down nor up". * |