Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2004-09-22 16:28:56 +0000
committerSilenio Quarti2004-09-22 16:28:56 +0000
commit30c55536af47b73825f98cdc0680c697150e9bd0 (patch)
treebd3ef65dd0951bfeb3d1b70c9e253b3da9e24fcf /bundles
parent15fa67ba44183c304b180a2b5a8d02f1ccb15a60 (diff)
downloadeclipse.platform.swt-30c55536af47b73825f98cdc0680c697150e9bd0.tar.gz
eclipse.platform.swt-30c55536af47b73825f98cdc0680c697150e9bd0.tar.xz
eclipse.platform.swt-30c55536af47b73825f98cdc0680c697150e9bd0.zip
*** empty log message ***
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c27
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java1
5 files changed, 37 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties
index 4722d92d6b..58832a32a5 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties
@@ -3484,6 +3484,11 @@ OS_memmove__I_3II_0=cast=(void *)
OS_memmove__I_3II_1=cast=(const void *),flags=no_out critical
OS_memmove__I_3II_2=cast=(size_t)
+OS_memmove__I_3JI=
+OS_memmove__I_3JI_0=cast=(void *)
+OS_memmove__I_3JI_1=cast=(const void *),flags=no_out critical
+OS_memmove__I_3JI_2=cast=(size_t)
+
OS_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I=
OS_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I_0=cast=(void *),flags=no_in
OS_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I_1=cast=(const void *)
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 aa4a1abbbe..07ff8954d8 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
@@ -9600,6 +9600,33 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__I_3II)
}
#endif
+#ifndef NO_memmove__I_3JI
+JNIEXPORT void JNICALL OS_NATIVE(memmove__I_3JI)
+ (JNIEnv *env, jclass that, jint arg0, jlongArray arg1, jint arg2)
+{
+ jlong *lparg1=NULL;
+ OS_NATIVE_ENTER(env, that, memmove__I_3JI_FUNC);
+#ifdef JNI_VERSION_1_2
+ if (IS_JNI_1_2) {
+ if (arg1) lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL);
+ } else
+#endif
+ {
+ if (arg1) lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL);
+ }
+ memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
+#ifdef JNI_VERSION_1_2
+ if (IS_JNI_1_2) {
+ if (arg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
+ } else
+#endif
+ {
+ if (arg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, JNI_ABORT);
+ }
+ OS_NATIVE_EXIT(env, that, memmove__I_3JI_FUNC);
+}
+#endif
+
#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I
JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I)
(JNIEnv *env, jclass that, jobject arg0, jint arg1)
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 0e722176e8..00d68e765c 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 = 888;
-int OS_nativeFunctionCallCount[888];
+int OS_nativeFunctionCount = 889;
+int OS_nativeFunctionCallCount[889];
char * OS_nativeFunctionNames[] = {
"GDK_1DISPLAY",
"GDK_1PIXMAP_1XID",
@@ -791,6 +791,7 @@ char * OS_nativeFunctionNames[] = {
"memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I",
"memmove__I_3BI",
"memmove__I_3II",
+ "memmove__I_3JI",
"memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I",
"memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II",
"memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II",
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 b18b39f454..046ccefbfc 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
@@ -795,6 +795,7 @@ typedef enum {
memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I_FUNC,
memmove__I_3BI_FUNC,
memmove__I_3II_FUNC,
+ memmove__I_3JI_FUNC,
memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I_FUNC,
memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II_FUNC,
memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II_FUNC,
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 88f88f8987..e81480cf6c 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
@@ -1215,6 +1215,7 @@ public static final native void memmove(PangoLayoutLine dest, int /*long*/ src,
public static final native void memmove(PangoLayoutRun dest, int /*long*/ src, int /*long*/ size);
public static final native void memmove(PangoLogAttr dest, int /*long*/ src, int /*long*/ size);
public static final native void memmove(int /*long*/ dest, int[] src, int /*long*/ size);
+public static final native void memmove(int /*long*/ dest, long[] src, int /*long*/ size);
public static final native void memmove(int /*long*/ dest, byte[] src, int /*long*/ size);
public static final native void memmove(int[] dest, byte[] src, int /*long*/ size);
public static final native void memmove(byte[] dest, int /*long*/ src, int /*long*/ size);

Back to the top