aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Fleischer <fleiben@gmail.com>2016-02-18 20:15:46 +0100
committerNikhil Benesch <nikhil.benesch@gmail.com>2016-07-28 12:25:37 -0400
commite178150a7225957a328992b39030bb3973b04463 (patch)
tree9bdf1f7c14309b0a6522b4eea352a7766c35c46c
parentc63acf3dd7fd2509b71a70d85b5a6813cc9ab627 (diff)
downloadsshfs-e178150a7225957a328992b39030bb3973b04463.tar
sshfs-e178150a7225957a328992b39030bb3973b04463.tar.gz
sshfs-e178150a7225957a328992b39030bb3973b04463.tar.bz2
sshfs-e178150a7225957a328992b39030bb3973b04463.zip
Remove call to g_slice_set_config()
It is unclear why G_SLICE_CONFIG_ALWAYS_MALLOC has been set before but doing so with the latest version of GLib (2.46.2) results in the following warning: GLib-CRITICAL **: g_slice_set_config: assertion 'sys_page_size == 0' failed This fixes issue osxfuse/sshfs#17
-rw-r--r--sshfs.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sshfs.c b/sshfs.c
index ce38925..77f3dbf 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -3949,9 +3949,6 @@ int main(int argc, char *argv[])
if (!realpath(*exec_path, sshfs_program_path)) {
memset(sshfs_program_path, 0, PATH_MAX);
}
-
- /* Until this gets fixed somewhere else. */
- g_slice_set_config(G_SLICE_CONFIG_ALWAYS_MALLOC, TRUE);
#endif /* __APPLE__ */
g_thread_init(NULL);