diff options
| author | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:24:08 +0900 |
|---|---|---|
| committer | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:25:02 +0900 |
| commit | 8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8 (patch) | |
| tree | 81f0750d91aa467df3ee81cf30d22a65db2e6685 /ares__timeval.c | |
| parent | ccccebb78520ec3a26a18370936516b12ae5d53a (diff) | |
| parent | 45e88a8337839e5fd88519bc55467053d521c9f6 (diff) | |
| download | c-ares-accepted/tizen/4.0/base/20170828.221324.tar.gz c-ares-accepted/tizen/4.0/base/20170828.221324.tar.bz2 c-ares-accepted/tizen/4.0/base/20170828.221324.zip | |
Merge branch 'tizen' into tizen_basetizen_4.0.m2_releasetizen_4.0.IoT.p1_releasesubmit/tizen_base/20170705.023439submit/tizen_base/20170703.013654submit/tizen_4.0_base/20170828.000001submit/tizen_4.0_base/20170828.000000submit/tizen_4.0_base/20170811.071500accepted/tizen/base/20170707.183634accepted/tizen/4.0/base/20170828.221324accepted/tizen/4.0/base/20170811.093019
Conflicts:
packaging/c-ares.spec
Change-Id: I1ec10e394aed3ef19ee21fefbe3aba7d7a615c74
Diffstat (limited to 'ares__timeval.c')
| -rw-r--r-- | ares__timeval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ares__timeval.c b/ares__timeval.c index f7aa788..94efb7d 100644 --- a/ares__timeval.c +++ b/ares__timeval.c @@ -56,7 +56,7 @@ struct timeval ares__tvnow(void) */ #ifdef HAVE_GETTIMEOFDAY else - (void)gettimeofday(&now, NULL); + (void)gettimeofday(&now, NULL); /* LCOV_EXCL_LINE */ #else else { now.tv_sec = (long)time(NULL); |