Merge branch '3231-gir-symbols-cleanup' into 'main'

introspection: Remove various public symbols from newly generated GIRs

Closes #3231

See merge request GNOME/glib!3910
This commit is contained in:
Philip Withnall 2024-02-09 10:58:29 +00:00
commit 2cacc09398
7 changed files with 52 additions and 19 deletions

View File

@ -21,6 +21,7 @@
#include "gio/gnetworking.h" #include "gio/gnetworking.h"
#include "../gio/gthreadedresolver.h" #include "../gio/gthreadedresolver.h"
#include "../gio/gthreadedresolver-private.h"
static void static void
test_for_rrtype (const guint8 *data, test_for_rrtype (const guint8 *data,

View File

@ -0,0 +1,46 @@
/* GIO - GLib Input, Output and Streaming Library
*
* Copyright (C) 2008 Red Hat, Inc.
*
* 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 __G_THREADED_RESOLVER_PRIVATE_H__
#define __G_THREADED_RESOLVER_PRIVATE_H__
#include <gio/gio.h>
#include <gio/gresolver.h>
G_BEGIN_DECLS
/* Used for a private test API */
#ifdef G_OS_UNIX
/*< private >*/
GIO_AVAILABLE_IN_ALL
GList *g_resolver_records_from_res_query (const gchar *rrname,
gint rrtype,
const guint8 *answer,
gssize len,
gint herr,
GError **error);
/*< private >*/
GIO_AVAILABLE_IN_ALL
gint g_resolver_record_type_to_rrtype (GResolverRecordType type);
#endif
G_END_DECLS
#endif /* __G_RESOLVER_PRIVATE_H__ */

View File

@ -30,6 +30,7 @@
#include "glib/glib-private.h" #include "glib/glib-private.h"
#include "gthreadedresolver.h" #include "gthreadedresolver.h"
#include "gthreadedresolver-private.h"
#include "gnetworkingprivate.h" #include "gnetworkingprivate.h"
#include "gcancellable.h" #include "gcancellable.h"

View File

@ -39,21 +39,6 @@ G_BEGIN_DECLS
GIO_AVAILABLE_IN_ALL GIO_AVAILABLE_IN_ALL
G_DECLARE_FINAL_TYPE (GThreadedResolver, g_threaded_resolver, G, THREADED_RESOLVER, GResolver) G_DECLARE_FINAL_TYPE (GThreadedResolver, g_threaded_resolver, G, THREADED_RESOLVER, GResolver)
/* Used for a private test API */
#ifdef G_OS_UNIX
/*< private >*/
GIO_AVAILABLE_IN_ALL
GList *g_resolver_records_from_res_query (const gchar *rrname,
gint rrtype,
const guint8 *answer,
gssize len,
gint herr,
GError **error);
/*< private >*/
GIO_AVAILABLE_IN_ALL
gint g_resolver_record_type_to_rrtype (GResolverRecordType type);
#endif
G_END_DECLS G_END_DECLS
#endif /* __G_RESOLVER_H__ */ #endif /* __G_RESOLVER_H__ */

View File

@ -26,6 +26,7 @@
#define GIO_COMPILATION #define GIO_COMPILATION
#include "gthreadedresolver.h" #include "gthreadedresolver.h"
#include "gthreadedresolver-private.h"
#undef GIO_COMPILATION #undef GIO_COMPILATION
#ifdef HAVE_DN_COMP #ifdef HAVE_DN_COMP

View File

@ -107,10 +107,12 @@ gint64 g_slice_get_config (GSliceConfig ckey);
GLIB_DEPRECATED_IN_2_34 GLIB_DEPRECATED_IN_2_34
gint64* g_slice_get_config_state (GSliceConfig ckey, gint64 address, guint *n_values); gint64* g_slice_get_config_state (GSliceConfig ckey, gint64 address, guint *n_values);
#ifndef __GI_SCANNER__
#ifdef G_ENABLE_DEBUG #ifdef G_ENABLE_DEBUG
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_slice_debug_tree_statistics (void); void g_slice_debug_tree_statistics (void);
#endif #endif
#endif
G_END_DECLS G_END_DECLS

View File

@ -331,7 +331,6 @@ glib_sources += files(
'gtimer.c', 'gtimer.c',
'gtimezone.c', 'gtimezone.c',
'gtrace.c', 'gtrace.c',
'gtrace-private.h',
'gtranslit.c', 'gtranslit.c',
'gtrashstack.c', 'gtrashstack.c',
'gtree.c', 'gtree.c',
@ -341,9 +340,7 @@ glib_sources += files(
'gunicollate.c', 'gunicollate.c',
'gunidecomp.c', 'gunidecomp.c',
'guri.c', 'guri.c',
'guriprivate.h',
'gutils.c', 'gutils.c',
'gutilsprivate.h',
'guuid.c', 'guuid.c',
'gvariant.c', 'gvariant.c',
'gvariant-core.c', 'gvariant-core.c',
@ -374,7 +371,7 @@ if host_system == 'windows'
glib_sources += files('dirent/wdirent.c') glib_sources += files('dirent/wdirent.c')
endif endif
else else
glib_sources += files('glib-unix.c', 'glib-unixprivate.h', 'gspawn.c', 'giounix.c') glib_sources += files('glib-unix.c', 'gspawn.c', 'giounix.c')
platform_deps = [] platform_deps = []
endif endif