walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

asio: Fix MSVC build (after QUIC merge)

This commit is contained in:
Vladimir Serdyuk 2021-09-11 16:49:46 +03:00
parent 11d7e549fd
commit 00eb9e2576
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/util.cc
View File

@ -418,27 +418,34 @@ char *iso8601_date(char *res, int64_t ms) {
char *iso8601_basic_date(char *res, int64_t ms) { char *iso8601_basic_date(char *res, int64_t ms) {
time_t sec = ms / 1000; time_t sec = ms / 1000;
tm tms; struct tm* ptms;
if (localtime_r(&sec, &tms) == nullptr) { #if !defined(_MSC_VER)
return res; struct tm tms;
ptms = localtime_r(&sec, &tms);
#else
ptms = localtime(&sec);
#endif
if (ptms == nullptr) {
return res;
} }
auto p = res; auto p = res;
p = cpydig(p, tms.tm_year + 1900, 4); p = cpydig(p, ptms->tm_year + 1900, 4);
p = cpydig(p, tms.tm_mon + 1, 2); p = cpydig(p, ptms->tm_mon + 1, 2);
p = cpydig(p, tms.tm_mday, 2); p = cpydig(p, ptms->tm_mday, 2);
*p++ = 'T'; *p++ = 'T';
p = cpydig(p, tms.tm_hour, 2); p = cpydig(p, ptms->tm_hour, 2);
p = cpydig(p, tms.tm_min, 2); p = cpydig(p, ptms->tm_min, 2);
p = cpydig(p, tms.tm_sec, 2); p = cpydig(p, ptms->tm_sec, 2);
*p++ = '.'; *p++ = '.';
p = cpydig(p, ms % 1000, 3); p = cpydig(p, ms % 1000, 3);
#ifdef HAVE_STRUCT_TM_TM_GMTOFF #ifdef HAVE_STRUCT_TM_TM_GMTOFF
auto gmtoff = tms.tm_gmtoff; auto gmtoff = ptms->tm_gmtoff;
#else // !HAVE_STRUCT_TM_TM_GMTOFF #else // !HAVE_STRUCT_TM_TM_GMTOFF
auto gmtoff = nghttp2_timegm(&tms) - sec; auto gmtoff = nghttp2_timegm(ptms) - sec;
#endif // !HAVE_STRUCT_TM_TM_GMTOFF #endif // !HAVE_STRUCT_TM_TM_GMTOFF
if (gmtoff == 0) { if (gmtoff == 0) {
*p++ = 'Z'; *p++ = 'Z';
@ -1790,6 +1797,7 @@ int daemonize(int nochdir, int noclose) {
#endif // !defined(__APPLE__) #endif // !defined(__APPLE__)
} }
#ifdef ENABLE_HTTP3
int msghdr_get_local_addr(Address &dest, msghdr *msg, int family) { int msghdr_get_local_addr(Address &dest, msghdr *msg, int family) {
switch (family) { switch (family) {
case AF_INET: case AF_INET:
@ -1823,6 +1831,7 @@ int msghdr_get_local_addr(Address &dest, msghdr *msg, int family) {
return -1; return -1;
} }
#endif
} // namespace util } // namespace util

2
src/util.h
View File

@ -863,7 +863,9 @@ std::mt19937 make_mt19937();
// daemon() using fork(). // daemon() using fork().
int daemonize(int nochdir, int noclose); int daemonize(int nochdir, int noclose);
#ifdef ENABLE_HTTP3
int msghdr_get_local_addr(Address &dest, msghdr *msg, int family); int msghdr_get_local_addr(Address &dest, msghdr *msg, int family);
#endif
} // namespace util } // namespace util