diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-26 10:30:21 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-12-03 14:29:26 +0000 |
| commit | 62178e3990b32e9c89bb7d6f06605044b31adba2 (patch) | |
| tree | d3c5c6d7040062772accd7e36816a7400a976201 /build | |
| parent | d88e6b517a9599d6202c8f55a00b88bee038a0dc (diff) | |
| download | external_chromium-62178e3990b32e9c89bb7d6f06605044b31adba2.zip external_chromium-62178e3990b32e9c89bb7d6f06605044b31adba2.tar.gz external_chromium-62178e3990b32e9c89bb7d6f06605044b31adba2.tar.bz2 | |
Merge Chromium at r66597: Fix conflicts.
build_config.h
http://src.chromium.org/viewvc/chrome?view=rev&revision=65920
pref_value_store.cc|h
http://src.chromium.org/viewvc/chrome?view=rev&revision=66426
personal_data_manager.cc
http://src.chromium.org/viewvc/chrome?view=rev&revision=65830
x509_certificate_openssl.cc
http://src.chromium.org/viewvc/chrome?view=rev&revision=66413
Change-Id: I2eab5c3e50a2fa4d79da023049681d36ca4bc0da
Diffstat (limited to 'build')
| -rw-r--r-- | build/build_config.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/build/build_config.h b/build/build_config.h index 9597eb4..960be0d 100644 --- a/build/build_config.h +++ b/build/build_config.h @@ -68,11 +68,8 @@ // For access to standard POSIXish features, use OS_POSIX instead of a // more specific macro. #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \ -<<<<<<< HEAD - defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(ANDROID) -======= - defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_NACL) ->>>>>>> chromium.org at r66597 + defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_NACL) || \ + defined(ANDROID) #define OS_POSIX 1 // Use base::DataPack for name/value pairs. #define USE_BASE_DATA_PACK 1 |