diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 22:53:13 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 22:53:13 +0000 |
| commit | 1968d9778f74daa4056ddc5a18aeac5061d0314b (patch) | |
| tree | 617c16cdb81229734e92aa908bbbd7a4923088be /base/time_posix.cc | |
| parent | a24417742faf535b1a616984b03dcf8258b9f818 (diff) | |
| download | chromium_src-1968d9778f74daa4056ddc5a18aeac5061d0314b.zip chromium_src-1968d9778f74daa4056ddc5a18aeac5061d0314b.tar.gz chromium_src-1968d9778f74daa4056ddc5a18aeac5061d0314b.tar.bz2 | |
Enable parts of base_untrusted that are used by remoting client
1. base64, rand_util, threading, time and threads were previosly disabled in
base_untrusted. Remoting code depends on these parts of base, so they
need to be enabled.
2. Implemented NaCl version of rand_util.
3. Enabled glibc version of base_untrusted
BUG=134216
Review URL: https://chromiumcodereview.appspot.com/10795083
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148641 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/time_posix.cc')
| -rw-r--r-- | base/time_posix.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/time_posix.cc b/base/time_posix.cc index 5fc2c5d..c74cae5 100644 --- a/base/time_posix.cc +++ b/base/time_posix.cc @@ -189,7 +189,7 @@ Time Time::FromExploded(bool is_local, const Exploded& exploded) { // TimeTicks ------------------------------------------------------------------ // FreeBSD 6 has CLOCK_MONOLITHIC but defines _POSIX_MONOTONIC_CLOCK to -1. -#if (defined(OS_POSIX) && \ +#if (defined(OS_POSIX) && !defined(OS_NACL) && \ defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0) || \ defined(OS_BSD) || defined(OS_ANDROID) |