From fff17a25ddc637a9253c758b7407aeda3f5244cb Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Thu, 25 Mar 2010 23:38:58 +0000 Subject: [PATCH] Use "local" instead of "system" header file inclusion. Now that these files are in the tree, they should prefer the tree's local copy of all Asterisk headers over any that may be installed. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@254931 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- addons/chan_ooh323.h | 48 ++++++++++++++++++------------------- addons/mp3/common.c | 4 ++-- addons/mp3/decode_ntom.c | 4 ++-- addons/mp3/interface.c | 4 ++-- addons/mp3/layer3.c | 4 ++-- addons/ooh323c/src/context.c | 4 ++-- addons/ooh323c/src/decode.c | 4 ++-- addons/ooh323c/src/dlist.c | 4 ++-- addons/ooh323c/src/encode.c | 4 ++-- addons/ooh323c/src/errmgmt.c | 4 ++-- addons/ooh323c/src/eventHandler.c | 4 ++-- addons/ooh323c/src/memheap.c | 4 ++-- addons/ooh323c/src/ooCalls.c | 4 ++-- addons/ooh323c/src/ooCapability.c | 4 ++-- addons/ooh323c/src/ooCmdChannel.c | 4 ++-- addons/ooh323c/src/ooGkClient.c | 4 ++-- addons/ooh323c/src/ooLogChan.c | 4 ++-- addons/ooh323c/src/ooStackCmds.c | 4 ++-- addons/ooh323c/src/ooTimer.c | 4 ++-- addons/ooh323c/src/ooUtils.c | 4 ++-- addons/ooh323c/src/ooasn1.h | 4 ++-- addons/ooh323c/src/oochannels.c | 4 ++-- addons/ooh323c/src/ooh245.c | 4 ++-- addons/ooh323c/src/ooh323.c | 4 ++-- addons/ooh323c/src/ooh323ep.c | 4 ++-- addons/ooh323c/src/ooports.c | 4 ++-- addons/ooh323c/src/ooq931.c | 4 ++-- addons/ooh323c/src/ootrace.c | 4 ++-- addons/ooh323c/src/perutil.c | 4 ++-- addons/ooh323c/src/printHandler.c | 4 ++-- addons/ooh323c/src/rtctype.c | 4 ++-- addons/ooh323cDriver.c | 8 +++---- addons/ooh323cDriver.h | 2 +- 33 files changed, 89 insertions(+), 89 deletions(-) diff --git a/addons/chan_ooh323.h b/addons/chan_ooh323.h index 1a4d55e..65eefb7 100644 --- a/addons/chan_ooh323.h +++ b/addons/chan_ooh323.h @@ -16,7 +16,7 @@ #ifndef _OO_CHAN_H323_H_ #define _OO_CHAN_H323_H_ -#include +#include "asterisk.h" #undef PACKAGE_NAME #undef PACKAGE_TARNAME #undef PACKAGE_VERSION @@ -40,29 +40,29 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "asterisk/lock.h" +#include "asterisk/channel.h" +#include "asterisk/config.h" +#include "asterisk/logger.h" +#include "asterisk/module.h" +#include "asterisk/pbx.h" +#include "asterisk/utils.h" +#include "asterisk/options.h" +#include "asterisk/sched.h" +#include "asterisk/io.h" +#include "asterisk/causes.h" +#include "asterisk/rtp_engine.h" +#include "asterisk/acl.h" +#include "asterisk/callerid.h" +#include "asterisk/file.h" +#include "asterisk/cli.h" +#include "asterisk/app.h" +#include "asterisk/musiconhold.h" +#include "asterisk/manager.h" +#include "asterisk/dsp.h" +#include "asterisk/stringfields.h" +#include "asterisk/frame_defs.h" +#include "asterisk/udptl.h" #include "ootypes.h" #include "ooUtils.h" diff --git a/addons/mp3/common.c b/addons/mp3/common.c index d8db2a3..9a6fd8c 100644 --- a/addons/mp3/common.c +++ b/addons/mp3/common.c @@ -1,5 +1,5 @@ -#include -#include +#include "asterisk.h" +#include "asterisk/logger.h" #include #include diff --git a/addons/mp3/decode_ntom.c b/addons/mp3/decode_ntom.c index b231f43..e6b10a4 100644 --- a/addons/mp3/decode_ntom.c +++ b/addons/mp3/decode_ntom.c @@ -7,8 +7,8 @@ * N->M down/up sampling. Not optimized for speed. */ -#include -#include +#include "asterisk.h" +#include "asterisk/logger.h" #include #include #include diff --git a/addons/mp3/interface.c b/addons/mp3/interface.c index 9ced533..a71d15d 100644 --- a/addons/mp3/interface.c +++ b/addons/mp3/interface.c @@ -1,5 +1,5 @@ -#include -#include +#include "asterisk.h" +#include "asterisk/logger.h" #include #include diff --git a/addons/mp3/layer3.c b/addons/mp3/layer3.c index 793c996..e635576 100644 --- a/addons/mp3/layer3.c +++ b/addons/mp3/layer3.c @@ -5,8 +5,8 @@ * All rights reserved. See also 'README' */ -#include -#include +#include "asterisk.h" +#include "asterisk/logger.h" #include #include "mpg123.h" #include "mpglib.h" diff --git a/addons/ooh323c/src/context.c b/addons/ooh323c/src/context.c index f2dc111..46f1fc8 100644 --- a/addons/ooh323c/src/context.c +++ b/addons/ooh323c/src/context.c @@ -13,8 +13,8 @@ * maintain this copyright notice. * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "ooasn1.h" #include diff --git a/addons/ooh323c/src/decode.c b/addons/ooh323c/src/decode.c index c80a481..643901e 100644 --- a/addons/ooh323c/src/decode.c +++ b/addons/ooh323c/src/decode.c @@ -14,8 +14,8 @@ * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "ooasn1.h" diff --git a/addons/ooh323c/src/dlist.c b/addons/ooh323c/src/dlist.c index 9a9bfbb..6e110e1 100644 --- a/addons/ooh323c/src/dlist.c +++ b/addons/ooh323c/src/dlist.c @@ -14,8 +14,8 @@ * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "ooasn1.h" diff --git a/addons/ooh323c/src/encode.c b/addons/ooh323c/src/encode.c index 099e6e9..22fc1f3 100644 --- a/addons/ooh323c/src/encode.c +++ b/addons/ooh323c/src/encode.c @@ -14,8 +14,8 @@ * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include #include "ooasn1.h" diff --git a/addons/ooh323c/src/errmgmt.c b/addons/ooh323c/src/errmgmt.c index 2b8c41f..de660c5 100644 --- a/addons/ooh323c/src/errmgmt.c +++ b/addons/ooh323c/src/errmgmt.c @@ -16,8 +16,8 @@ /* Error management functions */ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include #include "ooasn1.h" diff --git a/addons/ooh323c/src/eventHandler.c b/addons/ooh323c/src/eventHandler.c index 080117f..82e1eb4 100644 --- a/addons/ooh323c/src/eventHandler.c +++ b/addons/ooh323c/src/eventHandler.c @@ -14,8 +14,8 @@ * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "eventHandler.h" diff --git a/addons/ooh323c/src/memheap.c b/addons/ooh323c/src/memheap.c index d60b7a0..99ed06b 100644 --- a/addons/ooh323c/src/memheap.c +++ b/addons/ooh323c/src/memheap.c @@ -13,8 +13,8 @@ * maintain this copyright notice. * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include #include "memheap.h" diff --git a/addons/ooh323c/src/ooCalls.c b/addons/ooh323c/src/ooCalls.c index 6648c3f..71d6309 100644 --- a/addons/ooh323c/src/ooCalls.c +++ b/addons/ooh323c/src/ooCalls.c @@ -14,8 +14,8 @@ * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "ootrace.h" #include "ootypes.h" diff --git a/addons/ooh323c/src/ooCapability.c b/addons/ooh323c/src/ooCapability.c index 09dc3b9..3918640 100644 --- a/addons/ooh323c/src/ooCapability.c +++ b/addons/ooh323c/src/ooCapability.c @@ -13,8 +13,8 @@ * maintain this copyright notice. * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "ooCapability.h" #include "ootrace.h" diff --git a/addons/ooh323c/src/ooCmdChannel.c b/addons/ooh323c/src/ooCmdChannel.c index 27a28a2..d88ac79 100644 --- a/addons/ooh323c/src/ooCmdChannel.c +++ b/addons/ooh323c/src/ooCmdChannel.c @@ -14,8 +14,8 @@ * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "ooStackCmds.h" #include "ootrace.h" #include "ooq931.h" diff --git a/addons/ooh323c/src/ooGkClient.c b/addons/ooh323c/src/ooGkClient.c index 534f220..e5c6361 100644 --- a/addons/ooh323c/src/ooGkClient.c +++ b/addons/ooh323c/src/ooGkClient.c @@ -20,8 +20,8 @@ * This file contains functions to support RAS protocol. * */ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "ooGkClient.h" #include "ootypes.h" diff --git a/addons/ooh323c/src/ooLogChan.c b/addons/ooh323c/src/ooLogChan.c index dfd16c3..b230ede 100644 --- a/addons/ooh323c/src/ooLogChan.c +++ b/addons/ooh323c/src/ooLogChan.c @@ -14,8 +14,8 @@ * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "ooCalls.h" #include "ooh323ep.h" diff --git a/addons/ooh323c/src/ooStackCmds.c b/addons/ooh323c/src/ooStackCmds.c index 4c732d5..2987878 100644 --- a/addons/ooh323c/src/ooStackCmds.c +++ b/addons/ooh323c/src/ooStackCmds.c @@ -13,8 +13,8 @@ * maintain this copyright notice. * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "ooStackCmds.h" #include "ooh323ep.h" diff --git a/addons/ooh323c/src/ooTimer.c b/addons/ooh323c/src/ooTimer.c index bd04715..9e7f722 100644 --- a/addons/ooh323c/src/ooTimer.c +++ b/addons/ooh323c/src/ooTimer.c @@ -14,8 +14,8 @@ * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "ooDateTime.h" #include "ooTimer.h" diff --git a/addons/ooh323c/src/ooUtils.c b/addons/ooh323c/src/ooUtils.c index 4c08e24..7b5321b 100644 --- a/addons/ooh323c/src/ooUtils.c +++ b/addons/ooh323c/src/ooUtils.c @@ -14,8 +14,8 @@ * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "ooUtils.h" #include diff --git a/addons/ooh323c/src/ooasn1.h b/addons/ooh323c/src/ooasn1.h index 86a9b80..e7b585e 100644 --- a/addons/ooh323c/src/ooasn1.h +++ b/addons/ooh323c/src/ooasn1.h @@ -22,8 +22,8 @@ #ifndef _OOASN1_H_ #define _OOASN1_H_ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include #include diff --git a/addons/ooh323c/src/oochannels.c b/addons/ooh323c/src/oochannels.c index 7d8c1ab..42f00a9 100644 --- a/addons/ooh323c/src/oochannels.c +++ b/addons/ooh323c/src/oochannels.c @@ -13,8 +13,8 @@ * maintain this copyright notice. * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "ooports.h" #include "oochannels.h" diff --git a/addons/ooh323c/src/ooh245.c b/addons/ooh323c/src/ooh245.c index 9eee543..d42f8bb 100644 --- a/addons/ooh323c/src/ooh245.c +++ b/addons/ooh323c/src/ooh245.c @@ -13,8 +13,8 @@ * maintain this copyright notice. * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "ooh245.h" #include "ooCalls.h" #include "printHandler.h" diff --git a/addons/ooh323c/src/ooh323.c b/addons/ooh323c/src/ooh323.c index 21eab1f..8f6b4cb 100644 --- a/addons/ooh323c/src/ooh323.c +++ b/addons/ooh323c/src/ooh323.c @@ -14,8 +14,8 @@ * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include #include "ootypes.h" diff --git a/addons/ooh323c/src/ooh323ep.c b/addons/ooh323c/src/ooh323ep.c index 77c368b..1d5d957 100644 --- a/addons/ooh323c/src/ooh323ep.c +++ b/addons/ooh323c/src/ooh323ep.c @@ -13,8 +13,8 @@ * maintain this copyright notice. * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "ooh323ep.h" #include "ootrace.h" diff --git a/addons/ooh323c/src/ooports.c b/addons/ooh323c/src/ooports.c index 2b9cc09..3b2efb8 100644 --- a/addons/ooh323c/src/ooports.c +++ b/addons/ooh323c/src/ooports.c @@ -14,8 +14,8 @@ * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "ooports.h" #include "ooh323ep.h" diff --git a/addons/ooh323c/src/ooq931.c b/addons/ooh323c/src/ooq931.c index 307aba5..626f969 100644 --- a/addons/ooh323c/src/ooq931.c +++ b/addons/ooh323c/src/ooq931.c @@ -14,8 +14,8 @@ * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "asterisk/utils.h" #include diff --git a/addons/ooh323c/src/ootrace.c b/addons/ooh323c/src/ootrace.c index a688a39..ba77e7f 100644 --- a/addons/ooh323c/src/ootrace.c +++ b/addons/ooh323c/src/ootrace.c @@ -14,8 +14,8 @@ * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include #include #include diff --git a/addons/ooh323c/src/perutil.c b/addons/ooh323c/src/perutil.c index 4d9a84e..c6a608c 100644 --- a/addons/ooh323c/src/perutil.c +++ b/addons/ooh323c/src/perutil.c @@ -14,8 +14,8 @@ * *****************************************************************************/ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "ooasn1.h" #include "ooper.h" diff --git a/addons/ooh323c/src/printHandler.c b/addons/ooh323c/src/printHandler.c index 47c511f..abb4d4f 100644 --- a/addons/ooh323c/src/printHandler.c +++ b/addons/ooh323c/src/printHandler.c @@ -17,8 +17,8 @@ the fields of an encoded PER message to stdout in a structured output format.. */ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include /* #ifdef HAVE_MALLOC_H diff --git a/addons/ooh323c/src/rtctype.c b/addons/ooh323c/src/rtctype.c index ea51bdb..8dfe4e3 100644 --- a/addons/ooh323c/src/rtctype.c +++ b/addons/ooh323c/src/rtctype.c @@ -16,8 +16,8 @@ /* Run-time ctype substitution */ -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" #include "ooasn1.h" #include "rtctype.h" diff --git a/addons/ooh323cDriver.c b/addons/ooh323cDriver.c index e912f1f..dd07bb4 100644 --- a/addons/ooh323cDriver.c +++ b/addons/ooh323cDriver.c @@ -16,11 +16,11 @@ #include "ooh323cDriver.h" -#include -#include +#include "asterisk.h" +#include "asterisk/lock.h" -#include -#include +#include "asterisk/pbx.h" +#include "asterisk/logger.h" #undef AST_BACKGROUND_STACKSIZE #define AST_BACKGROUND_STACKSIZE 768 * 1024 diff --git a/addons/ooh323cDriver.h b/addons/ooh323cDriver.h index d295206..269c56a 100644 --- a/addons/ooh323cDriver.h +++ b/addons/ooh323cDriver.h @@ -22,7 +22,7 @@ #include "ooCalls.h" #include "ooCapability.h" #include "ooStackCmds.h" -#include +#include "asterisk/frame_defs.h" #define H323_DTMF_RFC2833 (1 << 0) #define H323_DTMF_Q931 (1 << 1) #define H323_DTMF_H245ALPHANUMERIC (1 << 2) -- 1.7.9.5