Rewire extern "C" blocks

This is needed in order not to #include "glib.h" in the extern "C"
blocks, which breaks in the newest GLib version.

Change-Id: Ia00fcb42434c1e70165dffe3bc1e9b1c57a78fe1

diff --git a/src/common/cgroup.h b/src/common/cgroup.h
index 873740a..f98fc8f 100644 (file)
--- a/src/common/cgroup.h
+++ b/src/common/cgroup.h
@@ -32,6 +32,10 @@
 #ifndef _CGROUP_LIBRARY_CGROUP_H_
 #define _CGROUP_LIBRARY_CGROUP_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define DEFAULT_CGROUP       "/sys/fs/cgroup"
 #define CGROUP_MEMORY        DEFAULT_CGROUP "/memory"
 
@@ -195,4 +199,8 @@ enum cgroup_memory_stat_id cgroup_memory_stat_string_to_id(const char *str);
 
 int cgroup_get_memory_stat(const char *name, struct cgroup_memory_stat **mem_stat);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /*_CGROUP_LIBRARY_CGROUP_H_*/

diff --git a/src/common/config-parser.h b/src/common/config-parser.h
index e425c5a..ce24e6a 100644 (file)
--- a/src/common/config-parser.h
+++ b/src/common/config-parser.h
@@ -23,6 +23,10 @@
 #include <stdio.h>
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define MATCH(a, b)    (!strncmp(a, b, strlen(a) + 1) ? 1 : 0)
 #define SET_CONF(a, b) (a = (b > 0.0 ? b : a))
 
