diff options
| author | robert.nagy@gmail.com <robert.nagy@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-12 19:58:58 +0000 |
|---|---|---|
| committer | robert.nagy@gmail.com <robert.nagy@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-12 19:58:58 +0000 |
| commit | f4a43486008ab3b72006f5609c8f5eeea84c71de (patch) | |
| tree | d7cace1b5f7b2ef19aead8a79f38ecc3a3a802ea /base | |
| parent | d97759da59ccdf1e7f728e6446cb853e20a4c8f0 (diff) | |
| download | chromium_src-f4a43486008ab3b72006f5609c8f5eeea84c71de.zip chromium_src-f4a43486008ab3b72006f5609c8f5eeea84c71de.tar.gz chromium_src-f4a43486008ab3b72006f5609c8f5eeea84c71de.tar.bz2 | |
disable GetAppOutputRestrictedSIGPIPE and enable ::vswprintf on OpenBSD
BUG=
TEST=
Review URL: http://codereview.chromium.org/8544003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109806 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/process_util_unittest.cc | 2 | ||||
| -rw-r--r-- | base/string_util_posix.h | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc index 8f6def9..452892e 100644 --- a/base/process_util_unittest.cc +++ b/base/process_util_unittest.cc @@ -739,7 +739,7 @@ TEST_F(ProcessUtilTest, GetAppOutputRestricted) { EXPECT_STREQ("", output.c_str()); } -#if !(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_OPENBSD) // TODO(benwells): GetAppOutputRestricted should terminate applications // with SIGPIPE when we have enough output. http://crbug.com/88502 TEST_F(ProcessUtilTest, GetAppOutputRestrictedSIGPIPE) { diff --git a/base/string_util_posix.h b/base/string_util_posix.h index 145d767..92ef1c2 100644 --- a/base/string_util_posix.h +++ b/base/string_util_posix.h @@ -45,15 +45,8 @@ inline int strncmp16(const char16* s1, const char16* s2, size_t count) { inline int vswprintf(wchar_t* buffer, size_t size, const wchar_t* format, va_list arguments) { -#if defined(OS_OPENBSD) - // TODO(phajdan.jr): There is a patch to add vswprintf to OpenBSD, - // http://marc.info/?l=openbsd-tech&m=130003157729839&w=2 - NOTIMPLEMENTED(); - return -1; -#else DCHECK(IsWprintfFormatPortable(format)); return ::vswprintf(buffer, size, format, arguments); -#endif } } // namespace base |