diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-11 12:10:14 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-11 12:10:14 -0500 |
| commit | f729e1e984896a9d6852768a8e5528932f668ac3 (patch) | |
| tree | f6e1aa68ec9e5f6875a06224333b96b8f7938b2e /src/common/util.h | |
| parent | f37181620951d2e7a13f1363386563115d628761 (diff) | |
| parent | b5af456685b502462385b5f1b7f22f4374822fe1 (diff) | |
| download | tor-f729e1e984896a9d6852768a8e5528932f668ac3.tar.gz tor-f729e1e984896a9d6852768a8e5528932f668ac3.zip | |
Merge branch 'feature3457-v4-nm-squashed'
Conflicts:
src/or/rendclient.c
Diffstat (limited to 'src/common/util.h')
| -rw-r--r-- | src/common/util.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/common/util.h b/src/common/util.h index 3a68f3993d..cbc56d0816 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -238,8 +238,11 @@ time_t tor_timegm(struct tm *tm); void format_rfc1123_time(char *buf, time_t t); int parse_rfc1123_time(const char *buf, time_t *t); #define ISO_TIME_LEN 19 +#define ISO_TIME_USEC_LEN (ISO_TIME_LEN+7) void format_local_iso_time(char *buf, time_t t); void format_iso_time(char *buf, time_t t); +void format_iso_time_nospace(char *buf, time_t t); +void format_iso_time_nospace_usec(char *buf, const struct timeval *tv); int parse_iso_time(const char *buf, time_t *t); int parse_http_time(const char *buf, struct tm *tm); int format_time_interval(char *out, size_t out_len, long interval); |