content/common/pepper_file_util.cc - Issue 1422773008: Fixing remaining VC++ 2015 64-bit build breaks

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/pepper_file_util.cc

Issue 1422773008: Fixing remaining VC++ 2015 64-bit build breaks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Adding #ifdefs Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/common/pepper_file_util.cc

diff --git a/content/common/pepper_file_util.cc b/content/common/pepper_file_util.cc

index 6264faa5374422e65609de14913359318e0b66fa..bebd7f7690d5bbd6a4e95c6b2f060cdd653682bf 100644

--- a/content/common/pepper_file_util.cc

+++ b/content/common/pepper_file_util.cc

@@ -3,6 +3,7 @@

// found in the LICENSE file.

#include "content/common/pepper_file_util.h"

+#include "ppapi/shared_impl/platform_file.h"

namespace content {

@@ -23,7 +24,7 @@ storage::FileSystemType PepperFileSystemTypeToFileSystemType(

int IntegerFromSyncSocketHandle(

const base::SyncSocket::Handle& socket_handle) {

#if defined(OS_WIN)

- return reinterpret_cast<int>(socket_handle);

+ return ppapi::PlatformFileToInt(socket_handle);

Will Harris 2015/11/11 23:49:35 looks like this could call down to ppapi::Platform

brucedawson 2015/11/12 02:04:24 Good point.

#elif defined(OS_POSIX)

return socket_handle;

#else

« no previous file with comments | « content/child/npapi/webplugin_delegate_impl_win.cc ('k') | content/common/sandbox_win.cc » ('j') | no next file with comments »