svn commit: r385242 - branches/2015Q2/databases/rocksdb/files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sun May  3 10:59:29 2015
New Revision: 385242
URL: https://svnweb.freebsd.org/changeset/ports/385242

Log:
  MFH: r385160
  
  - Fix build on i386
  - Regenerate patch file with makepatch:
  
  Approved by:	ports-secteam (zi)

Added:
  branches/2015Q2/databases/rocksdb/files/patch-util-logging.cc
     - copied unchanged from r385160, head/databases/rocksdb/files/patch-util-logging.cc
Modified:
  branches/2015Q2/databases/rocksdb/files/patch-util-thread_local.cc
Directory Properties:
  branches/2015Q2/   (props changed)

Copied: branches/2015Q2/databases/rocksdb/files/patch-util-logging.cc (from r385160, head/databases/rocksdb/files/patch-util-logging.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q2/databases/rocksdb/files/patch-util-logging.cc	Sun May  3 10:59:29 2015	(r385242, copy of r385160, head/databases/rocksdb/files/patch-util-logging.cc)
@@ -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: branches/2015Q2/databases/rocksdb/files/patch-util-thread_local.cc
==============================================================================
--- branches/2015Q2/databases/rocksdb/files/patch-util-thread_local.cc	Sun May  3 10:59:08 2015	(r385241)
+++ branches/2015Q2/databases/rocksdb/files/patch-util-thread_local.cc	Sun May  3 10:59:29 2015	(r385242)
@@ -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.