diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2015-05-02 08:50:27 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2015-05-02 08:50:27 +0800 |
| commit | 9e66a4dddc4a3b9f28af7b783dd56b0f81d079aa (patch) | |
| tree | de4de2fd814061ed8c78fb80efdfd92efe082e54 /databases/rocksdb | |
| parent | 29eb7a103637f3ea8427473635e10d9342114378 (diff) | |
| download | freebsd-ports-gnome-9e66a4dddc4a3b9f28af7b783dd56b0f81d079aa.tar.gz freebsd-ports-gnome-9e66a4dddc4a3b9f28af7b783dd56b0f81d079aa.tar.zst freebsd-ports-gnome-9e66a4dddc4a3b9f28af7b783dd56b0f81d079aa.zip | |
- Fix build on i386
- Regenerate patch file with makepatch:
MFH: 2015Q2
Diffstat (limited to 'databases/rocksdb')
| -rw-r--r-- | databases/rocksdb/files/patch-util-logging.cc | 15 | ||||
| -rw-r--r-- | databases/rocksdb/files/patch-util-thread_local.cc | 4 |
2 files changed, 17 insertions, 2 deletions
diff --git a/databases/rocksdb/files/patch-util-logging.cc b/databases/rocksdb/files/patch-util-logging.cc new file mode 100644 index 000000000000..7124a942d287 --- /dev/null +++ b/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); diff --git a/databases/rocksdb/files/patch-util-thread_local.cc b/databases/rocksdb/files/patch-util-thread_local.cc index 38175ca0dd91..73c60ee324ce 100644 --- a/databases/rocksdb/files/patch-util-thread_local.cc +++ b/databases/rocksdb/files/patch-util-thread_local.cc @@ -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. |