From 46177c53e20dd531996fbf3e539e883febc58461 Mon Sep 17 00:00:00 2001
From: Marco Chen <mchen@mozilla.com>
Date: Wed, 15 Jan 2014 15:55:12 +0800
Subject: [PATCH] Backout 977d6be3df40 Bug 957450 - The added "or condition"
 didn't prevent gonk-kk version fall into non-const definition.

---
 memory/build/malloc_decls.h   | 2 +-
 memory/mozjemalloc/jemalloc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/memory/build/malloc_decls.h b/memory/build/malloc_decls.h
index 4c0ab714add1..ea73fa921367 100644
--- a/memory/build/malloc_decls.h
+++ b/memory/build/malloc_decls.h
@@ -15,7 +15,7 @@
 
 #  include "jemalloc_types.h"
 
-#  if defined(__linux__) || (defined(MOZ_MEMORY_ANDROID) && (ANDROID_VERSION < 19))
+#  ifdef __linux__
 typedef void * usable_ptr_t;
 #  else
 typedef const void * usable_ptr_t;
diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c
index 1b7d61b94d56..bd7bc466ae4b 100644
--- a/memory/mozjemalloc/jemalloc.c
+++ b/memory/mozjemalloc/jemalloc.c
@@ -6548,7 +6548,7 @@ malloc_good_size_impl(size_t size)
 }
 
 
-#if defined(MOZ_MEMORY_ANDROID) && (ANDROID_VERSION < 19)
+#ifdef MOZ_MEMORY_ANDROID
 MOZ_MEMORY_API size_t
 malloc_usable_size_impl(void *ptr)
 #else