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 /wsutil/os_version_info.c | |
| parent | 1f94d34f43055ea47fc9426e1720bdb4b7397dd9 (diff) | |
| download | wireshark-357cfd3b035d1ba6438e82cc1cbec105874206b6.tar.gz | |
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 'wsutil/os_version_info.c')
| -rw-r--r-- | wsutil/os_version_info.c | 12 |
1 files changed, 6 insertions, 6 deletions
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)) { |