------------------------------------------------------------ revno: 13103 revision-id: kinkie@squid-cache.org-20131031153139-773ikpfhd47ktljy parent: squid3@treenet.co.nz-20131029105107-x250k5gtt765fc13 committer: Francesco Chemolli branch nick: trunk timestamp: Thu 2013-10-31 16:31:39 +0100 message: Fix typo in stub_time.cc ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kinkie@squid-cache.org-20131031153139-773ikpfhd47ktljy # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: a6addaef12a464c733e56113aca3c79e3e27cc74 # timestamp: 2013-10-31 15:55:22 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20131029105107-\ # x250k5gtt765fc13 # # Begin patch === modified file 'src/tests/stub_time.cc' --- src/tests/stub_time.cc 2013-10-29 09:27:45 +0000 +++ src/tests/stub_time.cc 2013-10-31 15:31:39 +0000 @@ -8,7 +8,7 @@ double current_dtime; time_t squid_curtime = 0; -time_t getCurrentTime(void) STUB__RETVAL(0) +time_t getCurrentTime(void) STUB_RETVAL(0) int tvSubMsec(struct timeval, struct timeval) STUB_RETVAL(0) const char * Time::FormatStrf(time_t ) STUB_RETVAL("") const char * Time::FormatHttpd(time_t ) STUB_RETVAL("")