Sync with tizen branch

Change-Id: I0ffa0949bfb35e6fc3c57ade2a71ca75f6681a86
Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>

diff --git a/include/hal-nfc-interface-1.h b/include/hal-nfc-interface-1.h
index fc28c03a8e2488c5a1dba1bee01aa7f11dcd7142..6b0e6256342809c63cff4f6183fd6c9545018e3a 100644 (file)
--- a/include/hal-nfc-interface-1.h
+++ b/include/hal-nfc-interface-1.h
@@ -737,7 +737,7 @@ typedef struct _net_nfc_llcp_internal_socket_s {
  * @details This structure defines an NDEF record structure containing various fields.
  * @since HAL_MODULE_NFC 1.0
  */
-typedef struct _net_nfc_record_s {
+typedef struct _net_nfc_ndef_record_s {
     uint8_t MB:1;                              /**< Message Begin bit. */
     uint8_t ME:1;                              /**< Message End bit. */
     uint8_t CF:1;                              /**< Chunk Flag bit. */
@@ -747,7 +747,7 @@ typedef struct _net_nfc_record_s {
     net_nfc_data_s type_s;                             /**< Type field. */
     net_nfc_data_s id_s;                               /**< ID field. */
     net_nfc_data_s payload_s;                          /**< Payload field. */
-    struct _record_s *next;                    /**< Pointer to next record. */
+    struct _net_nfc_ndef_record_s *next;                    /**< Pointer to next record. */
 } net_nfc_ndef_record_s;
 
 /**