commit 6c3d3ccfa5d1d77b80e5c7619909a48b976c69ec
author Kenny Root <kroot@android.com> Tue Jan 29 21:52:07 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 29 21:52:07 2013 -0800
tree 3e552c3f3f687e32f90fb0cd9285b5375e1195bd
parent 76dd8e33689292e6255b090da7408fba76919424
parent d033739d176f8a2da99f80ef4a03bdca0649b644

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

# By Ray Donnelly
# Via Android Git Automerger (1) and others
* commit 'd033739d176f8a2da99f80ef4a03bdca0649b644':
  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;