From 47470880b25185672f2b210ad4901c7adf82fc07 Mon Sep 17 00:00:00 2001 From: Jehan Date: Thu, 17 Oct 2024 17:12:30 +0200 Subject: [PATCH] app, libgimpbase: gimp_signal_private()'s header is now made private. As other functions, it is still exported, but let make its header not exposed in public API. --- app/signals.c | 1 + libgimpbase/gimpbase-private.h | 4 ++++ libgimpbase/gimpbase.h | 4 ---- libgimpbase/gimpsignal.c | 2 +- libgimpbase/meson.build | 3 +-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/signals.c b/app/signals.c index d668e44c57..e727293857 100644 --- a/app/signals.c +++ b/app/signals.c @@ -22,6 +22,7 @@ #include #include "libgimpbase/gimpbase.h" +#include "libgimpbase/gimpbase-private.h" #include "core/core-types.h" diff --git a/libgimpbase/gimpbase-private.h b/libgimpbase/gimpbase-private.h index 208069f970..e8db03afb3 100644 --- a/libgimpbase/gimpbase-private.h +++ b/libgimpbase/gimpbase-private.h @@ -26,6 +26,10 @@ #include #include +#ifndef G_OS_WIN32 +#include +#endif + typedef struct _GimpUnitVtable GimpUnitVtable; diff --git a/libgimpbase/gimpbase.h b/libgimpbase/gimpbase.h index 07267cb285..b0f01a5c0a 100644 --- a/libgimpbase/gimpbase.h +++ b/libgimpbase/gimpbase.h @@ -41,10 +41,6 @@ #include #include -#ifndef G_OS_WIN32 -#include -#endif - #undef __GIMP_BASE_H_INSIDE__ #endif /* __GIMP_BASE_H__ */ diff --git a/libgimpbase/gimpsignal.c b/libgimpbase/gimpsignal.c index 4e334f68ff..0c00c2f42b 100644 --- a/libgimpbase/gimpsignal.c +++ b/libgimpbase/gimpsignal.c @@ -41,7 +41,7 @@ /** * gimp_signal_private: (skip) - * @signum: Selects signal to be handled see man 5 signal (or man 7 signal) + * @signum: Selects signal to be handled (see `man 7 signal`) * @handler: Handler that maps to signum. Invoked by O/S. * Handler gets signal that caused invocation. Corresponds * to the @sa_handler field of the @sigaction struct. diff --git a/libgimpbase/meson.build b/libgimpbase/meson.build index 60e9f104e7..4d2fc11e2a 100644 --- a/libgimpbase/meson.build +++ b/libgimpbase/meson.build @@ -61,7 +61,6 @@ libgimpbase_sources_introspectable = files( 'gimpparasite.c', 'gimpparasiteio.c', 'gimprectangle.c', - 'gimpsignal.c', 'gimpunit.c', 'gimputils.c', 'gimpvaluearray.c', @@ -72,6 +71,7 @@ libgimpbase_sources = [ 'gimpbase-private.c', 'gimpprotocol.c', 'gimpreloc.c', + 'gimpsignal.c', 'gimpwire.c', 'gimpbaseenums.c', @@ -96,7 +96,6 @@ libgimpbase_headers_introspectable = files( 'gimpparasite.h', 'gimpparasiteio.h', 'gimprectangle.h', - 'gimpsignal.h', 'gimpunit.h', 'gimputils.h', 'gimpvaluearray.h',