Bug 515492: Revert some bogus changes for hopefully the last android build bustage fix.
authorKyle Huey <khuey@kylehuey.com>
Mon, 27 Jun 2011 20:17:22 -0700
changeset 72422 afb7bc7bc3facbd25afbcd589fd9b6bf472be04c
parent 72421 f17ad44b0d872da31c107581a3e50342b60c8e34
child 72423 ab19fc2d0dfe44ae5ca4a9412f3837c3506e0477
push id159
push usereakhgari@mozilla.com
push dateTue, 16 Aug 2011 17:53:11 +0000
treeherdermozilla-beta@8786e3e49240 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs515492
milestone7.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 515492: Revert some bogus changes for hopefully the last android build bustage fix.
browser/installer/package-manifest.in
memory/mozalloc/mozalloc.cpp
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -62,16 +62,18 @@
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
 #ifdef XP_WIN32
 #ifdef MOZ_MEMORY
 #ifdef WIN32_OLD_STYLE_JEMALLOC
 @BINPATH@/mozcrt19.dll
 @BINPATH@/mozcpp19.dll
+#else
+@BINPATH@/jemalloc.dll
 #endif
 #endif
 #else
 #if _MSC_VER == 1400
 @BINPATH@/Microsoft.VC80.CRT.manifest
 @BINPATH@/msvcm80.dll
 @BINPATH@/msvcp80.dll
 @BINPATH@/msvcr80.dll
--- a/memory/mozalloc/mozalloc.cpp
+++ b/memory/mozalloc/mozalloc.cpp
@@ -80,19 +80,17 @@
 #include "jemalloc.h"
 #define malloc(a)     je_malloc(a)
 #define valloc(a)     je_valloc(a)
 #define calloc(a, b)  je_calloc(a, b)
 #define realloc(a, b) je_realloc(a, b)
 #define free(a)       je_free(a)
 #define strdup(a)     je_strdup(a)
 #define strndup(a, b) je_strndup(a, b)
-#define memalign(a, b) je_memalign(a, b)
 #define posix_memalign(a, b, c)  je_posix_memalign(a, b, c)
-#define malloc_usable_size(a) je_malloc_usable_size(a)
 #endif
 
 void
 moz_free(void* ptr)
 {
     free(ptr);
 }