diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2014-04-30 21:49:00 +0100 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2014-04-30 21:49:00 +0100 |
| commit | ceaf401638b2861881d843c08d7800c03bc22e7b (patch) | |
| tree | 8a2e227f68a23b114e9fcf2d920e7539a50ab65c | |
| parent | 2bbd08d41b3d7bcfd1a03ac48615b31b22a66ad9 (diff) | |
| download | classpath-ceaf401638b2861881d843c08d7800c03bc22e7b.tar.gz | |
Remove obsolete Solaris 9 support.
2014-04-30 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Remove check for sys/loadavg.h used by Solaris 9.
* native/jni/java-lang/gnu_java_lang_management_VMOperatingSystemMXBeanImpl.c:
Remove Solaris 9 ifdef and update copyright header.
Signed-off-by: Andrew John Hughes <gnu_andrew@member.fsf.org>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | native/jni/java-lang/gnu_java_lang_management_VMOperatingSystemMXBeanImpl.c | 6 |
3 files changed, 9 insertions, 7 deletions
@@ -1,3 +1,10 @@ +2014-04-30 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * configure.ac: + Remove check for sys/loadavg.h used by Solaris 9. + * native/jni/java-lang/gnu_java_lang_management_VMOperatingSystemMXBeanImpl.c: + Remove Solaris 9 ifdef and update copyright header. + 2014-04-20 Andrew John Hughes <gnu_andrew@member.fsf.org> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c: diff --git a/configure.ac b/configure.ac index b20a4bb1b..5f2538d5c 100644 --- a/configure.ac +++ b/configure.ac @@ -419,7 +419,6 @@ 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. dnl Check for sys/sockio.h for SIOCGIFFLAGS on OpenSolaris. AC_CHECK_HEADERS([unistd.h sys/types.h sys/config.h sys/ioctl.h \ asm/ioctls.h \ @@ -433,7 +432,7 @@ if test "x${COMPILE_JNI}" = xyes; then sys/event.h sys/epoll.h \ ifaddrs.h \ netinet/in_systm.h netinet/ip.h net/if.h \ - sys/loadavg.h sys/sockio.h]) + sys/sockio.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 d6f99ae9f..c19e39943 100644 --- a/native/jni/java-lang/gnu_java_lang_management_VMOperatingSystemMXBeanImpl.c +++ b/native/jni/java-lang/gnu_java_lang_management_VMOperatingSystemMXBeanImpl.c @@ -1,5 +1,5 @@ /* VMOperatingSystemMXBeanImpl.c - gnu.java.lang.management native functions - Copyright (C) 2006 + Copyright (C) 2006, 2014 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,11 +38,7 @@ 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" |