Remove pthread.h from source. We should be using asterisk/lock.h everywhere instead...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3276 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/acl.c b/acl.c
index 4feea75a7fcf09a7767b2beaf28d2ecb294c007d..3f0afb9aba4656922e00098157884506bb834524 100755 (executable)
--- a/acl.c
+++ b/acl.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -23,6 +22,7 @@
 #include <asterisk/logger.h>
 #include <asterisk/channel.h>
 #include <asterisk/utils.h>
+#include <asterisk/lock.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netdb.h>

diff --git a/app.c b/app.c
index f041bd323aafa3d0a7d802ea829c57328e99a88f..813d35842dd8c36ddb2711d8ff97f919d10ae2e8 100755 (executable)
--- a/app.c
+++ b/app.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -28,6 +27,7 @@
 #include <asterisk/logger.h>
 #include <asterisk/options.h>
 #include <asterisk/utils.h>
+#include <asterisk/lock.h>
 #include "asterisk.h"
 #include "astconf.h"
 

diff --git a/astmm.c b/astmm.c
index 6b98c557d1be4aa74488fdcf33e3d1466ca59bfa..c249091ee222cbb423614cc25275c441246ee696 100755 (executable)
--- a/astmm.c
+++ b/astmm.c
@@ -18,7 +18,6 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <string.h>
-#include <pthread.h>
 #include <time.h>
 #include <asterisk/cli.h>
 #include <asterisk/logger.h>

diff --git a/autoservice.c b/autoservice.c
index 2f28f35a7a868405cc05f1ab1da6e7121232b39e..98a9633531b028cf0dca6bd7b1872d624256d618 100755 (executable)
--- a/autoservice.c
+++ b/autoservice.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -33,6 +32,7 @@
 #include <asterisk/chanvars.h>
 #include <asterisk/linkedlists.h>
 #include <asterisk/indications.h>
+#include <asterisk/lock.h>
 
 #define MAX_AUTOMONS 256
 

diff --git a/cdr.c b/cdr.c
index 4d9e492a90d15b73f5cabcddc990375c724bd752..0c6796daf1db499163d17d15a627df5e5b8a6548 100755 (executable)
--- a/cdr.c
+++ b/cdr.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
 
 int ast_default_amaflags = AST_CDR_DOCUMENTATION;
 char ast_default_accountcode[20] = "";

diff --git a/channel.c b/channel.c
index 83e39ed573f3dff4338abe87cedaf7ec621a6681..638ecfeecf370374e90bd062e29a8ec8085325f8 100755 (executable)
--- a/channel.c
+++ b/channel.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -38,6 +37,7 @@
 #include <asterisk/monitor.h>
 #include <asterisk/causes.h>
 #include <asterisk/utils.h>
+#include <asterisk/lock.h>
 #ifdef ZAPTEL_OPTIMIZATIONS
 #include <sys/ioctl.h>
 #ifdef __linux__

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index bdbefe232f226f8b09382eec746e01b126d69d77..0e469fb85f816f69c828ce33773b2bcda5b9b0f3 100755 (executable)
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -12,7 +12,6 @@
  */
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 622b71f17ddc99389360f4bdb80fd35f02d4d8fc..a2e88662cd1230ba91691ab88bd7e83ca9d0bda0 100755 (executable)
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -28,7 +28,6 @@
 
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/logger.h>

diff --git a/channels/chan_iax.c b/channels/chan_iax.c
index 055f303ec6b33042dfc6023c8444952e11a0f446..cb028557d9f9d1ddc3278280379db0ba5ff45429 100755 (executable)
--- a/channels/chan_iax.c
+++ b/channels/chan_iax.c
@@ -43,7 +43,6 @@
 #include <unistd.h>
 #include <netdb.h>
 #include <fcntl.h>
