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

* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix:
  sideband_demux(): fix decl-after-stmt

diff --cc builtin-send-pack.c
index aef47f8611a6595d93e41902f84698a607fac616,dfd3d1105d5de43c96007624170c70a4d8678064..fb110eb43000a6df87407e2e626591d0444cee66
--- 1/builtin-send-pack.c
--- 2/builtin-send-pack.c
+++ b/builtin-send-pack.c
@@@ -225,11 -374,11 +225,11 @@@ static void print_helper_status(struct 
  
  static int sideband_demux(int in, int out, void *data)
  {
-       int *fd = data;
+       int *fd = data, ret;
 -#ifndef WIN32
 +#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;
  }