summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2022-11-13 14:35:44 +0100
committerRico Tzschichholz <ricotz@ubuntu.com>2022-11-13 14:35:44 +0100
commit2861c026587b868bab4730a54345b27bbbd32fcf (patch)
treeb743233d1c7e40f6aaba7dcfc27ea711d120544a
parente95e19b55db856c23fea6a3e4002b4025e9d77fa (diff)
downloadgobject-introspection-2861c026587b868bab4730a54345b27bbbd32fcf.tar.gz
Update glib introspection data
This is based on f64f88baaeaca277687e6231b3cea6d14a26996b
-rw-r--r--gir/gio-2.0.c4
-rw-r--r--gir/glib-2.0.c19
2 files changed, 6 insertions, 17 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index 8192554c..407293d3 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -9527,6 +9527,10 @@
* #GTask was constructed to be running at least until the task has completed
* and its data has been freed.
*
+ * If a #GTask has been constructed and its callback set, it is an error to
+ * not call `g_task_return_*()` on it. GLib will warn at runtime if this happens
+ * (since 2.76).
+ *
* Here is an example for using GTask as a GAsyncResult:
* |[<!-- language="C" -->
* typedef struct {
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index 2e972a1f..e99535dc 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -4441,18 +4441,6 @@
/**
- * G_OS_DARWIN:
- *
- * This macro is defined only on Apple operating systems (macOS or iOS).
- * So you can bracket Apple-specific code in `\#ifdef G_OS_DARWIN`.
- *
- * Note that %G_OS_UNIX is also set.
- *
- * Since: 2.76
- */
-
-
-/**
* G_OS_UNIX:
*
* This macro is defined only on UNIX. So you can bracket
@@ -4466,13 +4454,10 @@
* - Linux kernel and GNU user-space: `\#if defined(__linux__) && defined(__GLIBC__)`
* - FreeBSD kernel (any libc, including glibc): `\#ifdef __FreeBSD_kernel__`
* - FreeBSD kernel and user-space: `\#ifdef __FreeBSD__`
+ * - Apple operating systems (macOS, iOS, tvOS), regardless of whether
+ * Cocoa/Carbon toolkits are available: `\#ifdef __APPLE__`
*
* See <https://sourceforge.net/p/predef/wiki/OperatingSystems/> for more.
- *
- * GLib defines OS-detection macros for some categories of systems
- * that can be less straightforward to detect, such as %G_OS_DARWIN, but
- * intentionally does not provide its own equivalents of macros like
- * `__linux__`.
*/