various: make mentions of macOS consistent

change all mentions and variations of OSX, OS X, MacOSX, MacOS X, etc
consistent. use the official naming macOS.

12 files changed, 16 insertions, 16 deletions

diff --git a/TOOLS/osxbundle.py b/TOOLS/osxbundle.py
index 0469e4abfc..1c769a06ab 100755
--- a/TOOLS/osxbundle.py
+++ b/TOOLS/osxbundle.py
@@ -67,7 +67,7 @@ def main():
 
     version = bundle_version(src_path).rstrip()
 
-    print("Creating Mac OS X application bundle (version: %s)..." % version)
+    print("Creating macOS application bundle (version: %s)..." % version)
     print("> copying bundle skeleton")
     copy_bundle(binary_name, src_path)
     print("> copying binary")
diff --git a/audio/out/ao_coreaudio_exclusive.c b/audio/out/ao_coreaudio_exclusive.c
index e24f791574..d4e66b73e3 100644
--- a/audio/out/ao_coreaudio_exclusive.c
+++ b/audio/out/ao_coreaudio_exclusive.c
@@ -1,5 +1,5 @@
 /*
- * CoreAudio audio output driver for Mac OS X
+ * CoreAudio audio output driver for macOS
  *
  * original copyright (C) Timothy J. Wood - Aug 2000
  * ported to MPlayer libao2 by Dan Christiansen
@@ -28,7 +28,7 @@
  */
 
 /*
- * The MacOS X CoreAudio framework doesn't mesh as simply as some
+ * The macOS CoreAudio framework doesn't mesh as simply as some
  * simpler frameworks do.  This is due to the fact that CoreAudio pulls
  * audio samples rather than having them pushed at it (which is nice
  * when you are wanting to do good buffering of audio).
diff --git a/etc/builtin.conf b/etc/builtin.conf
index 7bfbaceb02..1a5f647bca 100644
--- a/etc/builtin.conf
+++ b/etc/builtin.conf
@@ -26,7 +26,7 @@ input-terminal=no
 osc=no
 input-default-bindings=no
 input-vo-keyboard=no
-# OSX/Cocoa global input hooks
+# macOS global input hooks
 input-media-keys=no
 
 [encoding]
diff --git a/libmpv/client.h b/libmpv/client.h
index 56235e1120..8eb5e05a04 100644
--- a/libmpv/client.h
+++ b/libmpv/client.h
@@ -181,7 +181,7 @@ extern "C" {
  * filenames in the local 8 bit encoding. It does not use fopen() either;
  * it uses _wfopen().
  *
- * On OS X, filenames and other strings taken/returned by libmpv can have
+ * On macOS, filenames and other strings taken/returned by libmpv can have
  * inconsistent unicode normalization. This can sometimes lead to problems.
  * You have to hope for the best.
  *
@@ -197,7 +197,7 @@ extern "C" {
  *
  * There is an older way to embed the native mpv window into your own. You have
  * to get the raw window handle, and set it as "wid" option. This works on X11,
- * win32, and OSX only. It's much easier to use than the render API, but
+ * win32, and macOS only. It's much easier to use than the render API, but
  * also has various problems.
  *
  * Also see client API examples and the mpv manpage. There is an extensive
@@ -495,7 +495,7 @@ MPV_EXPORT mpv_handle *mpv_create(void);
  *        - load-scripts
  *        - script
  *        - player-operation-mode
- *        - input-app-events (OSX)
+ *        - input-app-events (macOS)
  *      - all encoding mode options
  *
  * @return error code
diff --git a/libmpv/render_gl.h b/libmpv/render_gl.h
index a2c31f0c72..aa2719d5c4 100644
--- a/libmpv/render_gl.h
+++ b/libmpv/render_gl.h
@@ -93,7 +93,7 @@ extern "C" {
  *                MPV_RENDER_PARAM_WL_DISPLAY for Wayland)
  * - nVidia/Linux: Both GLX and EGL should work (GLX is required if vdpau is
  *                 used, e.g. due to old drivers.)
- * - OSX: CGL is required (CGLGetCurrentContext() returning non-NULL)
+ * - macOS: CGL is required (CGLGetCurrentContext() returning non-NULL)
  * - iOS: EAGL is required (EAGLContext.currentContext returning non-nil)
  *
  * Once these things are setup, hardware decoding can be enabled/disabled at
diff --git a/options/path.h b/options/path.h
index 7ec8f7b18c..1bdfeb7566 100644
--- a/options/path.h
+++ b/options/path.h
@@ -30,7 +30,7 @@ void mp_init_paths(struct mpv_global *global, struct MPOpts *opts);
 
 // Search for the input filename in several paths. These include user and global
 // config locations by default. Some platforms may implement additional platform
-// related lookups (i.e.: OSX inside an application bundle).
+// related lookups (i.e.: macOS inside an application bundle).
 char *mp_find_config_file(void *talloc_ctx, struct mpv_global *global,
                           const char *filename);
 
diff --git a/osdep/path.h b/osdep/path.h
index 2c00ea56eb..a9b9a3237f 100644
--- a/osdep/path.h
+++ b/osdep/path.h
@@ -7,7 +7,7 @@
 // The following type values are defined:
 //  "home"          the native mpv-specific user config dir
 //  "old_home"      same as "home", but lesser priority (compatibility)
-//  "osxbundle"     OSX bundle resource path
+//  "osxbundle"     macOS bundle resource path
 //  "global"        the least priority, global config file location
 //  "desktop"       path to desktop contents
 //
diff --git a/osdep/semaphore.h b/osdep/semaphore.h
index 40cf3832f6..81da12d502 100644
--- a/osdep/semaphore.h
+++ b/osdep/semaphore.h
@@ -4,7 +4,7 @@
 #include <sys/types.h>
 #include <semaphore.h>
 
-// OSX provides non-working empty stubs, so we emulate them.
+// macOS provides non-working empty stubs, so we emulate them.
 // This should be AS-safe, but cancellation issues were ignored.
 // sem_getvalue() is not provided.
 // sem_post() won't always correctly return an error on overflow.
diff --git a/video/out/gpu/ra.h b/video/out/gpu/ra.h
index 5f229f8bd6..c0c58ac679 100644
--- a/video/out/gpu/ra.h
+++ b/video/out/gpu/ra.h
@@ -143,8 +143,8 @@ struct ra_tex_params {
                             // be true depends on ra_format.linear_filter)
     bool src_repeat;        // if false, clamp texture coordinates to edge
                             // if true, repeat texture coordinates
-    bool non_normalized;    // hack for GL_TEXTURE_RECTANGLE OSX idiocy
-                            // always set to false, except in OSX code
+    bool non_normalized;    // hack for GL_TEXTURE_RECTANGLE macOS idiocy
+                            // always set to false, except in macOS code
     bool external_oes;      // hack for GL_TEXTURE_EXTERNAL_OES idiocy
     // If non-NULL, the texture will be created with these contents. Using
     // this does *not* require setting host_mutable. Otherwise, the initial
diff --git a/video/out/opengl/common.c b/video/out/opengl/common.c
index ee2650867c..e3fc1ba032 100644
--- a/video/out/opengl/common.c
+++ b/video/out/opengl/common.c
@@ -398,7 +398,7 @@ static const struct gl_functions gl_functions[] = {
         .provides = MPGL_CAP_NESTED_ARRAY,
     },
     // Swap control, always an OS specific extension
-    // The OSX code loads this manually.
+    // The macOS code loads this manually.
     {
         .extension = "GLX_SGI_swap_control",
         .functions = (const struct gl_function[]) {
diff --git a/video/out/opengl/context_glx.c b/video/out/opengl/context_glx.c
index 40622245e6..a2a63e137a 100644
--- a/video/out/opengl/context_glx.c
+++ b/video/out/opengl/context_glx.c
@@ -25,7 +25,7 @@
 #define GLX_CONTEXT_FLAGS_ARB                   0x2094
 #define GLX_CONTEXT_PROFILE_MASK_ARB            0x9126
 #ifndef __APPLE__
-// These are respectively 0x00000001 and 0x00000002 on OSX
+// These are respectively 0x00000001 and 0x00000002 on macOS
 #define GLX_CONTEXT_DEBUG_BIT_ARB               0x0001
 #define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB  0x0002
 #endif
diff --git a/video/out/opengl/formats.c b/video/out/opengl/formats.c
index a0b79e269d..dd0e89d54d 100644
--- a/video/out/opengl/formats.c
+++ b/video/out/opengl/formats.c
@@ -94,7 +94,7 @@ const struct gl_format gl_formats[] = {
     // Special formats.
     {"rgb565",  GL_RGB8,     GL_RGB,
      GL_UNSIGNED_SHORT_5_6_5,                           F_TF | F_GL2 | F_GL3},
-    // Worthless, but needed by OSX videotoolbox interop on old Apple hardware.
+    // Worthless, but needed by macOS videotoolbox interop on old Apple hardware.
     {"appleyp", GL_RGB,      GL_RGB_422_APPLE,
      GL_UNSIGNED_SHORT_8_8_APPLE,                       F_TF | F_APPL},