Skip to content

Commit e481f37

Browse files
authored
browser(firefox): fix win compile (microsoft#3275)
1 parent 5c4f067 commit e481f37

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1147
2-
Changed: [email protected] Mon Aug 3 13:14:27 PDT 2020
1+
1148
2+
Changed: [email protected] Mon Aug 3 14:40:54 PDT 2020

browser_patches/firefox/juggler/pipe/nsRemoteDebuggingPipe.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "nsRemoteDebuggingPipe.h"
66

77
#include <cstring>
8-
#if defined(OS_WIN)
8+
#if defined(_WIN32)
99
#include <io.h>
1010
#else
1111
#include <stdio.h>
@@ -29,7 +29,7 @@ const int writeFD = 4;
2929

3030
const size_t kWritePacketSize = 1 << 16;
3131

32-
#if defined(OS_WIN)
32+
#if defined(_WIN32)
3333
HANDLE readHandle;
3434
HANDLE writeHandle;
3535
#endif
@@ -38,7 +38,7 @@ size_t ReadBytes(void* buffer, size_t size, bool exact_size)
3838
{
3939
size_t bytesRead = 0;
4040
while (bytesRead < size) {
41-
#if defined(OS_WIN)
41+
#if defined(_WIN32)
4242
DWORD sizeRead = 0;
4343
bool hadError = !ReadFile(readHandle, static_cast<char*>(buffer) + bytesRead,
4444
size - bytesRead, &sizeRead, nullptr);
@@ -66,7 +66,7 @@ void WriteBytes(const char* bytes, size_t size)
6666
size_t length = size - totalWritten;
6767
if (length > kWritePacketSize)
6868
length = kWritePacketSize;
69-
#if defined(OS_WIN)
69+
#if defined(_WIN32)
7070
DWORD bytesWritten = 0;
7171
bool hadError = !WriteFile(writeHandle, bytes + totalWritten, static_cast<DWORD>(length), &bytesWritten, nullptr);
7272
#else
@@ -105,7 +105,7 @@ nsresult nsRemoteDebuggingPipe::Init(nsIRemoteDebuggingPipeClient* aClient) {
105105
MOZ_ALWAYS_SUCCEEDS(NS_NewNamedThread("Pipe Reader", getter_AddRefs(mReaderThread)));
106106
MOZ_ALWAYS_SUCCEEDS(NS_NewNamedThread("Pipe Writer", getter_AddRefs(mWriterThread)));
107107

108-
#if defined(OS_WIN)
108+
#if defined(_WIN32)
109109
readHandle = reinterpret_cast<HANDLE>(_get_osfhandle(readFD));
110110
writeHandle = reinterpret_cast<HANDLE>(_get_osfhandle(writeFD));
111111
#endif
@@ -124,7 +124,7 @@ nsresult nsRemoteDebuggingPipe::Stop() {
124124
m_terminated = true;
125125
mClient = nullptr;
126126
// Cancel pending synchronous read.
127-
#if defined(OS_WIN)
127+
#if defined(_WIN32)
128128
CancelIoEx(readHandle, nullptr);
129129
CloseHandle(readHandle);
130130
#else

0 commit comments

Comments
 (0)