Index: head/databases/rocksdb/files/patch-util-logging.cc =================================================================== --- head/databases/rocksdb/files/patch-util-logging.cc (nonexistent) +++ head/databases/rocksdb/files/patch-util-logging.cc (revision 385160) @@ -0,0 +1,15 @@ +--- util/logging.cc.orig 2015-03-25 21:40:41 UTC ++++ util/logging.cc +@@ -35,10 +35,10 @@ int AppendHumanMicros(uint64_t micros, c + } else if (micros < 10000000) { + return snprintf(output, len, "%.3lf ms", + static_cast(micros) / 1000); +- } else if (micros < 1000000l * 60) { ++ } else if (micros < 1000000LL * 60) { + return snprintf(output, len, "%.3lf sec", + static_cast(micros) / 1000000); +- } else if (micros < 1000000l * 60 * 60) { ++ } else if (micros < 1000000LL * 60 * 60) { + return snprintf(output, len, "%02" PRIu64 ":%05.3f M:S", + micros / 1000000 / 60, + static_cast(micros % 60000000) / 1000000); Property changes on: head/databases/rocksdb/files/patch-util-logging.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/rocksdb/files/patch-util-thread_local.cc =================================================================== --- head/databases/rocksdb/files/patch-util-thread_local.cc (revision 385159) +++ head/databases/rocksdb/files/patch-util-thread_local.cc (revision 385160) @@ -1,11 +1,11 @@ ---- util/thread_local.cc.orig 2015-02-10 05:49:22.000000000 +0800 -+++ util/thread_local.cc 2015-02-21 15:54:52.950817216 +0800 +--- util/thread_local.cc.orig 2015-03-25 21:40:41 UTC ++++ util/thread_local.cc @@ -7,6 +7,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. +#include + #include "util/thread_local.h" #include "util/mutexlock.h" #include "port/likely.h"