1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-02-10 15:44:41 -05:00

Fix __cplusplus guard. Move after include

This commit is contained in:
Dave Davenport 2017-11-21 16:04:59 +01:00
parent 35304e705d
commit 54c45f8f5f
4 changed files with 8 additions and 28 deletions

View file

@ -27,12 +27,9 @@
#ifndef ROFI_HELPER_H #ifndef ROFI_HELPER_H
#define ROFI_HELPER_H #define ROFI_HELPER_H
#ifdef __cplusplus
extern "C"
{
#endif
#include <cairo.h> #include <cairo.h>
#include "rofi-types.h" #include "rofi-types.h"
G_BEGIN_DECLS
/** /**
* @defgroup HELPERS Helpers * @defgroup HELPERS Helpers
@ -339,7 +336,5 @@ void parse_ranges ( char *input, rofi_range_pair **list, unsigned int *length );
* @param filter * @param filter
*/ */
void rofi_output_formatted_line ( const char *format, const char *string, int selected_line, const char *filter ); void rofi_output_formatted_line ( const char *format, const char *string, int selected_line, const char *filter );
#ifdef __cplusplus G_END_DECLS
}
#endif
#endif // ROFI_HELPER_H #endif // ROFI_HELPER_H

View file

@ -27,11 +27,8 @@
#ifndef ROFI_MODE_PRIVATE_H #ifndef ROFI_MODE_PRIVATE_H
#define ROFI_MODE_PRIVATE_H #define ROFI_MODE_PRIVATE_H
#ifdef __cplusplus
extern "C"
{
#endif
#include <gmodule.h> #include <gmodule.h>
G_BEGIN_DECLS
/** ABI version to check if loaded plugin is compatible. */ /** ABI version to check if loaded plugin is compatible. */
#define ABI_VERSION 0x00000006 #define ABI_VERSION 0x00000006
@ -199,7 +196,5 @@ struct rofi_mode
/** Module */ /** Module */
GModule *module; GModule *module;
}; };
#ifdef __cplusplus G_END_DECLS
}
#endif
#endif // ROFI_MODE_PRIVATE_H #endif // ROFI_MODE_PRIVATE_H

View file

@ -27,12 +27,9 @@
#ifndef ROFI_MODE_H #ifndef ROFI_MODE_H
#define ROFI_MODE_H #define ROFI_MODE_H
#ifdef __cplusplus
extern "C"
{
#endif
#include <cairo.h> #include <cairo.h>
#include "rofi-types.h" #include "rofi-types.h"
G_BEGIN_DECLS
/** /**
* @defgroup MODE Mode * @defgroup MODE Mode
* *
@ -239,7 +236,5 @@ char * mode_preprocess_input ( Mode *mode, const char *input );
*/ */
char *mode_get_message ( const Mode *mode ); char *mode_get_message ( const Mode *mode );
/*@}*/ /*@}*/
#ifdef __cplusplus G_END_DECLS
}
#endif
#endif #endif

View file

@ -1,11 +1,8 @@
#ifndef INCLUDE_ROFI_TYPES_H #ifndef INCLUDE_ROFI_TYPES_H
#define INCLUDE_ROFI_TYPES_H #define INCLUDE_ROFI_TYPES_H
#ifdef __cplusplus
extern "C"
{
#endif
#include <glib.h> #include <glib.h>
G_BEGIN_DECLS
/** /**
* Type of property * Type of property
@ -238,7 +235,5 @@ typedef struct rofi_int_matcher_t
gboolean invert; gboolean invert;
} rofi_int_matcher; } rofi_int_matcher;
#ifdef __cplusplus G_END_DECLS
}
#endif
#endif // INCLUDE_ROFI_TYPES_H #endif // INCLUDE_ROFI_TYPES_H