Rename version.h to ast_version.h. Next, I will be re-adding version.h as an

automatically generated file like it used to be.  This still needs to be there
for modules that have to check it to compile against multiple asterisk versions.

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

diff --git a/build_tools/make_version_c b/build_tools/make_version_c
index 291290ddd8f3e8f86e20f466077fd64b769d60ff..018fc6e887e9f54924a4e3134c0fa6d291f3edf3 100755 (executable)
--- a/build_tools/make_version_c
+++ b/build_tools/make_version_c
@@ -14,7 +14,7 @@ cat << END
 
 #include "asterisk.h"
 
-#include "asterisk/version.h"
+#include "asterisk/ast_version.h"
 
 static const char asterisk_version[] = "${ASTERISKVERSION}${EXTRA}";
 

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 610404767beda29019bbe1bcfb070ded34072cd2..dcf922689fcc79da085b1825d743619813792782 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -173,7 +173,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/abstract_jb.h"
 #include "asterisk/threadstorage.h"
 #include "asterisk/translate.h"
-#include "asterisk/version.h"
+#include "asterisk/ast_version.h"
 #include "asterisk/event.h"
 #include "asterisk/tcptls.h"
 

diff --git a/include/asterisk/version.h b/include/asterisk/ast_version.h
similarity index 100%
rename from include/asterisk/version.h
rename to include/asterisk/ast_version.h

diff --git a/main/http.c b/main/http.c
index 6e8021fa244c984cb8ed2dd9e5023d9e1d12aaab..c1ec9f759f1ab479cbe373382051de977c27a4bd 100644 (file)
--- a/main/http.c
+++ b/main/http.c
@@ -49,7 +49,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/strings.h"
 #include "asterisk/config.h"
 #include "asterisk/stringfields.h"
-#include "asterisk/version.h"
+#include "asterisk/ast_version.h"
 #include "asterisk/manager.h"
 
 #define MAX_PREFIX 80

diff --git a/main/manager.c b/main/manager.c
index da4457752d6ab7e73fb500211cf72857cef85096..7fb16a403ebc580a6909469bbd45b5c8c29c862f 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -67,7 +67,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/tcptls.h"
 #include "asterisk/http.h"
-#include "asterisk/version.h"
+#include "asterisk/ast_version.h"
 #include "asterisk/threadstorage.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/version.h"

diff --git a/res/res_agi.c b/res/res_agi.c
index a3c95f46115bee21e631fb6c766159c1341db95d..6e9b5291ee3d7a39e5bfbf30fa959558fc9f9581 100644 (file)
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -53,7 +53,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/strings.h"
 #include "asterisk/agi.h"
 #include "asterisk/manager.h"
-#include "asterisk/version.h"
+#include "asterisk/ast_version.h"
 #include "asterisk/speech.h"
 #include "asterisk/manager.h"