Merge "kill HAVE_LOCALTIME_R"
This commit is contained in:
commit
d3d6c3830f
|
@ -70,11 +70,6 @@
|
|||
*/
|
||||
#define HAVE_SYMLINKS
|
||||
|
||||
/*
|
||||
* Define this if we have localtime_r().
|
||||
*/
|
||||
#define HAVE_LOCALTIME_R 1
|
||||
|
||||
/*
|
||||
* Endianness of the target machine. Choose one:
|
||||
*
|
||||
|
|
|
@ -70,11 +70,6 @@
|
|||
*/
|
||||
#define HAVE_SYMLINKS
|
||||
|
||||
/*
|
||||
* Define this if we have localtime_r().
|
||||
*/
|
||||
/* #define HAVE_LOCALTIME_R */
|
||||
|
||||
/*
|
||||
* Define this if we want to use WinSock.
|
||||
*/
|
||||
|
|
|
@ -70,11 +70,6 @@
|
|||
*/
|
||||
#define HAVE_SYMLINKS
|
||||
|
||||
/*
|
||||
* Define this if we have localtime_r().
|
||||
*/
|
||||
/* #define HAVE_LOCALTIME_R */
|
||||
|
||||
/*
|
||||
* Define this if we want to use WinSock.
|
||||
*/
|
||||
|
|
|
@ -65,11 +65,6 @@
|
|||
*/
|
||||
#define HAVE_SYMLINKS
|
||||
|
||||
/*
|
||||
* Define this if we have localtime_r().
|
||||
*/
|
||||
#define HAVE_LOCALTIME_R 1
|
||||
|
||||
/*
|
||||
* Define this if have clock_gettime() and friends
|
||||
*/
|
||||
|
|
|
@ -356,7 +356,7 @@ time_t ZipEntry::getModWhen(void) const
|
|||
*/
|
||||
void ZipEntry::setModWhen(time_t when)
|
||||
{
|
||||
#ifdef HAVE_LOCALTIME_R
|
||||
#if !defined(_WIN32)
|
||||
struct tm tmResult;
|
||||
#endif
|
||||
time_t even;
|
||||
|
@ -368,7 +368,7 @@ void ZipEntry::setModWhen(time_t when)
|
|||
even = (time_t)(((unsigned long)(when) + 1) & (~1));
|
||||
|
||||
/* expand */
|
||||
#ifdef HAVE_LOCALTIME_R
|
||||
#if !defined(_WIN32)
|
||||
ptm = localtime_r(&even, &tmResult);
|
||||
#else
|
||||
ptm = localtime(&even);
|
||||
|
|
Loading…
Reference in New Issue