-#include <pthread.h>
 #include <signal.h>
 #include <sys/signal.h>
 

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index dad6707ba02e3c570b50dcb64e83b79280069364..0d60b963a4b49135dcc9f73d9ab31b04b7ed897b 100755 (executable)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -45,7 +45,6 @@
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <signal.h>
-#include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/channels/chan_local.c b/channels/chan_local.c
index b4426825b575d0fdb9353aed972451277eb84346..758777a85c66ce93f17f6a903e94c5f02139df14 100755 (executable)
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -12,7 +12,6 @@
  */
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>

diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index b00168eeb45fa70603441b05e43152e2f80bbb6c..f96e9c90d7a4f44b8c879a5932fd309a383540d4 100755 (executable)
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -49,7 +49,6 @@
  */
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>
@@ -84,7 +83,6 @@
 #include <arpa/inet.h>
 #include <sys/signal.h>
 #include <signal.h>
-#include <pthread.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 

diff --git a/channels/chan_modem.c b/channels/chan_modem.c
index c2f7e618706c4ac1405a681fe081e9c54ba1c0a5..ace64c78e2f0affc049ba7d70e410ab3b7c9669c 100755 (executable)
--- a/channels/chan_modem.c
+++ b/channels/chan_modem.c
@@ -12,7 +12,6 @@
  */
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>

diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c
index 700dcc643f4aa6185c6d32f1e4b288e345acb50a..b30e1fadbd4f41788e38557fd650432e68cb5b99 100755 (executable)
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -12,7 +12,6 @@
  */
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>

diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index f699ee0bb21f0ab44bed2db6824193afc6e47229..69c0884bd150213f09cf8dcf3f436575b20c5373 100755 (executable)
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -12,7 +12,6 @@
  */
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index f7befec62e177c5dc281007c0d8e37c627a9fd4a..ddb4d8a6ec7288cbaa3caa68cf919d1dd49a271f 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>
@@ -49,7 +48,6 @@
 #include <fcntl.h>
 #include <netdb.h>
 #include <arpa/inet.h>
-#include <pthread.h>
 #include <signal.h>
 #include <sys/signal.h>
 #include <netinet/in_systm.h>

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index d73ce62b85b4a2ed78e5a3e39a046727d6c72919..227a9e20662eb90aaf077d40fab17e4d631d5890 100755 (executable)
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -15,7 +15,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>
@@ -51,7 +50,6 @@
 #include <arpa/inet.h>
 #include <sys/signal.h>
 #include <signal.h>
-#include <pthread.h>
 #include <asterisk/dsp.h>
 #include <ctype.h>
 

diff --git a/channels/chan_vofr.c b/channels/chan_vofr.c
index 7ab952dc27dec7f9c5a563a2e8cb0119c498e316..43e7271d986610342af4dd314b2a618955d1d453 100755 (executable)
--- a/channels/chan_vofr.c
+++ b/channels/chan_vofr.c
@@ -12,7 +12,6 @@
  */
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>

diff --git a/channels/chan_vpb.c b/channels/chan_vpb.c
index 8344ccba3d447aecc76f4d2cdadad761a6e8d0c5..bd4576b8f8b8d7ef13d2c966e9cb0c9ed387f597 100755 (executable)
--- a/channels/chan_vpb.c
+++ b/channels/chan_vpb.c
@@ -14,7 +14,6 @@
 
 
 #include <stdio.h>
-#include <pthread.h>
 #include <string.h>
 #include <asterisk/lock.h>
 #include <asterisk/channel.h>

diff --git a/cli.c b/cli.c
index 6543a0bf0524c829ed436cd64d57aa8e6c3a812d..1376ed257ea9f5c0c4f77200c8658afbeefbdf27 100755 (executable)
--- a/cli.c
+++ b/cli.c
@@ -20,11 +20,11 @@
 #include <asterisk/channel.h>
 #include <asterisk/channel_pvt.h>
 #include <asterisk/utils.h>
