mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 10:37:02 +00:00
Some missing from merge.
Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
parent
ec939a5bce
commit
f4be15a7af
1895 changed files with 160408 additions and 53601 deletions
|
|
@ -1,3 +1,5 @@
|
|||
// $Id: OS_NS_time.cpp 93561 2011-03-16 14:02:24Z olli $
|
||||
|
||||
#include "ace/OS_NS_time.h"
|
||||
|
||||
#if !defined (ACE_HAS_INLINED_OSCALLS)
|
||||
|
|
@ -73,14 +75,14 @@ ACE_OS::ctime_r (const time_t *clock, ACE_TCHAR *buf, int buflen)
|
|||
SYSTEMTIME systime;
|
||||
FileTimeToLocalFileTime (&file_time, &localtime);
|
||||
FileTimeToSystemTime (&localtime, &systime);
|
||||
ACE_OS::snprintf (buf, buflen, ACE_OS_CTIME_R_FMTSTR,
|
||||
ACE_OS_day_of_week_name[systime.wDayOfWeek],
|
||||
ACE_OS_month_name[systime.wMonth - 1],
|
||||
systime.wDay,
|
||||
systime.wHour,
|
||||
systime.wMinute,
|
||||
systime.wSecond,
|
||||
systime.wYear);
|
||||
ACE_OS::sprintf (buf, ACE_OS_CTIME_R_FMTSTR,
|
||||
ACE_OS_day_of_week_name[systime.wDayOfWeek],
|
||||
ACE_OS_month_name[systime.wMonth - 1],
|
||||
systime.wDay,
|
||||
systime.wHour,
|
||||
systime.wMinute,
|
||||
systime.wSecond,
|
||||
systime.wYear);
|
||||
return buf;
|
||||
}
|
||||
# endif /* ACE_HAS_WINCE */
|
||||
|
|
@ -287,7 +289,7 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res)
|
|||
return res;
|
||||
}
|
||||
#else
|
||||
return ace_localtime_r_helper (t, res);
|
||||
ACE_OSCALL_RETURN (::localtime_r (t, res), struct tm *, 0);
|
||||
#endif /* ACE_HAS_TR24731_2005_CRT */
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue