commit b155725ff3c32b8bf748008a6c6d46932ec44246
author Ruchi Kandoi <kandoiruchi@google.com> Tue Dec 05 21:08:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 05 21:08:24 2017 +0000
tree a5bf600d51dc1f65988ca93642cbcdf8bb07824b
parent 8be43056e4f07d56daac463f37098db6ca70d229
parent 832d0ad92e69c9c9a3616d5e43f14b4494f473b9

Merge "Fix function signature to match callback type." am: d4bd50049d
am: 832d0ad92e

Change-Id: I1feaec76dbb7791b3cf1f724f73e398e907e0706

src/nfc/include/nfc_int.h

diff --git a/src/nfc/include/nfc_int.h b/src/nfc/include/nfc_int.h
index 2144f6f..592b23d 100644
--- a/src/nfc/include/nfc_int.h
+++ b/src/nfc/include/nfc_int.h
@@ -296,7 +296,7 @@
 #endif
 
 /* From nfc_task.c */
-extern uint32_t nfc_task();
+extern uint32_t nfc_task(uint32_t);
 void nfc_task_shutdown_nfcc(void);
 
 /* From nfc_main.c */

src/nfc/nfc/nfc_task.cc

diff --git a/src/nfc/nfc/nfc_task.cc b/src/nfc/nfc/nfc_task.cc
index 7a4c91d..f9d2948 100644
--- a/src/nfc/nfc/nfc_task.cc
+++ b/src/nfc/nfc/nfc_task.cc
@@ -329,7 +329,7 @@
 ** Returns          nothing
 **
 *******************************************************************************/
-uint32_t nfc_task() {
+uint32_t nfc_task(__attribute__((unused)) uint32_t arg) {
   uint16_t event;
   NFC_HDR* p_msg;
   bool free_buf;