diff options
author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-20 22:18:21 +0000 |
---|---|---|
committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-20 22:18:21 +0000 |
commit | 8d3385f5344604e2e8f31eee7bf565e88778500b (patch) | |
tree | af054294a844611a54aa36bfacfb7377d8074695 /main | |
parent | e616a7a4e2434fe360530b21af62ea44c3700318 (diff) |
move internal function declarations to include/asterisk/_private.h
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89465 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/asterisk.c | 2 | ||||
-rw-r--r-- | main/astobj2.c | 1 | ||||
-rw-r--r-- | main/channel.c | 2 | ||||
-rw-r--r-- | main/cli.c | 1 | ||||
-rw-r--r-- | main/db.c | 1 | ||||
-rw-r--r-- | main/devicestate.c | 1 | ||||
-rw-r--r-- | main/dnsmgr.c | 1 | ||||
-rw-r--r-- | main/event.c | 1 | ||||
-rw-r--r-- | main/frame.c | 1 | ||||
-rw-r--r-- | main/loader.c | 1 | ||||
-rw-r--r-- | main/logger.c | 9 | ||||
-rw-r--r-- | main/manager.c | 1 | ||||
-rw-r--r-- | main/pbx.c | 1 | ||||
-rw-r--r-- | main/term.c | 1 | ||||
-rw-r--r-- | main/threadstorage.c | 15 |
15 files changed, 29 insertions, 10 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index dc0133758..69e75abdf 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -61,6 +61,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include "asterisk/_private.h" + #undef sched_setscheduler #undef setpriority #include <sys/time.h> diff --git a/main/astobj2.c b/main/astobj2.c index 8404f036d..e7a091c80 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -21,6 +21,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include "asterisk/_private.h" #include "asterisk/astobj2.h" #include "asterisk/utils.h" #include "asterisk/cli.h" diff --git a/main/channel.c b/main/channel.c index 94814e450..1fcc096bb 100644 --- a/main/channel.c +++ b/main/channel.c @@ -27,6 +27,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include "asterisk/_private.h" + #include <sys/time.h> #include <signal.h> #include <math.h> diff --git a/main/cli.c b/main/cli.c index aae8dfc04..b4c4b5fd2 100644 --- a/main/cli.c +++ b/main/cli.c @@ -27,6 +27,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include "asterisk/_private.h" #include <sys/signal.h> #include <signal.h> #include <ctype.h> @@ -31,6 +31,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include "asterisk/_private.h" #include <sys/time.h> #include <signal.h> #include <dirent.h> diff --git a/main/devicestate.c b/main/devicestate.c index 91ef8ee5d..7f00425fe 100644 --- a/main/devicestate.c +++ b/main/devicestate.c @@ -112,6 +112,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include "asterisk/_private.h" #include "asterisk/channel.h" #include "asterisk/utils.h" #include "asterisk/lock.h" diff --git a/main/dnsmgr.c b/main/dnsmgr.c index d5ab8e0ce..c6e3adffc 100644 --- a/main/dnsmgr.c +++ b/main/dnsmgr.c @@ -27,6 +27,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include "asterisk/_private.h" #include <regex.h> #include <signal.h> diff --git a/main/event.c b/main/event.c index f9d9b657c..be0d3f286 100644 --- a/main/event.c +++ b/main/event.c @@ -27,6 +27,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include "asterisk/_private.h" #include "asterisk/event.h" #include "asterisk/linkedlists.h" #include "asterisk/lock.h" diff --git a/main/frame.c b/main/frame.c index 85fa6a96a..13d81d4b4 100644 --- a/main/frame.c +++ b/main/frame.c @@ -27,6 +27,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include "asterisk/_private.h" #include "asterisk/lock.h" #include "asterisk/frame.h" #include "asterisk/options.h" diff --git a/main/loader.c b/main/loader.c index 5e51c8401..3ffa68758 100644 --- a/main/loader.c +++ b/main/loader.c @@ -31,6 +31,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include "asterisk/_private.h" #include <dirent.h> #include "asterisk/linkedlists.h" diff --git a/main/logger.c b/main/logger.c index 415019761..c94cf4b44 100644 --- a/main/logger.c +++ b/main/logger.c @@ -25,14 +25,17 @@ * \author Mark Spencer <markster@digium.com> */ -/* Prevent inclusion of logger.h - it redefines LOG_* which we need - * to define syslog_level_map. Later, we force its inclusion again. +/* + * define _ASTERISK_LOGGER_H to prevent the inclusion of logger.h; + * it redefines LOG_* which we need to define syslog_level_map. + * Later, we force the inclusion of logger.h again. */ #define _ASTERISK_LOGGER_H #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include "asterisk/_private.h" #include <signal.h> #include <time.h> #include <sys/stat.h> @@ -511,7 +514,7 @@ static int rotate_file(const char *filename) return res; } -int reload_logger(int rotate) +static int reload_logger(int rotate) { char old[PATH_MAX] = ""; int event_rotate = rotate, queue_rotate = rotate; diff --git a/main/manager.c b/main/manager.c index f7f818c79..14a9d9881 100644 --- a/main/manager.c +++ b/main/manager.c @@ -45,6 +45,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include "asterisk/_private.h" #include <ctype.h> #include <sys/time.h> #include <signal.h> diff --git a/main/pbx.c b/main/pbx.c index cd8a23ca8..d1a0570c7 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -27,6 +27,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include "asterisk/_private.h" #include <ctype.h> #include <time.h> #include <sys/time.h> diff --git a/main/term.c b/main/term.c index d79c83c10..825a710da 100644 --- a/main/term.c +++ b/main/term.c @@ -27,6 +27,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include "asterisk/_private.h" #include <sys/time.h> #include <signal.h> #include <sys/stat.h> diff --git a/main/threadstorage.c b/main/threadstorage.c index 5a6f4b3e8..35d3eca55 100644 --- a/main/threadstorage.c +++ b/main/threadstorage.c @@ -24,8 +24,15 @@ */ #include "asterisk.h" +#include "asterisk/_private.h" -#if defined(DEBUG_THREADLOCALS) +#if !defined(DEBUG_THREADLOCALS) + +void threadstorage_init(void) +{ +} + +#else /* !defined(DEBUG_THREADLOCALS) */ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -226,11 +233,5 @@ void threadstorage_init(void) ast_cli_register_multiple(cli, sizeof(cli) / sizeof(cli[0])); } -#else /* !defined(DEBUG_THREADLOCALS) */ - -void threadstorage_init(void) -{ -} - #endif /* !defined(DEBUG_THREADLOCALS) */ |