Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1080994 - Build libclearkey without a dependency on mozalloc or mozglue. r=dkeeler,r=cpearce

Browse Source
This commit is contained in:
Mike Hommey 2014-10-14 07:13:25 +09:00
parent 7dfc0f99b9
commit 951b27b2b0
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
media/gmp-clearkey/0.1/Makefile.in
View File

@ -10,4 +10,6 @@ CLEARKEY_CDM_FILES = \
clearkey.info \
$(NULL)
MOZ_GLUE_LDFLAGS =
include $(topsrcdir)/config/rules.mk

4
media/gmp-clearkey/0.1/moz.build
View File

@ -20,4 +20,6 @@ LOCAL_INCLUDES += [
]
USE_STATIC_LIBS = True
USE_LIBS += [ 'mozalloc' ]
DISABLE_STL_WRAPPING = True
DEFINES['MOZ_NO_MOZALLOC'] = True

7
security/manager/ssl/src/ScopedNSSTypes.h
View File

@ -11,7 +11,9 @@
#include "NSSErrorsService.h"
#include "mozilla/Likely.h"
#ifndef MOZ_NO_MOZALLOC
#include "mozilla/mozalloc_oom.h"
#endif
#include "mozilla/Scoped.h"
#include "nsError.h"
#include "nsDebug.h"
@ -257,8 +259,11 @@ inline void
SECITEM_AllocItem(SECItem & item, uint32_t len)
{
if (MOZ_UNLIKELY(!SECITEM_AllocItem(nullptr, &item, len))) {
#ifndef MOZ_NO_MOZALLOC
mozalloc_handle_oom(len);
if (MOZ_UNLIKELY(!SECITEM_AllocItem(nullptr, &item, len))) {
if (MOZ_UNLIKELY(!SECITEM_AllocItem(nullptr, &item, len)))
#endif
{
MOZ_CRASH();
}
}