Add cplusplus definition to header

Change-Id: I12ea115b16538ff160495ca0e42d7c05d893aeb5
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/include/wifi-direct-asp.h b/include/wifi-direct-asp.h
index 45df7b1..60ebda6 100644 (file)
--- a/include/wifi-direct-asp.h
+++ b/include/wifi-direct-asp.h
@@ -53,6 +53,7 @@ void wfd_asp_connect_status(unsigned char *session_mac,
 void wfd_asp_session_peer_ip(unsigned char *session_mac,
                unsigned int session_id, unsigned char *service_mac,
                unsigned char *session_ip);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/wifi-direct-event.h b/include/wifi-direct-event.h
index ec0292e..b3f87c2 100644 (file)
--- a/include/wifi-direct-event.h
+++ b/include/wifi-direct-event.h
@@ -28,6 +28,10 @@
 #ifndef __WIFI_DIRECT_EVENT_H__
 #define __WIFI_DIRECT_EVENT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void wfd_event_deactivated(wfd_oem_event_s *event);
 void wfd_event_peer_found(wfd_oem_event_s *event);
 void wfd_event_peer_disappeared(wfd_oem_event_s *event);
@@ -60,5 +64,8 @@ void wfd_event_asp_prov_start(wfd_oem_event_s *event);
 void wfd_event_asp_prov_done(wfd_oem_event_s *event);
 
 void wfd_event_init(wfd_oem_event_cbs_s *event_cb);
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __WIFI_DIRECT_EVENT_H__ */

diff --git a/include/wifi-direct-group.h b/include/wifi-direct-group.h
index 513599b..4085d27 100644 (file)
--- a/include/wifi-direct-group.h
+++ b/include/wifi-direct-group.h
@@ -28,6 +28,10 @@
 #ifndef __WIFI_DIRECT_GROUP_H__
 #define __WIFI_DIRECT_GROUP_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define IFACE_NAME_LEN 16
 
 typedef enum {
@@ -66,4 +70,8 @@ int wfd_group_make_persistent();
 int wfd_group_is_autonomous(wfd_group_s *group);
 wfd_device_s *wfd_group_find_member_by_addr(wfd_group_s *group, unsigned char *addr);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __WIFI_DIRECT_GROUP_H__ */

diff --git a/include/wifi-direct-ipc.h b/include/wifi-direct-ipc.h
index e9d51db..28e710c 100644 (file)
--- a/include/wifi-direct-ipc.h
+++ b/include/wifi-direct-ipc.h
@@ -22,6 +22,10 @@
 #ifndef __WIFI_DIRECT_IPC_H__
 #define __WIFI_DIRECT_IPC_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "wifi-direct-error.h"
 
 #define true 1
@@ -239,4 +243,8 @@ typedef struct {
        unsigned char go_mac_address[6];
 } wfd_persistent_group_info_s;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __WIFI_DIRECT_IPC_H__ */

diff --git a/include/wifi-direct-log.h b/include/wifi-direct-log.h
index e36616a..9dd196a 100644 (file)
--- a/include/wifi-direct-log.h
+++ b/include/wifi-direct-log.h
@@ -28,6 +28,10 @@
 #ifndef __WIFI_DIRECT_LOG_H__
 #define __WIFI_DIRECT_LOG_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef USE_DLOG
 #include <dlog.h>
 
@@ -63,4 +67,9 @@
 #define WDS_SECLOGD(format, args...)
 
 #endif /* USE_DLOG */
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __WIFI_DIRECT_LOG_H__ */

diff --git a/include/wifi-direct-manager.h b/include/wifi-direct-manager.h
index a4b0b9c..7af213d 100644 (file)
--- a/include/wifi-direct-manager.h
+++ b/include/wifi-direct-manager.h
@@ -28,6 +28,10 @@
 #ifndef __WIFI_DIRECT_MANAGER_H__
 #define __WIFI_DIRECT_MANAGER_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define DEFAULT_IFNAME "p2p0"
 #define GROUP_IFNAME   "p2p0"
 #define DEFAULT_PRIMARY_DEVICE_TYPE WIFI_DIRECT_PRIMARY_DEVICE_TYPE_TELEPHONE
@@ -226,5 +230,8 @@ void wfd_manager_add_active_client(const char *client_id);
 void wfd_manager_remove_active_client(const char *name,
                                                 const gchar *old_owner,
                                                 const char *new_owner);
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __WIFI_DIRECT_MANAGER_H__ */

diff --git a/include/wifi-direct-peer.h b/include/wifi-direct-peer.h
index 283e7bf..7ac03be 100644 (file)
--- a/include/wifi-direct-peer.h
+++ b/include/wifi-direct-peer.h
@@ -28,6 +28,9 @@
 #ifndef __WIFI_DIRECT_PEER_H__
 #define __WIFI_DIRECT_PEER_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 wfd_device_s *wfd_add_peer(void *data, unsigned char *dev_addr, char *dev_name);
 int wfd_remove_peer(void *data, unsigned char *dev_addr);
@@ -42,4 +45,9 @@ int wfd_peer_get_data(unsigned char *dev_addr, int type, int data);
 int wfd_peer_set_data(unsigned char *dev_addr, int type, int data);
 #endif
 wfd_device_s *wfd_peer_find_by_addr(void *data, unsigned char *addr);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __WIFI_DIRECT_PEER_H__ */

diff --git a/include/wifi-direct-service.h b/include/wifi-direct-service.h
index 94f123b..72d7550 100644 (file)
--- a/include/wifi-direct-service.h
+++ b/include/wifi-direct-service.h
@@ -28,6 +28,10 @@
 #ifndef __WIFI_DIRECT_SERVICE_H__
 #define __WIFI_DIRECT_SERVICE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef enum {
        WFD_SERVICE_TYPE_ALL,
        WFD_SERVICE_TYPE_BONJOUR,
@@ -83,5 +87,8 @@ int wfd_service_disc_req(unsigned char *addr, int type, char *data);
 int wfd_service_disc_cancel(int handle);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __WIFI_DIRECT_SERVICE_H__ */

diff --git a/include/wifi-direct-session.h b/include/wifi-direct-session.h
index 3d1c7fe..b563491 100644 (file)
--- a/include/wifi-direct-session.h
+++ b/include/wifi-direct-session.h
@@ -28,6 +28,10 @@
 #ifndef __WIFI_DIRECT_SESSION_H__
 #define __WIFI_DIRECT_SESSION_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef enum {
        SESSION_TYPE_NORMAL,
        SESSION_TYPE_INVITE,
@@ -92,4 +96,8 @@ int wfd_session_asp_session_start(wfd_session_s *session, wfd_oem_asp_prov_s *pa
 int wfd_session_asp_connect(wfd_session_s *session, int role);
 int wfd_session_asp_persistent_connect(wfd_session_s *session, int persist_group_id);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __WIFI_DIRECT_SESSION_H__ */

diff --git a/include/wifi-direct-state.h b/include/wifi-direct-state.h
index 4d804ba..f94e351 100644 (file)
--- a/include/wifi-direct-state.h
+++ b/include/wifi-direct-state.h
@@ -28,7 +28,15 @@
 #ifndef __WIFI_DIRECT_STATE_H__
 #define __WIFI_DIRECT_STATE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int wfd_state_set(wfd_manager_s *manager, int state);
 int wfd_state_get(wfd_manager_s *manager, int *state);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __WIFI_DIRECT_STATE_H__ */

diff --git a/include/wifi-direct-util.h b/include/wifi-direct-util.h
index a4d3f72..50a4f4a 100644 (file)
--- a/include/wifi-direct-util.h
+++ b/include/wifi-direct-util.h
@@ -27,6 +27,11 @@
 
 #ifndef __WIFI_DIRECT_UTIL_H__
 #define __WIFI_DIRECT_UTIL_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
 #define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
 #define IP2STR(a) (a)[0], (a)[1], (a)[2], (a)[3]
@@ -82,4 +87,8 @@ int wfd_util_ip_over_eap_assign(wfd_device_s *peer, const char *ifname);
 int wfd_util_ip_unset(const char *ifname);
 gboolean wfd_util_is_remove_group_allowed(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __WIFI_DIRECT_UTIL_H__ */

diff --git a/oem/wifi-direct-oem.h b/oem/wifi-direct-oem.h
index a37d52a..b4506fb 100644 (file)
--- a/oem/wifi-direct-oem.h
+++ b/oem/wifi-direct-oem.h
@@ -28,6 +28,10 @@
 #ifndef __WIFI_DIRECT_OEM_H__
 #define __WIFI_DIRECT_OEM_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define SUPPL_PLUGIN_PATH "/usr/lib/wifi-direct-plugin-wpasupplicant.so"
 #define SUPPL_PLUGIN_64BIT_PATH "/usr/lib64/wifi-direct-plugin-wpasupplicant.so"
 
@@ -776,4 +780,8 @@ typedef struct {
 int wfd_oem_prd_init(wfd_oem_ops_s *ops);
 #endif /* TIZEN_ENABLE_PRD */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __WIFI_DIRECT_OEM_H__ */

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index dc33826..c33d33c 100644 (file)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -6,7 +6,7 @@
 
 Name:          wifi-direct-manager
 Summary:       Wi-Fi Direct manger
-Version:       1.2.256
+Version:       1.2.257
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0

diff --git a/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-log.h b/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-log.h
index a515aa5..6809ee8 100644 (file)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-log.h
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-log.h
@@ -28,6 +28,10 @@
 #ifndef __WFD_PLUGIN_LOG_H_
 #define __WFD_PLUGIN_LOG_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef USE_DLOG
 #include <dlog.h>
 
@@ -64,4 +68,8 @@
 
 #endif /* USE_DLOG */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __WFD_PLUGIN_LOG_H_ */

diff --git a/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h b/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
index 304cb5f..344cbf5 100644 (file)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
@@ -28,6 +28,9 @@
 #ifndef __WFD_PLUGIN_WPASUPPLICANT_H__
 #define __WFD_PLUGIN_WPASUPPLICANT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
 #define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
@@ -380,4 +383,8 @@ int ws_add_vsie(wfd_oem_vsie_frames_e frame_id, const char* vsie);
 int ws_get_vsie(wfd_oem_vsie_frames_e frame_id, char **vsie);
 int ws_remove_vsie(wfd_oem_vsie_frames_e frame_id, const char *vsie);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __WFD_PLUGIN_WPASUPPLICANT_H__ */

diff --git a/plugin/wpasupplicant/emul/include/wfd-plugin-wpasupplicant.h b/plugin/wpasupplicant/emul/include/wfd-plugin-wpasupplicant.h
index 9edeb9f..76f7a88 100644 (file)
--- a/plugin/wpasupplicant/emul/include/wfd-plugin-wpasupplicant.h
+++ b/plugin/wpasupplicant/emul/include/wfd-plugin-wpasupplicant.h
@@ -28,6 +28,10 @@
 #ifndef __WFD_PLUGIN_WPASUPPLICANT_H__
 #define __WFD_PLUGIN_WPASUPPLICANT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef USE_DLOG
 #include <dlog.h>
 
@@ -131,4 +135,8 @@ int ws_add_vsie(wfd_oem_vsie_frames_e frame_id, const char* vsie);
 int ws_get_vsie(wfd_oem_vsie_frames_e frame_id, char **vsie);
 int ws_remove_vsie(wfd_oem_vsie_frames_e frame_id, const char *vsie);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __WFD_PLUGIN_WPASUPPLICANT_H__ */