From 5c7411981584e487ac41794feb98a66df9fd6fcb Mon Sep 17 00:00:00 2001 From: gandalf Date: Fri, 23 Mar 2012 15:19:26 +0000 Subject: Merge GNU Classpath 0.99 into libjava. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185741 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/include/gnu_java_awt_peer_qt_QtFontMetrics.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libjava/classpath/include/gnu_java_awt_peer_qt_QtFontMetrics.h') 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 b07bc9cae70..542e7229841 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 -- cgit v1.2.3