rethinkdb
diff --git a/‎WINDOWS.md‎
Lines changed: 10 additions & 3 deletions b/‎WINDOWS.md‎
Lines changed: 10 additions & 3 deletions
diff --git a/‎src/clustering/administration/logs/log_writer.cc‎
Lines changed: 2 additions & 11 deletions b/‎src/clustering/administration/logs/log_writer.cc‎
Lines changed: 2 additions & 11 deletions
@@ -6,8 +6,7 @@
 
 * CMake ("Windows Installer" from https://cmake.org/download/)
 
-* The `precompiled/` directory from a RethinkDB source tarball. It can
-  be built on Linux by running `make dist`.
+* node.js with NPM (https://nodejs.org/en/download/)
 
 * Cygwin (https://cygwin.com/install.html)
 
@@ -27,4 +26,12 @@ make -j
 ```
 
 Will first download and build the libraries that RethinkDB needs, then
-build RethinkDB itself and place it in `build\Release_x64\rethinkdb.exe`
+build RethinkDB itself and place it in `build\Release_x64\rethinkdb.exe`
+
+If `make` complains about missing files in `mk/gen`, run `mkdir mk/gen` manually.
+Then run `make -j` again.
+
+On some systems, you might get permission errors like the ones described in
+https://github.com/npm/npm/issues/10826 during the build from npm.
+Try running `npm install -g JSONStream` and then run `make -j` again to work
+around this issue.
@@ -472,20 +472,11 @@ bool fallback_log_writer_t::write(const log_message_t &msg, std::string *error_o
         flockfile(write_stream);
 #endif
 
-#ifdef _WIN32
-        DWORD bytes_written = 0;
-        BOOL res = WriteFile(filefd, console_formatted.data(), console_formatted.length(), &bytes_written, nullptr);
-        if (!res || bytes_written != console_formatted.length()) {
-            error_out->assign("cannot write to stdout/stderr: " + winerr_string(GetLastError()));
-            return false;
-        }
-#else
-        ssize_t write_res = ::write(filefd, console_formatted.data(), console_formatted.length());
-        if (write_res != static_cast<ssize_t>(console_formatted.length())) {
+        size_t write_res = ::fwrite(console_formatted.data(), 1, console_formatted.length(), write_stream);
+        if (write_res != console_formatted.length()) {
             error_out->assign("cannot write to stdout/stderr: " + errno_string(get_errno()));
             return false;
         }
-#endif
 
 #ifdef _WIN32
         // WINDOWS TODO