From 490e9d0ae773747e3fea8dac7c499a93a89c5449 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 11 Apr 2012 14:10:26 +0300 Subject: Remove X*Event unused memmove bindings. Conflicts: bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c --- .../Eclipse SWT PI/gtk/library/os.c | 73 ---------------------- .../Eclipse SWT PI/gtk/library/os_stats.c | 19 +----- .../Eclipse SWT PI/gtk/library/os_stats.h | 15 ----- .../gtk/org/eclipse/swt/internal/gtk/OS.java | 18 ------ 4 files changed, 2 insertions(+), 123 deletions(-) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c index 7aeba0d828..6fdf13c7da 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c @@ -19533,30 +19533,6 @@ fail: } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#endif -{ - XCrossingEvent _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J_FUNC); -#endif - if (arg1) if ((lparg1 = getXCrossingEventFields(env, arg1, &_arg1)) == NULL) goto fail; - memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); -fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J_FUNC); -#endif -} -#endif - #if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) @@ -19581,30 +19557,6 @@ fail: } #endif -#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) -#endif -{ - XFocusChangeEvent _arg1, *lparg1=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J_FUNC); -#endif - if (arg1) if ((lparg1 = getXFocusChangeEventFields(env, arg1, &_arg1)) == NULL) goto fail; - memmove((void *)arg0, (const void *)lparg1, (size_t)arg2); -fail: -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J_FUNC); -#endif -} -#endif - #if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1) @@ -20419,31 +20371,6 @@ fail: } #endif -#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ) && defined(JNI64)) -#ifndef JNI64 -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#else -JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) -#endif -{ - XCrossingEvent _arg0, *lparg0=NULL; -#ifndef JNI64 - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II_FUNC); -#else - OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ_FUNC); -#endif - if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail; - memmove((void *)lparg0, (const void *)arg1, (size_t)arg2); -fail: - if (arg0 && lparg0) setXCrossingEventFields(env, arg0, lparg0); -#ifndef JNI64 - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II_FUNC); -#else - OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ_FUNC); -#endif -} -#endif - #if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ) && defined(JNI64)) #ifndef JNI64 JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c index c4925aada9..5f8a83c5c5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c @@ -18,8 +18,8 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 1400; -int OS_nativeFunctionCallCount[1400]; +int OS_nativeFunctionCount = 1397; +int OS_nativeFunctionCallCount[1397]; char * OS_nativeFunctionNames[] = { #ifndef JNI64 "Call__IIII", @@ -1585,21 +1585,11 @@ char * OS_nativeFunctionNames[] = { #else "memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J", #endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I", -#else - "memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J", -#endif #ifndef JNI64 "memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I", #else "memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J", #endif -#ifndef JNI64 - "memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I", -#else - "memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J", -#endif #ifndef JNI64 "memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I", #else @@ -1770,11 +1760,6 @@ char * OS_nativeFunctionNames[] = { #else "memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ", #endif -#ifndef JNI64 - "memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II", -#else - "memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ", -#endif #ifndef JNI64 "memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II", #else diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h index fbcff1ec73..cea6896104 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h @@ -1593,21 +1593,11 @@ typedef enum { #else memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J_FUNC, #endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I_FUNC, -#else - memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J_FUNC, -#endif #ifndef JNI64 memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I_FUNC, #else memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J_FUNC, #endif -#ifndef JNI64 - memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I_FUNC, -#else - memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J_FUNC, -#endif #ifndef JNI64 memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I_FUNC, #else @@ -1778,11 +1768,6 @@ typedef enum { #else memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ_FUNC, #endif -#ifndef JNI64 - memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II_FUNC, -#else - memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ_FUNC, -#endif #ifndef JNI64 memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II_FUNC, #else diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java index 455e3c05f4..b65444d8b3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java @@ -1264,30 +1264,12 @@ public static final void gdk_window_remove_filter(int /*long*/ window, int /*lon * @param size cast=(size_t) */ public static final native void memmove(int /*long*/ dest, XClientMessageEvent src, int /*long*/ size); -/** - * @param dest cast=(void *) - * @param src cast=(const void *),flags=no_out - * @param size cast=(size_t) - */ -public static final native void memmove(int /*long*/ dest, XCrossingEvent src, int /*long*/ size); /** * @param dest cast=(void *) * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ public static final native void memmove(int /*long*/ dest, XExposeEvent src, int /*long*/ size); -/** - * @param dest cast=(void *) - * @param src cast=(const void *),flags=no_out - * @param size cast=(size_t) - */ -public static final native void memmove(int /*long*/ dest, XFocusChangeEvent src, int /*long*/ size); -/** - * @param dest cast=(void *),flags=no_in - * @param src cast=(const void *) - * @param size cast=(size_t) - */ -public static final native void memmove(XCrossingEvent dest, int /*long*/ src, int /*long*/ size); /** * @param dest cast=(void *),flags=no_in * @param src cast=(const void *) -- cgit