Author: jbeich Date: Sat Nov 22 11:36:15 2014 New Revision: 1771 Log: update just Nightly to pick up bug 1097592
Deleted: trunk/www/firefox-nightly/files/patch-bug1063726 Modified: trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Sat Nov 22 11:29:52 2014 (r1770) +++ trunk/www/firefox-nightly/Makefile.hgrev Sat Nov 22 11:36:15 2014 (r1771) @@ -1 +1 @@ -HGREV= 216336:20065dfb6476 +HGREV= 216988:ac55dd11daec Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Sat Nov 22 11:29:52 2014 (r1770) +++ trunk/www/firefox-nightly/distinfo Sat Nov 22 11:36:15 2014 (r1771) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/20065dfb6476.tar.bz2) = 1ba878b151604490970897b1b387a937702fe596f424317f42d1f0a1488ce648 -SIZE (firefox-nightly/20065dfb6476.tar.bz2) = 174587296 +SHA256 (firefox-nightly/ac55dd11daec.tar.bz2) = e44f77973bece68be7cb2b8720369ef81124a235bd1817374957dffd220810f4 +SIZE (firefox-nightly/ac55dd11daec.tar.bz2) = 175046048 Deleted: trunk/www/firefox-nightly/files/patch-bug1063726 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug1063726 Sat Nov 22 11:36:15 2014 (r1770) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,41 +0,0 @@ -diff --git js/src/configure.in js/src/configure.in -index 75177dd..1051ba2 100644 ---- js/src/configure.in -+++ js/src/configure.in -@@ -3913,7 +3913,17 @@ dnl ======================================================== - dnl JavaScript shell - dnl ======================================================== - --AC_CHECK_HEADERS(malloc.h malloc/malloc.h) -+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" -+MALLOC_H= -+ -+for file in $MALLOC_HEADERS; do -+ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) -+ if test "$MALLOC_H" != ""; then -+ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) -+ break -+ fi -+done -+ - AC_CHECK_FUNCS(setlocale localeconv malloc_size malloc_usable_size) - - AC_SUBST(MOZILLA_VERSION) -diff --git js/src/shell/js.cpp js/src/shell/js.cpp -index 866522a..b0b475f 100644 ---- js/src/shell/js.cpp -+++ js/src/shell/js.cpp -@@ -22,11 +22,8 @@ - # include <io.h> /* for isatty() */ - #endif - #include <locale.h> --#ifdef HAVE_MALLOC_H /* for malloc_usable_size on Linux, _msize on Windows */ --#include <malloc.h> --#endif --#ifdef HAVE_MALLOC_MALLOC_H --#include <malloc/malloc.h> /* for malloc_size on OSX */ -+#if defined(MALLOC_H) -+#include MALLOC_H /* for malloc_usable_size, malloc_size, _msize */ - #endif - #include <math.h> - #include <signal.h> _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "[email protected]"
