diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-04-28 17:15:31 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-04-28 17:15:31 -0400 |
commit | 8b33928676bdf751010e5d660e6e6cca9a152389 (patch) | |
tree | 7157f7178764e393c6009d6e754547acef61937b /src/common/compat.h | |
parent | 88638d40ca08057e006c0dd6604a4255371acc75 (diff) | |
parent | 2dc9546eef6d748245d90b288f28ace1aa9b6f14 (diff) | |
download | tor-8b33928676bdf751010e5d660e6e6cca9a152389.tar.gz tor-8b33928676bdf751010e5d660e6e6cca9a152389.zip |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/common/compat.h')
-rw-r--r-- | src/common/compat.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/common/compat.h b/src/common/compat.h index 6d2565ac19..b658ed51a0 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -323,17 +323,8 @@ struct timeval { void tor_gettimeofday(struct timeval *timeval); -#ifdef HAVE_LOCALTIME_R -#define tor_localtime_r localtime_r -#else struct tm *tor_localtime_r(const time_t *timep, struct tm *result); -#endif - -#ifdef HAVE_GMTIME_R -#define tor_gmtime_r gmtime_r -#else struct tm *tor_gmtime_r(const time_t *timep, struct tm *result); -#endif #ifndef timeradd /** Replacement for timeradd on platforms that do not have it: sets tvout to |