------------------------------------------------------------
revno: 13077
revision-id: squid3@treenet.co.nz-20131029092745-d3sjiu3gfrsa27kb
parent: kinkie@squid-cache.org-20131031111445-qbsvl9cphivvnah2
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Tue 2013-10-29 02:27:45 -0700
message:
  Fix stub_time definitions
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20131029092745-d3sjiu3gfrsa27kb
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 1fd6b9c06b9b55a351df380a445e459377d11900
# timestamp: 2013-10-31 13:57:29 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: kinkie@squid-cache.org-20131031111445-\
#   qbsvl9cphivvnah2
# 
# Begin patch
=== modified file 'src/tests/stub_time.cc'
--- src/tests/stub_time.cc	2013-10-30 18:37:05 +0000
+++ src/tests/stub_time.cc	2013-10-29 09:27:45 +0000
@@ -8,7 +8,7 @@
 double current_dtime;
 time_t squid_curtime = 0;
 
-time_t getCurrentTime(void) STUB
-int tvSubMsec(struct timeval, struct timeval) STUB
-const char * Time::FormatStrf(time_t ) STUB
-const char * Time::FormatHttpd(time_t ) STUB
+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("")