luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-30 20:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

girepository: Various fixes to symbol visibility and compilation defines

Browse Source 
To make the setup in libgirepository match that in libgio.

Signed-off-by: Philip Withnall <philip@tecnocode.co.uk>

Helps: #3155
This commit is contained in:
Philip Withnall 2023-10-25 18:30:38 +01:00
parent 5f012e9f12
commit f0e11e82d3
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
girepository/gdump.c
View File

@ -32,7 +32,7 @@
* to libgirepository; see * to libgirepository; see
* https://bugzilla.gnome.org/show_bug.cgi?id=630342 * https://bugzilla.gnome.org/show_bug.cgi?id=630342
*/ */
#ifdef G_IREPOSITORY_COMPILATION #ifdef GI_COMPILATION
#include "config.h" #include "config.h"
#include "girepository.h" #include "girepository.h"
#endif #endif
@ -543,7 +543,7 @@ dump_error_quark (GQuark quark, const char *symbol, GOutputStream *out)
* *
* Returns: %TRUE on success, %FALSE on error * Returns: %TRUE on success, %FALSE on error
*/ */
#ifndef G_IREPOSITORY_COMPILATION #ifndef GI_COMPILATION
static gboolean static gboolean
dump_irepository (const char *arg, GError **error) G_GNUC_UNUSED; dump_irepository (const char *arg, GError **error) G_GNUC_UNUSED;
static gboolean static gboolean

2
girepository/girepository.h
View File

@ -247,4 +247,6 @@ void gi_cclosure_marshal_generic (GClosure *closure,
G_END_DECLS G_END_DECLS
#undef __GIREPOSITORY_H_INSIDE__
#endif /* __G_IREPOSITORY_H__ */ #endif /* __G_IREPOSITORY_H__ */

4
girepository/girffi.h
View File

@ -24,6 +24,10 @@
#ifndef __GIRFFI_H__ #ifndef __GIRFFI_H__
#define __GIRFFI_H__ #define __GIRFFI_H__
#if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
#error "Only <girepository.h> can be included directly."
#endif
#include <ffi.h> #include <ffi.h>
#include "girepository.h" #include "girepository.h"

2
girepository/meson.build
View File

@ -67,7 +67,7 @@ girepo_headers = files(
install_headers(girepo_headers, install_dir: gir_includedir) install_headers(girepo_headers, install_dir: gir_includedir)
gir_c_args = [ gir_c_args = [
'-DG_IREPOSITORY_COMPILATION', '-DGI_COMPILATION',
'-DG_LOG_DOMAIN="GLib-GIRepository"', '-DG_LOG_DOMAIN="GLib-GIRepository"',
'-DGIR_SUFFIX="gir-1.0"', '-DGIR_SUFFIX="gir-1.0"',
'-DGIR_DIR="@0@"'.format(glib_girdir), '-DGIR_DIR="@0@"'.format(glib_girdir),