From b7ec076367502fec756d6667c99e12ac6fad43d1 Mon Sep 17 00:00:00 2001
From: tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Sun, 10 Jan 2010 06:56:36 +0000
Subject: It's been long enough -- make the behavior introduced in 1.6 the
 default.

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@239000 f38db490-d61c-443f-a65b-d21fe96a405b
---
 Makefile        | 8 ++++----
 main/asterisk.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 2cae111b3..ac304dc9a 100644
--- a/Makefile
+++ b/Makefile
@@ -745,10 +745,10 @@ samples: adsi
 		echo ";astctlgroup = apache" ; \
 		echo ";astctl = asterisk.ctl" ; \
 		echo "" ; \
-		echo "[compat]" ; \
-		echo "pbx_realtime=1.6" ; \
-		echo "res_agi=1.6" ; \
-		echo "app_set=1.6" ; \
+		echo ";[compat]" ; \
+		echo ";pbx_realtime=1.6" ; \
+		echo ";res_agi=1.6" ; \
+		echo ";app_set=1.6" ; \
 		) > $(DESTDIR)$(ASTCONFPATH) ; \
 	else \
 		echo "Skipping asterisk.conf creation"; \
diff --git a/main/asterisk.c b/main/asterisk.c
index 5509788e2..39940ebf5 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -170,7 +170,7 @@ int daemon(int, int);  /* defined in libresolv of all places */
 /*! @{ */
 
 struct ast_flags ast_options = { AST_DEFAULT_OPTIONS };
-struct ast_flags ast_compat = { 0 };
+struct ast_flags ast_compat = { 0x07 };
 
 int option_verbose;				/*!< Verbosity level */
 int option_debug;				/*!< Debug level */
-- 
cgit v1.2.3