From 9030be4996d4c8ae2853507676207c69f9e21b87 Mon Sep 17 00:00:00 2001 From: Michael Starzinger Date: Tue, 3 Nov 2009 16:15:59 +0100 Subject: [PATCH] * configure.ac: Added check for sys/utsname.h header. * src/vm/os.hpp: Properly includes above header. * src/mm/codememory.c: Removed includes of "uncommon" headers. * src/mm/gc-none.cpp: Likewise. * src/mm/tlh.c: Likewise. * src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.cpp: Likewise. * src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.cpp: Likewise. * src/native/vm/gnuclasspath/java_lang_VMClassLoader.cpp: Likewise. * src/native/vm/gnuclasspath/java_lang_VMRuntime.cpp: Likewise. * src/native/vm/openjdk/jvm.cpp: Likewise. * src/vm/exceptions.cpp: Likewise. * src/vm/properties.cpp: Likewise. * src/vm/signal.cpp: Likewise. * src/vm/zip.cpp: Likewise. --- configure.ac | 1 + src/mm/codememory.c | 1 - src/mm/gc-none.cpp | 5 +---- src/mm/tlh.c | 2 +- .../vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.cpp | 4 +--- .../vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.cpp | 1 - src/native/vm/gnuclasspath/java_lang_VMClassLoader.cpp | 2 +- src/native/vm/gnuclasspath/java_lang_VMRuntime.cpp | 1 - src/native/vm/openjdk/jvm.cpp | 2 -- src/vm/exceptions.cpp | 1 - src/vm/os.hpp | 4 ++++ src/vm/properties.cpp | 1 - src/vm/signal.cpp | 7 ------- src/vm/zip.cpp | 3 +-- 14 files changed, 10 insertions(+), 25 deletions(-) diff --git a/configure.ac b/configure.ac index 5dcff4dde..44f986f8a 100644 --- a/configure.ac +++ b/configure.ac @@ -295,6 +295,7 @@ AC_CHECK_HEADERS([sys/socket.h]) AC_CHECK_HEADERS([sys/stat.h]) AC_CHECK_HEADERS([sys/time.h]) AC_CHECK_HEADERS([sys/types.h]) +AC_CHECK_HEADERS([sys/utsname.h]) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST diff --git a/src/mm/codememory.c b/src/mm/codememory.c index c3e00384c..38edd13b7 100644 --- a/src/mm/codememory.c +++ b/src/mm/codememory.c @@ -27,7 +27,6 @@ #include #include -#include /* REMOVEME */ #include "threads/mutex.hpp" #include "threads/thread.hpp" diff --git a/src/mm/gc-none.cpp b/src/mm/gc-none.cpp index 0ef0cf3f0..55eedeb0f 100644 --- a/src/mm/gc-none.cpp +++ b/src/mm/gc-none.cpp @@ -27,10 +27,6 @@ #include -#if defined(HAVE_SYS_MMAN_H) -# include -#endif - #include "vm/types.h" #include "boehm-gc/include/gc.h" @@ -44,6 +40,7 @@ #include "vm/global.h" #include "vm/loader.hpp" #include "vm/options.h" +#include "vm/os.hpp" #include "vm/vm.hpp" diff --git a/src/mm/tlh.c b/src/mm/tlh.c index 6fcaf5a7a..07646cb1a 100644 --- a/src/mm/tlh.c +++ b/src/mm/tlh.c @@ -27,9 +27,9 @@ #include "mm/tlh.h" #include "vm/global.h" +#include "vm/os.hpp" #include -#include static const int TLH_MAX_SIZE = (20 * 1024 * 1024); diff --git a/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.cpp b/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.cpp index 30efeaa2c..520a4018f 100644 --- a/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.cpp +++ b/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.cpp @@ -25,9 +25,6 @@ #include "config.h" -#include -#include -#include #include #include @@ -45,6 +42,7 @@ #include "vm/array.hpp" #include "vm/exceptions.hpp" #include "vm/javaobjects.hpp" +#include "vm/os.hpp" #include "vm/string.hpp" #include "vm/types.h" #include "vm/vm.hpp" /* REMOVE ME: temporarily */ diff --git a/src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.cpp b/src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.cpp index cf99a13a9..b03e49c2d 100644 --- a/src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.cpp +++ b/src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.cpp @@ -30,7 +30,6 @@ #include #include #include -#include #include "vm/types.h" diff --git a/src/native/vm/gnuclasspath/java_lang_VMClassLoader.cpp b/src/native/vm/gnuclasspath/java_lang_VMClassLoader.cpp index 10e2d63eb..65d5f96ed 100644 --- a/src/native/vm/gnuclasspath/java_lang_VMClassLoader.cpp +++ b/src/native/vm/gnuclasspath/java_lang_VMClassLoader.cpp @@ -27,7 +27,6 @@ #include #include -#include #include "mm/memory.hpp" @@ -57,6 +56,7 @@ #include "vm/linker.hpp" #include "vm/loader.hpp" #include "vm/options.h" +#include "vm/os.hpp" #include "vm/primitive.hpp" #include "vm/statistics.h" #include "vm/string.hpp" diff --git a/src/native/vm/gnuclasspath/java_lang_VMRuntime.cpp b/src/native/vm/gnuclasspath/java_lang_VMRuntime.cpp index 2a8856678..4317bc618 100644 --- a/src/native/vm/gnuclasspath/java_lang_VMRuntime.cpp +++ b/src/native/vm/gnuclasspath/java_lang_VMRuntime.cpp @@ -30,7 +30,6 @@ #include #include #include -#include #if defined(__DARWIN__) # if defined(__POWERPC__) diff --git a/src/native/vm/openjdk/jvm.cpp b/src/native/vm/openjdk/jvm.cpp index 7a194fe2a..945f22157 100644 --- a/src/native/vm/openjdk/jvm.cpp +++ b/src/native/vm/openjdk/jvm.cpp @@ -38,8 +38,6 @@ #include #endif -#include -#include #include // Include our JNI header before the JVM headers, because the JVM diff --git a/src/vm/exceptions.cpp b/src/vm/exceptions.cpp index 332fca04b..69a748feb 100644 --- a/src/vm/exceptions.cpp +++ b/src/vm/exceptions.cpp @@ -29,7 +29,6 @@ #include #include #include -#include #include "vm/types.h" diff --git a/src/vm/os.hpp b/src/vm/os.hpp index c80b2ea1d..e1aa4c458 100644 --- a/src/vm/os.hpp +++ b/src/vm/os.hpp @@ -109,6 +109,10 @@ # include #endif +#if defined(HAVE_SYS_UTSNAME_H) +# include +#endif + #ifdef __cplusplus diff --git a/src/vm/properties.cpp b/src/vm/properties.cpp index c605efd65..a13b8b6dd 100644 --- a/src/vm/properties.cpp +++ b/src/vm/properties.cpp @@ -32,7 +32,6 @@ #include #include #include -#include #include "mm/memory.hpp" diff --git a/src/vm/signal.cpp b/src/vm/signal.cpp index 57d422d1d..a34cfd54c 100644 --- a/src/vm/signal.cpp +++ b/src/vm/signal.cpp @@ -30,13 +30,6 @@ #include #include -#if defined(__DARWIN__) -/* If we compile with -ansi on darwin, is not - included. So let's do it here. */ -# include -# include -#endif - #include "arch.h" #if defined(ENABLE_GC_BOEHM) diff --git a/src/vm/zip.cpp b/src/vm/zip.cpp index 601e31d08..6eb7f621b 100644 --- a/src/vm/zip.cpp +++ b/src/vm/zip.cpp @@ -27,10 +27,8 @@ #include #include -#include #include #include -#include #include "vm/types.h" @@ -40,6 +38,7 @@ #include "mm/memory.hpp" #include "vm/global.h" +#include "vm/os.hpp" #include "vm/suck.hpp" #include "vm/utf8.h" #include "vm/vm.hpp" -- 2.25.1