forked from enlightenment/efl
Evil: remove localtime_r as mingw-w64 defines it when _POSIX_C_SOURCE is defined
Summary: localtime_r() is already defined by mingw-w64 when _POSIX_C_SOURCE is defined Test Plan: compilation Reviewers: raster, zmike, cedric Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T7907 Differential Revision: https://phab.enlightenment.org/D8854
This commit is contained in:
parent
4473062dd4
commit
a4c44e5e74
|
@ -265,6 +265,7 @@ case "$host_vendor" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
AC_DEFINE([_POSIX_C_SOURCE], [1], [Define the POSIX version])
|
||||||
AC_SUBST([MODULE_ARCH])
|
AC_SUBST([MODULE_ARCH])
|
||||||
AC_DEFINE_UNQUOTED([MODULE_ARCH], ["${MODULE_ARCH}"], ["Module architecture"])
|
AC_DEFINE_UNQUOTED([MODULE_ARCH], ["${MODULE_ARCH}"], ["Module architecture"])
|
||||||
AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["${MODULE_EXT}"], [Suffix for shared objects])
|
AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["${MODULE_EXT}"], [Suffix for shared objects])
|
||||||
|
|
|
@ -97,6 +97,7 @@ add_global_arguments(dev_cflags, language: 'cpp')
|
||||||
foreach lang : ['c', 'objc', 'cpp']
|
foreach lang : ['c', 'objc', 'cpp']
|
||||||
add_global_arguments('-DHAVE_CONFIG_H=1', language: lang)
|
add_global_arguments('-DHAVE_CONFIG_H=1', language: lang)
|
||||||
add_global_arguments('-D_GNU_SOURCE=1', language: lang)
|
add_global_arguments('-D_GNU_SOURCE=1', language: lang)
|
||||||
|
add_global_arguments('-D_POSIX_C_SOURCE=1', language: lang)
|
||||||
add_global_arguments('-DEFL_BETA_API_SUPPORT=1', language: lang)
|
add_global_arguments('-DEFL_BETA_API_SUPPORT=1', language: lang)
|
||||||
add_global_arguments('-DNEED_RUN_IN_TREE=1', language: lang)
|
add_global_arguments('-DNEED_RUN_IN_TREE=1', language: lang)
|
||||||
add_global_arguments('-DEFL_BUILD=1', language: lang)
|
add_global_arguments('-DEFL_BUILD=1', language: lang)
|
||||||
|
|
|
@ -45,20 +45,6 @@
|
||||||
#endif
|
#endif
|
||||||
#define mkdir(dirname, mode) evil_mkdir(dirname, mode)
|
#define mkdir(dirname, mode) evil_mkdir(dirname, mode)
|
||||||
|
|
||||||
/*
|
|
||||||
* evil_time.h
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @def localtime_r(t, r)
|
|
||||||
*
|
|
||||||
* Wrapper around evil_localtime_r().
|
|
||||||
*/
|
|
||||||
#ifdef localtime_r
|
|
||||||
# undef localtime_r
|
|
||||||
#endif
|
|
||||||
#define localtime_r(t, r) evil_localtime_r(t, r)
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* evil_unistd.h
|
* evil_unistd.h
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -12,16 +12,6 @@
|
||||||
#include "evil_macro_wrapper.h"
|
#include "evil_macro_wrapper.h"
|
||||||
#include "evil_private.h"
|
#include "evil_private.h"
|
||||||
|
|
||||||
struct tm *
|
|
||||||
evil_localtime_r(const time_t *timep, struct tm *result)
|
|
||||||
{
|
|
||||||
__time64_t t = *timep;
|
|
||||||
|
|
||||||
_localtime64_s(result, &t);
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* strptime
|
* strptime
|
||||||
* based on http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/time/strptime.c?rev=HEAD
|
* based on http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/time/strptime.c?rev=HEAD
|
||||||
|
|
|
@ -2,6 +2,9 @@
|
||||||
#define __EVIL_TIME_H__
|
#define __EVIL_TIME_H__
|
||||||
|
|
||||||
|
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @file evil_time.h
|
* @file evil_time.h
|
||||||
* @brief The file that provides functions ported from Unix in time.h.
|
* @brief The file that provides functions ported from Unix in time.h.
|
||||||
|
@ -14,26 +17,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Convert the calendar time to broken-time representation in a
|
|
||||||
* user supplied data.
|
|
||||||
*
|
|
||||||
* @param timep The calender time.
|
|
||||||
* @param result The broken-down time representation.
|
|
||||||
* @return The broken-down time representation.
|
|
||||||
*
|
|
||||||
* This function converts the calendar time @p timep to a broken-time
|
|
||||||
* representation. The result is stored in the buffer @p result
|
|
||||||
* supplied by the user. If @p timep or @p result are @c NULL, or if
|
|
||||||
* an error occurred, this function returns @c NULL and the values in
|
|
||||||
* @p result might be undefined. Otherwise it returns @p result.
|
|
||||||
*
|
|
||||||
* Conformity: Non applicable.
|
|
||||||
*
|
|
||||||
* Supported OS: Windows XP.
|
|
||||||
*/
|
|
||||||
EAPI struct tm *evil_localtime_r(const time_t *timep, struct tm *result);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Convert a string representation of time to a time tm structure .
|
* @brief Convert a string representation of time to a time tm structure .
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue