summaryrefslogtreecommitdiff
path: root/java/jdk15/files/patch-j2se::hpi::memory_md.c
diff options
context:
space:
mode:
Diffstat (limited to 'java/jdk15/files/patch-j2se::hpi::memory_md.c')
-rw-r--r--java/jdk15/files/patch-j2se::hpi::memory_md.c30
1 files changed, 0 insertions, 30 deletions
diff --git a/java/jdk15/files/patch-j2se::hpi::memory_md.c b/java/jdk15/files/patch-j2se::hpi::memory_md.c
deleted file mode 100644
index 3b2b85b2c8bb..000000000000
--- a/java/jdk15/files/patch-j2se::hpi::memory_md.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- ../../j2se/src/solaris/hpi/src/memory_md.c
-+++ ../../j2se/src/solaris/hpi/src/memory_md.c
-@@ -32,7 +32,9 @@
- #include <stdlib.h>
- #include <stdio.h> /* For perror() */
- #include <string.h>
--#if !defined(_ALLBSD_SOURCE)
-+#if defined(_ALLBSD_SOURCE)
-+#include <sys/param.h>
-+#else
- #include <malloc.h>
- #endif
-
-@@ -67,7 +69,16 @@
- static size_t memGrainSize; /* A page for Linux */
- #elif defined(_ALLBSD_SOURCE)
- static size_t memGrainSize; /* A page for FreeBSD */
-+#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
- #else
- static unsigned int memGrainSize; /* A page for Solaris */
- #endif