+#include <asterisk/lock.h>
 #include <sys/signal.h>
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
-#include <pthread.h>
 /* For rl_filename_completion */
 #include "editline/readline/readline.h"
 /* For module directory */

diff --git a/codecs/codec_a_mu.c b/codecs/codec_a_mu.c
index 84d23a146cd86a8abdc733c7e3460ec44d48b8d8..09b8e02bc05f004ff36d597942ab58521b05d237 100755 (executable)
--- a/codecs/codec_a_mu.c
+++ b/codecs/codec_a_mu.c
@@ -19,7 +19,6 @@
 #include <asterisk/ulaw.h>
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index 9aa0304c715859344507af8086999ddb9986321f..7bc75075d26622d94eddeab23b7797606d05049a 100755 (executable)
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -20,7 +20,6 @@
 #include <asterisk/channel.h>
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c
index 5574cd451fbee16ac061c856800ff0a685b87751..6ba4e1da967903147858867d0a743c0c4875fc25 100755 (executable)
--- a/codecs/codec_alaw.c
+++ b/codecs/codec_alaw.c
@@ -18,7 +18,6 @@
 #include <asterisk/alaw.h>
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/codecs/codec_g723_1.c b/codecs/codec_g723_1.c
index 3692b56abddbdf0e27b952ba2a096e037aff7b87..48b85e8ddb10462c0edcf336d914cd3159153476 100755 (executable)
--- a/codecs/codec_g723_1.c
+++ b/codecs/codec_g723_1.c
@@ -22,11 +22,11 @@
 #define TYPE_MASK       0x3
 
 #include <sys/types.h>
+#include <asterisk/lock.h>
 #include <asterisk/translate.h>
 #include <asterisk/module.h>
 #include <asterisk/logger.h>
 #include <asterisk/channel.h>
-#include <pthread.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c
index 3dad026ddc90765fd551c1b1f206ec06a1c3a117..de3e6c73d99b165c9208ee0ffbbbcd908d9564ed 100755 (executable)
--- a/codecs/codec_g726.c
+++ b/codecs/codec_g726.c
@@ -20,7 +20,6 @@
 #include <asterisk/channel.h>
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c
index 8e37c70ec53621abfa1a5594b730ae79eba17b36..286dc4fb89215ac3f015efb7e12c1ac0bed1f4ba 100755 (executable)
--- a/codecs/codec_gsm.c
+++ b/codecs/codec_gsm.c
@@ -24,7 +24,6 @@
 #include <asterisk/module.h>
 #include <asterisk/logger.h>
 #include <asterisk/channel.h>
-#include <pthread.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c
index 947921249214a54666207f6d97d9379eea2d18a1..5756d9ce9148e72a1d21e57f1316007d3aeeee65 100755 (executable)
--- a/codecs/codec_ilbc.c
+++ b/codecs/codec_ilbc.c
@@ -18,7 +18,6 @@
 #include <asterisk/module.h>
 #include <asterisk/logger.h>
 #include <asterisk/channel.h>
-#include <pthread.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c
index 2b054710a5092ce040e8275276e6cdf2e9a5e06f..9ec7a7ee207bfe6043885ef44af0d785373bcd4a 100755 (executable)
--- a/codecs/codec_lpc10.c
+++ b/codecs/codec_lpc10.c
@@ -22,7 +22,6 @@
 #include <asterisk/module.h>
 #include <asterisk/logger.h>
 #include <asterisk/channel.h>
-#include <pthread.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c
index 4bd5155dde7b15e989d12a7fe4d2af3a0582233f..5c44a0aefa4767d8d585eafeed80bcefb07fe031 100755 (executable)
--- a/codecs/codec_speex.c
+++ b/codecs/codec_speex.c
@@ -23,7 +23,6 @@
 #include <asterisk/module.h>
 #include <asterisk/logger.h>
 #include <asterisk/channel.h>
