tqcq/leveldb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more upstream changes

Browse Source 
git-svn-id: https://leveldb.googlecode.com/svn/trunk@10 62dab493-f737-651d-591e-8d6aee1b9529
This commit is contained in:
jorlow@chromium.org 2011-03-21 21:06:49 +00:00
parent 0e38925490
commit 4bcb231187
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
port/port_chromium.cc
View File

@ -8,7 +8,6 @@
#if defined(USE_SNAPPY) #if defined(USE_SNAPPY)
# include "third_party/snappy/src/snappy.h" # include "third_party/snappy/src/snappy.h"
# include "snappy-stubs-public.h"
#endif #endif
namespace leveldb { namespace leveldb {

6
util/env_chromium.cc
View File

@ -594,10 +594,8 @@ void ChromiumEnv::StartThread(void (*function)(void* arg), void* arg) {
new Thread(function, arg); // Will self-delete. new Thread(function, arg); // Will self-delete.
} }
// TODO(jorlow): This won't co-exist with Chrome. Need to find a better way. ::base::LazyInstance<ChromiumEnv, ::base::LeakyLazyInstanceTraits<ChromiumEnv> >
::base::AtExitManager exit_manager; default_env(::base::LINKER_INITIALIZED);
::base::LazyInstance<ChromiumEnv> default_env(::base::LINKER_INITIALIZED);
} }