Merge branch 'wip/smcv/autofd' into 'main'

gstdio: Silence "Not available before" warnings for inline functions

Closes #2796

See merge request GNOME/glib!3026

gio/tests/max-version.c

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2022 Collabora Ltd.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GLIB_VERSION_MAX_ALLOWED
+/* This is the oldest version macro available */
+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_26
+#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_26
+#endif
+
+#include <glib.h>
+
+/* All the headers that can validly be included in third-party code */
+#include <gio/gio.h>
+#include <gio/gnetworking.h>
+
+#define G_SETTINGS_ENABLE_BACKEND
+#include <gio/gsettingsbackend.h>
+
+#ifdef G_OS_UNIX
+#include <gio/gdesktopappinfo.h>
+#include <gio/gfiledescriptorbased.h>
+#include <gio/gunixconnection.h>
+#include <gio/gunixcredentialsmessage.h>
+#include <gio/gunixfdlist.h>
+#include <gio/gunixfdmessage.h>
+#include <gio/gunixinputstream.h>
+#include <gio/gunixmounts.h>
+#include <gio/gunixoutputstream.h>
+#include <gio/gunixsocketaddress.h>
+#endif
+
+#ifdef G_OS_WIN32
+#include <gio/gwin32inputstream.h>
+#include <gio/gwin32outputstream.h>
+#include <gio/gwin32registrykey.h>
+#endif
+
+#ifdef HAVE_COCOA
+#include <gio/gosxappinfo.h>
+#endif
+
+static void
+nothing (void)
+{
+  /* This doesn't really do anything: the real "test" is at compile time.
+   * Just make sure the GIO library gets linked. */
+  g_debug ("Loaded %s from GIO library", g_type_name (G_TYPE_CANCELLABLE));
+}
+
+int
+main (int   argc,
+      char *argv[])
+{
+  g_test_init (&argc, &argv, NULL);
+
+  g_test_add_func ("/max-version/tested-at-compile-time", nothing);
+  return g_test_run ();
+}

gio/tests/meson.build

@@ -81,6 +81,7 @@ gio_tests = {
   },
   'inet-address' : {},
   'io-stream' : {},
+  'max-version' : {'install' : false},
   'memory-input-stream' : {},
   'memory-monitor' : {},
   'memory-output-stream' : {},

glib/gstdio.h

@@ -190,7 +190,10 @@ g_clear_fd (int     *fd_ptr,
   if (fd < 0)
     return TRUE;
 
+  /* Suppress "Not available before" warning */
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   return g_close (fd, error);
+  G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 /* g_autofd should be defined on the same compilers where g_autofree is
@@ -200,14 +203,17 @@ g_clear_fd (int     *fd_ptr,
 static inline void
 _g_clear_fd_ignore_error (int *fd_ptr)
 {
+  /* Suppress "Not available before" warning */
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   if (!g_clear_fd (fd_ptr, NULL))
     {
       /* Do nothing: we ignore all errors, except for EBADF which
        * is a programming error, checked for by g_close(). */
     }
+  G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
-#define g_autofd _GLIB_CLEANUP(_g_clear_fd_ignore_error)
+#define g_autofd _GLIB_CLEANUP(_g_clear_fd_ignore_error) GLIB_AVAILABLE_MACRO_IN_2_76
 #endif
 
 G_END_DECLS

glib/tests/max-version.c

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2022 Collabora Ltd.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GLIB_VERSION_MAX_ALLOWED
+/* This is the oldest version macro available */
+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_26
+#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_26
+#endif
+
+/* All the headers that can validly be included in third-party code */
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <glib/gprintf.h>
+#include <glib/gstdio.h>
+
+#ifdef G_OS_UNIX
+#include <glib-unix.h>
+#endif
+
+static void
+nothing (void)
+{
+  /* This doesn't really do anything: the real "test" is at compile time. */
+}
+
+int
+main (int   argc,
+      char *argv[])
+{
+  g_test_init (&argc, &argv, NULL);
+
+  g_test_add_func ("/max-version/tested-at-compile-time", nothing);
+  return g_test_run ();
+}

glib/tests/meson.build

@@ -56,6 +56,7 @@ glib_tests = {
   'markup-collect' : {},
   'markup-escape' : {},
   'markup-subparser' : {},
+  'max-version' : {'install' : false},
   'memchunk' : {},
   'mem-overflow' : {
     'link_args' : cc.get_id() == 'gcc' and cc.version().version_compare('> 6')

gmodule/tests/max-version.c

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2022 Collabora Ltd.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GLIB_VERSION_MAX_ALLOWED
+/* This is the oldest version macro available */
+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_26
+#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_26
+#endif
+
+#include <glib.h>
+
+#include <gmodule.h>
+
+static void
+nothing (void)
+{
+  /* This doesn't really do anything: the real "test" is at compile time.
+   * Just make sure the GModule library gets linked. */
+  g_debug ("GModule supported: %s", g_module_supported () ? "yes" : "no");
+}
+
+int
+main (int   argc,
+      char *argv[])
+{
+  g_test_init (&argc, &argv, NULL);
+
+  g_test_add_func ("/max-version/tested-at-compile-time", nothing);
+  return g_test_run ();
+}

gmodule/tests/meson.build

@@ -1,4 +1,5 @@
 gmodule_tests = {
+  'max-version' : {'install': false},
   'module-test-library' : {
     'export_dynamic' : true,
     'source': 'module-test.c',

gobject/tests/max-version.c

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2022 Collabora Ltd.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GLIB_VERSION_MAX_ALLOWED
+/* This is the oldest version macro available */
+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_26
+#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_26
+#endif
+
+#include <glib.h>
+
+/* All the headers that can validly be included in third-party code */
+#include <glib-object.h>
+#include <gobject/gvaluecollector.h>
+
+static void
+nothing (void)
+{
+  /* This doesn't really do anything: the real "test" is at compile time.
+   * Just make sure the GObject library gets linked. */
+  g_debug ("Loaded %s", g_type_name (G_TYPE_OBJECT));
+}
+
+int
+main (int   argc,
+      char *argv[])
+{
+  g_test_init (&argc, &argv, NULL);
+
+  g_test_add_func ("/max-version/tested-at-compile-time", nothing);
+  return g_test_run ();
+}

gobject/tests/meson.build

@@ -47,6 +47,7 @@ gobject_tests = {
     'source' : ['dynamictype.c', 'testmodule.c'],
   },
   'enums' : {},
+  'max-version' : {'install': false},
   'override' : {},
   'param' : {},
   'references' : {},