diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2007-05-25 18:44:27 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2007-05-25 18:44:27 +0000 |
| commit | 7446ea7a70abb17206c2d63b7369fe2dbe4683c1 (patch) | |
| tree | 2a7658d09bba2cebe4097c381677b942c1fa639c /java/jdk15/files/patch-j2se::hpi::memory_md.c | |
| parent | - update to 1.2.1 (diff) | |
Various fixes for -CURRENT.
- Build fixes after GCC 4.2 import.
- Remove SIGRTMIN and SIGRTMAX redefinitions.
- Use posix_memalign(3) instead of valloc(3).
Approved by: glewis (maintainer)
Diffstat (limited to 'java/jdk15/files/patch-j2se::hpi::memory_md.c')
| -rw-r--r-- | java/jdk15/files/patch-j2se::hpi::memory_md.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/java/jdk15/files/patch-j2se::hpi::memory_md.c b/java/jdk15/files/patch-j2se::hpi::memory_md.c new file mode 100644 index 000000000000..3b2b85b2c8bb --- /dev/null +++ b/java/jdk15/files/patch-j2se::hpi::memory_md.c @@ -0,0 +1,30 @@ +--- ../../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 |