Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix

* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix:
  sideband_demux(): fix decl-after-stmt
This commit is contained in:
Junio C Hamano 2011-05-16 17:01:03 -07:00
commit 1c1f046c43

View File

@ -225,11 +225,11 @@ static void print_helper_status(struct ref *ref)
static int sideband_demux(int in, int out, void *data)
{
int *fd = data;
int *fd = data, ret;
#ifdef NO_PTHREADS
close(fd[1]);
#endif
int ret = recv_sideband("send-pack", fd[0], out);
ret = recv_sideband("send-pack", fd[0], out);
close(out);
return ret;
}