am 4c6c6d1c: Merge "You either have winsock or <sys/sockets.h>."

* commit '4c6c6d1c7ed7d8481d717f949c18657efa5533af': You either have winsock or <sys/sockets.h>.
2015-01-09 22:02:26 +00:00 · 2015-01-09 22:02:26 +00:00 · 55410c4e62
parent 8e9407506f 4c6c6d1c7e
commit 55410c4e62
1 changed files with 1 additions and 1 deletions
--- a/include/cutils/sockets.h
+++ b/include/cutils/sockets.h
@ -25,7 +25,7 @@
 #ifdef HAVE_WINSOCK
 #include <winsock2.h>
 typedef int  socklen_t;
-#elif HAVE_SYS_SOCKET_H
+#else
 #include <sys/socket.h>
 #endif