diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-02-28 00:07:24 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-02-28 00:07:24 +0000 |
| commit | 16ccc49aedb2f5edc29d4d0c70a84d8fc06f78c2 (patch) | |
| tree | 170c3f96df6efd96272eb09a04e703e969e1fcd3 | |
| parent | f51039f0969f9cafb1483e5929292cd0e65d23e8 (diff) | |
| download | classpath-16ccc49aedb2f5edc29d4d0c70a84d8fc06f78c2.tar.gz | |
2008-02-27 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Check for sys/loadavg.h.
* native/jni/java-lang/gnu_java_lang_management_VMOperatingSystemMXBeanImpl.c:
Include sys/loadavg.h if found.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | native/jni/java-lang/gnu_java_lang_management_VMOperatingSystemMXBeanImpl.c | 5 |
3 files changed, 15 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2008-02-27 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * configure.ac: + Check for sys/loadavg.h. + * native/jni/java-lang/gnu_java_lang_management_VMOperatingSystemMXBeanImpl.c: + Include sys/loadavg.h if found. + 2008-02-26 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/21869: diff --git a/configure.ac b/configure.ac index 413fbb3d8..50d4f497d 100644 --- a/configure.ac +++ b/configure.ac @@ -369,6 +369,7 @@ if test "x${COMPILE_JNI}" = xyes; then dnl BSD_COMP is defined; just including sys/filio.h is simpler. dnl Check for crt_externs.h on Darwin. dnl Check for netinet/in_systm.h, netinet/ip.h and net/if.h for Windows CE. + dnl Check for sys/loadavg.h for getloadavg() on Solaris 9. AC_CHECK_HEADERS([unistd.h sys/types.h sys/config.h sys/ioctl.h \ asm/ioctls.h \ inttypes.h stdint.h utime.h sys/utime.h sys/filio.h \ @@ -380,7 +381,8 @@ if test "x${COMPILE_JNI}" = xyes; then magic.h \ sys/event.h sys/epoll.h \ ifaddrs.h \ - netinet/in_systm.h netinet/ip.h net/if.h]) + netinet/in_systm.h netinet/ip.h net/if.h \ + sys/loadavg.h]) AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t])) AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t])) diff --git a/native/jni/java-lang/gnu_java_lang_management_VMOperatingSystemMXBeanImpl.c b/native/jni/java-lang/gnu_java_lang_management_VMOperatingSystemMXBeanImpl.c index 68e89b36a..d6f99ae9f 100644 --- a/native/jni/java-lang/gnu_java_lang_management_VMOperatingSystemMXBeanImpl.c +++ b/native/jni/java-lang/gnu_java_lang_management_VMOperatingSystemMXBeanImpl.c @@ -37,7 +37,12 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ #include <config.h> + +#if defined HAVE_SYS_LOADAVG_H /* Get getloadavg() on Solaris 9 */ +#include <sys/loadavg.h> +#else #include <stdlib.h> +#endif #include "gnu_java_lang_management_VMOperatingSystemMXBeanImpl.h" |