diff options
| author | Christopher Aillon <caillon@redhat.com> | 2011-01-12 23:32:14 -0800 |
|---|---|---|
| committer | Christopher Aillon <caillon@redhat.com> | 2011-01-12 23:32:14 -0800 |
| commit | a29ca70c4cec4d079a77bbca5518f1d6e4fc0fde (patch) | |
| tree | 90eded6e7157019102f6f71af67c233ac6d44cc7 | |
| parent | Remove global prefs (diff) | |
| download | librewolf-fedora-ff-a29ca70c4cec4d079a77bbca5518f1d6e4fc0fde.tar.gz librewolf-fedora-ff-a29ca70c4cec4d079a77bbca5518f1d6e4fc0fde.tar.bz2 librewolf-fedora-ff-a29ca70c4cec4d079a77bbca5518f1d6e4fc0fde.zip | |
housekeeping: remove upstreamed patch
Pushed upstream as http://hg.mozilla.org/mozilla-central/rev/526ea23c8b21
| -rw-r--r-- | mozilla-jemalloc-526152.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/mozilla-jemalloc-526152.patch b/mozilla-jemalloc-526152.patch deleted file mode 100644 index 5f60485..0000000 --- a/mozilla-jemalloc-526152.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: David Mandelin <dmandelin@mozilla.com> - -diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c ---- a/memory/jemalloc/jemalloc.c -+++ b/memory/jemalloc/jemalloc.c -@@ -5792,24 +5792,24 @@ __attribute__((noinline)) - #else - inline - #endif - void * - memalign(size_t alignment, size_t size) - { - void *ret; - -- assert(((alignment - 1) & alignment) == 0 && alignment >= -- sizeof(void *)); -+ assert(((alignment - 1) & alignment) == 0); - - if (malloc_init()) { - ret = NULL; - goto RETURN; - } - -+ alignment = alignment < sizeof(void*) ? sizeof(void*) : alignment; - ret = ipalloc(alignment, size); - - RETURN: - #ifdef MALLOC_XMALLOC - if (opt_xmalloc && ret == NULL) { - _malloc_message(_getprogname(), - ": (malloc) Error in memalign(): out of memory\n", "", ""); - abort(); |