From 2ca2a042b96cd164e1409412124f6837590166ea Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 6 May 2015 14:14:40 +0200 Subject: [PATCH] godeps: update metrics (freebsd build fix) --- Godeps/Godeps.json | 2 +- .../_workspace/src/github.com/codahale/metrics/runtime/fds.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index a6da06354..2d5fd5d00 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -63,7 +63,7 @@ }, { "ImportPath": "github.com/codahale/metrics", - "Rev": "7d3beb1b480077e77c08a6f6c65ea969f6e91420" + "Rev": "7c37910bc765e705301b159683480bdd44555c91" }, { "ImportPath": "github.com/coreos/go-semver/semver", diff --git a/Godeps/_workspace/src/github.com/codahale/metrics/runtime/fds.go b/Godeps/_workspace/src/github.com/codahale/metrics/runtime/fds.go index 8d9611f55..5a6469114 100644 --- a/Godeps/_workspace/src/github.com/codahale/metrics/runtime/fds.go +++ b/Godeps/_workspace/src/github.com/codahale/metrics/runtime/fds.go @@ -14,7 +14,9 @@ func getFDLimit() (uint64, error) { if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rlimit); err != nil { return 0, err } - return rlimit.Cur, nil + // rlimit.Cur's type is platform-dependent, so here we widen it as far as Go + // will allow by converting it to a uint64. + return uint64(rlimit.Cur), nil } func getFDUsage() (uint64, error) {