Skip to content

browser(firefox): fix win compile #3275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yury-s merged 1 commit into from
Aug 3, 2020
Merged

browser(firefox): fix win compile #3275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions browser_patches/firefox/BUILD_NUMBER
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1147
Changed: [email protected] Mon Aug 3 13:14:27 PDT 2020
1148
Changed: [email protected] Mon Aug 3 14:40:54 PDT 2020
12 changes: 6 additions & 6 deletions browser_patches/firefox/juggler/pipe/nsRemoteDebuggingPipe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "nsRemoteDebuggingPipe.h"

#include <cstring>
#if defined(OS_WIN)
#if defined(_WIN32)
#include <io.h>
#else
#include <stdio.h>
Expand All @@ -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
Expand All @@ -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<char*>(buffer) + bytesRead,
size - bytesRead, &sizeRead, nullptr);
Expand Down Expand Up @@ -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<DWORD>(length), &bytesWritten, nullptr);
#else
Expand Down Expand Up @@ -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<HANDLE>(_get_osfhandle(readFD));
writeHandle = reinterpret_cast<HANDLE>(_get_osfhandle(writeFD));
#endif
Expand All @@ -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
Expand Down