diff options
| author | Philip Withnall <pwithnall@endlessos.org> | 2022-11-02 10:01:09 +0000 |
|---|---|---|
| committer | Philip Withnall <pwithnall@endlessos.org> | 2022-11-07 11:30:32 +0000 |
| commit | 7b52ccbfc4e12e3f3f8346e87fdd783203e4b4fa (patch) | |
| tree | deb43eda84e9a1991f7aab21da11c888c90cda98 /gio/gio-querymodules.c | |
| parent | 483b6f2214d69a9f95fbc6e6b44d1aae3b2e1634 (diff) | |
Revert "gio, glib: Use G_OS_DARWIN for code that is for such environments"
This reverts commit 476e33c3f3632bd32370fadc67b10d61da9a4098.
We’ve decided to remove `G_OS_DARWIN` in favour of recommending people
use `__APPLE__` instead. As per the discussion on #2802 and linked
issues,
* Adding a new define shifts the complexity from “which of these
platform-provided defines do I use” to “which platform-provided
defines does G_OS_DARWIN use”
* There should ideally be no cases where a user of GLib has to use
their own platform-specific code, since GLib should be providing
appropriate abstractions
* Providing a single `G_OS_DARWIN` to cover all Apple products (macOS
and iOS) hides the complexity of what the user is actually testing:
are they testing for the Mach kernel, the Carbon and/or Cocoa user
space toolkits, macOS vs iOS vs tvOS, etc
Helps: #2802
Diffstat (limited to 'gio/gio-querymodules.c')
| -rw-r--r-- | gio/gio-querymodules.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gio/gio-querymodules.c b/gio/gio-querymodules.c index 3766e4303..145d6ddae 100644 --- a/gio/gio-querymodules.c +++ b/gio/gio-querymodules.c @@ -35,7 +35,7 @@ static gboolean is_valid_module_name (const gchar *basename) { #if !defined(G_OS_WIN32) && !defined(G_WITH_CYGWIN) - #if defined(G_OS_DARWIN) + #if defined(__APPLE__) return g_str_has_prefix (basename, "lib") && (g_str_has_suffix (basename, ".so") || g_str_has_suffix (basename, ".dylib")); |