library: Change init/deinit order to allow utils to depend on threading

2014-06-04 15:53:01 +02:00
parent c46cee6f6d
commit 965e846cc3
2 changed files with 8 additions and 4 deletions
@@ -141,12 +141,13 @@ void library_deinit()
 	{
 		lib->leak_detective->report(lib->leak_detective, detailed);
 		lib->leak_detective->destroy(lib->leak_detective);
+		lib->leak_detective = NULL;
 	}

-	arrays_deinit();
-	threads_deinit();
 	backtrace_deinit();
+	arrays_deinit();
 	utils_deinit();
+	threads_deinit();

 	free((void*)this->public.ns);
 	free(this);
@@ -269,10 +270,10 @@ bool library_init(char *settings, const char *namespace)
 	);
 	lib = &this->public;

-	utils_init();
-	backtrace_init();
 	threads_init();
+	utils_init();
 	arrays_init();
+	backtrace_init();

 #ifdef LEAK_DETECTIVE
 	lib->leak_detective = leak_detective_create();