[svn-commits] mmichelson: branch 1.6.0 r125684 - in /branches/1.6.0: apps/ channels/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Jun 26 20:09:04 2008
New Revision: 125684

URL: http://svn.digium.com/view/asterisk?view=rev&rev=125684
Log:
SENTINEL is not defined in 1.6.0


Modified:
    branches/1.6.0/apps/app_queue.c
    branches/1.6.0/channels/chan_iax2.c

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=125684&r1=125683&r2=125684
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Thu Jun 26 20:09:04 2008
@@ -5371,7 +5371,7 @@
 		load_realtime_queue(argv[2]);
 	}
 	else if (ast_check_realtime("queues")) {
-		struct ast_config *cfg = ast_load_realtime_multientry("queues", "name LIKE", "%", SENTINEL);
+		struct ast_config *cfg = ast_load_realtime_multientry("queues", "name LIKE", "%", (char *) NULL);
 		char *queuename;
 		if (cfg) {
 			for (queuename = ast_category_browse(cfg, NULL); !ast_strlen_zero(queuename); queuename = ast_category_browse(cfg, queuename)) {

Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=125684&r1=125683&r2=125684
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Thu Jun 26 20:09:04 2008
@@ -53,7 +53,9 @@
 #include <sys/stat.h>
 #include <regex.h>
 #include <sys/ioctl.h>
+#if defined(HAVE_DAHDI)
 #include <dahdi/user.h>
+#endif
 
 #include "asterisk/paths.h"	/* need ast_config_AST_DATA_DIR for firmware */