diff options
| author | Hans Wennborg <hans@chromium.org> | 2011-09-26 17:37:09 +0100 |
|---|---|---|
| committer | Hans Wennborg <hans@chromium.org> | 2011-09-26 17:37:09 +0100 |
| commit | 26db4d971a15d2a7d45bef73f69ef527d164b340 (patch) | |
| tree | ea57cee493c3e70da16cfa1904c18414b5c32f55 | |
| parent | 213a68eb68ece93a8915ef18a8eba920d5a924a4 (diff) | |
| download | leveldb-26db4d971a15d2a7d45bef73f69ef527d164b340.tar.gz | |
Sync with upstream @24213649.
Adding GNU/kFreeBSD support. As requested here:
http://code.google.com/p/leveldb/issues/detail?id=38
Use uint64_t instead of size_t in MemEnvTest. As pointed out at
http://code.google.com/p/leveldb/issues/detail?id=41
| -rw-r--r-- | build_detect_platform | 5 | ||||
| -rw-r--r-- | helpers/memenv/memenv_test.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/build_detect_platform b/build_detect_platform index d1804e0..7f0df31 100644 --- a/build_detect_platform +++ b/build_detect_platform @@ -35,6 +35,11 @@ case `uname -s` in echo "PLATFORM_CFLAGS=-D_REENTRANT -DOS_FREEBSD" >> build_config.mk echo "PLATFORM_LDFLAGS=-lpthread" >> build_config.mk ;; + GNU/kFreeBSD) + PLATFORM=OS_FREEBSD + echo "PLATFORM_CFLAGS=-pthread -DOS_FREEBSD" >> build_config.mk + echo "PLATFORM_LDFLAGS=-lpthread -lrt" >> build_config.mk + ;; *) echo "Unknown platform!" exit 1 diff --git a/helpers/memenv/memenv_test.cc b/helpers/memenv/memenv_test.cc index 30b0bb0..3791dc3 100644 --- a/helpers/memenv/memenv_test.cc +++ b/helpers/memenv/memenv_test.cc @@ -26,7 +26,7 @@ class MemEnvTest { }; TEST(MemEnvTest, Basics) { - size_t file_size; + uint64_t file_size; WritableFile* writable_file; std::vector<std::string> children; |