-#include <pthread.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c
index 55ff81e1cce40f0446fdb4a89eda045ceb746261..698733a3cb3f93dbdc52f5de51c73f2667a72756 100755 (executable)
--- a/codecs/codec_ulaw.c
+++ b/codecs/codec_ulaw.c
@@ -18,7 +18,6 @@
 #include <asterisk/ulaw.h>
 #include <fcntl.h>
 #include <netinet/in.h>
-#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/db.c b/db.c
index 4842b71de9a003471ebdc2474ec2223bd9caf4d0..128547fdecb26f4e85c0c9f55cc500dce50b1ebc 100755 (executable)
--- a/db.c
+++ b/db.c
@@ -17,7 +17,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -33,6 +32,7 @@
 #include <asterisk/astdb.h>
 #include <asterisk/cli.h>
 #include <asterisk/utils.h>
+#include <asterisk/lock.h>
 #include "db1-ast/include/db.h"
 #include "asterisk.h"
 #include "astconf.h"

diff --git a/file.c b/file.c
index 1e896e8cd1ecf0186018f73045d73ec082ba665d..d5d1f8e940b2a5387e3e49580bf66cc98ac33e4a 100755 (executable)
--- a/file.c
+++ b/file.c
@@ -20,11 +20,11 @@
 #include <asterisk/options.h>
 #include <asterisk/translate.h>
 #include <asterisk/utils.h>
+#include <asterisk/lock.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <dirent.h>

diff --git a/formats/format_g723.c b/formats/format_g723.c
index cf5228f8beec7b9d26e1818db1143f4256811fcb..955ce59164fe3c1676d67dc52f6d87af86c18ebc 100755 (executable)
--- a/formats/format_g723.c
+++ b/formats/format_g723.c
@@ -23,7 +23,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #include <sys/time.h>
 #include "../channels/adtranvofr.h"
 

diff --git a/formats/format_g726.c b/formats/format_g726.c
index acb44c728bb44e6ca20fcce37079bc78c47d32b8..9788a28b47de2cc12b06eef60ca4900f645daa8c 100755 (executable)
--- a/formats/format_g726.c
+++ b/formats/format_g726.c
@@ -24,7 +24,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else

diff --git a/formats/format_g729.c b/formats/format_g729.c
index 9f7531d5f244186d7c7e9a4534fa6f222c10b5ad..746874d7dffa806954d47893065210e99d84c133 100755 (executable)
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else

diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index 619786e56fb698849002f4d753330c8cf10e5f16..f4b5aa1894549d14b63defe1a40916524e511f80 100755 (executable)
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else

diff --git a/formats/format_h263.c b/formats/format_h263.c
index dd8a21454c14b67dccceb185640028986fc61cd8..1482e5b5d93098be3f8fb0b4d50112d816ed3f02 100755 (executable)
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else

diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c
index 0d50900d90da0e19d0601f9d4d12398e1e45cc47..61b9d595861a24b974a169279187e996936dbe59 100755 (executable)
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -27,7 +27,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else

diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c
index db7c2096eb09bf2728dbb6b6d34d0d10244798e1..56c5ef8d8092b0cb6e893b76dc0713c0464233ab 100755 (executable)
--- a/formats/format_jpeg.c
+++ b/formats/format_jpeg.c
@@ -18,6 +18,7 @@
 #include <asterisk/sched.h>
 #include <asterisk/module.h>
 #include <asterisk/image.h>
+#include <asterisk/lock.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
@@ -26,7 +27,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else

diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index 2ad29471ce7779303ba803bff19def1382d256c2..3c1cbe3cb47eef9db9d9e9cd4b5d808cce4a7e84 100755 (executable)
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else

diff --git a/formats/format_pcm_alaw.c b/formats/format_pcm_alaw.c
index 55911d8f39e7d06f47c46e706999170eaaaaa89d..eda446ca4226c2bbd9b698f48b426d21339e34eb 100755 (executable)
--- a/formats/format_pcm_alaw.c
+++ b/formats/format_pcm_alaw.c
@@ -27,7 +27,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else

