diff options
| author | yetist <[email protected]> | 2018-05-02 22:42:02 +0800 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-05-27 13:44:45 +0200 |
| commit | b642c7cdb1ff1ff418c62f0169e568a87f4cc4e5 (patch) | |
| tree | bb4d0b4e55b6b6787bd9587e719918e0c0a5380e | |
| parent | 929408351cfb8e3a9373d12c26fb96781297ab5d (diff) | |
| download | mate-menus-b642c7cdb1ff1ff418c62f0169e568a87f4cc4e5.tar.bz2 mate-menus-b642c7cdb1ff1ff418c62f0169e568a87f4cc4e5.tar.xz | |
use G_BEGIN/END_DECLS
| -rw-r--r-- | libmenu/canonicalize.h | 14 | ||||
| -rw-r--r-- | libmenu/entry-directories.h | 8 | ||||
| -rw-r--r-- | libmenu/menu-layout.h | 8 | ||||
| -rw-r--r-- | libmenu/menu-monitor.h | 8 | ||||
| -rw-r--r-- | libmenu/menu-util.h | 9 |
5 files changed, 13 insertions, 34 deletions
diff --git a/libmenu/canonicalize.h b/libmenu/canonicalize.h index dcc6f6e..bb291cf 100644 --- a/libmenu/canonicalize.h +++ b/libmenu/canonicalize.h @@ -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 */ diff --git a/libmenu/entry-directories.h b/libmenu/entry-directories.h index 5b9dfae..c1d159a 100644 --- a/libmenu/entry-directories.h +++ b/libmenu/entry-directories.h @@ -23,9 +23,7 @@ #include <glib.h> #include "desktop-entries.h" -#ifdef __cplusplus -extern "C" { -#endif +G_BEGIN_DECLS typedef struct EntryDirectory EntryDirectory; @@ -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__ */ diff --git a/libmenu/menu-layout.h b/libmenu/menu-layout.h index 5d3e81a..3cfdcbc 100644 --- a/libmenu/menu-layout.h +++ b/libmenu/menu-layout.h @@ -26,9 +26,7 @@ #include "entry-directories.h" -#ifdef __cplusplus -extern "C" { -#endif +G_BEGIN_DECLS typedef struct MenuLayoutNode MenuLayoutNode; @@ -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__ */ diff --git a/libmenu/menu-monitor.h b/libmenu/menu-monitor.h index 8180c68..868bc89 100644 --- a/libmenu/menu-monitor.h +++ b/libmenu/menu-monitor.h @@ -23,9 +23,7 @@ #include <glib.h> -#ifdef __cplusplus -extern "C" { -#endif +G_BEGIN_DECLS typedef struct MenuMonitor MenuMonitor; @@ -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__ */ diff --git a/libmenu/menu-util.h b/libmenu/menu-util.h index c8721e2..3496b27 100644 --- a/libmenu/menu-util.h +++ b/libmenu/menu-util.h @@ -26,10 +26,7 @@ #include "menu-layout.h" -#ifdef __cplusplus -extern "C" { -#endif - +G_BEGIN_DECLS #ifdef G_ENABLE_DEBUG @@ -52,8 +49,6 @@ extern "C" { #endif /* G_ENABLE_DEBUG */ -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif /* __MENU_UTIL_H__ */ |