diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-11 13:20:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-11 13:20:15 -0400 |
| commit | 5833861f62d2667eeda1ed0f6595763aa00250b0 (patch) | |
| tree | 654dcbc4cd6faf1a30d9e0ce5fbc9025d89e8f8c /src/common/util.h | |
| parent | 8731a4e148e23d8edbb7f32bdfeee30c326f33cc (diff) | |
| parent | 84f47ffc462dface8db1def322414daa43400d1c (diff) | |
| download | tor-5833861f62d2667eeda1ed0f6595763aa00250b0.tar.gz tor-5833861f62d2667eeda1ed0f6595763aa00250b0.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
Conflicts:
src/test/test_util.c
Diffstat (limited to 'src/common/util.h')
| -rw-r--r-- | src/common/util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/util.h b/src/common/util.h index a2ab0ccac8..8977d273c5 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -244,7 +244,7 @@ int64_t tv_to_msec(const struct timeval *tv); int64_t tv_to_usec(const struct timeval *tv); long tv_udiff(const struct timeval *start, const struct timeval *end); long tv_mdiff(const struct timeval *start, const struct timeval *end); -time_t tor_timegm(struct tm *tm); +int tor_timegm(const struct tm *tm, time_t *time_out); #define RFC1123_TIME_LEN 29 void format_rfc1123_time(char *buf, time_t t); int parse_rfc1123_time(const char *buf, time_t *t); |