diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2010-08-05 16:51:11 +0200 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2010-08-07 00:07:35 +0200 |
| commit | 1c65f9b607388a2f817ae6c38b13907da09e6275 (patch) | |
| tree | 948d9d80a036c9bb6f441177776e7920545eede8 | |
| parent | faa3aebaee2a4c53aca94a63a89f2ee0d0522e4d (diff) | |
openjdk: update the unused-backtrace-patch for uclibc
| -rw-r--r-- | recipes/openjdk/openjdk-6-6b18-1.8/icedtea-jdk-remove-unused-backtrace.patch | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/recipes/openjdk/openjdk-6-6b18-1.8/icedtea-jdk-remove-unused-backtrace.patch b/recipes/openjdk/openjdk-6-6b18-1.8/icedtea-jdk-remove-unused-backtrace.patch index 09ab459084..5423fde52f 100644 --- a/recipes/openjdk/openjdk-6-6b18-1.8/icedtea-jdk-remove-unused-backtrace.patch +++ b/recipes/openjdk/openjdk-6-6b18-1.8/icedtea-jdk-remove-unused-backtrace.patch @@ -1,7 +1,7 @@ Index: openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c =================================================================== ---- openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-06-13 13:44:00.741955478 +0200 -+++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-06-13 13:48:11.451931804 +0200 +--- openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:45:56.607257503 +0200 ++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:47:19.727254686 +0200 @@ -27,9 +27,6 @@ #include <X11/Xutil.h> #include <X11/Xos.h> @@ -12,9 +12,9 @@ Index: openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c #include <jvm.h> #include <jni.h> -@@ -692,35 +689,11 @@ - - static XErrorHandler saved_error_handler = NULL; +@@ -689,26 +686,6 @@ + return ret; + } -#ifdef __linux__ -void print_stack(void) @@ -36,16 +36,6 @@ Index: openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c -} -#endif - - static int NoisyXErrorHandler(Display * dpy, XErrorEvent * event) { - fprintf(stderr, "id=%x, serial=%x, ec=%d, rc=%d, mc=%d\n", - event->resourceid, event->serial, event->error_code, - event->request_code, event->minor_code); -- /* -- #ifdef __linux__ -- print_stack(); -- #endif -- */ -+ - if (jvm != NULL) { - JNIEnv * env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); - JNU_CallStaticMethodByName(env, NULL, "java/lang/Thread", "dumpStack", "()V"); + Window get_xawt_root_shell(JNIEnv *env) { + static jclass classXRootWindow = NULL; + static jmethodID methodGetXRootWindow = NULL; |