@@ -79,4 +83,9 @@ int config_parse_bytes(const char *filename, unsigned line, const char *section,
 int config_parse_float(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data);
 int config_parse_long(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data);
 int config_parse_strv(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif

diff --git a/src/common/dbus-handler.h b/src/common/dbus-handler.h
index d98c6ae..46f81c2 100644 (file)
--- a/src/common/dbus-handler.h
+++ b/src/common/dbus-handler.h
@@ -30,6 +30,10 @@
 #include <gio/gio.h>
 #include <resourced.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 typedef void (*d_bus_method_callback)(GDBusMethodInvocation *invocation, GVariant *params);
 typedef void (*d_bus_signal_callback)(GVariant *params);
 
@@ -133,4 +137,8 @@ int launch_system_app_by_dbus(const char *dest, const char *path,
 void d_bus_init(void);
 void d_bus_exit(void);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __DBUS_HANDLER_H__ */

diff --git a/src/common/dedup-common.h b/src/common/dedup-common.h
index 4827f60..60280ea 100644 (file)
--- a/src/common/dedup-common.h
+++ b/src/common/dedup-common.h
@@ -29,6 +29,10 @@
 #include "resourced.h"
 #include "memory-common.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define DEDUP_CONF_FILE                RD_CONFIG_FILE(dedup)
 #define DEDUP_SYSFS_KSM_PATH   "/sys/kernel/mm/ksm"
 
@@ -67,4 +71,8 @@ enum dedup_state dedup_get_state(void);
 void dedup_set_state(enum dedup_state state);
 unsigned int dedup_get_ksm_stat(enum ksm_stat stat_type);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __DEDUP_COMMON_H__ */

diff --git a/src/common/fd-handler.h b/src/common/fd-handler.h
index c8b7454..d4f4592 100644 (file)
--- a/src/common/fd-handler.h
+++ b/src/common/fd-handler.h
@@ -23,6 +23,10 @@
 #include <gio/gio.h>
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /**
  * @brief   File descriptor handler
  * @since_tizen 4.0
@@ -66,4 +70,8 @@ int add_fd_read_handler(int fd, fd_changed_cb callback,
  */
 int remove_fd_read_handler(fd_handler_h *handler);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __FD_HANDLER_H__ */

diff --git a/src/common/file-helper.h b/src/common/file-helper.h
index 4fa5734..fa07982 100644 (file)
--- a/src/common/file-helper.h
+++ b/src/common/file-helper.h
@@ -28,6 +28,10 @@
 
 #include "resourced.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /**
  * @desc write string to the file
  * @param path - path to the file, str - string is written to the file
@@ -64,4 +68,8 @@ inline int fread_ulong(const char *path, unsigned long *number)
        return fread_nth_ulong(path, 0, number);
 }
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif  /*_RESOURCED_FILE_HELPER_H_*/

diff --git a/src/common/filemap.h b/src/common/filemap.h
index e90bb73..f651055 100644 (file)
--- a/src/common/filemap.h
+++ b/src/common/filemap.h
@@ -25,6 +25,10 @@
 #ifndef __FILEMAP_HELPER_H_
 #define __FILEMAP_HELPER_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define FILEMAP_MAX_KEY_LEN    1024
 #define FILEMAP_MAX_VALUE_LEN  1024
 
@@ -58,4 +62,8 @@ int filemap_foreach_read(struct filemap *fm, struct filemap_node *fn,
        void (*callbackfn)(const struct filemap_info *fi));
 struct filemap_node *filemap_root_node(struct filemap *fm);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /*__FILEMAP_HELPER_H__*/

diff --git a/src/common/freezer-common.h b/src/common/freezer-common.h
index 1fcbd73..f97209f 100644 (file)
--- a/src/common/freezer-common.h
+++ b/src/common/freezer-common.h
@@ -20,10 +20,18 @@
 #ifndef __FREEZER_COMMON_H__
 #define __FREEZER_COMMON_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 extern int (*resourced_freezer_get_proc_late_control)(void);
 
 /* Freezer cgroup late control setting retrieval */
 int resourced_freezer_proc_late_control(void);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __FREEZER_COMMON_H__ */
 

diff --git a/src/common/heart-common.h b/src/common/heart-common.h
index 2680baf..8acaf9d 100644 (file)
--- a/src/common/heart-common.h
+++ b/src/common/heart-common.h
@@ -30,6 +30,10 @@
 #include <time.h>
 #include <glib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define HEART_BATTERY_STATS_MAX 1024
 #define QUERY_INSERT_BATTERYSTATS      "INSERT INTO batterystats(resourceid, starttime, stoptime) VALUES('%d', '%ld', '%ld');"
 #define QUERY_SELECT_BATTERYSTATS_BY_RESOURCEID        "SELECT sum(min(stoptime - starttime, stoptime - %ld)) from batterystats where resourceid=%d and stoptime > %ld;"
@@ -138,4 +142,8 @@ int heart_memory_save(void);
 struct heart_memory_data *heart_memory_get_memdata(char *appid, enum heart_data_period period);
 int heart_memory_get_latest_data(char *appid, unsigned int *rss);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __heart_COMMON_H__ */

diff --git a/src/common/losetup.h b/src/common/losetup.h
index 8dcb091..1e968b4 100644 (file)
--- a/src/common/losetup.h
+++ b/src/common/losetup.h
@@ -20,6 +20,10 @@
 
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 int find_loop_device(char *file, char *device);
 
 int losetup(const char *device,
@@ -31,3 +35,7 @@ int losetup(const char *device,
            bool readdonly);
 
 int check_valid_compressor(const char* crypt_type);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */

diff --git a/src/common/memory-common.h b/src/common/memory-common.h
index 3195cb0..15cf27c 100644 (file)
--- a/src/common/memory-common.h
+++ b/src/common/memory-common.h
@@ -29,6 +29,10 @@
 #include <stdbool.h>
 #include "const.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /*
  * [memory cgroup information]
  * MEMCG_MEMORY : root cgroup for system daemons
@@ -163,4 +167,8 @@ int memcg_set_eventfd(const char *memcg, const char *event, char *value);
  */
 void make_memps_log(enum mem_log path, pid_t pid, char *victim_name);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /*__MEMORY_COMMONL_H__*/

diff --git a/src/common/module-data.h b/src/common/module-data.h
index 5eaae6b..a2caa64 100644 (file)
--- a/src/common/module-data.h
+++ b/src/common/module-data.h
@@ -27,6 +27,10 @@
 
 #include "init.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 struct swap_module_data {
        int swap_state;                 /* swap SWAP_ON/SWAP_OFF */
 };
@@ -40,4 +44,8 @@ struct shared_modules_data *get_shared_modules_data(void);
 
 void init_modules_arg(struct daemon_arg *darg);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __MODULE_DATA_HANDLE_H__ */

diff --git a/src/common/module.h b/src/common/module.h
index 867a342..50241d6 100644 (file)
--- a/src/common/module.h
+++ b/src/common/module.h
@@ -25,6 +25,10 @@
 #ifndef __MODULE_HANDLE_H__
 #define __MODULE_HANDLE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /**
  * @brief module_priority is used to initialization order of each
  * modules.
@@ -101,4 +105,8 @@ int modules_add_methods(void);
 
 const struct module_ops *find_module(const char *name);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __MODULE_HANDLE_H__ */

diff --git a/src/common/notifier.h b/src/common/notifier.h
index 12a65bb..bb839ee 100644 (file)
--- a/src/common/notifier.h
+++ b/src/common/notifier.h
@@ -21,6 +21,10 @@
 #ifndef __NOTIFIER_H__
 #define __NOTIFIER_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 enum notifier_type {
        /*
         * application status
@@ -110,4 +114,8 @@ int register_notifier(enum notifier_type status, int (*func)(void *data));
 int unregister_notifier(enum notifier_type status, int (*func)(void *data));
 void resourced_notify(enum notifier_type status, void *value);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __NOTIFIER_H__ */

diff --git a/src/common/proc-common.h b/src/common/proc-common.h
index efaea5e..283379e 100644 (file)
--- a/src/common/proc-common.h
+++ b/src/common/proc-common.h
@@ -33,6 +33,10 @@
 #include "const.h"
 #include "memory-common.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define RUNTIME_APP_INFO_DIR RUNTIME_RESOURCED_DIR"/appinfo"
 
 #define GPOINTER_TO_PID(x) (pid_t)GPOINTER_TO_INT((x))
@@ -230,4 +234,8 @@ static inline void cleanup_proc_app_list_close_func(GSList **l)
  */
 int proc_priority_is_oom_fixed_process(int pid);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __PROC_COMMON_H__ */

diff --git a/src/common/procfs.h b/src/common/procfs.h
index 2560ae8..b30ba46 100644 (file)
--- a/src/common/procfs.h
+++ b/src/common/procfs.h
@@ -28,6 +28,10 @@
 #include <assert.h>
 #include <string.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define OOMADJ_SERVICE_MIN             (-900)
 #define OOMADJ_SU                      (0)
 #define OOMADJ_INIT                    (100)
@@ -473,4 +477,8 @@ static inline void __cleanup_proc_swaps_free_func(struct proc_swaps ***swaps)
  */
 int proc_get_swaps(struct proc_swaps ***swaps);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /*__PROCFS_H__*/

diff --git a/src/common/resourced-helper-worker.h b/src/common/resourced-helper-worker.h
index e65d8d7..e4c879c 100644 (file)
--- a/src/common/resourced-helper-worker.h
+++ b/src/common/resourced-helper-worker.h
@@ -22,6 +22,10 @@
 
 #include <glib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 struct resourced_worker {
        pthread_t       worker_thread;
        GAsyncQueue     *queue;
@@ -47,4 +51,8 @@ struct resourced_helper_data {
 int request_helper_worker(enum helper_worker_operation op,
        void *data, int (*function) (void *data), void *callback);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __RESOURCED_HELPER_WORKER_H__ */

diff --git a/src/common/safe-kill.h b/src/common/safe-kill.h
index ed6fa5d..7f0de4b 100644 (file)
--- a/src/common/safe-kill.h
+++ b/src/common/safe-kill.h
@@ -21,12 +21,20 @@
 #define SAFE_KILL_H
 
 #include <sys/types.h>
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
 int safe_kill(pid_t pid, int sig);
 
 #ifdef _UNIT_TEST
-#include <stdbool.h>
 bool is_process_coredumping(pid_t pid);
 #endif
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* SAFE_KILL_H */

diff --git a/src/common/smaps.h b/src/common/smaps.h
index dd44349..5962c81 100644 (file)
--- a/src/common/smaps.h
+++ b/src/common/smaps.h
@@ -30,6 +30,10 @@
 
 #include "util.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 enum smap_id {
        SMAPS_ID_INVALID = -1,
        SMAPS_ID_ANON_HUGE_PAGES = 0,
@@ -117,4 +121,8 @@ static inline void smaps_freep(struct smaps **maps)
 
 #define _cleanup_smaps_free_ _cleanup_(smaps_freep)
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif  /* _RESOURCED_SMAPS_H_ */

diff --git a/src/common/storage-helper.h b/src/common/storage-helper.h
index bb6b0fd..bad6b13 100644 (file)
--- a/src/common/storage-helper.h
+++ b/src/common/storage-helper.h
@@ -31,6 +31,10 @@
 #include <sys/statvfs.h>
 #include <glib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define KB 1024
 
 enum storage_type {
@@ -53,4 +57,8 @@ bool is_mounted(const char* path);
  */
 resourced_ret_c get_storage_root_paths(int type, GSList **paths);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif  /*_RESOURCED_STORAGE_HELPER_H_*/

diff --git a/src/common/swap-common.h b/src/common/swap-common.h
index 5bb0e87..0c28ff7 100644 (file)
--- a/src/common/swap-common.h
+++ b/src/common/swap-common.h
@@ -29,6 +29,10 @@
 #include "resourced.h"
 #include "memory-common.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define SWAP_ZRAM_SYSFILE      "/sys/block/zram0/"
 #define SWAP_FILE_NAME         "/opt/usr/.swapfile"
 #define SWAP_CONF_FILE         RD_CONFIG_FILE(swap)
@@ -110,4 +114,8 @@ static void __attribute__ ((destructor)) swap_module_unregister(void)       \
        swap_remove(swap);                              \
 }
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __SWAP_COMMON_H__ */

diff --git a/src/common/userinfo-list.h b/src/common/userinfo-list.h
index b60691e..6271d52 100644 (file)
--- a/src/common/userinfo-list.h
+++ b/src/common/userinfo-list.h
@@ -30,6 +30,10 @@
 
 #include "resourced.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define userinfo_for_each(elem, list)  \
        guint _ui_idx;  \
        struct user_info *elem; \
@@ -59,4 +63,8 @@ const char *userinfo_find_home_dir(uid_t uid);
  */
 const GArray *userinfo_get_list(void);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /*__USERINFO_LIST_H__*/

diff --git a/src/common/util.h b/src/common/util.h
index 6552665..3752ec1 100644 (file)
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -32,6 +32,10 @@
 #include <string.h>
 #include <dirent.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define COMMENT                '#'
 #define COMMENTS       "#;"
 #define NEWLINE                "\n\r"
@@ -144,4 +148,9 @@ int strv_attach(char **first, char **second, char ***strv, bool free_second);
 void strv_free_full(char ***strv);
 
 int resourced_restarted(void);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /*_RESOURCED_UTIL_H_*/

diff --git a/src/process/block/block.h b/src/process/block/block.h
index 059fde4..57f096a 100644 (file)
--- a/src/process/block/block.h
+++ b/src/process/block/block.h
@@ -33,6 +33,10 @@
 #include "const.h"
 #include "fd-handler.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 struct block_monitor_info {
        int mfd;
        int mode;
@@ -52,5 +56,9 @@ int convert_fanotify_mode(const char *mode);
 int register_fanotify(struct block_monitor_info *bmi);
 void unregister_fanotify(struct block_monitor_info *bmi);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __BLOCK_H__ */
 

diff --git a/src/process/proc-appusage.h b/src/process/proc-appusage.h
index 3e939ba..744a32f 100644 (file)
--- a/src/process/proc-appusage.h
+++ b/src/process/proc-appusage.h
@@ -29,6 +29,14 @@
 #include <stdbool.h>
 #endif /* !__cplusplus */
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 bool proc_check_favorite_app(char *appid);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /*__PROC_APPUSAGE_H__*/

diff --git a/src/process/proc-handler.h b/src/process/proc-handler.h
index fc6f4d2..6a04c31 100644 (file)
--- a/src/process/proc-handler.h
+++ b/src/process/proc-handler.h
@@ -25,9 +25,17 @@
 #ifndef __PROC_HANDLER_H__
 #define __PROC_HANDLER_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define PREDEF_FOREGRD         "foregrd"
 #define PREDEF_BACKGRD         "backgrd"
 
 void dbus_proc_handler(char* type, char *buf);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif

diff --git a/src/process/proc-main.h b/src/process/proc-main.h
index fb7dd32..56aca18 100644 (file)
--- a/src/process/proc-main.h
+++ b/src/process/proc-main.h
@@ -34,6 +34,10 @@
 #include "resourced.h"
 #include "const.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 struct proc_app_list {
        GSList *list;
        pthread_mutex_t lock;
@@ -100,4 +104,8 @@ void proc_remove_program_info(struct proc_program_info *ppi, struct proc_app_inf
 GSList *proc_app_list_remove_app_info(struct proc_app_info *pai);
 #endif
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /*__PROC_MAIN_H__ */

diff --git a/src/process/proc-monitor.h b/src/process/proc-monitor.h
index a51d0aa..01d1a05 100644 (file)
--- a/src/process/proc-monitor.h
+++ b/src/process/proc-monitor.h
@@ -25,8 +25,14 @@
 #ifndef __RESOURCED_PROC_MONITOR_H__
 #define __RESOURCED_PROC_MONITOR_H__
 
+#include <gio/gio.h>
+
 #include <resourced.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /*
   * Initialize proc monitor module by registering it in edbus.
   */
@@ -34,7 +40,6 @@
 void proc_set_watchdog_state(int state);
 
 #ifdef _UNIT_TEST
-#include <gio/gio.h>
 void proc_dbus_aul_group(GVariant *params);
 void dbus_get_memory_lists(GDBusMethodInvocation *invocation, GVariant *params);
 void dbus_get_app_memory(GDBusMethodInvocation *invocation, GVariant *params);
@@ -56,4 +61,8 @@ void proc_dbus_suspend_hint(GVariant *params);
 void proc_dbus_exclude_method_handler(GDBusMethodInvocation *invocation, GVariant *params);
 #endif
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __RESOURCED_PROC_MONITOR_H__ */

diff --git a/src/process/proc-process.h b/src/process/proc-process.h
index 090b11b..d1519e8 100644 (file)
--- a/src/process/proc-process.h
+++ b/src/process/proc-process.h
@@ -25,6 +25,10 @@
 #ifndef __PROC_PROCESS_H__
 #define __PROC_PROCESS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 enum proc_sweep_type {
        PROC_SWEEP_EXCLUDE_ACTIVE,
        PROC_SWEEP_INCLUDE_ACTIVE,
@@ -40,5 +44,8 @@ int proc_set_inactive(int pid, int oom_score_adj);
 
 int proc_set_service_oomscore(const pid_t pid, const int oom_score);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #endif /*__PROC_PROCESS_H__*/

diff --git a/src/process/proc-usage-stats-helper.h b/src/process/proc-usage-stats-helper.h
index 18e761f..a8168da 100644 (file)
--- a/src/process/proc-usage-stats-helper.h
+++ b/src/process/proc-usage-stats-helper.h
@@ -32,6 +32,10 @@
 #include <time.h>
 #include <gio/gio.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define INVALID_PROCESS_INFO_FIELD_VALUE -1
 
 #define TASK_NAME_SIZE 256
@@ -76,6 +80,10 @@ int proc_read_from_usage_struct(void *usage_info_list, int index, int *result, r
 void proc_get_task_name(char *task_name, int size, runtime_info_task_type task_type);
 void proc_free_runtime_info_task(struct runtime_info_task *rt_task);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 /* TODO
  * ** Return different failure values in reply dbus message according to reason
  * ** Add some kind of identifier for the process making the method call,

diff --git a/src/process/proc-usage-stats.h b/src/process/proc-usage-stats.h
index 21fb3d6..8abaf92 100644 (file)
--- a/src/process/proc-usage-stats.h
+++ b/src/process/proc-usage-stats.h
@@ -27,6 +27,10 @@
 
 #include <gio/gio.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /**
  * @brief       DBus method to return the memory usage information of input processes
  * @since_tizen 2.4
@@ -81,4 +85,9 @@ void dbus_proc_cpu_usage(GDBusMethodInvocation *invocation, GVariant *params);
  *                     response dbus message contains only an integer whose value will the error value.
  */
 void dbus_proc_swap_usage(GDBusMethodInvocation *invocation, GVariant *params);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __PROC_USAGE_STATS_H__ */

diff --git a/src/resource-limiter/cpu/cpu-hotplug.h b/src/resource-limiter/cpu/cpu-hotplug.h
index de859e5..9879088 100644 (file)
--- a/src/resource-limiter/cpu/cpu-hotplug.h
+++ b/src/resource-limiter/cpu/cpu-hotplug.h
@@ -1,7 +1,15 @@
 #ifndef CPU_HOTPLUG_H
 #define CPU_HOTPLUG_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 int cpu_hotplug_init();
 void cpu_hotplug_finalize();
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* CPU_HOTPLUG_H */

diff --git a/src/resource-limiter/memory/lowmem-handler.h b/src/resource-limiter/memory/lowmem-handler.h
index 3e4217c..fb1a664 100644 (file)
--- a/src/resource-limiter/memory/lowmem-handler.h
+++ b/src/resource-limiter/memory/lowmem-handler.h
@@ -29,6 +29,10 @@
 #include <proc-common.h>
 #include <memory-common.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define MAX_MEMORY_CGROUP_VICTIMS      10
 
 enum lmk_type {
@@ -122,4 +126,8 @@ enum {
        LOWMEM_RECLAIM_WAIT,
 };
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /*__LOWMEM_HANDLER_H__*/

diff --git a/src/resource-monitor/heart.h b/src/resource-monitor/heart.h
index c7347ff..9c0772f 100644 (file)
--- a/src/resource-monitor/heart.h
+++ b/src/resource-monitor/heart.h
@@ -30,6 +30,10 @@
 
 #include "dbus-handler.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define HEART_CONF_FILE_PATH           RD_CONFIG_FILE(heart)
 #define HEART_FILE_PATH                                RD_SYS_DATA"/heart"
 #define HEART_USER_FILE_PATH           "%s/data/heart"
@@ -68,4 +72,8 @@ void heart_dbus_declare_methods(const char *xml, const struct d_bus_method *meth
                                                                const size_t size);
 int heart_dbus_init(void);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /*__HEART_H__*/

diff --git a/src/resource-monitor/logging.h b/src/resource-monitor/logging.h
index 3b0a00b..ea75ea4 100644 (file)
--- a/src/resource-monitor/logging.h
+++ b/src/resource-monitor/logging.h
@@ -31,6 +31,10 @@
 #include "const.h"
 #include "dbus-handler.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #ifndef CLOCK_BOOTTIME
 #define CLOCK_BOOTTIME                          7
 #endif
@@ -129,4 +133,8 @@ int logging_leveldb_put(char *key, unsigned int key_len, char *value, unsigned i
 int logging_leveldb_putv(char *key, unsigned int key_len, const char *fmt, ...);
 int logging_leveldb_read(char *key, unsigned int key_len, char *value, unsigned int value_len);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /*__LOGGING_H__*/

diff --git a/src/resourced/init.h b/src/resourced/init.h
index b5b40eb..55d5a8f 100644 (file)
--- a/src/resourced/init.h
+++ b/src/resourced/init.h
@@ -31,6 +31,10 @@
 
 #include "resourced.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 struct daemon_arg {
        int argc;
        char **argv;
@@ -49,4 +53,8 @@ void resourced_quit_mainloop(void);
 
 struct counter_arg;
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* _RESOURCED_INIT_H */

diff --git a/tests/lowmem-dbus-env.hpp b/tests/lowmem-dbus-env.hpp
index a7578ba..8f99ea2 100644 (file)
--- a/tests/lowmem-dbus-env.hpp
+++ b/tests/lowmem-dbus-env.hpp
@@ -21,9 +21,7 @@
 
 #include "lowmem-env.hpp"
 
-extern "C" {
 #include "lowmem-handler.h"
-}
 
 class LowmemDbusEnv {
 public:

diff --git a/tests/lowmem-dbus-test.cpp b/tests/lowmem-dbus-test.cpp
index 0b7af5a..70a190c 100644 (file)
--- a/tests/lowmem-dbus-test.cpp
+++ b/tests/lowmem-dbus-test.cpp
@@ -20,11 +20,9 @@
 #include "lowmem-dbus-env.hpp"
 #include "cmocka-wrap.hpp"
 
-extern "C" {
 #include "lowmem-handler.h"
 #include "memory-common.h"
 #include "procfs.h"
-}
 
 #include <limits>
 

diff --git a/tests/lowmem-env.hpp b/tests/lowmem-env.hpp
index 07575e7..05c15b6 100644 (file)
--- a/tests/lowmem-env.hpp
+++ b/tests/lowmem-env.hpp
@@ -19,11 +19,9 @@
 
 #pragma once
 
-extern "C" {
 #include "notifier.h"
 #include "resourced.h"
 #include "dbus-handler.h"
-}
 
 #include <map>
 #include <set>

diff --git a/tests/lowmem-limit-env.cpp b/tests/lowmem-limit-env.cpp
index b246297..e8580ce 100644 (file)
--- a/tests/lowmem-limit-env.cpp
+++ b/tests/lowmem-limit-env.cpp
@@ -22,9 +22,7 @@
 
 #include "cmocka-wrap.hpp"
 
-extern "C" {
 #include "notifier.h"
-}
 
 #include "lowmem-limit-env.hpp"
 

diff --git a/tests/lowmem-limit-env.hpp b/tests/lowmem-limit-env.hpp
index 0816ec2..8c34557 100644 (file)
--- a/tests/lowmem-limit-env.hpp
+++ b/tests/lowmem-limit-env.hpp
@@ -23,7 +23,6 @@
 
 #include "lowmem-env.hpp"
 
-extern "C" {
 #include "cgroup.h"
 #include "config-parser.h"
 #include "fd-handler.h"
@@ -31,7 +30,6 @@ extern "C" {
 #include "memory-common.h"
 #include "resourced.h"
 #include "resourced-helper-worker.h"
-}
 
 #include <map>
 #include <vector>

diff --git a/tests/lowmem-limit-test.cpp b/tests/lowmem-limit-test.cpp
index 3579024..a4eade9 100644 (file)
--- a/tests/lowmem-limit-test.cpp
+++ b/tests/lowmem-limit-test.cpp
@@ -25,9 +25,7 @@
 #include <iostream>
 #include "cmocka-wrap.hpp"
 
-extern "C" {
 #include "lowmem-handler.h"
-}
 
 #include "lowmem-limit-env.hpp"
 

diff --git a/tests/lowmem-system-test.cpp b/tests/lowmem-system-test.cpp
index ad5239a..7d434c4 100644 (file)
--- a/tests/lowmem-system-test.cpp
+++ b/tests/lowmem-system-test.cpp
@@ -20,10 +20,8 @@
 #include "lowmem-system-env.hpp"
 #include "cmocka-wrap.hpp"
 
-extern "C" {
 #include "lowmem-handler.h"
 #include "memory-common.h"
-}
 
 #include <vector>