diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-10 00:50:39 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-10 00:50:39 +0000 |
| commit | 94140239f22a09cc5a35aa84ed22e67100a7f91d (patch) | |
| tree | e8c3511448116e83144320e191f6ccf3725af0ec | |
| parent | 928cdf67bc1889f67b5fd51101e326492bda70ab (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@97656 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/console_board.c | 1 | ||||
| -rw-r--r-- | channels/console_video.c | 1 | ||||
| -rw-r--r-- | channels/vgrabbers.c | 1 | ||||
| -rw-r--r-- | include/asterisk.h | 3 | ||||
| -rw-r--r-- | utils/astman.c | 2 |
5 files changed, 7 insertions, 1 deletions
diff --git a/channels/console_board.c b/channels/console_board.c index f8805affe..eafccc391 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 5c7e87e72..554d03c39 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 b58979982..0e4e62f56 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 9d5c1ae8a..a27d2ad56 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 bffd3db60..900e6f759 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> |