diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2022-10-10 13:39:54 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2022-10-10 13:39:54 +0000 |
| commit | 15070ab54ec888d298f84a8444c958d5ce4c4da4 (patch) | |
| tree | 342f84b9d445c3907dcbd8c1018fc4ed0c963bdd | |
| parent | 2e46d5b14592038ea74ffb292f69bc9db510f0ce (diff) | |
| parent | cdef2bb414ec05aa9bb4bf7cc15743d643eef6c3 (diff) | |
| download | libglnx-15070ab54ec888d298f84a8444c958d5ce4c4da4.tar.gz | |
Merge branch 'wip/smcv/null-option-entry-ifndef' into 'master'
backports: Use #ifndef instead of GLIB_CHECK_VERSION
See merge request GNOME/libglnx!43
| -rw-r--r-- | glnx-backports.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/glnx-backports.h b/glnx-backports.h index 68ce025..27fbde3 100644 --- a/glnx-backports.h +++ b/glnx-backports.h @@ -85,7 +85,7 @@ gboolean glnx_set_object (GObject **object_ptr, #define G_DBUS_METHOD_INVOCATION_UNHANDLED FALSE #endif -#if !GLIB_CHECK_VERSION(2, 70, 0) +#ifndef G_OPTION_ENTRY_NULL /* added in 2.70 */ #define G_OPTION_ENTRY_NULL { NULL, 0, 0, 0, NULL, NULL, NULL } #endif |