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@3276 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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>

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"
 

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>

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
 

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] = "";

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__

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>

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>

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>
 

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>

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>

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>
 

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>

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>

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>

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>

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>
 

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>

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>

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 */

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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"

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>

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"
 

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

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

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

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

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

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

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

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

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

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

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

frame.c

@@ -22,7 +22,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <pthread.h>
 #include <stdio.h>
 #include "asterisk.h"
 

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"
 

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)

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)						\

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;

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"
 

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"

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>

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";

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>

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>

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)

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>
 
 

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>

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>

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";

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
 

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";

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
 

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) || \

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;

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>
 

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>