diff options
| author | Luigi Rizzo <rizzo@icir.org> | 2007-01-19 16:21:24 +0000 |
|---|---|---|
| committer | Luigi Rizzo <rizzo@icir.org> | 2007-01-19 16:21:24 +0000 |
| commit | 1b35a441d945c9a6f88deeae692e4fe36bad8568 (patch) | |
| tree | 0ffc05c4e114a93fd3a851c1444fec0e08b6f686 /apps/app_meetme.c | |
| parent | dc31eaa025260f4d2c94c3e961686e1005f027b3 (diff) | |
include "asterisk/zapata.h" instead of testing for
the location of the header files.
On passing, add a cast to insure -Werror clean compilation
on FreeBSD 6.x, where time_t does not match %ld
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51293 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index f315b2cb3..0d82ea95f 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -38,8 +38,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <string.h> #include <unistd.h> #include <errno.h> -#include <sys/ioctl.h> -#include <zaptel/zaptel.h> + +#include "asterisk/zapata.h" #include "asterisk/lock.h" #include "asterisk/file.h" @@ -1933,7 +1933,7 @@ bailoutandtrynormal: user->user_no, S_OR(user->chan->cid.cid_num, "<unknown>"), S_OR(user->chan->cid.cid_name, "<unknown>"), - (now - user->jointime)); + (long)(now - user->jointime)); } conf->users--; |