diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-06-16 01:49:44 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-06-16 08:50:33 +0000 |
| commit | 74858beb66edb7b3896eb42f01dedfda0ddaa923 (patch) | |
| tree | ff51ab27354ad1f395aa9bdbeb83b9a552b5f139 /wsutil | |
| parent | 3e828e898cdb8fa89673074289dbd58668590522 (diff) | |
| download | wireshark-74858beb66edb7b3896eb42f01dedfda0ddaa923.tar.gz | |
Change some names to reflect Apple's new UNIX-for-Macs name.
{OS_X,os_x} -> {MACOS,macos}.
Change-Id: Icebea6ab566c65996ee97bacb88fac7e84ec32de
Reviewed-on: https://code.wireshark.org/review/22161
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 5039d0e57635589208e1d969a57250746e422e06)
Reviewed-on: https://code.wireshark.org/review/22162
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | wsutil/Makefile.am | 4 | ||||
| -rw-r--r-- | wsutil/os_version_info.c | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 474992105c..709db328bd 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -79,7 +79,7 @@ if(WIN32) ENDIF(WIN32) -if(HAVE_OS_X_FRAMEWORKS) +if(HAVE_MACOS_FRAMEWORKS) list(APPEND WSUTIL_FILES cfutils.c) endif() diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index a51251f36c..2af1b6c714 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -31,7 +31,7 @@ AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DWS_BUILD_DLL \ # Optional headers for ABI checking wsutil_optional_abi_includes = -if HAVE_OS_X_FRAMEWORKS +if HAVE_MACOS_FRAMEWORKS wsutil_optional_abi_includes += cfutils.h endif @@ -157,7 +157,7 @@ libwsutil_la_SOURCES = \ wsgcrypt.c \ wsjsmn.c -if HAVE_OS_X_FRAMEWORKS +if HAVE_MACOS_FRAMEWORKS libwsutil_la_SOURCES += cfutils.c cfutils.h endif diff --git a/wsutil/os_version_info.c b/wsutil/os_version_info.c index cbd4025ead..4ad3986e7a 100644 --- a/wsutil/os_version_info.c +++ b/wsutil/os_version_info.c @@ -29,7 +29,7 @@ #include <sys/utsname.h> #endif -#ifdef HAVE_OS_X_FRAMEWORKS +#ifdef HAVE_MACOS_FRAMEWORKS #include <CoreFoundation/CoreFoundation.h> #include <wsutil/cfutils.h> #endif @@ -49,7 +49,7 @@ typedef void (WINAPI *nativesi_func_ptr)(LPSYSTEM_INFO); * from macOS (we want the macOS version, not the Darwin version, the latter * being easy to get with uname()). */ -#ifdef HAVE_OS_X_FRAMEWORKS +#ifdef HAVE_MACOS_FRAMEWORKS /* * Fetch a string, as a UTF-8 C string, from a dictionary, given a key. @@ -437,7 +437,7 @@ get_os_version_info(GString *str) * 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 +#ifdef HAVE_MACOS_FRAMEWORKS /* * On macOS, report the macOS version number as the OS * version if we can, and put the Darwin information @@ -450,7 +450,7 @@ get_os_version_info(GString *str) /* Failure - just use the Darwin information. */ g_string_append_printf(str, "%s %s", name.sysname, name.release); } -#else /* HAVE_OS_X_FRAMEWORKS */ +#else /* HAVE_MACOS_FRAMEWORKS */ /* * XXX - on Linux, are there any APIs to get the distribution * name and version number? I think some distributions have @@ -503,7 +503,7 @@ get_os_version_info(GString *str) * releases. */ g_string_append_printf(str, "%s %s", name.sysname, name.release); -#endif /* HAVE_OS_X_FRAMEWORKS */ +#endif /* HAVE_MACOS_FRAMEWORKS */ } #else g_string_append(str, "an unknown OS"); |