diff --git a/browser_patches/firefox/BUILD_NUMBER b/browser_patches/firefox/BUILD_NUMBER index 61e24b86d6..23d019ba5b 100644 --- a/browser_patches/firefox/BUILD_NUMBER +++ b/browser_patches/firefox/BUILD_NUMBER @@ -1,2 +1,2 @@ -1147 -Changed: dgozman@gmail.com Mon Aug 3 13:14:27 PDT 2020 +1148 +Changed: dgozman@gmail.com Mon Aug 3 14:40:54 PDT 2020 diff --git a/browser_patches/firefox/juggler/pipe/nsRemoteDebuggingPipe.cpp b/browser_patches/firefox/juggler/pipe/nsRemoteDebuggingPipe.cpp index 47e78365a8..48d0d54fac 100644 --- a/browser_patches/firefox/juggler/pipe/nsRemoteDebuggingPipe.cpp +++ b/browser_patches/firefox/juggler/pipe/nsRemoteDebuggingPipe.cpp @@ -5,7 +5,7 @@ #include "nsRemoteDebuggingPipe.h" #include -#if defined(OS_WIN) +#if defined(_WIN32) #include #else #include @@ -29,7 +29,7 @@ const int writeFD = 4; const size_t kWritePacketSize = 1 << 16; -#if defined(OS_WIN) +#if defined(_WIN32) HANDLE readHandle; HANDLE writeHandle; #endif @@ -38,7 +38,7 @@ size_t ReadBytes(void* buffer, size_t size, bool exact_size) { size_t bytesRead = 0; while (bytesRead < size) { -#if defined(OS_WIN) +#if defined(_WIN32) DWORD sizeRead = 0; bool hadError = !ReadFile(readHandle, static_cast(buffer) + bytesRead, size - bytesRead, &sizeRead, nullptr); @@ -66,7 +66,7 @@ void WriteBytes(const char* bytes, size_t size) size_t length = size - totalWritten; if (length > kWritePacketSize) length = kWritePacketSize; -#if defined(OS_WIN) +#if defined(_WIN32) DWORD bytesWritten = 0; bool hadError = !WriteFile(writeHandle, bytes + totalWritten, static_cast(length), &bytesWritten, nullptr); #else @@ -105,7 +105,7 @@ nsresult nsRemoteDebuggingPipe::Init(nsIRemoteDebuggingPipeClient* aClient) { MOZ_ALWAYS_SUCCEEDS(NS_NewNamedThread("Pipe Reader", getter_AddRefs(mReaderThread))); MOZ_ALWAYS_SUCCEEDS(NS_NewNamedThread("Pipe Writer", getter_AddRefs(mWriterThread))); -#if defined(OS_WIN) +#if defined(_WIN32) readHandle = reinterpret_cast(_get_osfhandle(readFD)); writeHandle = reinterpret_cast(_get_osfhandle(writeFD)); #endif @@ -124,7 +124,7 @@ nsresult nsRemoteDebuggingPipe::Stop() { m_terminated = true; mClient = nullptr; // Cancel pending synchronous read. -#if defined(OS_WIN) +#if defined(_WIN32) CancelIoEx(readHandle, nullptr); CloseHandle(readHandle); #else