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
main
Hans Wennborg 13 years ago
parent 213a68eb68
commit 26db4d971a
  1. 5
      build_detect_platform
  2. 2
      helpers/memenv/memenv_test.cc

@ -35,6 +35,11 @@ case `uname -s` in
echo "PLATFORM_CFLAGS=-D_REENTRANT -DOS_FREEBSD" >> build_config.mk echo "PLATFORM_CFLAGS=-D_REENTRANT -DOS_FREEBSD" >> build_config.mk
echo "PLATFORM_LDFLAGS=-lpthread" >> 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!" echo "Unknown platform!"
exit 1 exit 1

@ -26,7 +26,7 @@ class MemEnvTest {
}; };
TEST(MemEnvTest, Basics) { TEST(MemEnvTest, Basics) {
size_t file_size; uint64_t file_size;
WritableFile* writable_file; WritableFile* writable_file;
std::vector<std::string> children; std::vector<std::string> children;

Loading…
Cancel
Save