diff options
| author | Elliott Hughes <enh@google.com> | 2011-04-15 18:41:26 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2011-04-15 18:41:26 -0700 |
| commit | c469fa622ebadfa3defc73a064e2e724f0ab7c75 (patch) | |
| tree | 4d3b890876efd58e456aadfbc805be1605aa452d /libnativehelper | |
| parent | 12ddb41dba3735bf0cf9798a96c85a46f29a330e (diff) | |
| download | android_dalvik-c469fa622ebadfa3defc73a064e2e724f0ab7c75.tar.gz android_dalvik-c469fa622ebadfa3defc73a064e2e724f0ab7c75.tar.bz2 android_dalvik-c469fa622ebadfa3defc73a064e2e724f0ab7c75.zip | |
Fix build by reverting NELEM change.
Change-Id: Ie68f42213e7a915fb1be45ae87790117f8356c4e
Diffstat (limited to 'libnativehelper')
| -rw-r--r-- | libnativehelper/include/nativehelper/JNIHelp.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libnativehelper/include/nativehelper/JNIHelp.h b/libnativehelper/include/nativehelper/JNIHelp.h index c3e0320c7..1b5ff0c2e 100644 --- a/libnativehelper/include/nativehelper/JNIHelp.h +++ b/libnativehelper/include/nativehelper/JNIHelp.h @@ -27,23 +27,10 @@ #include "utils/Log.h" #include <unistd.h> -#ifdef __cplusplus - -// Type-safe implementation from Google's "base/macros.h". -#ifndef NELEM -template <typename T, size_t N> char (&JniArraySizeHelper(T (&array)[N]))[N]; -#define NELEM(array) (sizeof(JniArraySizeHelper(array))) -#endif - -#else - -// Backwards-compatible C cruft. #ifndef NELEM # define NELEM(x) ((int) (sizeof(x) / sizeof((x)[0]))) #endif -#endif - #ifdef __cplusplus extern "C" { #endif |