uv: upgrade to 179f475

nodejs · Oct 22, 2011 · dd6faa5 · dd6faa5
1 parent ac379b3
commit dd6faa5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/deps/uv/src/win/fs.c b/deps/uv/src/win/fs.c
@@ -424,7 +424,7 @@ void fs__readdir(uv_fs_t* req, const wchar_t* path, int flags) {
       len = wcslen(name);
 
       if (!buf) {
-        buf = (wchar_t*)malloc(buf_size);
+        buf = (wchar_t*)malloc(buf_size * sizeof(wchar_t));
         if (!buf) {
           uv_fatal_error(ERROR_OUTOFMEMORY, "malloc");
         }
@@ -435,7 +435,7 @@ void fs__readdir(uv_fs_t* req, const wchar_t* path, int flags) {
       while ((ptr - buf) + len + 1 > buf_size) {
         buf_size *= 2;
         path2 = buf;
-        buf = (wchar_t*)realloc(buf, buf_size);
+        buf = (wchar_t*)realloc(buf, buf_size * sizeof(wchar_t));
         if (!buf) {
           uv_fatal_error(ERROR_OUTOFMEMORY, "realloc");
         }

diff --git a/deps/uv/src/win/tcp.c b/deps/uv/src/win/tcp.c
@@ -964,7 +964,7 @@ int uv_tcp_nodelay(uv_tcp_t* handle, int enable) {
 }
 
 
-int uv_tcp_keepalive(uv_tcp_t* handle, int enable, int delay) {
+int uv_tcp_keepalive(uv_tcp_t* handle, int enable, unsigned int delay) {
   uv__set_artificial_error(handle->loop, UV_ENOSYS);
   return -1;
 }
diff --git a/deps/uv/src/win/tty.c b/deps/uv/src/win/tty.c
@@ -1334,6 +1334,7 @@ static int uv_tty_write_bufs(uv_tty_t* handle, uv_buf_t bufs[], int bufcnt,
 
           case 'c':
             /* Full console reset. */
+            FLUSH_TEXT();
             uv_tty_reset(handle, error);
             ansi_parser_state = ANSI_NORMAL;
             continue;

diff --git a/deps/uv/src/win/winapi.h b/deps/uv/src/win/winapi.h
@@ -4211,6 +4211,10 @@ typedef enum _FILE_INFORMATION_CLASS {
 # define FILE_DEVICE_FILE_SYSTEM 0x00000009
 #endif
 
+#ifndef FILE_DEVICE_NETWORK
+# define FILE_DEVICE_NETWORK 0x00000012
+#endif
+
 #ifndef METHOD_BUFFERED
 # define METHOD_BUFFERED 0
 #endif

diff --git a/deps/uv/src/win/winsock.h b/deps/uv/src/win/winsock.h
@@ -27,6 +27,8 @@
 #include <ws2tcpip.h>
 #include <windows.h>
 
+#include "winapi.h"
+
 
 /*
  * MinGW is missing these too