mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-02 07:23:41 +02:00
Revert "gio, glib: Use G_OS_DARWIN for code that is for such environments"
This reverts commit 476e33c3f3
.
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
This commit is contained in:
@@ -805,7 +805,7 @@ test_uri_query_info (void)
|
||||
g_assert_nonnull (content_type);
|
||||
mime_type = g_content_type_get_mime_type (content_type);
|
||||
g_assert_nonnull (mime_type);
|
||||
#ifdef G_OS_DARWIN
|
||||
#ifdef __APPLE__
|
||||
g_assert_cmpstr (mime_type, ==, "text/*");
|
||||
#else
|
||||
g_assert_cmpstr (mime_type, ==, "text/plain");
|
||||
|
Reference in New Issue
Block a user