diff options
| author | Elliott Hughes <enh@google.com> | 2015-01-29 03:37:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 03:37:18 +0000 |
| commit | 3dea8ac44920d073b83814b466fb053d36562fba (patch) | |
| tree | e524ebe43101f84232fb7fd9d552afbeb89f0654 /nci | |
| parent | 104ed755a8eea24c3754b768c3e765d6d3865967 (diff) | |
| parent | 9d734bdf2c98e4408d1bf4645a805c24da9c604d (diff) | |
| download | android_packages_apps_Nfc-3dea8ac44920d073b83814b466fb053d36562fba.tar.gz android_packages_apps_Nfc-3dea8ac44920d073b83814b466fb053d36562fba.tar.bz2 android_packages_apps_Nfc-3dea8ac44920d073b83814b466fb053d36562fba.zip | |
am 9d734bdf: Merge "Add missing includes."
* commit '9d734bdf2c98e4408d1bf4645a805c24da9c604d':
Add missing includes.
Diffstat (limited to 'nci')
| -rw-r--r-- | nci/jni/CondVar.cpp | 1 | ||||
| -rw-r--r-- | nci/jni/DataQueue.cpp | 3 | ||||
| -rw-r--r-- | nci/jni/Mutex.cpp | 1 | ||||
| -rw-r--r-- | nci/jni/NativeLlcpConnectionlessSocket.cpp | 4 | ||||
| -rwxr-xr-x | nci/jni/NativeNfcTag.cpp | 2 |
5 files changed, 10 insertions, 1 deletions
diff --git a/nci/jni/CondVar.cpp b/nci/jni/CondVar.cpp index ed550cd1..9d8c9b1c 100644 --- a/nci/jni/CondVar.cpp +++ b/nci/jni/CondVar.cpp @@ -23,6 +23,7 @@ #include <cutils/log.h> #include <errno.h> +#include <string.h> /******************************************************************************* diff --git a/nci/jni/DataQueue.cpp b/nci/jni/DataQueue.cpp index bfe573e3..c86c1263 100644 --- a/nci/jni/DataQueue.cpp +++ b/nci/jni/DataQueue.cpp @@ -20,6 +20,9 @@ #include "DataQueue.h" +#include <malloc.h> +#include <string.h> + #include <cutils/log.h> diff --git a/nci/jni/Mutex.cpp b/nci/jni/Mutex.cpp index faf62d4a..7382a0ea 100644 --- a/nci/jni/Mutex.cpp +++ b/nci/jni/Mutex.cpp @@ -23,6 +23,7 @@ #include <cutils/log.h> #include <errno.h> +#include <string.h> /******************************************************************************* ** diff --git a/nci/jni/NativeLlcpConnectionlessSocket.cpp b/nci/jni/NativeLlcpConnectionlessSocket.cpp index dee8f1b3..fb0b96db 100644 --- a/nci/jni/NativeLlcpConnectionlessSocket.cpp +++ b/nci/jni/NativeLlcpConnectionlessSocket.cpp @@ -14,8 +14,10 @@ * limitations under the License. */ -#include <semaphore.h> #include <errno.h> +#include <malloc.h> +#include <semaphore.h> +#include <string.h> #include "OverrideLog.h" #include "NfcJniUtil.h" #include "JavaClassConstants.h" diff --git a/nci/jni/NativeNfcTag.cpp b/nci/jni/NativeNfcTag.cpp index 840c64d8..844e9cfc 100755 --- a/nci/jni/NativeNfcTag.cpp +++ b/nci/jni/NativeNfcTag.cpp @@ -16,8 +16,10 @@ #include <semaphore.h> #include <errno.h> +#include <malloc.h> #include <time.h> #include <signal.h> +#include <string.h> #include "OverrideLog.h" #include "NfcJniUtil.h" #include "NfcTag.h" |