------------------------------------------------------------ revno: 11449 revision-id: kinkie@squid-cache.org-20110526112819-ukbke6sosu8a5t1l parent: squid3@treenet.co.nz-20110526033826-nnla6zjroxvvykna committer: Francesco Chemolli branch nick: trunk timestamp: Thu 2011-05-26 13:28:19 +0200 message: Portability fix for OpenBSD in time quota external acl helper. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kinkie@squid-cache.org-20110526112819-ukbke6sosu8a5t1l # target_branch: http://www.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 9826c4c697c9eb9de983aa4d1374325250063849 # timestamp: 2011-05-26 11:52:50 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20110526033826-\ # nnla6zjroxvvykna # # Begin patch === modified file 'helpers/external_acl/time_quota/ext_time_quota_acl.cc' --- helpers/external_acl/time_quota/ext_time_quota_acl.cc 2011-05-10 00:12:40 +0000 +++ helpers/external_acl/time_quota/ext_time_quota_acl.cc 2011-05-26 11:28:19 +0000 @@ -96,7 +96,8 @@ { time_t now = time(NULL); - fprintf(logfile, "%ld %s| %s: ", now, program_name, level); + fprintf(logfile, "%ld %s| %s: ", static_cast(now), + program_name, level); vfprintf (logfile, format, args); fflush(logfile); }