Skip to content

Commit

Permalink
use G_BEGIN/END_DECLS
Browse files Browse the repository at this point in the history
  • Loading branch information
yetist authored and raveit65 committed May 27, 2018
1 parent 9294083 commit b642c7c
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 34 deletions.
14 changes: 5 additions & 9 deletions libmenu/canonicalize.h
Expand Up @@ -20,19 +20,15 @@
* 02110-1301 USA.
*/

#ifndef G_CANONICALIZE_H
#define G_CANONICALIZE_H
#ifndef MATE_CANONICALIZE_H
#define MATE_CANONICALIZE_H

#include <glib.h>

#ifdef __cplusplus
extern "C" {
#endif
G_BEGIN_DECLS

char* menu_canonicalize_file_name(const char* name, gboolean allow_missing_basename);

#ifdef __cplusplus
}
#endif
G_END_DECLS

#endif /* G_CANONICALIZE_H */
#endif /* MATE_CANONICALIZE_H */
8 changes: 2 additions & 6 deletions libmenu/entry-directories.h
Expand Up @@ -23,9 +23,7 @@
#include <glib.h>
#include "desktop-entries.h"

#ifdef __cplusplus
extern "C" {
#endif
G_BEGIN_DECLS

typedef struct EntryDirectory EntryDirectory;

Expand Down Expand Up @@ -60,8 +58,6 @@ DesktopEntry* entry_directory_list_get_directory (EntryDirectoryList* list, cons
DesktopEntrySet* _entry_directory_list_get_all_desktops(EntryDirectoryList* list);
void _entry_directory_list_empty_desktop_cache(void);

#ifdef __cplusplus
}
#endif
G_END_DECLS

#endif /* __ENTRY_DIRECTORIES_H__ */
8 changes: 2 additions & 6 deletions libmenu/menu-layout.h
Expand Up @@ -26,9 +26,7 @@

#include "entry-directories.h"

#ifdef __cplusplus
extern "C" {
#endif
G_BEGIN_DECLS

typedef struct MenuLayoutNode MenuLayoutNode;

Expand Down Expand Up @@ -154,8 +152,6 @@ typedef void (*MenuLayoutNodeEntriesChangedFunc) (MenuLayoutNode* node, gpointer
void menu_layout_node_root_add_entries_monitor (MenuLayoutNode* node, MenuLayoutNodeEntriesChangedFunc callback, gpointer user_data);
void menu_layout_node_root_remove_entries_monitor (MenuLayoutNode* node, MenuLayoutNodeEntriesChangedFunc callback, gpointer user_data);

#ifdef __cplusplus
}
#endif
G_END_DECLS

#endif /* __MENU_LAYOUT_H__ */
8 changes: 2 additions & 6 deletions libmenu/menu-monitor.h
Expand Up @@ -23,9 +23,7 @@

#include <glib.h>

#ifdef __cplusplus
extern "C" {
#endif
G_BEGIN_DECLS

typedef struct MenuMonitor MenuMonitor;

Expand Down Expand Up @@ -63,8 +61,6 @@ void menu_monitor_remove_notify(MenuMonitor* monitor, MenuMonitorNotifyFunc noti
#define mate_menu_monitor_notify_ref menu_monitor_notify_ref /* private */
#define mate_menu_monitor_notify_unref menu_monitor_notify_unref /* private */

#ifdef __cplusplus
}
#endif
G_END_DECLS

#endif /* __MENU_MONITOR_H__ */
9 changes: 2 additions & 7 deletions libmenu/menu-util.h
Expand Up @@ -26,10 +26,7 @@

#include "menu-layout.h"

#ifdef __cplusplus
extern "C" {
#endif

G_BEGIN_DECLS


#ifdef G_ENABLE_DEBUG
Expand All @@ -52,8 +49,6 @@ extern "C" {

#endif /* G_ENABLE_DEBUG */

#ifdef __cplusplus
}
#endif
G_END_DECLS

#endif /* __MENU_UTIL_H__ */

0 comments on commit b642c7c

Please sign in to comment.