[asterisk-commits] murf: trunk r97656 - in /trunk: channels/ include/ utils/

[SVN commits to the Asterisk project]

Author: murf
Date: Wed Jan  9 18:50:39 2008
New Revision: 97656

URL: http://svn.digium.com/view/asterisk?view=rev&rev=97656
Log:
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.

Modified:
    trunk/channels/console_board.c
    trunk/channels/console_video.c
    trunk/channels/vgrabbers.c
    trunk/include/asterisk.h
    trunk/utils/astman.c

Modified: trunk/channels/console_board.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/console_board.c?view=diff&rev=97656&r1=97655&r2=97656
==============================================================================
--- trunk/channels/console_board.c (original)
+++ trunk/channels/console_board.c Wed Jan  9 18:50:39 2008
@@ -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 */
 

Modified: trunk/channels/console_video.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/console_video.c?view=diff&rev=97656&r1=97655&r2=97656
==============================================================================
--- trunk/channels/console_video.c (original)
+++ trunk/channels/console_video.c Wed Jan  9 18:50:39 2008
@@ -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"

Modified: trunk/channels/vgrabbers.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/vgrabbers.c?view=diff&rev=97656&r1=97655&r2=97656
==============================================================================
--- trunk/channels/vgrabbers.c (original)
+++ trunk/channels/vgrabbers.c Wed Jan  9 18:50:39 2008
@@ -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 */

Modified: trunk/include/asterisk.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk.h?view=diff&rev=97656&r1=97655&r2=97656
==============================================================================
--- trunk/include/asterisk.h (original)
+++ trunk/include/asterisk.h Wed Jan  9 18:50:39 2008
@@ -49,6 +49,9 @@
 #define	sched_setscheduler	__PLEASE_USE_ast_set_priority_INSTEAD_OF_sched_setscheduler__
 
 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.

Modified: trunk/utils/astman.c
URL: http://svn.digium.com/view/asterisk/trunk/utils/astman.c?view=diff&rev=97656&r1=97655&r2=97656
==============================================================================
--- trunk/utils/astman.c (original)
+++ trunk/utils/astman.c Wed Jan  9 18:50:39 2008
@@ -23,7 +23,7 @@
  */
 
 #include "asterisk.h"
-
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <newt.h>
 #include <stdio.h>
 #include <sys/time.h>