TS-1194 Change conversions to build with gcc-4.6 on Solaris
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0aa9dda8 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0aa9dda8 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0aa9dda8 Branch: refs/heads/master Commit: 0aa9dda8d7cc04c0e64672060aab74eede563976 Parents: 00bb63c Author: Leif Hedstrom <[email protected]> Authored: Mon Apr 9 14:03:24 2012 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Mon Apr 9 14:03:24 2012 -0600 ---------------------------------------------------------------------- iocore/cache/Store.cc | 2 +- mgmt/Alarms.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0aa9dda8/iocore/cache/Store.cc ---------------------------------------------------------------------- diff --git a/iocore/cache/Store.cc b/iocore/cache/Store.cc index d865291..f630de3 100644 --- a/iocore/cache/Store.cc +++ b/iocore/cache/Store.cc @@ -612,7 +612,7 @@ Span::init(char *filename, int64_t size) break; default: - Warning("unknown file type '%s': %d", filename, s.st_mode); + Warning("unknown file type '%s': %" PRId64 "", filename, (int64_t)(s.st_mode)); err = "unknown file type"; goto Lfail; } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0aa9dda8/mgmt/Alarms.cc ---------------------------------------------------------------------- diff --git a/mgmt/Alarms.cc b/mgmt/Alarms.cc index 7234c46..a74585a 100644 --- a/mgmt/Alarms.cc +++ b/mgmt/Alarms.cc @@ -585,7 +585,7 @@ Alarms::execAlarmBin(const char *desc) // or -1 if there is some problem; returns 0 if child status // is not available if (waitpid(pid, &status, WNOHANG) != 0) { - Debug("alarm", "[Alarms::execAlarmBin] child pid %d has status", pid); + Debug("alarm", "[Alarms::execAlarmBin] child pid %" PRId64 " has status", (int64_t)pid); script_done = true; break; } @@ -593,7 +593,7 @@ Alarms::execAlarmBin(const char *desc) } // need to kill the child script process if it's not complete if (!script_done) { - Debug("alarm", "[Alarms::execAlarmBin] kill child pid %d", pid); + Debug("alarm", "[Alarms::execAlarmBin] kill child pid %" PRId64 "", (int64_t)pid); kill(pid, SIGKILL); waitpid(pid, &status, 0); // to reap the thread }
