third_party/crashpad/crashpad/util/posix/close_multiple.cc - Issue 2773813002: Update Crashpad to 8e37886d418dd042c3c7bfadac99214739ee4d98

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: third_party/crashpad/crashpad/util/posix/close_multiple.cc

Issue 2773813002: Update Crashpad to 8e37886d418dd042c3c7bfadac99214739ee4d98 (Closed)

Patch Set: Update Crashpad to 8e37886d418dd042c3c7bfadac99214739ee4d98 Created 3 years, 9 months 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: third_party/crashpad/crashpad/util/posix/close_multiple.cc

diff --git a/third_party/crashpad/crashpad/util/posix/close_multiple.cc b/third_party/crashpad/crashpad/util/posix/close_multiple.cc

index 172a8f0215baa409d3a8654d641351c9f5f9aa2c..3749191b8dc1074ee8c55c74d645c228109ca8bb 100644

--- a/third_party/crashpad/crashpad/util/posix/close_multiple.cc

+++ b/third_party/crashpad/crashpad/util/posix/close_multiple.cc

@@ -179,7 +179,7 @@ void CloseMultipleNowOrOnExec(int fd, int preserve_fd) {

max_fd = std::max(max_fd, getdtablesize());

#endif

-#if !defined(OS_LINUX) || defined(OPEN_MAX)

+#if !(defined(OS_LINUX) || defined(OS_ANDROID)) || defined(OPEN_MAX)

// Linux does not provide OPEN_MAX. See

// https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/include/linux/limits.h?id=77293034696e3e0b6c8b8fc1f96be091104b3d2b.

max_fd = std::max(max_fd, OPEN_MAX);