[DEV] update nullptr in null (specific etk)
This commit is contained in:
parent
7bd26a9458
commit
88ee59cd5f
@ -16,7 +16,7 @@ ETK_DECLARE_TYPE(echrono::Steady);
|
||||
static int64_t getTime() {
|
||||
#if defined(__TARGET_OS__Android)
|
||||
struct timevalnow;
|
||||
gettimeofday(&now, nullptr);
|
||||
gettimeofday(&now, null);
|
||||
return int64_t(now.tv_sec)*1000000000LL + int64_t(now.tv_usec)*1000LL;
|
||||
#elif defined(__TARGET_OS__Web) \
|
||||
|| defined(__TARGET_OS__Linux) \
|
||||
@ -31,7 +31,7 @@ static int64_t getTime() {
|
||||
#endif
|
||||
if (ret != 0) {
|
||||
// Error to get the time ...
|
||||
now.tv_sec = time(nullptr);
|
||||
now.tv_sec = time(null);
|
||||
now.tv_nsec = 0;
|
||||
}
|
||||
return int64_t(now.tv_sec)*1000000000LL + int64_t(now.tv_nsec);
|
||||
|
@ -19,7 +19,7 @@ ETK_DECLARE_TYPE(echrono::Time);
|
||||
static int64_t getTime() {
|
||||
#if defined(__TARGET_OS__Android)
|
||||
struct timevalnow;
|
||||
gettimeofday(&now, nullptr);
|
||||
gettimeofday(&now, null);
|
||||
return int64_t(now.tv_sec)*1000000000LL + int64_t(now.tv_usec)*1000LL;
|
||||
#elif defined(__TARGET_OS__Web) \
|
||||
|| defined(__TARGET_OS__Linux) \
|
||||
@ -30,7 +30,7 @@ static int64_t getTime() {
|
||||
int ret = clock_gettime(CLOCK_REALTIME, &now);
|
||||
if (ret != 0) {
|
||||
// Error to get the time ...
|
||||
now.tv_sec = time(nullptr);
|
||||
now.tv_sec = time(null);
|
||||
now.tv_nsec = 0;
|
||||
}
|
||||
return int64_t(now.tv_sec)*1000000000LL + int64_t(now.tv_nsec);
|
||||
|
@ -47,7 +47,7 @@ def configure(target, my_module):
|
||||
# name of the dependency
|
||||
my_module.add_depend([
|
||||
'elog',
|
||||
'etk',
|
||||
'etk-base',
|
||||
])
|
||||
|
||||
my_module.add_path(".")
|
||||
|
Loading…
x
Reference in New Issue
Block a user