summaryrefslogtreecommitdiff
path: root/java/jdk15/files/patch-j2se::sound::HAE_API_BSDOS.c
blob: 44d92bdc47253d26d69ad1702fa1a55e566ebcf5 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
--- ../../j2se/src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c
+++ ../../j2se/src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c
@@ -42,6 +42,7 @@
 #include <errno.h>
 
 #ifdef __FreeBSD__
+#include <sys/param.h>
 #include <sys/soundcard.h>
 #endif
 #if defined(__NetBSD__) || defined(__OpenBSD__)
@@ -67,7 +68,16 @@
 #define FALSE		0
 #endif
 
+#if defined(__FreeBSD__) && (__FreeBSD_version >= 700013)
+static inline void *
+memalign(size_t alignment, size_t size)
+{
+    void *ret;
+    return posix_memalign(&ret, alignment, size) ? NULL : ret;
+}
+#else
 #define memalign(a, b)	valloc(b)
+#endif
 
 // How many audio frames to generate at one time 
 #define HAE_BSD_FRAMES_PER_BLOCK		8