[glib: 3/3] Merge branch 'wip/3v1n0/add-darwin-os' into 'main'




commit e6fa40bf990e42f00210ba50f25a10da5940ce36
Merge: 5b01b47c34 476e33c3f3
Author: Philip Withnall <philip tecnocode co uk>
Date:   Thu Oct 20 11:41:48 2022 +0000

    Merge branch 'wip/3v1n0/add-darwin-os' into 'main'
    
    meson: Define G_OS_DARWIN when compiling under OSX or iOS
    
    See merge request GNOME/glib!2981

 docs/reference/glib/glib-overrides.txt   |  5 +++++
 docs/reference/glib/glib-sections.txt.in |  1 +
 gio/gapplication.c                       |  2 +-
 gio/gcredentials.c                       |  4 ++--
 gio/gcredentialsprivate.h                |  4 ++--
 gio/gio-tool-launch.c                    |  6 +++---
 gio/gio-tool-open.c                      |  2 +-
 gio/giomodule.c                          |  8 ++++----
 gio/gioprivate.h                         |  4 ++--
 gio/glib-compile-resources.c             |  2 +-
 gio/glocalfileinfo.c                     |  2 +-
 gio/tests/contenttype.c                  | 22 +++++++++++-----------
 gio/tests/file.c                         | 12 ++++++------
 gio/tests/gdbus-server-auth.c            |  2 +-
 glib/docs.c                              | 11 +++++++++++
 glib/gbacktrace.c                        |  2 +-
 glib/gbacktrace.h                        |  2 +-
 glib/gspawn.c                            |  2 +-
 glib/gstdio.c                            |  2 +-
 glib/gutils.c                            |  8 ++++----
 glib/tests/collate.c                     |  2 +-
 glib/tests/date.c                        |  2 +-
 glib/tests/gdatetime.c                   |  8 ++++----
 glib/tests/macros.c                      | 11 +++++++++++
 glib/tests/test-printf.c                 |  8 ++++----
 glib/tests/utils.c                       |  4 ++--
 glib/valgrind.h                          |  4 ++--
 gobject/gtype.h                          |  2 +-
 meson.build                              |  3 +++
 29 files changed, 89 insertions(+), 58 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]