diff options
| author | djm <> | 2010-10-01 22:59:01 +0000 |
|---|---|---|
| committer | djm <> | 2010-10-01 22:59:01 +0000 |
| commit | 8922d4bc4a8b8893d72a48deb2cdf58215f98505 (patch) | |
| tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/o_time.h | |
| parent | 76262f7bf9262f965142b1b2b2105cb279c5c696 (diff) | |
| download | openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.gz openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.bz2 openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.zip | |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/o_time.h')
| -rw-r--r-- | src/lib/libcrypto/o_time.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/libcrypto/o_time.h b/src/lib/libcrypto/o_time.h index e66044626d..e391da7508 100644 --- a/src/lib/libcrypto/o_time.h +++ b/src/lib/libcrypto/o_time.h | |||
| @@ -62,5 +62,6 @@ | |||
| 62 | #include <time.h> | 62 | #include <time.h> |
| 63 | 63 | ||
| 64 | struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result); | 64 | struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result); |
| 65 | int OPENSSL_gmtime_adj(struct tm *tm, int offset_day, long offset_sec); | ||
| 65 | 66 | ||
| 66 | #endif | 67 | #endif |