commit 71dc3c0df0a1874d19b57e468c1314b135477e8e
author Elliott Hughes <enh@google.com> Fri Jan 30 21:22:19 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 30 21:22:19 2015 +0000
tree d171501366bae7f51f78fa25ba6dd513c82238a5
parent 868ce9b80ac193262d185ceae1bbc44d9afb4898
parent 33fc4b74e29f4857d06b56d8bec42f887ca4e8e7

am 33fc4b74: Merge "Add missing includes."

* commit '33fc4b74e29f4857d06b56d8bec42f887ca4e8e7':
  Add missing includes.

halimpl/bcm2079x/gki/ulinux/gki_ulinux.c

diff --git a/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c b/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c
index 30ecf91..df58e27 100644
--- a/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c
+++ b/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c
@@ -15,6 +15,7 @@
  *  limitations under the License.
  *
  ******************************************************************************/
+#include <malloc.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <errno.h>

halimpl/bcm2079x/nfc_nci.c

diff --git a/halimpl/bcm2079x/nfc_nci.c b/halimpl/bcm2079x/nfc_nci.c
index 0209806..b293c2b 100644
--- a/halimpl/bcm2079x/nfc_nci.c
+++ b/halimpl/bcm2079x/nfc_nci.c
@@ -20,6 +20,8 @@
 #define LOG_TAG "NfcNciHal"
 #include "OverrideLog.h"
 #include <errno.h>
+#include <malloc.h>
+#include <string.h>
 #include <hardware/hardware.h>
 #include <hardware/nfc.h>
 #include "HalAdaptation.h"

src/adaptation/libmain.c

diff --git a/src/adaptation/libmain.c b/src/adaptation/libmain.c
index 9517470..92b24be 100644
--- a/src/adaptation/libmain.c
+++ b/src/adaptation/libmain.c
@@ -18,6 +18,7 @@
 #include "OverrideLog.h"
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <malloc.h>
 #include <fcntl.h>
 #include <errno.h>
 #include "buildcfg.h"
@@ -25,6 +26,8 @@
 #include "config.h"
 #include "nfc_hal_target.h"
 #include "nfc_hal_nv_co.h"
+#include "nfa_nv_ci.h"
+#include "CrcChecksum.h"
 extern char bcm_nfc_location[];
 static const char* sNfaStorageBin = "/nfaStorage.bin";
 

src/gki/ulinux/gki_ulinux.c

diff --git a/src/gki/ulinux/gki_ulinux.c b/src/gki/ulinux/gki_ulinux.c
index bb5a932..3a377bf 100644
--- a/src/gki/ulinux/gki_ulinux.c
+++ b/src/gki/ulinux/gki_ulinux.c
@@ -15,6 +15,7 @@
  *  limitations under the License.
  *
  ******************************************************************************/
+#include <malloc.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <errno.h>

src/nfc/nfc/nfc_ncif.c

diff --git a/src/nfc/nfc/nfc_ncif.c b/src/nfc/nfc/nfc_ncif.c
index 9823f9a..4316807 100644
--- a/src/nfc/nfc/nfc_ncif.c
+++ b/src/nfc/nfc/nfc_ncif.c
@@ -24,6 +24,7 @@
  *  (callback). On the transmit side, it manages the command transmission.
  *
  ******************************************************************************/
+#include <stdlib.h>
 #include <string.h>
 #include "nfc_target.h"