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 /glib/tests/collate.c | |
| parent | 483b6f2214d69a9f95fbc6e6b44d1aae3b2e1634 (diff) | |
| download | glib-7b52ccbfc4e12e3f3f8346e87fdd783203e4b4fa.tar.gz | |
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 'glib/tests/collate.c')
| -rw-r--r-- | glib/tests/collate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/glib/tests/collate.c b/glib/tests/collate.c index f3907976f..bd9ea234f 100644 --- a/glib/tests/collate.c +++ b/glib/tests/collate.c @@ -235,7 +235,7 @@ const gchar *sorted2[] = { const gchar *file_sorted2[] = { /* Filename collation in OS X follows Finder style which gives * a slightly different order from usual Linux locales. */ -#ifdef G_OS_DARWIN +#ifdef HAVE_CARBON "a-.a", "a.a", "aa.a", |