The fixes in this commit are mainly to allow compiling of trunk with --enable-dev...

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

diff --git a/channels/console_board.c b/channels/console_board.c
index f8805affec3c1e356d3f192ac5c154e3bf5f5d70..eafccc391e78edf09eca7d37d98235a9153e020b 100644 (file)
--- a/channels/console_board.c
+++ b/channels/console_board.c
@@ -38,6 +38,7 @@
  */
 
 #include "asterisk.h"  /* ast_strdupa */
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"    /* ast_strdupa */
 #include "console_video.h"     /* ast_strdupa */
 

diff --git a/channels/console_video.c b/channels/console_video.c
index 5c7e87e7211ec8cf8ee926c4e6721181169e40a5..554d03c39ee37974ecb8405da4ce69340f5aabaf 100644 (file)
--- a/channels/console_video.c
+++ b/channels/console_video.c
@@ -37,6 +37,7 @@
 //#define OLD_FFMPEG   1       /* set for old ffmpeg with no swscale */
 
 #include "asterisk.h"
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/ioctl.h>
 #include "asterisk/cli.h"
 #include "asterisk/file.h"

diff --git a/channels/vgrabbers.c b/channels/vgrabbers.c
index b5897998265fa3e71fe95abc88157fa359a9c312..0e4e62f5644fbdc1e1fe4db2dbe0852745259b14 100644 (file)
--- a/channels/vgrabbers.c
+++ b/channels/vgrabbers.c
@@ -45,6 +45,7 @@
  */
 
 #include "asterisk.h"
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/ioctl.h>
 #include "asterisk/file.h"
 #include "asterisk/utils.h"    /* ast_calloc */

diff --git a/include/asterisk.h b/include/asterisk.h
index 9d5c1ae8a50fd68199709a35eb822cf62dbaf387..a27d2ad5684aaab411cc30f61aaeccd6628f4ec1 100644 (file)
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -50,6 +50,9 @@
 
 int ast_set_priority(int);                     /*!< Provided by asterisk.c */
 
+const char *ast_get_version(void);
+const char *ast_get_version_num(void);
+
 /*!
  * \brief Register a function to be executed before Asterisk exits.
  * \param func The callback function to use.

diff --git a/utils/astman.c b/utils/astman.c
index bffd3db603da8a32ea7ae6a5a240d24c539538a9..900e6f759df652abd2586f23028f45ca97771e23 100644 (file)
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -23,7 +23,7 @@
  */
 
 #include "asterisk.h"
-
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <newt.h>
 #include <stdio.h>
 #include <sys/time.h>