Diff between 784607f89c9d6956420f252965ce3ce8a0b13017 and 1c6f080d7f408042acee779b47cfcaf9dced1594

Changed Files

File Additions Deletions Status
configure.ac +0 -8 modified
obexd/src/main.c +0 -7 modified
obexd/src/plugin.c +0 -5 modified

Full Patch

diff --git a/configure.ac b/configure.ac
index ab2c671..52689b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,14 +83,6 @@ AC_CHECK_DECLS([basename], [],
 
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.36)
-
-if (test "${enable_threads}" = "yes"); then
-	AC_DEFINE(NEED_THREADS, 1, [Define if threading support is required])
-	PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.16)
-	GLIB_CFLAGS="$GLIB_CFLAGS $GTHREAD_CFLAGS"
-	GLIB_LIBS="$GLIB_LIBS $GTHREAD_LIBS"
-fi
-
 PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.10)
 
 AC_ARG_WITH([dbusconfdir], AS_HELP_STRING([--with-dbusconfdir=DIR],
diff --git a/obexd/src/main.c b/obexd/src/main.c
index 6837f0d..5114104 100644
--- a/obexd/src/main.c
+++ b/obexd/src/main.c
@@ -285,13 +285,6 @@ int main(int argc, char *argv[])
 
 	signal = setup_signalfd();
 
-#ifdef NEED_THREADS
-	if (dbus_threads_init_default() == FALSE) {
-		fprintf(stderr, "Can't init usage of threads\n");
-		exit(EXIT_FAILURE);
-	}
-#endif
-
 	if (manager_init() == FALSE) {
 		error("manager_init failed");
 		exit(EXIT_FAILURE);
diff --git a/obexd/src/plugin.c b/obexd/src/plugin.c
index 1432778..15df99b 100644
--- a/obexd/src/plugin.c
+++ b/obexd/src/plugin.c
@@ -28,12 +28,7 @@
  * will crash on exit. This is a bug inside these libraries, but there is
  * nothing much that can be done about it. One bad example is libebook.
  */
-#ifdef NEED_THREADS
 #define PLUGINFLAG (RTLD_NOW | RTLD_NODELETE)
-#else
-#define PLUGINFLAG (RTLD_NOW)
-#endif
-
 #define IS_ENABLED(x) (x)
 
 static GSList *plugins = NULL;