Merge branch 'PHP-7.0'

weltling · weltling · commit 628272ee6cf3 · 2016-06-06T07:34:34.000+02:00
* PHP-7.0:
  missing return
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c
@@ -672,6 +672,8 @@ mbfl_filt_conv_wchar_jis2004(int c, mbfl_convert_filter *filter) {
 			CK(mbfl_filt_conv_illegal_output(c, filter));
 		}
 	}
+
+	return c;
 }
 
 int

Original file line number	Diff line number	Diff line change
`@@ -672,6 +672,8 @@ mbfl_filt_conv_wchar_jis2004(int c, mbfl_convert_filter *filter) {`
`672`	`672`	`CK(mbfl_filt_conv_illegal_output(c, filter));`
`673`	`673`	`}`
`674`	`674`	`}`
	`675`	`+`
	`676`	`+ return c;`
`675`	`677`	`}`
`676`	`678`
`677`	`679`	`int`