[Asterisk-cvs] asterisk acl.c,1.22,1.23 app.c,1.22,1.23 astmm.c,1.10,1.11 autoservice.c,1.5,1.6 cdr.c,1.16,1.17 channel.c,1.119,1.120 cli.c,1.43,1.44 db.c,1.8,1.9 file.c,1.42,1.43 frame.c,1.33,1.34 image.c,1.9,1.10 indications.c,1.16,1.17 loader.c,1.23,1.24 logger.c,1.39,1.40 manager.c,1.56,1.57 privacy.c,1.2,1.3 rtp.c,1.72,1.73 sched.c,1.12,1.13 term.c,1.4,1.5 translate.c,1.25,1.26 utils.c,1.8,1.9

citats at lists.digium.com citats at lists.digium.com
Tue Jun 22 15:03:10 CDT 2004 

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/home/citats/cvs/asterisk

Modified Files:
	acl.c app.c astmm.c autoservice.c cdr.c channel.c cli.c db.c 
	file.c frame.c image.c indications.c loader.c logger.c 
	manager.c privacy.c rtp.c sched.c term.c translate.c utils.c 
Log Message:
Remove pthread.h from source.  We should be using asterisk/lock.h everywhere instead (except in asterisk/lock.h).

Index: acl.c
===================================================================
RCS file: /usr/cvsroot/asterisk/acl.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- acl.c	9 Jun 2004 01:45:07 -0000	1.22
+++ acl.c	22 Jun 2004 18:48:59 -0000	1.23
@@ -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>

Index: app.c
===================================================================
RCS file: /usr/cvsroot/asterisk/app.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- app.c	15 Jun 2004 20:33:26 -0000	1.22
+++ app.c	22 Jun 2004 18:48:59 -0000	1.23
@@ -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"
 

Index: astmm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/astmm.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- astmm.c	9 Jun 2004 01:45:07 -0000	1.10
+++ astmm.c	22 Jun 2004 18:48:59 -0000	1.11
@@ -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>

Index: autoservice.c
===================================================================
RCS file: /usr/cvsroot/asterisk/autoservice.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- autoservice.c	9 Jun 2004 01:45:07 -0000	1.5
+++ autoservice.c	22 Jun 2004 18:48:59 -0000	1.6
@@ -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
 

Index: cdr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cdr.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cdr.c	20 Jun 2004 22:46:42 -0000	1.16
+++ cdr.c	22 Jun 2004 18:48:59 -0000	1.17
@@ -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] = "";

Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- channel.c	14 Jun 2004 21:18:52 -0000	1.119
+++ channel.c	22 Jun 2004 18:48:59 -0000	1.120
@@ -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__

Index: cli.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cli.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- cli.c	22 Jun 2004 17:42:13 -0000	1.43
+++ cli.c	22 Jun 2004 18:48:59 -0000	1.44
@@ -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 */

Index: db.c
===================================================================
RCS file: /usr/cvsroot/asterisk/db.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- db.c	9 Jun 2004 01:45:07 -0000	1.8
+++ db.c	22 Jun 2004 18:48:59 -0000	1.9
@@ -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"

Index: file.c
===================================================================
RCS file: /usr/cvsroot/asterisk/file.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- file.c	9 Jun 2004 01:45:07 -0000	1.42
+++ file.c	22 Jun 2004 18:48:59 -0000	1.43
@@ -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>

Index: frame.c
===================================================================
RCS file: /usr/cvsroot/asterisk/frame.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- frame.c	9 Jun 2004 01:45:07 -0000	1.33
+++ frame.c	22 Jun 2004 18:48:59 -0000	1.34
@@ -22,7 +22,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <pthread.h>
 #include <stdio.h>
 #include "asterisk.h"
 

Index: image.c
===================================================================
RCS file: /usr/cvsroot/asterisk/image.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- image.c	9 Jun 2004 01:45:07 -0000	1.9
+++ image.c	22 Jun 2004 18:48:59 -0000	1.10
@@ -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"
 

Index: indications.c
===================================================================
RCS file: /usr/cvsroot/asterisk/indications.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- indications.c	9 Jun 2004 01:45:07 -0000	1.16
+++ indications.c	22 Jun 2004 18:48:59 -0000	1.17
@@ -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;

Index: loader.c
===================================================================
RCS file: /usr/cvsroot/asterisk/loader.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- loader.c	11 Jun 2004 00:12:35 -0000	1.23
+++ loader.c	22 Jun 2004 18:48:59 -0000	1.24
@@ -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"
 

Index: logger.c
===================================================================
RCS file: /usr/cvsroot/asterisk/logger.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- logger.c	17 Jun 2004 01:13:10 -0000	1.39
+++ logger.c	22 Jun 2004 18:48:59 -0000	1.40
@@ -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"

Index: manager.c
===================================================================
RCS file: /usr/cvsroot/asterisk/manager.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- manager.c	22 Jun 2004 17:42:13 -0000	1.56
+++ manager.c	22 Jun 2004 18:48:59 -0000	1.57
@@ -13,7 +13,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>

Index: privacy.c
===================================================================
RCS file: /usr/cvsroot/asterisk/privacy.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- privacy.c	28 May 2004 19:20:29 -0000	1.2
+++ privacy.c	22 Jun 2004 18:48:59 -0000	1.3
@@ -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)

Index: rtp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/rtp.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- rtp.c	9 Jun 2004 01:33:16 -0000	1.72
+++ rtp.c	22 Jun 2004 18:48:59 -0000	1.73
@@ -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
 

Index: sched.c
===================================================================
RCS file: /usr/cvsroot/asterisk/sched.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sched.c	22 Jun 2004 17:42:13 -0000	1.12
+++ sched.c	22 Jun 2004 18:48:59 -0000	1.13
@@ -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) || \

Index: term.c
===================================================================
RCS file: /usr/cvsroot/asterisk/term.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- term.c	2 May 2004 19:13:16 -0000	1.4
+++ term.c	22 Jun 2004 18:48:59 -0000	1.5
@@ -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;

Index: translate.c
===================================================================
RCS file: /usr/cvsroot/asterisk/translate.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- translate.c	9 Jun 2004 01:45:07 -0000	1.25
+++ translate.c	22 Jun 2004 18:48:59 -0000	1.26
@@ -25,7 +25,6 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <stdio.h>
 

Index: utils.c
===================================================================
RCS file: /usr/cvsroot/asterisk/utils.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- utils.c	22 Jun 2004 17:42:13 -0000	1.8
+++ utils.c	22 Jun 2004 18:48:59 -0000	1.9
@@ -12,7 +12,6 @@
 #include <ctype.h>
 #include <string.h>
 #include <unistd.h>
-#include <pthread.h> 
 #include <asterisk/lock.h>
 #include <asterisk/utils.h>

More information about the svn-commits mailing list