[svn-commits] mmichelson: branch group/v6-new r274781 - in /team/group/v6-new: ./ main/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Jul  8 16:53:05 2010
New Revision: 274781

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=274781
Log:
Sync with trunk.


Modified:
    team/group/v6-new/   (props changed)
    team/group/v6-new/main/channel.c

Propchange: team/group/v6-new/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul  8 16:53:05 2010
@@ -1,1 +1,1 @@
-/trunk:1-270973,270975-274733
+/trunk:1-270973,270975-274780

Modified: team/group/v6-new/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/group/v6-new/main/channel.c?view=diff&rev=274781&r1=274780&r2=274781
==============================================================================
--- team/group/v6-new/main/channel.c (original)
+++ team/group/v6-new/main/channel.c Thu Jul  8 16:53:05 2010
@@ -72,9 +72,9 @@
 #include <sys/epoll.h>
 #endif
 
-#ifdef HAVE_PRI
-#include "sig_pri.h"
-#endif
+#if defined(HAVE_PRI)
+#include "libpri.h"
+#endif	/* defined(HAVE_PRI) */
 
 struct ast_epoll_data {
 	struct ast_channel *chan;
@@ -285,7 +285,7 @@
 
 static const char *callerid_ton2str(int ton)
 {
-#ifdef HAVE_PRI
+#if defined(HAVE_PRI)
 	switch (ton) {
 	case PRI_TON_INTERNATIONAL:
 		return "International Number";
@@ -303,7 +303,7 @@
 	default:
 		return "Unknown Number Type";
 	}
-#endif
+#endif	/* defined(HAVE_PRI) */
 	return "";
 }