Fix build by reverting NELEM change.
Change-Id: Ie68f42213e7a915fb1be45ae87790117f8356c4e
diff --git a/include/nativehelper/JNIHelp.h b/include/nativehelper/JNIHelp.h
index c3e0320..1b5ff0c 100644
--- a/include/nativehelper/JNIHelp.h
+++ b/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
