SENTINEL is not defined in 1.6.0

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125684 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_queue.c

@@ -5371,7 +5371,7 @@ static char *__queues_show(struct mansession *s, int fd, int argc, char **argv)
 		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)) {

channels/chan_iax2.c

@@ -53,7 +53,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #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 */