diff options
| author | Dave Davenport <qball@gmpclient.org> | 2017-11-21 16:04:59 +0100 |
|---|---|---|
| committer | Dave Davenport <qball@gmpclient.org> | 2017-11-21 16:04:59 +0100 |
| commit | 54c45f8f5fa98a6becb7bedeb06bd8062dcea513 (patch) | |
| tree | daef1d4ad7134d6b579cbe4519280473a7e699a4 | |
| parent | 35304e705d3a13eca9655be5fb14cdff10cb9862 (diff) | |
Fix __cplusplus guard. Move after include
| -rw-r--r-- | include/helper.h | 9 | ||||
| -rw-r--r-- | include/mode-private.h | 9 | ||||
| -rw-r--r-- | include/mode.h | 9 | ||||
| -rw-r--r-- | include/rofi-types.h | 9 |
4 files changed, 8 insertions, 28 deletions
diff --git a/include/helper.h b/include/helper.h index 35d28cf1..4fc9d147 100644 --- a/include/helper.h +++ b/include/helper.h @@ -27,12 +27,9 @@ #ifndef ROFI_HELPER_H #define ROFI_HELPER_H -#ifdef __cplusplus -extern "C" -{ -#endif #include <cairo.h> #include "rofi-types.h" +G_BEGIN_DECLS /** * @defgroup HELPERS Helpers @@ -339,7 +336,5 @@ void parse_ranges ( char *input, rofi_range_pair **list, unsigned int *length ); * @param filter */ void rofi_output_formatted_line ( const char *format, const char *string, int selected_line, const char *filter ); -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif // ROFI_HELPER_H diff --git a/include/mode-private.h b/include/mode-private.h index 4d3b96a7..e9f2deb3 100644 --- a/include/mode-private.h +++ b/include/mode-private.h @@ -27,11 +27,8 @@ #ifndef ROFI_MODE_PRIVATE_H #define ROFI_MODE_PRIVATE_H -#ifdef __cplusplus -extern "C" -{ -#endif #include <gmodule.h> +G_BEGIN_DECLS /** ABI version to check if loaded plugin is compatible. */ #define ABI_VERSION 0x00000006 @@ -199,7 +196,5 @@ struct rofi_mode /** Module */ GModule *module; }; -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif // ROFI_MODE_PRIVATE_H diff --git a/include/mode.h b/include/mode.h index d8d74bd1..1729590e 100644 --- a/include/mode.h +++ b/include/mode.h @@ -27,12 +27,9 @@ #ifndef ROFI_MODE_H #define ROFI_MODE_H -#ifdef __cplusplus -extern "C" -{ -#endif #include <cairo.h> #include "rofi-types.h" +G_BEGIN_DECLS /** * @defgroup MODE Mode * @@ -239,7 +236,5 @@ char * mode_preprocess_input ( Mode *mode, const char *input ); */ char *mode_get_message ( const Mode *mode ); /*@}*/ -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif diff --git a/include/rofi-types.h b/include/rofi-types.h index 69b9cd76..93fc683c 100644 --- a/include/rofi-types.h +++ b/include/rofi-types.h @@ -1,11 +1,8 @@ #ifndef INCLUDE_ROFI_TYPES_H #define INCLUDE_ROFI_TYPES_H -#ifdef __cplusplus -extern "C" -{ -#endif #include <glib.h> +G_BEGIN_DECLS /** * Type of property @@ -238,7 +235,5 @@ typedef struct rofi_int_matcher_t gboolean invert; } rofi_int_matcher; -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif // INCLUDE_ROFI_TYPES_H |