diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2022-10-20 22:16:25 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-10-20 22:16:59 -0400 |
| commit | 276535b381b789da2bd697c4bd39f8e08ab488be (patch) | |
| tree | c0f1b8f0729111805d5088fc313ac0ab855910e7 /modules/printbackends | |
| parent | 375432f0b60c5db74d63f8404dba8ac77b600a91 (diff) | |
| download | gtk+-fix-build-with-glib.tar.gz | |
Revert "modules: Fix build on Visual Studio"fix-build-with-glib
This reverts commit acd9c12667a021936b30e0fa8f43d3a8c7133cf7.
This commit breaks the build with GLib main,
we now get complaints about _GLIB_EXTERN being
redefined.
Maybe it is not needed anymore anyway, since
export macros have seen Window-related fixes.
Diffstat (limited to 'modules/printbackends')
| -rw-r--r-- | modules/printbackends/gtkprintbackendcups.c | 3 | ||||
| -rw-r--r-- | modules/printbackends/gtkprintbackendfile.c | 3 | ||||
| -rw-r--r-- | modules/printbackends/gtkprintbackendlpr.c | 3 | ||||
| -rw-r--r-- | modules/printbackends/meson.build | 1 |
4 files changed, 9 insertions, 1 deletions
diff --git a/modules/printbackends/gtkprintbackendcups.c b/modules/printbackends/gtkprintbackendcups.c index 41774a0bdd..e0398bb1d4 100644 --- a/modules/printbackends/gtkprintbackendcups.c +++ b/modules/printbackends/gtkprintbackendcups.c @@ -246,6 +246,7 @@ static void secrets_service_vanished_cb (GDBusConnec G_DEFINE_DYNAMIC_TYPE(GtkPrintBackendCups, gtk_print_backend_cups, GTK_TYPE_PRINT_BACKEND) +G_MODULE_EXPORT void g_io_module_load (GIOModule *module) { @@ -260,11 +261,13 @@ g_io_module_load (GIOModule *module) 10); } +G_MODULE_EXPORT void g_io_module_unload (GIOModule *module) { } +G_MODULE_EXPORT char ** g_io_module_query (void) { diff --git a/modules/printbackends/gtkprintbackendfile.c b/modules/printbackends/gtkprintbackendfile.c index 0275492f65..739313064b 100644 --- a/modules/printbackends/gtkprintbackendfile.c +++ b/modules/printbackends/gtkprintbackendfile.c @@ -103,6 +103,7 @@ static GtkPageSetup * file_printer_get_default_page_size (GtkPrinter G_DEFINE_DYNAMIC_TYPE(GtkPrintBackendFile, gtk_print_backend_file, GTK_TYPE_PRINT_BACKEND) +G_MODULE_EXPORT void g_io_module_load (GIOModule *module) { @@ -116,11 +117,13 @@ g_io_module_load (GIOModule *module) 10); } +G_MODULE_EXPORT void g_io_module_unload (GIOModule *module) { } +G_MODULE_EXPORT char ** g_io_module_query (void) { diff --git a/modules/printbackends/gtkprintbackendlpr.c b/modules/printbackends/gtkprintbackendlpr.c index b4f711632f..e4b81289c6 100644 --- a/modules/printbackends/gtkprintbackendlpr.c +++ b/modules/printbackends/gtkprintbackendlpr.c @@ -82,6 +82,7 @@ static void gtk_print_backend_lpr_print_stream (GtkPrintBacke G_DEFINE_DYNAMIC_TYPE (GtkPrintBackendLpr, gtk_print_backend_lpr, GTK_TYPE_PRINT_BACKEND) +G_MODULE_EXPORT void g_io_module_load (GIOModule *module) { @@ -95,11 +96,13 @@ g_io_module_load (GIOModule *module) 10); } +G_MODULE_EXPORT void g_io_module_unload (GIOModule *module) { } +G_MODULE_EXPORT char ** g_io_module_query (void) { diff --git a/modules/printbackends/meson.build b/modules/printbackends/meson.build index 77d97307f2..6e0188f62c 100644 --- a/modules/printbackends/meson.build +++ b/modules/printbackends/meson.build @@ -8,7 +8,6 @@ printbackends_args = [ '-DGTK_COMPILATION', '-DGTK_DISABLE_DEPRECATION_WARNINGS', '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED', - '-D_GLIB_EXTERN=@0@'.format(visibility_define), ] + common_cflags cups_dep = dependency('cups', version : '>=2.0', required: get_option('print-cups')) |