stop using malloc.h; these patches are a bit of a hack, but upstream's

next release properly deals with it (as confirmed by landry@).

discussed with landry@
This commit is contained in:
jasper 2016-01-20 08:39:57 +00:00
parent dbf701486f
commit 9809b01bdb
2 changed files with 29 additions and 4 deletions

View File

@ -1,11 +1,12 @@
$OpenBSD: patch-mozilla_config_system-headers,v 1.3 2015/10/16 20:02:02 dcoppa Exp $
$OpenBSD: patch-mozilla_config_system-headers,v 1.4 2016/01/20 08:39:57 jasper Exp $
Fix building with freetype>=2.6.1
https://hg.mozilla.org/mozilla-central/rev/af40750720b5
--- mozilla/config/system-headers.orig Fri Oct 16 21:41:20 2015
+++ mozilla/config/system-headers Fri Oct 16 21:41:53 2015
Stop using malloc.h.
--- mozilla/config/system-headers.orig Wed Nov 4 02:56:15 2015
+++ mozilla/config/system-headers Thu Jan 14 18:11:28 2016
@@ -455,6 +455,7 @@ frame/log.h
frame/req.h
freetype/freetype.h
@ -14,3 +15,11 @@ https://hg.mozilla.org/mozilla-central/rev/af40750720b5
freetype/ftglyph.h
freetype/ftsynth.h
freetype/ftoutln.h
@@ -708,7 +709,6 @@ MacMemory.h
MacTCP.h
MacTypes.h
MacWindows.h
-malloc.h
malloc_np.h
map
mapicode.h

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-mozilla_media_libav_config_unix_h,v 1.1 2016/01/20 08:39:57 jasper Exp $
Stop using malloc.h on OpenBSD.
--- mozilla/media/libav/config_unix.h.orig Thu Jan 14 19:35:51 2016
+++ mozilla/media/libav/config_unix.h Thu Jan 14 19:36:05 2016
@@ -144,7 +144,9 @@
#define HAVE_MACH_MACH_TIME_H 0
#define HAVE_MACHINE_IOCTL_BT848_H 0
#define HAVE_MACHINE_IOCTL_METEOR_H 0
+#ifndef __OpenBSD__
#define HAVE_MALLOC_H 1
+#endif
#define HAVE_POLL_H 1
#define HAVE_SNDIO_H 0
#define HAVE_SOUNDCARD_H 0