From fff17a25ddc637a9253c758b7407aeda3f5244cb Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
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 1a4d55edb6..65eefb7c60 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 <asterisk.h>
+#include "asterisk.h"
 #undef PACKAGE_NAME
 #undef PACKAGE_TARNAME
 #undef PACKAGE_VERSION
@@ -40,29 +40,29 @@
 #include <signal.h>
 #include <sys/signal.h>
 
-#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 "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 d8db2a3d29..9a6fd8c132 100644
--- a/addons/mp3/common.c
+++ b/addons/mp3/common.c
@@ -1,5 +1,5 @@
-#include <asterisk.h>
-#include <asterisk/logger.h>
+#include "asterisk.h"
+#include "asterisk/logger.h"
 
 #include <ctype.h>
 #include <stdlib.h>
diff --git a/addons/mp3/decode_ntom.c b/addons/mp3/decode_ntom.c
index b231f439f6..e6b10a4c16 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 <asterisk.h>
-#include <asterisk/logger.h>
+#include "asterisk.h"
+#include "asterisk/logger.h"
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
diff --git a/addons/mp3/interface.c b/addons/mp3/interface.c
index 9ced533426..a71d15df57 100644
--- a/addons/mp3/interface.c
+++ b/addons/mp3/interface.c
@@ -1,5 +1,5 @@
-#include <asterisk.h>
-#include <asterisk/logger.h>
+#include "asterisk.h"
+#include "asterisk/logger.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/addons/mp3/layer3.c b/addons/mp3/layer3.c
index 793c996330..e6355764d1 100644
--- a/addons/mp3/layer3.c
+++ b/addons/mp3/layer3.c
@@ -5,8 +5,8 @@
  * All rights reserved. See also 'README'
  */ 
 
-#include <asterisk.h>
-#include <asterisk/logger.h>
+#include "asterisk.h"
+#include "asterisk/logger.h"
 #include <stdlib.h>
 #include "mpg123.h"
 #include "mpglib.h"
diff --git a/addons/ooh323c/src/context.c b/addons/ooh323c/src/context.c
index f2dc1119b8..46f1fc8c06 100644
--- a/addons/ooh323c/src/context.c
+++ b/addons/ooh323c/src/context.c
@@ -13,8 +13,8 @@
  * maintain this copyright notice.
  *
  *****************************************************************************/
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include "ooasn1.h"
 #include <stdlib.h>
diff --git a/addons/ooh323c/src/decode.c b/addons/ooh323c/src/decode.c
index c80a481ba6..643901e7d7 100644
--- a/addons/ooh323c/src/decode.c
+++ b/addons/ooh323c/src/decode.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#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 9a9bfbb4c9..6e110e17b5 100644
--- a/addons/ooh323c/src/dlist.c
+++ b/addons/ooh323c/src/dlist.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#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 099e6e9ec1..22fc1f31d3 100644
--- a/addons/ooh323c/src/encode.c
+++ b/addons/ooh323c/src/encode.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 #include <stdlib.h>
 
 #include "ooasn1.h"
diff --git a/addons/ooh323c/src/errmgmt.c b/addons/ooh323c/src/errmgmt.c
index 2b8c41feb3..de660c5fd1 100644
--- a/addons/ooh323c/src/errmgmt.c
+++ b/addons/ooh323c/src/errmgmt.c
@@ -16,8 +16,8 @@
 
 /* Error management functions */
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 #include <stdlib.h>
 #include "ooasn1.h"
 
diff --git a/addons/ooh323c/src/eventHandler.c b/addons/ooh323c/src/eventHandler.c
index 080117f97e..82e1eb4359 100644
--- a/addons/ooh323c/src/eventHandler.c
+++ b/addons/ooh323c/src/eventHandler.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#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 d60b7a074e..99ed06ba7c 100644
--- a/addons/ooh323c/src/memheap.c
+++ b/addons/ooh323c/src/memheap.c
@@ -13,8 +13,8 @@
  * maintain this copyright notice.
  *
  *****************************************************************************/
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 #include <stdlib.h>
 #include "memheap.h"
 
diff --git a/addons/ooh323c/src/ooCalls.c b/addons/ooh323c/src/ooCalls.c
index 6648c3fe2a..71d63092db 100644
--- a/addons/ooh323c/src/ooCalls.c
+++ b/addons/ooh323c/src/ooCalls.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#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 09dc3b95ea..3918640182 100644
--- a/addons/ooh323c/src/ooCapability.c
+++ b/addons/ooh323c/src/ooCapability.c
@@ -13,8 +13,8 @@
  * maintain this copyright notice.
  *
  *****************************************************************************/
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#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 27a28a2824..d88ac7942d 100644
--- a/addons/ooh323c/src/ooCmdChannel.c
+++ b/addons/ooh323c/src/ooCmdChannel.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#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 534f2205c3..e5c6361e4f 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 <asterisk.h>
-#include <asterisk/lock.h>
+#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 dfd16c3057..b230edef42 100644
--- a/addons/ooh323c/src/ooLogChan.c
+++ b/addons/ooh323c/src/ooLogChan.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#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 4c732d538b..29878789e3 100644
--- a/addons/ooh323c/src/ooStackCmds.c
+++ b/addons/ooh323c/src/ooStackCmds.c
@@ -13,8 +13,8 @@
  * maintain this copyright notice.
  *
  *****************************************************************************/
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#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 bd04715ff6..9e7f7227a8 100644
--- a/addons/ooh323c/src/ooTimer.c
+++ b/addons/ooh323c/src/ooTimer.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#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 4c08e247c6..7b5321b6d6 100644
--- a/addons/ooh323c/src/ooUtils.c
+++ b/addons/ooh323c/src/ooUtils.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 #include "ooUtils.h"
 #include <ctype.h>
 
