summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@android.com>2013-01-29 21:49:36 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-29 21:49:36 -0800
commitd033739d176f8a2da99f80ef4a03bdca0649b644 (patch)
treea51a9d1ec566c005b574ad5c83b56f9fd86cbe69
parentdb9697b3b059469153e81bf9e8844fb8e23149ea (diff)
parentd40fd86ec5bdf56e8cd5a702ffc5332b6de931e4 (diff)
downloadsystem_core-d033739d176f8a2da99f80ef4a03bdca0649b644.zip
system_core-d033739d176f8a2da99f80ef4a03bdca0649b644.tar.gz
system_core-d033739d176f8a2da99f80ef4a03bdca0649b644.tar.bz2
am d40fd86e: Merge "Windows adb: initialize on to 1 in disable_tcp_nagle"
# By Ray Donnelly # Via Gerrit Code Review (1) and Ray Donnelly (1) * commit 'd40fd86ec5bdf56e8cd5a702ffc5332b6de931e4': Windows adb: initialize on to 1 in disable_tcp_nagle
-rw-r--r--adb/sysdeps_win32.c2
1 files changed, 1 insertions, 1 deletions
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 @@ int adb_socket_accept(int serverfd, struct sockaddr* addr, socklen_t *addrle
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;