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 /ui | |
| 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 'ui')
| -rw-r--r-- | ui/gtk/webbrowser.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/webbrowser.c b/ui/gtk/webbrowser.c index 467a7333f1..7401c10876 100644 --- a/ui/gtk/webbrowser.c +++ b/ui/gtk/webbrowser.c @@ -124,7 +124,7 @@ #include <wsutil/unicode-utils.h> /* if WIN32_LEAN_AND_MEAN is defined, shellapi.h is needed too */ #include <shellapi.h> -#elif defined (HAVE_OS_X_FRAMEWORKS) +#elif defined (HAVE_MACOS_FRAMEWORKS) /* macOS - use Launch Services to start a browser */ #include <CoreFoundation/CoreFoundation.h> #include <ApplicationServices/ApplicationServices.h> @@ -159,7 +159,7 @@ browser_open_url (const gchar *url) return ((intptr_t) ShellExecute (HWND_DESKTOP, _T("open"), utf_8to16(url), NULL, NULL, SW_SHOWNORMAL) > 32); -#elif defined(HAVE_OS_X_FRAMEWORKS) +#elif defined(HAVE_MACOS_FRAMEWORKS) CFStringRef url_CFString; CFURLRef url_CFURL; @@ -291,7 +291,7 @@ filemanager_open_directory (const gchar *path) g_free(xpath); return (ret > 32); -#elif defined(HAVE_OS_X_FRAMEWORKS) +#elif defined(HAVE_MACOS_FRAMEWORKS) CFStringRef path_CFString; CFURLRef path_CFURL; |