diff --git a/addons/ooh323c/src/ooasn1.h b/addons/ooh323c/src/ooasn1.h
index 86a9b80c8b..e7b585eb1e 100644
--- a/addons/ooh323c/src/ooasn1.h
+++ b/addons/ooh323c/src/ooasn1.h
@@ -22,8 +22,8 @@
 #ifndef _OOASN1_H_
 #define _OOASN1_H_
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/addons/ooh323c/src/oochannels.c b/addons/ooh323c/src/oochannels.c
index 7d8c1ab723..42f00a9e8b 100644
--- a/addons/ooh323c/src/oochannels.c
+++ b/addons/ooh323c/src/oochannels.c
@@ -13,8 +13,8 @@
  * maintain this copyright notice.
  *
  *****************************************************************************/
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#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 9eee543162..d42f8bbc17 100644
--- a/addons/ooh323c/src/ooh245.c
+++ b/addons/ooh323c/src/ooh245.c
@@ -13,8 +13,8 @@
  * maintain this copyright notice.
  *
  *****************************************************************************/
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#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 21eab1fa32..8f6b4cb285 100644
--- a/addons/ooh323c/src/ooh323.c
+++ b/addons/ooh323c/src/ooh323.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 #include <time.h>
 
 #include "ootypes.h"
diff --git a/addons/ooh323c/src/ooh323ep.c b/addons/ooh323c/src/ooh323ep.c
index 77c368b0b7..1d5d9579ed 100644
--- a/addons/ooh323c/src/ooh323ep.c
+++ b/addons/ooh323c/src/ooh323ep.c
@@ -13,8 +13,8 @@
  * maintain this copyright notice.
  *
  *****************************************************************************/
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#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 2b9cc09ff9..3b2efb8d5c 100644
--- a/addons/ooh323c/src/ooports.c
+++ b/addons/ooh323c/src/ooports.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#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 307aba5a68..626f969391 100644
--- a/addons/ooh323c/src/ooq931.c
+++ b/addons/ooh323c/src/ooq931.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 #include "asterisk/utils.h"
 #include <time.h>
 
diff --git a/addons/ooh323c/src/ootrace.c b/addons/ooh323c/src/ootrace.c
index a688a390c2..ba77e7fd1a 100644
--- a/addons/ooh323c/src/ootrace.c
+++ b/addons/ooh323c/src/ootrace.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/addons/ooh323c/src/perutil.c b/addons/ooh323c/src/perutil.c
index 4d9a84eb50..c6a608ca7d 100644
--- a/addons/ooh323c/src/perutil.c
+++ b/addons/ooh323c/src/perutil.c
@@ -14,8 +14,8 @@
  *
  *****************************************************************************/
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#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 47c511f969..abb4d4f2de 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 <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include <stdlib.h>
 /* #ifdef HAVE_MALLOC_H
diff --git a/addons/ooh323c/src/rtctype.c b/addons/ooh323c/src/rtctype.c
index ea51bdbd38..8dfe4e3fa9 100644
--- a/addons/ooh323c/src/rtctype.c
+++ b/addons/ooh323c/src/rtctype.c
@@ -16,8 +16,8 @@
 
 /* Run-time ctype substitution */
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
 #include "ooasn1.h"
 #include "rtctype.h"
diff --git a/addons/ooh323cDriver.c b/addons/ooh323cDriver.c
index e912f1f162..dd07bb4b01 100644
--- a/addons/ooh323cDriver.c
+++ b/addons/ooh323cDriver.c
@@ -16,11 +16,11 @@
 
 #include "ooh323cDriver.h"
 
-#include <asterisk.h>
-#include <asterisk/lock.h>
+#include "asterisk.h"
+#include "asterisk/lock.h"
 
-#include <asterisk/pbx.h>
-#include <asterisk/logger.h>
+#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 d295206467..269c56a719 100644
--- a/addons/ooh323cDriver.h
+++ b/addons/ooh323cDriver.h
@@ -22,7 +22,7 @@
 #include "ooCalls.h"
 #include "ooCapability.h"
 #include "ooStackCmds.h"
-#include <asterisk/frame_defs.h>
+#include "asterisk/frame_defs.h"
 #define H323_DTMF_RFC2833          (1 << 0)
 #define H323_DTMF_Q931             (1 << 1)
 #define H323_DTMF_H245ALPHANUMERIC (1 << 2)
-- 
GitLab