[asterisk-commits] rizzo: trunk r51293 - /trunk/apps/app_meetme.c

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Fri Jan 19 10:21:24 2007
New Revision: 51293

URL: http://svn.digium.com/view/asterisk?view=rev&rev=51293
Log:
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


Modified:
    trunk/apps/app_meetme.c

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=51293&r1=51292&r2=51293
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Fri Jan 19 10:21:24 2007
@@ -38,8 +38,8 @@
 #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 @@
 				      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--;