commit 53e5b242317a079a6a194e21e5e06a91ab6a23d8
author Kenny Root <kroot@android.com> Tue Jan 29 21:53:59 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 29 21:53:59 2013 -0800
tree deaa49362505467daa5d0e4b53cfa95a035f260c
parent b94fd1abcbff1eacb8a2ad79c51de21ecf8f6d65
parent 6c3d3ccfa5d1d77b80e5c7619909a48b976c69ec

am 6c3d3ccf: am d033739d: am d40fd86e: Merge "Windows adb: initialize on to 1 in disable_tcp_nagle"

# By Ray Donnelly
# Via Android Git Automerger (2) and others
* commit '6c3d3ccfa5d1d77b80e5c7619909a48b976c69ec':
  Windows adb: initialize on to 1 in disable_tcp_nagle

adb/sysdeps_win32.c

diff --git a/adb/sysdeps_win32.c b/adb/sysdeps_win32.c
index d41c42c..2105b16 100644
--- a/adb/sysdeps_win32.c
+++ b/adb/sysdeps_win32.c
@@ -781,7 +781,7 @@
 void  disable_tcp_nagle(int fd)
 {
     FH   fh = _fh_from_int(fd);
-    int  on;
+    int  on = 1;
 
     if ( !fh || fh->clazz != &_fh_socket_class )
         return;