diff --git a/formats/format_vox.c b/formats/format_vox.c
index 92f4f4e565a50eadee74067162073490594bc994..1a09dac52c82f52bd234cbc011ee5a13bfc13eb4 100755 (executable)
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else

diff --git a/formats/format_wav.c b/formats/format_wav.c
index 804c38c4ebf1a352a139ec941c34bebbb2865cd0..0e87f2de9a186f67e53b98d8ae504e966676678b 100755 (executable)
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else

diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index a9f9df838a0ea0f3fcc3da33a29d4dba93f6b609..6ed2c64712acd34b922e15a710a12e7931615803 100755 (executable)
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <pthread.h>
 #ifdef __linux__
 #include <endian.h>
 #else

diff --git a/frame.c b/frame.c
index f8905ca959d023192bb2c87483138e096c9f2f8b..7ee6c77ae2ca7c3151639a4dce997276627a513d 100755 (executable)
--- a/frame.c
+++ b/frame.c
@@ -22,7 +22,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <pthread.h>
 #include <stdio.h>
 #include "asterisk.h"
 

diff --git a/image.c b/image.c
index f0c21035f9d4664294e637c260066b88f7acd900..211534e40a0b8c9ed64fd75876ab734b5e52a601 100755 (executable)
--- a/image.c
+++ b/image.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <sys/stat.h>
@@ -29,6 +28,7 @@
 #include <asterisk/image.h>
 #include <asterisk/translate.h>
 #include <asterisk/cli.h>
+#include <asterisk/lock.h>
 #include "asterisk.h"
 #include "astconf.h"
 

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 758670f2824ccbaa5332e992037752f9ef618d5e..e4421c1b1f20db1839a95cd36bbcded7cbeccec7 100755 (executable)
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -19,7 +19,6 @@
 #include <asterisk/chanvars.h>
 #include <unistd.h>
 #include <setjmp.h>
-#include <pthread.h>
 #include <sys/poll.h>
 
 #if defined(__cplusplus) || defined(c_plusplus)

diff --git a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h
index b752b3adb781808be53993ce1fa1120e3269be85..6fd7787922344e99b225a9d3ce7f47b6655b688d 100755 (executable)
--- a/include/asterisk/linkedlists.h
+++ b/include/asterisk/linkedlists.h
@@ -1,7 +1,6 @@
 #ifndef ASTERISK_LINKEDLISTS_H
 #define ASTERISK_LINKEDLISTS_H
 
-#include <pthread.h>
 #include <asterisk/lock.h>
 
 #define AST_LIST_LOCK(head)                                            \

diff --git a/indications.c b/indications.c
index 25b98a0ca5953c1bd2d876d6e514e8d0425e4567..b4ba6d33c31942ce5e0c8fc0fa9ccf4d52d04fad 100755 (executable)
--- a/indications.c
+++ b/indications.c
@@ -18,7 +18,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <math.h>                      /* For PI */
 #include <asterisk/indications.h>
@@ -26,6 +25,7 @@
 #include <asterisk/options.h>
 #include <asterisk/channel.h>
 #include <asterisk/logger.h>
