aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-06-16 01:49:44 -0700
committerGuy Harris <guy@alum.mit.edu>2017-06-16 08:50:22 +0000
commit5039d0e57635589208e1d969a57250746e422e06 (patch)
tree455ae6bfd28a26c33ee4b8cbff8bbb1534380811 /ui/gtk
parent63b91ad3119c64eb8fdaa67303fe37d71a01a1b0 (diff)
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>
Diffstat (limited to 'ui/gtk')
-rw-r--r--ui/gtk/webbrowser.c6
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;