Merge GNU Classpath 0.99 into libjava.

From-SVN: r185741

37 files changed, 263 insertions, 0 deletions

diff --git a/libjava/classpath/include/Makefile.am b/libjava/classpath/include/Makefile.am
index ab59f0f..223975f 100644
--- a/libjava/classpath/include/Makefile.am
+++ b/libjava/classpath/include/Makefile.am
@@ -145,6 +145,7 @@ gnu_java_nio_VMSelector.h \
 gnu_java_nio_charset_iconv_IconvEncoder.h \
 gnu_java_nio_charset_iconv_IconvDecoder.h \
 gnu_java_lang_management_VMOperatingSystemMXBeanImpl.h \
+java_io_VMConsole.h \
 java_io_VMFile.h \
 java_io_VMObjectInputStream.h \
 java_io_VMObjectStreamClass.h \
@@ -385,6 +386,8 @@ gnu_java_nio_VMSelector.h: $(top_srcdir)/vm/reference/gnu/java/nio/VMSelector.ja
 	$(JAVAH) -o $@ gnu.java.nio.VMSelector
 gnu_java_lang_management_VMOperatingSystemMXBeanImpl.h: $(top_srcdir)/vm/reference/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java
 	$(JAVAH) -o $@ gnu.java.lang.management.VMOperatingSystemMXBeanImpl
+java_io_VMConsole.h: $(top_srcdir)/vm/reference/java/io/VMConsole.java
+	$(JAVAH) -o $@ java.io.VMConsole
 java_io_VMFile.h: $(top_srcdir)/vm/reference/java/io/VMFile.java
 	$(JAVAH) -o $@ java.io.VMFile
 java_io_VMObjectInputStream.h: $(top_srcdir)/vm/reference/java/io/VMObjectInputStream.java
diff --git a/libjava/classpath/include/Makefile.in b/libjava/classpath/include/Makefile.in
index 63b020e..1039aee 100644
--- a/libjava/classpath/include/Makefile.in
+++ b/libjava/classpath/include/Makefile.in
@@ -420,6 +420,7 @@ gnu_java_nio_VMSelector.h \
 gnu_java_nio_charset_iconv_IconvEncoder.h \
 gnu_java_nio_charset_iconv_IconvDecoder.h \
 gnu_java_lang_management_VMOperatingSystemMXBeanImpl.h \
+java_io_VMConsole.h \
 java_io_VMFile.h \
 java_io_VMObjectInputStream.h \
 java_io_VMObjectStreamClass.h \
@@ -863,6 +864,8 @@ uninstall-am:
 @CREATE_JNI_HEADERS_TRUE@	$(JAVAH) -o $@ gnu.java.nio.VMSelector
 @CREATE_JNI_HEADERS_TRUE@gnu_java_lang_management_VMOperatingSystemMXBeanImpl.h: $(top_srcdir)/vm/reference/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java
 @CREATE_JNI_HEADERS_TRUE@	$(JAVAH) -o $@ gnu.java.lang.management.VMOperatingSystemMXBeanImpl
+@CREATE_JNI_HEADERS_TRUE@java_io_VMConsole.h: $(top_srcdir)/vm/reference/java/io/VMConsole.java
+@CREATE_JNI_HEADERS_TRUE@	$(JAVAH) -o $@ java.io.VMConsole
 @CREATE_JNI_HEADERS_TRUE@java_io_VMFile.h: $(top_srcdir)/vm/reference/java/io/VMFile.java
 @CREATE_JNI_HEADERS_TRUE@	$(JAVAH) -o $@ java.io.VMFile
 @CREATE_JNI_HEADERS_TRUE@java_io_VMObjectInputStream.h: $(top_srcdir)/vm/reference/java/io/VMObjectInputStream.java
diff --git a/libjava/classpath/include/config.h.in b/libjava/classpath/include/config.h.in
index cdf45d9..c80ba1d 100644
--- a/libjava/classpath/include/config.h.in
+++ b/libjava/classpath/include/config.h.in
@@ -24,6 +24,9 @@
 /* Define to 1 if you have BSD u_int32_t */
 #undef HAVE_BSD_INT32_DEFINED
 
+/* Define to 1 if you have the `clock_gettime' function. */
+#undef HAVE_CLOCK_GETTIME
+
 /* Define to 1 if you have the `close' function. */
 #undef HAVE_CLOSE
 
