From 05b19376eab0550595c1f27647d028074c8f739a Mon Sep 17 00:00:00 2001 From: rbuj Date: Wed, 25 Nov 2020 15:16:24 +0100 Subject: Use G_BEGIN_DECLS/G_END_DECLS macros --- capplets/keybindings/eggaccelerators.h | 10 +++------- capplets/keybindings/eggcellrendererkeys.h | 11 +++-------- 2 files changed, 6 insertions(+), 15 deletions(-) (limited to 'capplets/keybindings') diff --git a/capplets/keybindings/eggaccelerators.h b/capplets/keybindings/eggaccelerators.h index 4f503d6b..794879b8 100644 --- a/capplets/keybindings/eggaccelerators.h +++ b/capplets/keybindings/eggaccelerators.h @@ -21,12 +21,11 @@ #ifndef __EGG_ACCELERATORS_H__ #define __EGG_ACCELERATORS_H__ +#include #include #include -#ifdef __cplusplus -extern "C" { -#endif +G_BEGIN_DECLS /* Where a value is also in GdkModifierType we coincide, * otherwise we don't overlap. @@ -91,9 +90,6 @@ gchar* egg_virtual_accelerator_label (guint accelerator_key, guint keycode, EggVirtualModifierType accelerator_mods); -#ifdef __cplusplus -} -#endif - +G_END_DECLS #endif /* __EGG_ACCELERATORS_H__ */ diff --git a/capplets/keybindings/eggcellrendererkeys.h b/capplets/keybindings/eggcellrendererkeys.h index 1b5f4262..061bd07a 100644 --- a/capplets/keybindings/eggcellrendererkeys.h +++ b/capplets/keybindings/eggcellrendererkeys.h @@ -20,12 +20,11 @@ #ifndef __EGG_CELL_RENDERER_KEYS_H__ #define __EGG_CELL_RENDERER_KEYS_H__ +#include #include #include "eggaccelerators.h" -#ifdef __cplusplus -extern "C" { -#endif +G_BEGIN_DECLS #define EGG_TYPE_CELL_RENDERER_KEYS (egg_cell_renderer_keys_get_type ()) #define EGG_CELL_RENDERER_KEYS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeys)) @@ -84,10 +83,6 @@ void egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys void egg_cell_renderer_keys_set_accel_mode (EggCellRendererKeys *keys, EggCellRendererKeysMode accel_mode); - -#ifdef __cplusplus -} -#endif - +G_END_DECLS #endif /* __GTK_CELL_RENDERER_KEYS_H__ */ -- cgit v1.2.1