From f5c18f62a1a06fe68eec8c060d7c4979efb331bb Mon Sep 17 00:00:00 2001 From: James Golovich Date: Tue, 22 Jun 2004 19:32:52 +0000 Subject: [PATCH] Remove pthread.h from source. We should be using asterisk/lock.h everywhere instead (except in asterisk/lock.h). git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3277 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_adsiprog.c | 3 +-- apps/app_agi.c | 3 +-- apps/app_alarmreceiver.c | 1 - apps/app_authenticate.c | 2 -- apps/app_chanisavail.c | 2 -- apps/app_controlplayback.c | 1 - apps/app_datetime.c | 3 --- apps/app_db.c | 4 +--- apps/app_dial.c | 2 -- apps/app_directory.c | 1 - apps/app_disa.c | 1 - apps/app_echo.c | 3 --- apps/app_enumlookup.c | 3 --- apps/app_festival.c | 2 +- apps/app_flash.c | 1 - apps/app_getcpeid.c | 3 --- apps/app_hasnewvoicemail.c | 3 +-- apps/app_ices.c | 1 - apps/app_image.c | 1 - apps/app_intercom.c | 1 - apps/app_lookupblacklist.c | 1 - apps/app_lookupcidname.c | 1 - apps/app_macro.c | 3 +-- apps/app_meetme.c | 1 - apps/app_milliwatt.c | 2 -- apps/app_mp3.c | 1 - apps/app_nbscat.c | 1 - apps/app_parkandannounce.c | 3 +-- apps/app_playback.c | 1 - apps/app_privacy.c | 1 - apps/app_qcall.c | 1 - apps/app_queue.c | 2 -- apps/app_read.c | 1 - apps/app_record.c | 1 - apps/app_rpt.c | 1 - apps/app_senddtmf.c | 1 - apps/app_sendtext.c | 1 - apps/app_setcallerid.c | 1 - apps/app_setcidname.c | 1 - apps/app_setcidnum.c | 1 - apps/app_skel.c | 2 +- apps/app_sms.c | 2 -- apps/app_softhangup.c | 4 +--- apps/app_sql_postgres.c | 1 - apps/app_striplsd.c | 4 +--- apps/app_substring.c | 4 +--- apps/app_system.c | 3 --- apps/app_talkdetect.c | 1 - apps/app_transfer.c | 3 --- apps/app_txtcidname.c | 3 --- apps/app_url.c | 1 - apps/app_userevent.c | 1 - apps/app_voicemail.c | 1 - apps/app_waitforring.c | 4 +--- apps/app_zapateller.c | 1 - apps/app_zapbarge.c | 1 - apps/app_zapras.c | 2 -- apps/app_zapscan.c | 1 - 58 files changed, 12 insertions(+), 94 deletions(-) diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index 2fa21f0eb4..f4d18e2311 100755 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -29,8 +30,6 @@ #include #include -#include - #include "../asterisk.h" #include "../astconf.h" diff --git a/apps/app_agi.c b/apps/app_agi.c index 991a9a5edf..51f04e846c 100755 --- a/apps/app_agi.c +++ b/apps/app_agi.c @@ -37,11 +37,10 @@ #include #include #include +#include #include "../asterisk.h" #include "../astconf.h" -#include - #define MAX_ARGS 128 /* Recycle some stuff from the CLI interface */ diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c index b8300f934f..91317ae36a 100755 --- a/apps/app_alarmreceiver.c +++ b/apps/app_alarmreceiver.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #define ALMRCV_CONFIG "alarmreceiver.conf" diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c index 4169e59a89..9b64c6cda9 100755 --- a/apps/app_authenticate.c +++ b/apps/app_authenticate.c @@ -26,8 +26,6 @@ #include #include #include -#include - static char *tdesc = "Authentication Application"; diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c index a77777334a..4438663ce1 100755 --- a/apps/app_chanisavail.c +++ b/apps/app_chanisavail.c @@ -27,8 +27,6 @@ #include #include -#include - static char *tdesc = "Check if channel is available"; static char *app = "ChanIsAvail"; diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c index 2ec8de1b64..b44eafba96 100755 --- a/apps/app_controlplayback.c +++ b/apps/app_controlplayback.c @@ -22,7 +22,6 @@ #include #include #include -#include static char *tdesc = "Control Playback Application"; diff --git a/apps/app_datetime.c b/apps/app_datetime.c index 97c1088f87..2f3cc4f207 100755 --- a/apps/app_datetime.c +++ b/apps/app_datetime.c @@ -23,9 +23,6 @@ #include #include -#include - - static char *tdesc = "Date and Time"; static char *app = "DateTime"; diff --git a/apps/app_db.c b/apps/app_db.c index 64850c0bab..26af2c41b3 100755 --- a/apps/app_db.c +++ b/apps/app_db.c @@ -20,14 +20,12 @@ #include #include #include -#include #include +#include #include #include #include #include -#include - static char *tdesc = "Database access functions for Asterisk extension logic"; diff --git a/apps/app_dial.c b/apps/app_dial.c index 8b096c40ca..b0a21fb858 100755 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -36,8 +36,6 @@ #include #include -#include - static char *tdesc = "Dialing Application"; static char *app = "Dial"; diff --git a/apps/app_directory.c b/apps/app_directory.c index f9499acae5..cd164e55c8 100755 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include "../asterisk.h" #include "../astconf.h" diff --git a/apps/app_disa.c b/apps/app_disa.c index cf199013d9..132f86efa6 100755 --- a/apps/app_disa.c +++ b/apps/app_disa.c @@ -25,7 +25,6 @@ #include #include #include -#include #include /* diff --git a/apps/app_echo.c b/apps/app_echo.c index 42355a2ff9..09d8a51574 100755 --- a/apps/app_echo.c +++ b/apps/app_echo.c @@ -22,9 +22,6 @@ #include #include -#include - - static char *tdesc = "Simple Echo Application"; static char *app = "Echo"; diff --git a/apps/app_enumlookup.c b/apps/app_enumlookup.c index 148477e99b..bf81a4d339 100755 --- a/apps/app_enumlookup.c +++ b/apps/app_enumlookup.c @@ -27,9 +27,6 @@ #include #include -#include - - static char *tdesc = "ENUM Lookup"; static char *app = "EnumLookup"; diff --git a/apps/app_festival.c b/apps/app_festival.c index c0352cbb29..6e895b69a3 100755 --- a/apps/app_festival.c +++ b/apps/app_festival.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -35,7 +36,6 @@ #include #include #include -#include #define FESTIVAL_CONFIG "festival.conf" diff --git a/apps/app_flash.c b/apps/app_flash.c index 45d1e25cfd..a4bf4e84e9 100755 --- a/apps/app_flash.c +++ b/apps/app_flash.c @@ -29,7 +29,6 @@ #include #include #include -#include static char *tdesc = "Flash zap trunk application"; diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c index b4367499ba..9aa0bc60b6 100755 --- a/apps/app_getcpeid.c +++ b/apps/app_getcpeid.c @@ -24,9 +24,6 @@ #include #include -#include - - static char *tdesc = "Get ADSI CPE ID"; static char *app = "GetCPEID"; diff --git a/apps/app_hasnewvoicemail.c b/apps/app_hasnewvoicemail.c index ff660dc7e6..62585f1c4e 100755 --- a/apps/app_hasnewvoicemail.c +++ b/apps/app_hasnewvoicemail.c @@ -37,14 +37,13 @@ #include #include #include +#include #include #include #include #include #include -#include - #include "../astconf.h" static char *tdesc = "Indicator for whether a voice mailbox has messages in a given folder."; diff --git a/apps/app_ices.c b/apps/app_ices.c index 294ecc6047..395407dbea 100755 --- a/apps/app_ices.c +++ b/apps/app_ices.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include "../astconf.h" diff --git a/apps/app_image.c b/apps/app_image.c index 6a46f03880..04af0a3155 100755 --- a/apps/app_image.c +++ b/apps/app_image.c @@ -21,7 +21,6 @@ #include #include #include -#include static char *tdesc = "Image Transmission Application"; diff --git a/apps/app_intercom.c b/apps/app_intercom.c index 4462be1809..5c2782433e 100755 --- a/apps/app_intercom.c +++ b/apps/app_intercom.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/apps/app_lookupblacklist.c b/apps/app_lookupblacklist.c index 5760a0d9e6..69743e377c 100755 --- a/apps/app_lookupblacklist.c +++ b/apps/app_lookupblacklist.c @@ -24,7 +24,6 @@ #include #include #include -#include static char *tdesc = "Look up Caller*ID name/number from blacklist database"; diff --git a/apps/app_lookupcidname.c b/apps/app_lookupcidname.c index c24a0dc1db..ecb0a4e5c2 100755 --- a/apps/app_lookupcidname.c +++ b/apps/app_lookupcidname.c @@ -24,7 +24,6 @@ #include #include #include -#include static char *tdesc = "Look up CallerID Name from local database"; diff --git a/apps/app_macro.c b/apps/app_macro.c index 7812173377..dd53946bd1 100755 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -19,13 +19,12 @@ #include #include #include +#include #include #include #include #include -#include - #define MAX_ARGS 80 static char *tdesc = "Extension Macros"; diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 14a6524735..97e54a0739 100755 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -31,7 +31,6 @@ #include #include #include -#include #ifdef __linux__ #include diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c index dd14b60d49..6b9e6b763f 100755 --- a/apps/app_milliwatt.c +++ b/apps/app_milliwatt.c @@ -23,8 +23,6 @@ #include #include -#include - static char *tdesc = "Digital Milliwatt (mu-law) Test Application"; static char *app = "Milliwatt"; diff --git a/apps/app_mp3.c b/apps/app_mp3.c index a2e0ce22a6..b7c6699bab 100755 --- a/apps/app_mp3.c +++ b/apps/app_mp3.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #define LOCAL_MPG_123 "/usr/local/bin/mpg123" diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c index 892840ebb1..75951de51c 100755 --- a/apps/app_nbscat.c +++ b/apps/app_nbscat.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c index 59492887ac..2faa92dc13 100755 --- a/apps/app_parkandannounce.c +++ b/apps/app_parkandannounce.c @@ -25,14 +25,13 @@ #include #include #include +#include #include #include #include #include -#include - static char *tdesc = "Call Parking and Announce Application"; static char *app = "ParkAndAnnounce"; diff --git a/apps/app_playback.c b/apps/app_playback.c index b547547a0e..24a130a7d9 100755 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -21,7 +21,6 @@ #include #include #include -#include static char *tdesc = "Trivial Playback Application"; diff --git a/apps/app_privacy.c b/apps/app_privacy.c index db5375eda3..7628ea0e73 100755 --- a/apps/app_privacy.c +++ b/apps/app_privacy.c @@ -25,7 +25,6 @@ #include #include #include -#include #define PRIV_CONFIG "privacy.conf" diff --git a/apps/app_qcall.c b/apps/app_qcall.c index e876f0ae36..33731b2353 100755 --- a/apps/app_qcall.c +++ b/apps/app_qcall.c @@ -62,7 +62,6 @@ #include #include #include -#include #include #include #include diff --git a/apps/app_queue.c b/apps/app_queue.c index e36bbda8e5..c9e3ee998d 100755 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -55,8 +55,6 @@ #include "../astconf.h" -#include - #define QUEUE_STRATEGY_RINGALL 0 #define QUEUE_STRATEGY_ROUNDROBIN 1 #define QUEUE_STRATEGY_LEASTRECENT 2 diff --git a/apps/app_read.c b/apps/app_read.c index 4cba132aa5..cbc65f941e 100755 --- a/apps/app_read.c +++ b/apps/app_read.c @@ -23,7 +23,6 @@ #include #include #include -#include static char *tdesc = "Read Variable Application"; diff --git a/apps/app_record.c b/apps/app_record.c index 17b95160cb..02676bd98a 100755 --- a/apps/app_record.c +++ b/apps/app_record.c @@ -21,7 +21,6 @@ #include #include #include -#include static char *tdesc = "Trivial Record Application"; diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 9edd77f525..bf6a51d41f 100755 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -50,7 +50,6 @@ enum {REM_OFF,REM_MONITOR,REM_TX}; enum{ID,PROC,TERM,COMPLETE,UNKEY,REMDISC,REMALREADY,REMNOTFOUND,REMGO, CONNECTED,CONNFAIL,STATUS}; -#include #include #include #include diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c index 39de24f958..f60ee65ea8 100755 --- a/apps/app_senddtmf.c +++ b/apps/app_senddtmf.c @@ -23,7 +23,6 @@ #include #include #include -#include static char *tdesc = "Send DTMF digits Application"; diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c index e1920b6e19..73d24a1897 100755 --- a/apps/app_sendtext.c +++ b/apps/app_sendtext.c @@ -22,7 +22,6 @@ #include #include #include -#include static char *tdesc = "Send Text Applications"; diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c index 2b0fdb61ab..a84c7a0363 100755 --- a/apps/app_setcallerid.c +++ b/apps/app_setcallerid.c @@ -21,7 +21,6 @@ #include #include #include -#include static char *tdesc = "Set CallerID Application"; diff --git a/apps/app_setcidname.c b/apps/app_setcidname.c index 089d35f2f4..c73af9a433 100755 --- a/apps/app_setcidname.c +++ b/apps/app_setcidname.c @@ -23,7 +23,6 @@ #include #include #include -#include static char *tdesc = "Set CallerID Name"; diff --git a/apps/app_setcidnum.c b/apps/app_setcidnum.c index a4ded6b295..9aef3bacba 100755 --- a/apps/app_setcidnum.c +++ b/apps/app_setcidnum.c @@ -24,7 +24,6 @@ #include #include #include -#include static char *tdesc = "Set CallerID Number"; diff --git a/apps/app_skel.c b/apps/app_skel.c index f78652c55a..68bdd9262d 100755 --- a/apps/app_skel.c +++ b/apps/app_skel.c @@ -16,10 +16,10 @@ #include #include #include +#include #include #include #include -#include static char *tdesc = "Trivial skeleton Application"; static char *app = "skel"; diff --git a/apps/app_sms.c b/apps/app_sms.c index b935ae5cc4..dc7c14aca3 100755 --- a/apps/app_sms.c +++ b/apps/app_sms.c @@ -27,8 +27,6 @@ #include #include -#include - /* ToDo */ /* When acting as SC and answering, should check for messages and send instead of sending EST as first packet */ /* Add full VP support */ diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c index 43a42247cc..02135beb04 100755 --- a/apps/app_softhangup.c +++ b/apps/app_softhangup.c @@ -17,14 +17,12 @@ #include #include #include +#include #include #include #include #include -#include - - static char *synopsis = "Soft Hangup Application"; static char *tdesc = "Hangs up the requested channel"; diff --git a/apps/app_sql_postgres.c b/apps/app_sql_postgres.c index 8497927f78..b6e3e3c738 100755 --- a/apps/app_sql_postgres.c +++ b/apps/app_sql_postgres.c @@ -26,7 +26,6 @@ #include #include #include -#include #include "libpq-fe.h" #define EXTRA_LOG 0 diff --git a/apps/app_striplsd.c b/apps/app_striplsd.c index cc82d99cbe..600f0bdbf4 100755 --- a/apps/app_striplsd.c +++ b/apps/app_striplsd.c @@ -17,14 +17,12 @@ #include #include #include +#include #include #include #include #include -#include - - static char *tdesc = "Strip trailing digits"; static char *descrip = diff --git a/apps/app_substring.c b/apps/app_substring.c index 78d270ecad..d2b2f8c0d7 100755 --- a/apps/app_substring.c +++ b/apps/app_substring.c @@ -18,14 +18,12 @@ #include #include #include +#include #include #include #include #include -#include - - static char *tdesc = "(Deprecated) Save substring digits in a given variable"; static char *descrip = diff --git a/apps/app_system.c b/apps/app_system.c index 010137f996..4dfed73509 100755 --- a/apps/app_system.c +++ b/apps/app_system.c @@ -24,9 +24,6 @@ #include #include -#include - - static char *tdesc = "Generic System() application"; static char *app = "System"; diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c index 60219c2c81..79bac38594 100755 --- a/apps/app_talkdetect.c +++ b/apps/app_talkdetect.c @@ -22,7 +22,6 @@ #include #include #include -#include static char *tdesc = "Playback with Talk Detection"; diff --git a/apps/app_transfer.c b/apps/app_transfer.c index 239161d585..826c93c05a 100755 --- a/apps/app_transfer.c +++ b/apps/app_transfer.c @@ -22,9 +22,6 @@ #include #include -#include - - static char *tdesc = "Transfer"; static char *app = "Transfer"; diff --git a/apps/app_txtcidname.c b/apps/app_txtcidname.c index d4e24d97e7..dd72ed0979 100755 --- a/apps/app_txtcidname.c +++ b/apps/app_txtcidname.c @@ -26,9 +26,6 @@ #include #include -#include - - static char *tdesc = "TXTCIDName"; static char *app = "TXTCIDName"; diff --git a/apps/app_url.c b/apps/app_url.c index 6cae9eb9b6..fdaa270eaf 100755 --- a/apps/app_url.c +++ b/apps/app_url.c @@ -21,7 +21,6 @@ #include #include #include -#include static char *tdesc = "Send URL Applications"; diff --git a/apps/app_userevent.c b/apps/app_userevent.c index 89527dfdf9..e1a87c2a4a 100755 --- a/apps/app_userevent.c +++ b/apps/app_userevent.c @@ -19,7 +19,6 @@ #include #include #include -#include static char *tdesc = "Custom User Event Application"; diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 803ea4c2ab..e1d29430b0 100755 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -58,7 +58,6 @@ static inline int sql_init(void) { return 0; } static inline void sql_close(void) { } #endif -#include #include "../asterisk.h" #include "../astconf.h" diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c index bb8622920f..3bf8625b5b 100755 --- a/apps/app_waitforring.c +++ b/apps/app_waitforring.c @@ -18,14 +18,12 @@ #include #include #include +#include #include #include #include #include -#include - - static char *synopsis = "Wait for Ring Application"; static char *tdesc = "Waits until first ring after time"; diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c index 497bd3a051..42777779c5 100755 --- a/apps/app_zapateller.c +++ b/apps/app_zapateller.c @@ -20,7 +20,6 @@ #include #include #include -#include static char *tdesc = "Block Telemarketers with Special Information Tone"; diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c index 6d455ce4aa..852d9ab1fd 100755 --- a/apps/app_zapbarge.c +++ b/apps/app_zapbarge.c @@ -32,7 +32,6 @@ #include #include #include -#include #ifdef __linux__ #include diff --git a/apps/app_zapras.c b/apps/app_zapras.c index efe93f9fbc..d835e12f8d 100755 --- a/apps/app_zapras.c +++ b/apps/app_zapras.c @@ -34,8 +34,6 @@ #include #include -#include - /* Need some zaptel help here */ #ifdef __linux__ #include diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c index dab62711d9..178cc511ce 100755 --- a/apps/app_zapscan.c +++ b/apps/app_zapscan.c @@ -33,7 +33,6 @@ #include #include #include -#include #ifdef __linux__ #include