diff --git a/libjava/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h b/libjava/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h
index 160cb39..05aeb5c 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h
@@ -19,6 +19,19 @@ JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_nativeGra
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_copyAreaNative (JNIEnv *env, jobject, jobject, jint, jint, jint, jint, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile (JNIEnv *env, jobject, jobject, jlong, jint, jint, jint, jint, jint, jint, jint, jint);
 
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_NEAREST
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_NEAREST 0L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_BILINEAR
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_BILINEAR 1L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_BICUBIC
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_BICUBIC 5L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_SPEED
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_SPEED 2L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_QUALITY
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_QUALITY 3L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_DEFAULT
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_DEFAULT 4L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h b/libjava/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h
index 8b1c26c..e31c80e 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h
@@ -13,6 +13,19 @@ extern "C"
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphicsCopy_getPixbuf (JNIEnv *env, jobject, jobject, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphicsCopy_copyPixbuf (JNIEnv *env, jobject, jobject, jobject, jint, jint, jint, jint);
 
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_NEAREST
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_NEAREST 0L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_BILINEAR
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_BILINEAR 1L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_BICUBIC
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_BICUBIC 5L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_SPEED
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_SPEED 2L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_QUALITY
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_QUALITY 3L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_DEFAULT
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_DEFAULT 4L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h b/libjava/classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h
index cb424f4..b8c8a4f 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h
@@ -17,6 +17,17 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getKerning
 JNIEXPORT jdoubleArray JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getMetricsNative (JNIEnv *env, jobject, jint, jlong);
 JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphOutlineNative (JNIEnv *env, jobject, jint, jlong);
 
+#undef java_awt_font_GlyphVector_FLAG_COMPLEX_GLYPHS
+#define java_awt_font_GlyphVector_FLAG_COMPLEX_GLYPHS 8L
+#undef java_awt_font_GlyphVector_FLAG_HAS_POSITION_ADJUSTMENTS
+#define java_awt_font_GlyphVector_FLAG_HAS_POSITION_ADJUSTMENTS 2L
+#undef java_awt_font_GlyphVector_FLAG_HAS_TRANSFORMS
+#define java_awt_font_GlyphVector_FLAG_HAS_TRANSFORMS 1L
+#undef java_awt_font_GlyphVector_FLAG_MASK
+#define java_awt_font_GlyphVector_FLAG_MASK 15L
+#undef java_awt_font_GlyphVector_FLAG_RUN_RTL
+#define java_awt_font_GlyphVector_FLAG_RUN_RTL 4L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h b/libjava/classpath/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h
index 6199933..2e76dfd 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h
@@ -19,6 +19,13 @@ JNIEXPORT jobjectArray JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevic
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeSetDisplayMode (JNIEnv *env, jobject, jobject, jint, jshort);
 JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetBounds (JNIEnv *env, jobject);
 
+#undef java_awt_GraphicsDevice_TYPE_RASTER_SCREEN
+#define java_awt_GraphicsDevice_TYPE_RASTER_SCREEN 0L
+#undef java_awt_GraphicsDevice_TYPE_PRINTER
+#define java_awt_GraphicsDevice_TYPE_PRINTER 1L
+#undef java_awt_GraphicsDevice_TYPE_IMAGE_BUFFER
+#define java_awt_GraphicsDevice_TYPE_IMAGE_BUFFER 2L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h b/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h
index 55891c8..464656f 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h
@@ -13,6 +13,23 @@ extern "C"
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create (JNIEnv *env, jobject, jlong);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_construct (JNIEnv *env, jobject, jlong);
 
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_NORMAL
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_NORMAL 0L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DIALOG
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DIALOG 1L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_MENU
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_MENU 2L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_TOOLBAR
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_TOOLBAR 3L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_SPLASHSCREEN
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_SPLASHSCREEN 4L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_UTILITY
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_UTILITY 5L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DOCK
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DOCK 6L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DESKTOP
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DESKTOP 7L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h b/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h
index f9e1341..ec7b4cb 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h
@@ -17,6 +17,23 @@ JNIEXPORT jstring JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeGet
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetDirectory (JNIEnv *env, jobject, jstring);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFilenameFilter (JNIEnv *env, jobject, jobject);
 
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_NORMAL
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_NORMAL 0L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DIALOG
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DIALOG 1L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_MENU
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_MENU 2L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_TOOLBAR
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_TOOLBAR 3L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_SPLASHSCREEN
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_SPLASHSCREEN 4L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_UTILITY
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_UTILITY 5L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DOCK
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DOCK 6L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DESKTOP
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DESKTOP 7L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkFramePeer.h b/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkFramePeer.h
index f100d3d..0676019 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkFramePeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkFramePeer.h
@@ -22,6 +22,23 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_iconify (JNIEnv *
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_deiconify (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_nativeSetIconImage (JNIEnv *env, jobject, jobject);
 
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_NORMAL
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_NORMAL 0L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DIALOG
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DIALOG 1L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_MENU
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_MENU 2L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_TOOLBAR
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_TOOLBAR 3L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_SPLASHSCREEN
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_SPLASHSCREEN 4L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_UTILITY
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_UTILITY 5L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DOCK
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DOCK 6L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DESKTOP
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DESKTOP 7L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkImage.h b/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkImage.h
index 3e65ea9..29d7e4c 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkImage.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkImage.h
@@ -20,6 +20,17 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkImage_freePixbuf (JNIEnv *e
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkImage_createScaledPixbuf (JNIEnv *env, jobject, jobject, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkImage_createFromPixbuf (JNIEnv *env, jobject);
 
+#undef java_awt_Image_SCALE_DEFAULT
+#define java_awt_Image_SCALE_DEFAULT 1L
+#undef java_awt_Image_SCALE_FAST
+#define java_awt_Image_SCALE_FAST 2L
+#undef java_awt_Image_SCALE_SMOOTH
+#define java_awt_Image_SCALE_SMOOTH 4L
+#undef java_awt_Image_SCALE_REPLICATE
+#define java_awt_Image_SCALE_REPLICATE 8L
+#undef java_awt_Image_SCALE_AREA_AVERAGING
+#define java_awt_Image_SCALE_AREA_AVERAGING 16L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h b/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
index 57bac0d..e563743 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
@@ -16,6 +16,23 @@ JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGe
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea (JNIEnv *env, jobject, jlong, jint, jint, jint, jint, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile (JNIEnv *env, jobject, jlong, jlong, jint, jint, jint, jint);
 
+#undef java_awt_image_VolatileImage_IMAGE_OK
+#define java_awt_image_VolatileImage_IMAGE_OK 0L
+#undef java_awt_image_VolatileImage_IMAGE_RESTORED
+#define java_awt_image_VolatileImage_IMAGE_RESTORED 1L
+#undef java_awt_image_VolatileImage_IMAGE_INCOMPATIBLE
+#define java_awt_image_VolatileImage_IMAGE_INCOMPATIBLE 2L
+#undef java_awt_Image_SCALE_DEFAULT
+#define java_awt_Image_SCALE_DEFAULT 1L
+#undef java_awt_Image_SCALE_FAST
+#define java_awt_Image_SCALE_FAST 2L
+#undef java_awt_Image_SCALE_SMOOTH
+#define java_awt_Image_SCALE_SMOOTH 4L
+#undef java_awt_Image_SCALE_REPLICATE
+#define java_awt_Image_SCALE_REPLICATE 8L
+#undef java_awt_Image_SCALE_AREA_AVERAGING
+#define java_awt_Image_SCALE_AREA_AVERAGING 16L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_MainQtThread.h b/libjava/classpath/include/gnu_java_awt_peer_qt_MainQtThread.h
index 73959ac..5336d38 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_MainQtThread.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_MainQtThread.h
@@ -13,6 +13,13 @@ extern "C"
 JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_qt_MainQtThread_init (JNIEnv *env, jobject, jstring, jboolean);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_MainQtThread_exec (JNIEnv *env, jobject, jlong);
 
+#undef java_lang_Thread_MIN_PRIORITY
+#define java_lang_Thread_MIN_PRIORITY 1L
+#undef java_lang_Thread_NORM_PRIORITY
+#define java_lang_Thread_NORM_PRIORITY 5L
+#undef java_lang_Thread_MAX_PRIORITY
+#define java_lang_Thread_MAX_PRIORITY 10L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtButtonPeer.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtButtonPeer.h
index b5a3c74..f0293f0 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtButtonPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtButtonPeer.h
@@ -13,6 +13,9 @@ extern "C"
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtButtonPeer_init (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtButtonPeer_setLabel (JNIEnv *env, jobject, jstring);
 
+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtCanvasPeer.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtCanvasPeer.h
index 74c86a8..c1c80ec 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtCanvasPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtCanvasPeer.h
@@ -12,6 +12,9 @@ extern "C"
 
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtCanvasPeer_init (JNIEnv *env, jobject);
 
+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtCheckboxPeer.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtCheckboxPeer.h
index aaee33d..da46035 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtCheckboxPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtCheckboxPeer.h
@@ -14,6 +14,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtCheckboxPeer_init (JNIEnv *en
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtCheckboxPeer_setLabel (JNIEnv *env, jobject, jstring);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtCheckboxPeer_setState (JNIEnv *env, jobject, jboolean);
 
+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtChoicePeer.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtChoicePeer.h
index ef639fa..96e667f 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtChoicePeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtChoicePeer.h
@@ -15,6 +15,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtChoicePeer_add (JNIEnv *env,
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtChoicePeer_remove (JNIEnv *env, jobject, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtChoicePeer_select (JNIEnv *env, jobject, jint);
 
+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtDialogPeer.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtDialogPeer.h
index 0fd19f2..56d6eaf 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtDialogPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtDialogPeer.h
@@ -15,6 +15,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtDialogPeer_setModal (JNIEnv *
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtDialogPeer_setBoundsNative (JNIEnv *env, jobject, jint, jint, jint, jint, jboolean);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtDialogPeer_setResizable (JNIEnv *env, jobject, jboolean);
 
+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h
index 8913a3b..748f02d 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h
@@ -13,6 +13,9 @@ extern "C"
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtEmbeddedWindowPeer_init (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtEmbeddedWindowPeer_embed (JNIEnv *env, jobject, jlong);
 
+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtFileDialogPeer.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtFileDialogPeer.h
index f1e4736..d8a67af 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtFileDialogPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtFileDialogPeer.h
@@ -13,6 +13,9 @@ extern "C"
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtFileDialogPeer_init (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtFileDialogPeer_setMode (JNIEnv *env, jobject, jint);
 
+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtFontMetrics.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtFontMetrics.h
index b07bc9c..542e722 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtFontMetrics.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtFontMetrics.h
@@ -23,6 +23,9 @@ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtFontMetrics_getMaxAdvance (JN
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtFontMetrics_charWidth (JNIEnv *env, jobject, jchar);
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtFontMetrics_stringWidth (JNIEnv *env, jobject, jstring);
 
+#undef java_awt_FontMetrics_serialVersionUID
+#define java_awt_FontMetrics_serialVersionUID 1681126225205050147LL
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtFramePeer.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtFramePeer.h
index 06f1824..f03c5ce 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtFramePeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtFramePeer.h
@@ -16,6 +16,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtFramePeer_setMaximizedBounds
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtFramePeer_setMenu (JNIEnv *env, jobject, jobject);
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtFramePeer_menuBarHeight (JNIEnv *env, jobject);
 
+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtImage.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtImage.h
index cc399b7..9f994df 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtImage.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtImage.h
@@ -24,6 +24,17 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtImage_drawPixelsTransformed (
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtImage_drawPixelsScaledFlipped (JNIEnv *env, jobject, jobject, jint, jint, jint, jboolean, jboolean, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtImage_copyArea (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint);
 
+#undef java_awt_Image_SCALE_DEFAULT
+#define java_awt_Image_SCALE_DEFAULT 1L
+#undef java_awt_Image_SCALE_FAST
+#define java_awt_Image_SCALE_FAST 2L
+#undef java_awt_Image_SCALE_SMOOTH
+#define java_awt_Image_SCALE_SMOOTH 4L
+#undef java_awt_Image_SCALE_REPLICATE
+#define java_awt_Image_SCALE_REPLICATE 8L
+#undef java_awt_Image_SCALE_AREA_AVERAGING
+#define java_awt_Image_SCALE_AREA_AVERAGING 16L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtLabelPeer.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtLabelPeer.h
index 6707142..55e8e7b 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtLabelPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtLabelPeer.h
@@ -14,6 +14,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtLabelPeer_init (JNIEnv *env,
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtLabelPeer_setAlignment (JNIEnv *env, jobject, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtLabelPeer_setText (JNIEnv *env, jobject, jstring);
 
+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtListPeer.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtListPeer.h
index b08ebf9..2392482 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtListPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtListPeer.h
@@ -18,6 +18,9 @@ JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_qt_QtListPeer_getSelectedInde
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtListPeer_makeVisible (JNIEnv *env, jobject, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtListPeer_setMultipleMode (JNIEnv *env, jobject, jboolean);
 
+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtPanelPeer.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtPanelPeer.h
index 0b95a62..8433731 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtPanelPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtPanelPeer.h
@@ -12,6 +12,9 @@ extern "C"
 
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtPanelPeer_init (JNIEnv *env, jobject);
 
+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtScreenDevice.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtScreenDevice.h
index a35627a..a91d1da 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtScreenDevice.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtScreenDevice.h
@@ -17,6 +17,13 @@ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtScreenDevice_getDpiX (JNIEnv
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtScreenDevice_getDpiY (JNIEnv *env, jobject);
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtScreenDevice_depth (JNIEnv *env, jobject);
 
+#undef java_awt_GraphicsDevice_TYPE_RASTER_SCREEN
+#define java_awt_GraphicsDevice_TYPE_RASTER_SCREEN 0L
+#undef java_awt_GraphicsDevice_TYPE_PRINTER
+#define java_awt_GraphicsDevice_TYPE_PRINTER 1L
+#undef java_awt_GraphicsDevice_TYPE_IMAGE_BUFFER
+#define java_awt_GraphicsDevice_TYPE_IMAGE_BUFFER 2L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtScrollPanePeer.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtScrollPanePeer.h
index af9412e..33bad25 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtScrollPanePeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtScrollPanePeer.h
@@ -17,6 +17,9 @@ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtScrollPanePeer_getHScrollbarH
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtScrollPanePeer_getVScrollbarWidth (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtScrollPanePeer_setScrollPosition (JNIEnv *env, jobject, jint, jint);
 
+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtScrollbarPeer.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtScrollbarPeer.h
index 8f3d08e..947f286 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtScrollbarPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtScrollbarPeer.h
@@ -16,6 +16,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtScrollbarPeer_setLineIncremen
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtScrollbarPeer_setPageIncrement (JNIEnv *env, jobject, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtScrollbarPeer_setValues (JNIEnv *env, jobject, jint, jint, jint, jint);
 
+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtTextAreaPeer.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtTextAreaPeer.h
index 3c83349..dbd0f1c 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtTextAreaPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtTextAreaPeer.h
@@ -20,6 +20,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtTextAreaPeer_select (JNIEnv *
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtTextAreaPeer_setEditable (JNIEnv *env, jobject, jboolean);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtTextAreaPeer_setCaretPosition (JNIEnv *env, jobject, jint);
 
+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtTextFieldPeer.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtTextFieldPeer.h
index 621c798..3d14b2d 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtTextFieldPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtTextFieldPeer.h
@@ -22,6 +22,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtTextFieldPeer_setEchoChar (JN
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtTextFieldPeer_setEditable (JNIEnv *env, jobject, jboolean);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtTextFieldPeer_setText (JNIEnv *env, jobject, jstring);
 
+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtVolatileImage.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtVolatileImage.h
index 94a3b5d..93ce9d5 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtVolatileImage.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtVolatileImage.h
@@ -23,6 +23,23 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtVolatileImage_drawPixelsTrans
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtVolatileImage_drawPixelsScaledFlipped (JNIEnv *env, jobject, jobject, jint, jint, jint, jboolean, jboolean, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtVolatileImage_copyArea (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint);
 
+#undef java_awt_image_VolatileImage_IMAGE_OK
+#define java_awt_image_VolatileImage_IMAGE_OK 0L
+#undef java_awt_image_VolatileImage_IMAGE_RESTORED
+#define java_awt_image_VolatileImage_IMAGE_RESTORED 1L
+#undef java_awt_image_VolatileImage_IMAGE_INCOMPATIBLE
+#define java_awt_image_VolatileImage_IMAGE_INCOMPATIBLE 2L
+#undef java_awt_Image_SCALE_DEFAULT
+#define java_awt_Image_SCALE_DEFAULT 1L
+#undef java_awt_Image_SCALE_FAST
+#define java_awt_Image_SCALE_FAST 2L
+#undef java_awt_Image_SCALE_SMOOTH
+#define java_awt_Image_SCALE_SMOOTH 4L
+#undef java_awt_Image_SCALE_REPLICATE
+#define java_awt_Image_SCALE_REPLICATE 8L
+#undef java_awt_Image_SCALE_AREA_AVERAGING
+#define java_awt_Image_SCALE_AREA_AVERAGING 16L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtWindowPeer.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtWindowPeer.h
index 64eb5a5..e7fd625 100644
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtWindowPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtWindowPeer.h
@@ -15,6 +15,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtWindowPeer_toBack (JNIEnv *en
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtWindowPeer_toFront (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtWindowPeer_setTitle (JNIEnv *env, jobject, jstring);
 
+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_nio_charset_iconv_IconvDecoder.h b/libjava/classpath/include/gnu_java_nio_charset_iconv_IconvDecoder.h
index c708d75..3e8c97c 100644
--- a/libjava/classpath/include/gnu_java_nio_charset_iconv_IconvDecoder.h
+++ b/libjava/classpath/include/gnu_java_nio_charset_iconv_IconvDecoder.h
@@ -14,6 +14,15 @@ JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_openIconv (J
 JNIEXPORT jint JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_decode (JNIEnv *env, jobject, jbyteArray, jcharArray, jint, jint, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_closeIconv (JNIEnv *env, jobject);
 
+#undef java_nio_charset_CharsetDecoder_STATE_RESET
+#define java_nio_charset_CharsetDecoder_STATE_RESET 0L
+#undef java_nio_charset_CharsetDecoder_STATE_CODING
+#define java_nio_charset_CharsetDecoder_STATE_CODING 1L
+#undef java_nio_charset_CharsetDecoder_STATE_END
+#define java_nio_charset_CharsetDecoder_STATE_END 2L
+#undef java_nio_charset_CharsetDecoder_STATE_FLUSHED
+#define java_nio_charset_CharsetDecoder_STATE_FLUSHED 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/gnu_java_nio_charset_iconv_IconvEncoder.h b/libjava/classpath/include/gnu_java_nio_charset_iconv_IconvEncoder.h
index f460d01..6d2e789 100644
--- a/libjava/classpath/include/gnu_java_nio_charset_iconv_IconvEncoder.h
+++ b/libjava/classpath/include/gnu_java_nio_charset_iconv_IconvEncoder.h
@@ -14,6 +14,15 @@ JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_openIconv (J
 JNIEXPORT jint JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_encode (JNIEnv *env, jobject, jcharArray, jbyteArray, jint, jint, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_closeIconv (JNIEnv *env, jobject);
 
+#undef java_nio_charset_CharsetEncoder_STATE_RESET
+#define java_nio_charset_CharsetEncoder_STATE_RESET 0L
+#undef java_nio_charset_CharsetEncoder_STATE_CODING
+#define java_nio_charset_CharsetEncoder_STATE_CODING 1L
+#undef java_nio_charset_CharsetEncoder_STATE_END
+#define java_nio_charset_CharsetEncoder_STATE_END 2L
+#undef java_nio_charset_CharsetEncoder_STATE_FLUSHED
+#define java_nio_charset_CharsetEncoder_STATE_FLUSHED 3L
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libjava/classpath/include/java_io_VMConsole.h b/libjava/classpath/include/java_io_VMConsole.h
new file mode 100644
index 0000000..857711b
--- /dev/null
+++ b/libjava/classpath/include/java_io_VMConsole.h
@@ -0,0 +1,19 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#include <jni.h>
+
+#ifndef __java_io_VMConsole__
+#define __java_io_VMConsole__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+JNIEXPORT jstring JNICALL Java_java_io_VMConsole_readPassword (JNIEnv *env, jclass, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __java_io_VMConsole__ */
diff --git a/libjava/classpath/include/java_lang_VMSystem.h b/libjava/classpath/include/java_lang_VMSystem.h
index 020cc30..adf5bf7 100644
--- a/libjava/classpath/include/java_lang_VMSystem.h
+++ b/libjava/classpath/include/java_lang_VMSystem.h
@@ -15,6 +15,7 @@ JNIEXPORT jint JNICALL Java_java_lang_VMSystem_identityHashCode (JNIEnv *env, jc
 JNIEXPORT void JNICALL Java_java_lang_VMSystem_setIn (JNIEnv *env, jclass, jobject);
 JNIEXPORT void JNICALL Java_java_lang_VMSystem_setOut (JNIEnv *env, jclass, jobject);
 JNIEXPORT void JNICALL Java_java_lang_VMSystem_setErr (JNIEnv *env, jclass, jobject);
+JNIEXPORT jlong JNICALL Java_java_lang_VMSystem_currentTimeMillis (JNIEnv *env, jclass);
 JNIEXPORT jlong JNICALL Java_java_lang_VMSystem_nanoTime (JNIEnv *env, jclass);
 JNIEXPORT jobject JNICALL Java_java_lang_VMSystem_environ (JNIEnv *env, jclass);
 JNIEXPORT jstring JNICALL Java_java_lang_VMSystem_getenv (JNIEnv *env, jclass, jstring);