Bug 509258 - Remove dlclose/dlsym bindings
Not used and generally not good idea to use them in the Java code.
Change-Id: I42336a28051e55e70901d69bc6e674dfd4fa9745
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
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 75e7811..786c2f6 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
@@ -1731,18 +1731,6 @@
}
#endif
-#ifndef NO__1dlclose
-JNIEXPORT jint JNICALL OS_NATIVE(_1dlclose)
- (JNIEnv *env, jclass that, jintLong arg0)
-{
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1dlclose_FUNC);
- rc = (jint)dlclose((void *)arg0);
- OS_NATIVE_EXIT(env, that, _1dlclose_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO__1dlopen
JNIEXPORT jintLong JNICALL OS_NATIVE(_1dlopen)
(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
@@ -1759,22 +1747,6 @@
}
#endif
-#ifndef NO__1dlsym
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1dlsym)
- (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
-{
- jbyte *lparg1=NULL;
- jintLong rc = 0;
- OS_NATIVE_ENTER(env, that, _1dlsym_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- rc = (jintLong)dlsym((void *)arg0, (const char *)lparg1);
-fail:
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1dlsym_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO__1g_1app_1info_1create_1from_1commandline
JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1create_1from_1commandline)
(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
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 a30205a..59fa7d1 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
@@ -178,9 +178,7 @@
"_1call__JJJJJJJJ",
#endif
"_1call_1get_1size",
- "_1dlclose",
"_1dlopen",
- "_1dlsym",
"_1g_1app_1info_1create_1from_1commandline",
"_1g_1app_1info_1get_1all",
"_1g_1app_1info_1get_1default_1for_1type",
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 ffeece9..c054825 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
@@ -188,9 +188,7 @@
_1call__JJJJJJJJ_FUNC,
#endif
_1call_1get_1size_FUNC,
- _1dlclose_FUNC,
_1dlopen_FUNC,
- _1dlsym_FUNC,
_1g_1app_1info_1create_1from_1commandline_FUNC,
_1g_1app_1info_1get_1all_FUNC,
_1g_1app_1info_1get_1default_1for_1type_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 e7dbea0..e3f60bd 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
@@ -1687,16 +1687,6 @@
lock.unlock();
}
}
-/** @param handle cast=(void *) */
-public static final native int _dlclose(long /*int*/ handle);
-public static final int dlclose(long /*int*/ handle) {
- lock.lock();
- try {
- return _dlclose(handle);
- } finally {
- lock.unlock();
- }
-}
/** @param filename cast=(const char *) */
public static final native long /*int*/ _dlopen(byte[] filename, int flag);
public static final long /*int*/ dlopen(byte[] filename, int flag) {
@@ -1708,19 +1698,6 @@
}
}
/**
- * @param handle cast=(void *)
- * @param symbol cast=(const char *)
- */
-public static final native long /*int*/ _dlsym(long /*int*/ handle, byte[] symbol);
-public static final long /*int*/ dlsym(long /*int*/ handle, byte[] symbol) {
- lock.lock();
- try {
- return _dlsym(handle, symbol);
- } finally {
- lock.unlock();
- }
-}
-/**
* @param commandline cast=(gchar *)
* @param applName cast=(gchar *)
* @param flags cast=(GAppInfoCreateFlags)