+#include <asterisk/lock.h>
 
 struct playtones_item {
        int freq1;

diff --git a/loader.c b/loader.c
index d6108f8f60a6b2869f8d897d2d9756d8684248b5..c6a0ca24de0ee64e8264f83b045f67ae12620284 100755 (executable)
--- a/loader.c
+++ b/loader.c
@@ -26,13 +26,13 @@
 #include <asterisk/manager.h>
 #include <asterisk/enum.h>
 #include <asterisk/rtp.h>
+#include <asterisk/lock.h>
 #ifdef __APPLE__
 #include <asterisk/dlfcn-compat.h>
 #else
 #include <dlfcn.h>
 #endif
 #include <asterisk/md5.h>
-#include <pthread.h>
 #include "asterisk.h"
 #include "astconf.h"
 

diff --git a/logger.c b/logger.c
index 9ba890bd8b55bc24846bee5b42614f944cf2c141..38eb195b59fa76b5e2a31d0b1c80558c70169a3d 100755 (executable)
--- a/logger.c
+++ b/logger.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <pthread.h>
 #include <sys/stat.h>
 #include "asterisk.h"
 #include "astconf.h"

diff --git a/manager.c b/manager.c
index e16bdf8b3eafce2b6ac8161d5392e22b98ebf005..cdf9234f0e590c7d7e2d4f12911e987312a797d2 100755 (executable)
--- a/manager.c
+++ b/manager.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>

diff --git a/pbx/pbx_kdeconsole_main.cc b/pbx/pbx_kdeconsole_main.cc
index 4ca3da5dd8de25eeca1910998b44c427b448cdfe..9f43ee88f5cb4689dd6652b5992d217711ebc860 100755 (executable)
--- a/pbx/pbx_kdeconsole_main.cc
+++ b/pbx/pbx_kdeconsole_main.cc
@@ -14,7 +14,7 @@
 #include <asterisk/module.h>
 #include <asterisk/channel.h>
 #include <asterisk/logger.h>
-#include <pthread.h>
+#include <asterisk/lock.h>
 #include "pbx_kdeconsole.h"
 
 static char *dtext = "KDE Console Monitor";

diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index b2a90c68b11b44a95b43fcfeb7ccbddecaaa83ff..eb3dd2bcb708298f5247aef3d93ab8ddf84dbed2 100755 (executable)
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -19,7 +19,6 @@
 #include <asterisk/module.h>
 #include <asterisk/options.h>
 #include <asterisk/utils.h>
-#include <pthread.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <time.h>

diff --git a/pbx/pbx_wilcalu.c b/pbx/pbx_wilcalu.c
index c58795089b007ddb22c8f258edb521f592415277..4f6fa8a38f8705eea6b6adbcd5d61641e957786e 100755 (executable)
--- a/pbx/pbx_wilcalu.c
+++ b/pbx/pbx_wilcalu.c
@@ -28,7 +28,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>

diff --git a/privacy.c b/privacy.c
index 9dcb4308dd8728659cfcd63c3cc134370fd67fc8..bd50c3f1f2ce0552525192b6812889bd25d7d514 100755 (executable)
--- a/privacy.c
+++ b/privacy.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -30,6 +29,7 @@
 #include <asterisk/callerid.h>
 #include <asterisk/privacy.h>
 #include <asterisk/utils.h>
+#include <asterisk/lock.h>
 #include "asterisk.h"
 
 int ast_privacy_check(char *dest, char *cid)

diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index ffaccb8cb4ee2b8c3b2542fa17c60d164f166c49..dead1233bbdd25f12e60ccd96e2d83458c891518 100755 (executable)
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -17,10 +17,10 @@
 #include <asterisk/config.h>
 #include <asterisk/config_pvt.h>
 #include <asterisk/module.h>
+#include <asterisk/lock.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <pthread.h>
 #include <asterisk/res_odbc.h>
 
 

diff --git a/res/res_crypto.c b/res/res_crypto.c
index 2ebf4bef9d64976e854f216c2c942b6b642a6bf6..4e12eb5b776b49fe8bbba2a65217a8eb06733435 100755 (executable)
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -22,10 +22,10 @@
 #include <asterisk/md5.h>
 #include <asterisk/cli.h>
 #include <asterisk/io.h>
+#include <asterisk/lock.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <stdio.h>
-#include <pthread.h>
 #include <dirent.h>
 #include <string.h>
 #include <errno.h>

diff --git a/res/res_indications.c b/res/res_indications.c
index 78eb2a33d40a1dcb0b4e88915d770fe63eaed84f..f3bbc01ba907960e10c65d347c393272edd3881e 100755 (executable)
--- a/res/res_indications.c
+++ b/res/res_indications.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 6bef3a6d6f839a0f89b00a5f041a96b2ed947528..960f40d2bcec348229759dc2c525a5bb4b13672d 100755 (executable)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -46,8 +46,6 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 
-#include <pthread.h>
-
 static char *app0 = "MusicOnHold";
 static char *app1 = "WaitMusicOnHold";
 static char *app2 = "SetMusicOnHold";

diff --git a/res/res_odbc.c b/res/res_odbc.c
index 60e8cd24387d439372df623adfe989c32fa04e10..b064b92d28df755aa9db66f78580c384c89c738a 100755 (executable)
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -19,10 +19,10 @@
 #include <asterisk/pbx.h>
 #include <asterisk/module.h>
 #include <asterisk/cli.h>
+#include <asterisk/lock.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <pthread.h>
 #include <asterisk/res_odbc.h>
 #define MAX_ODBC_HANDLES 25
 

diff --git a/res/res_parking.c b/res/res_parking.c
index 29db04136d21db5bbbb17256729ea4e82666e459..7448ef9c94935013c48706e56a03a622adf1649b 100755 (executable)
--- a/res/res_parking.c
+++ b/res/res_parking.c
@@ -36,8 +36,6 @@
 #include <sys/signal.h>
 #include <netinet/in.h>
 
-#include <pthread.h>
-
 #define DEFAULT_PARK_TIME 45000
 
 static char *parkedcall = "ParkedCall";

diff --git a/rtp.c b/rtp.c
index cb2dd20456375c5378ac873b0d40aace238f7395..e311bdb9ad879e776553ebebee53e9fc9f829af8 100755 (executable)
--- a/rtp.c
+++ b/rtp.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -34,6 +33,7 @@
 #include <asterisk/channel.h>
 #include <asterisk/channel_pvt.h>
 #include <asterisk/config.h>
+#include <asterisk/lock.h>
 
 #define RTP_MTU                1200
 

diff --git a/sched.c b/sched.c
index 48417ef7106d0832af26b20ce78bbd14042b06b3..c088d36a084211ceeab5d954ea27b3de52e9944b 100755 (executable)
--- a/sched.c
+++ b/sched.c
@@ -21,12 +21,12 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <pthread.h>
 #include <string.h>
 
 #include <asterisk/sched.h>
 #include <asterisk/logger.h>
 #include <asterisk/channel.h>
+#include <asterisk/lock.h>
 
 /* Determine if a is sooner than b */
 #define SOONER(a,b) (((b).tv_sec > (a).tv_sec) || \

diff --git a/term.c b/term.c
index 577d85adfa6e45f036fd67898336ca0503676252..5522111b5f0fb989be363fbb36a75e0131bbb862 100755 (executable)
--- a/term.c
+++ b/term.c
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -21,6 +20,7 @@
 #include <unistd.h>
 #include <asterisk/term.h>
 #include <asterisk/options.h>
+#include <asterisk/lock.h>
 #include "asterisk.h"
 
 static int vt100compat = 0;

diff --git a/translate.c b/translate.c
index 56f0e5e9988ac36c636dcf39390e8bfd091c6348..0e6d19b26e6987107b3513bd49361978cbdb4fa2 100755 (executable)
--- a/translate.c
+++ b/translate.c
@@ -25,7 +25,6 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <stdio.h>
 

diff --git a/utils.c b/utils.c
index d65f2a8e53079a2561c25885cb09cde6975a4964..66ac2e2470d8d2c1dbc4628e515b4971d63978fe 100755 (executable)
--- a/utils.c
+++ b/utils.c
@@ -12,7 +12,6 @@
 #include <ctype.h>
 #include <string.h>
 #include <unistd.h>
-#include <pthread.h> 
 #include <asterisk/lock.h>
 #include <asterisk/utils.h>