Date: Sat, 2 May 2015 00:50:28 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385160 - head/databases/rocksdb/files Message-ID: <201505020050.t420oSQ2091231@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sat May 2 00:50:27 2015 New Revision: 385160 URL: https://svnweb.freebsd.org/changeset/ports/385160 Log: - Fix build on i386 - Regenerate patch file with makepatch: MFH: 2015Q2 Added: head/databases/rocksdb/files/patch-util-logging.cc (contents, props changed) Modified: head/databases/rocksdb/files/patch-util-thread_local.cc Added: head/databases/rocksdb/files/patch-util-logging.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/rocksdb/files/patch-util-logging.cc Sat May 2 00:50:27 2015 (r385160) @@ -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<double>(micros) / 1000); +- } else if (micros < 1000000l * 60) { ++ } else if (micros < 1000000LL * 60) { + return snprintf(output, len, "%.3lf sec", + static_cast<double>(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<double>(micros % 60000000) / 1000000); Modified: head/databases/rocksdb/files/patch-util-thread_local.cc ============================================================================== --- head/databases/rocksdb/files/patch-util-thread_local.cc Sat May 2 00:22:17 2015 (r385159) +++ head/databases/rocksdb/files/patch-util-thread_local.cc Sat May 2 00:50:27 2015 (r385160) @@ -1,5 +1,5 @@ ---- 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505020050.t420oSQ2091231>