From: Seonah Moon <seonah1.moon@samsung.com>
Date: Tue, 18 Feb 2020 07:51:29 +0000 (+0900)
Subject: fix conflicts
X-Git-Tag: submit/tizen/20200403.050222~2^2~59^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=22c6e1947d6b75a774c3cf1f26536d62ca2d187f;p=platform%2Fcore%2Fapi%2Fwifi-aware.git

fix conflicts
---

22c6e1947d6b75a774c3cf1f26536d62ca2d187f
diff --cc src/include/wifi-aware-private.h
index 5d05915,0e8e8ee..da4c714
--- a/src/include/wifi-aware-private.h
+++ b/src/include/wifi-aware-private.h
@@@ -32,6 -31,13 +31,15 @@@ extern "C" 
  #define WIFI_AWARE_HANDLE_LOCK
  #define WIFI_AWARE_HANDLE_UNLOCK
  
+ typedef struct {
+ 	int client_id;
+ 	wifi_aware_enabled_cb enabled_cb;
+ 	void *enabled_cb_data;
++	wifi_aware_disabled_cb disabled_cb;
++	void *disabled_cb_data;
+ 	GHashTable *peer_map;
+ } wifi_aware_s;
+ 
  const char *_wifi_aware_convert_error_type_to_string(wifi_aware_error_e err);
  
  int _wifi_aware_handle_create(wifi_aware_h *wifi_aware);