diff options
| author | Gerald Carter <jerry@samba.org> | 2006-06-08 20:07:34 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2006-06-08 20:07:34 +0000 |
| commit | 3a5cc58fde0d53d83d46e37f80670ad6bd67f892 (patch) | |
| tree | af90a90140ba6578e973247176d40c6af54a167a /source/lib/time.c | |
| parent | a1b3f2f9bac039395fa20f0be779367f7e23400a (diff) | |
| download | samba-3a5cc58fde0d53d83d46e37f80670ad6bd67f892.tar.gz samba-3a5cc58fde0d53d83d46e37f80670ad6bd67f892.tar.xz samba-3a5cc58fde0d53d83d46e37f80670ad6bd67f892.zip | |
r16104: Set version to 3.0.23rc2
Bring release tree up to current 3.0 tree
(svn merge -r15845:16103 $SVNURL/branches/SAMBA_3_0)
Diffstat (limited to 'source/lib/time.c')
| -rw-r--r-- | source/lib/time.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/lib/time.c b/source/lib/time.c index 749af37cae0..f8a1538910c 100644 --- a/source/lib/time.c +++ b/source/lib/time.c @@ -153,7 +153,6 @@ void get_process_uptime(struct timeval *ret_time) GetTimeOfDay(&time_now_hires); ret_time->tv_sec = time_now_hires.tv_sec - start_time_hires.tv_sec; - ret_time->tv_usec = time_now_hires.tv_usec - start_time_hires.tv_usec; if (time_now_hires.tv_usec < start_time_hires.tv_usec) { ret_time->tv_sec -= 1; ret_time->tv_usec = 1000000 + (time_now_hires.tv_usec - start_time_hires.tv_usec); |