From: Steve Murphy <murf@digium.com>
Date: Thu, 10 Jan 2008 00:50:39 +0000 (+0000)
Subject: The fixes in this commit are mainly to allow compiling of trunk with --enable-dev... 
X-Git-Tag: 1.6.0-beta1~3^2~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71ad27409c0b5f57136b427d1d0746d99546a572;p=thirdparty%2Fasterisk.git

The fixes in this commit are mainly to allow compiling of trunk with --enable-dev-mode, mutex profiling, lock debugging, etc. Mainly, the version.c needs to be in the OBJS line; asterisk.h was chosen to have the prototypes for ast_get_version, ast_get_version_num; and the ASTERISK_FILE_VERSION macro needs to be used after including asterisk.h in a few files. I hope I did the right thing. If not, let me know.

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 f8805affec..eafccc391e 100644
--- 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 5c7e87e721..554d03c39e 100644
--- 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 b589799826..0e4e62f564 100644
--- 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 9d5c1ae8a5..a27d2ad568 100644
--- 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 bffd3db603..900e6f759d 100644
--- 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>