Fix bad merge

bigbes · bigbes · commit 2016f8aa2ab2 · 2016-04-18T20:29:15.000+03:00
diff --git a/src/tarantool.c b/src/tarantool.c
@@ -121,7 +121,7 @@ tarantool_stream_send(tarantool_object *obj TSRMLS_DC) {
  * See https://bugs.launchpad.net/tarantool/+bug/1182474
  */
 static size_t
-tarantool_stream_read(tarantool_connection *obj, char *buf, size_t size) {
+tarantool_stream_read(tarantool_object *obj, char *buf, size_t size) {
 	return tntll_stream_read2(obj->stream, buf, size);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ tarantool_stream_send(tarantool_object *obj TSRMLS_DC) {`
`121`	`121`	`* See https://bugs.launchpad.net/tarantool/+bug/1182474`
`122`	`122`	`*/`
`123`	`123`	`static size_t`
`124`		`-tarantool_stream_read(tarantool_connection obj, char buf, size_t size) {`
	`124`	`+tarantool_stream_read(tarantool_object obj, char buf, size_t size) {`
`125`	`125`	`return tntll_stream_read2(obj->stream, buf, size);`
`126`	`126`	`}`
`127`	`127`