use autoconf determined time_t printf format specifier
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4787 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
490f53c183
commit
bc8a4855a6
14
configure.in
14
configure.in
|
@ -171,6 +171,7 @@ AC_CHECK_SIZEOF(int, 4)
|
|||
AC_CHECK_SIZEOF(long, 4)
|
||||
AC_CHECK_SIZEOF(short, 2)
|
||||
AC_CHECK_SIZEOF(long long, 8)
|
||||
AC_CHECK_SIZEOF(time_t, 4)
|
||||
AC_TYPE_SIZE_T
|
||||
AC_CHECK_TYPE(ssize_t, int)
|
||||
|
||||
|
@ -246,6 +247,16 @@ else
|
|||
size_t_fmt='#error Can not determine the proper size for size_t'
|
||||
fi
|
||||
|
||||
if test "$ac_cv_sizeof_time_t" = "$ac_cv_sizeof_int"; then
|
||||
time_t_fmt='#define TIME_T_FMT "d"'
|
||||
elif test "$ac_cv_sizeof_time_t" = "$ac_cv_sizeof_long"; then
|
||||
time_t_fmt='#define TIME_T_FMT "ld"'
|
||||
elif test "$ac_cv_sizeof_time_t" = "$ac_cv_sizeof_long_long"; then
|
||||
time_t_fmt='#define TIME_T_FMT "lld"'
|
||||
else
|
||||
time_t_fmt='#error Can not determine the proper format specifier for time_t of size $ac_cv_sizeof_time_t'
|
||||
fi
|
||||
|
||||
# Basically, we have tried to figure out the correct format strings
|
||||
# for SWITCH types which vary between platforms, but we don't always get
|
||||
# it right. If you find that we don't get it right for your platform,
|
||||
|
@ -294,8 +305,7 @@ AC_SUBST(int64_t_fmt)
|
|||
AC_SUBST(uint64_t_fmt)
|
||||
AC_SUBST(ssize_t_fmt)
|
||||
AC_SUBST(size_t_fmt)
|
||||
|
||||
|
||||
AC_SUBST(time_t_fmt)
|
||||
|
||||
AC_PATH_PROGS(ZCAT, gunzip gzcat gzip zcat)
|
||||
AC_PATH_PROGS(TAR, gtar tar)
|
||||
|
|
|
@ -15,5 +15,6 @@
|
|||
@size_t_fmt@
|
||||
@int64_t_fmt@
|
||||
@uint64_t_fmt@
|
||||
@time_t_fmt@
|
||||
|
||||
#endif
|
||||
|
|
|
@ -213,6 +213,12 @@ typedef intptr_t switch_ssize_t;
|
|||
#define SWITCH_INT64_T_FMT "I64d"
|
||||
#define SWITCH_UINT64_T_FMT "I64u"
|
||||
|
||||
#ifdef _USE_32BIT_TIME_T
|
||||
#define TIME_T_FMT "d"
|
||||
#else
|
||||
#define TIME_T_FMT SWITCH_INT64_T_FMT
|
||||
#endif
|
||||
|
||||
#else
|
||||
#ifndef SWITCH_SSIZE_T_FMT
|
||||
#define SWITCH_SSIZE_T_FMT (sizeof (switch_ssize_t) == sizeof (long) ? "ld" : sizeof (switch_ssize_t) == sizeof (int) ? "d" : "lld")
|
||||
|
@ -230,6 +236,10 @@ typedef intptr_t switch_ssize_t;
|
|||
#define SWITCH_UINT64_T_FMT (sizeof (long) == 8 ? "lu" : "llu")
|
||||
#endif
|
||||
|
||||
#ifndef TIME_T_FMT
|
||||
#define TIME_T_FMT "ld"
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#define SWITCH_TIME_T_FMT SWITCH_INT64_T_FMT
|
||||
|
|
|
@ -402,7 +402,7 @@ SWITCH_DECLARE(uint32_t) switch_core_scheduler_add_task(time_t task_runtime,
|
|||
switch_mutex_unlock(runtime.task_mutex);
|
||||
|
||||
tp = container;
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Added task %u %s (%s) to run at %ld\n",
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Added task %u %s (%s) to run at %"TIME_T_FMT"\n",
|
||||
tp->task.task_id, tp->desc, switch_str_nil(tp->task.group), task_runtime);
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue