Merge pull request #800 from tenderlove/compiler-error

tenderlove · web-flow · commit f26ed3e2fe39 · 2019-05-28T10:44:50.000-07:00
Unlock GVL callback should be `void *(*)(void *)`
diff --git a/ext/rugged/rugged_diff.c b/ext/rugged/rugged_diff.c
@@ -204,12 +204,14 @@ struct nogvl_diff_patch_args {
 	VALUE rb_str;
 };
 
-static void rb_git_diff_patch_nogvl(void * _args)
+static void * rb_git_diff_patch_nogvl(void * _args)
 {
 	struct nogvl_diff_patch_args * args;
 
 	args = (struct nogvl_diff_patch_args *)_args;
 	git_diff_print(args->diff, args->format, diff_print_cb, (void*) args->rb_str);
+
+        return NULL;
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -204,12 +204,14 @@ struct nogvl_diff_patch_args {`
`204`	`204`	`VALUE rb_str;`
`205`	`205`	`};`
`206`	`206`
`207`		`-static void rb_git_diff_patch_nogvl(void * _args)`
	`207`	`+static void * rb_git_diff_patch_nogvl(void * _args)`
`208`	`208`	`{`
`209`	`209`	`struct nogvl_diff_patch_args * args;`
`210`	`210`
`211`	`211`	`args = (struct nogvl_diff_patch_args *)_args;`
`212`	`212`	`git_diff_print(args->diff, args->format, diff_print_cb, (void*) args->rb_str);`
	`213`	`+`
	`214`	`+ return NULL;`
`213`	`215`	`}`
`214`	`216`
`215`	`217`	`/*`