[Asterisk-cvs] asterisk/channels Makefile,1.37.2.2,1.37.2.3 chan_sip.c,1.292.2.20,1.292.2.21

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv32457/channels

Modified Files:
      Tag: v1-0_stable
	Makefile chan_sip.c 
Log Message:
Split mysql friends by type


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/Makefile,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -u -d -r1.37.2.2 -r1.37.2.3
--- Makefile	15 Mar 2004 23:33:50 -0000	1.37.2.2
+++ Makefile	21 Mar 2004 21:24:31 -0000	1.37.2.3
@@ -14,6 +14,7 @@
 OSARCH=$(shell uname -s)
 
 USE_MYSQL_FRIENDS=0
+USE_SIP_MYSQL_FRIENDS=0
 
 CHANNEL_LIBS=chan_modem.so chan_iax.so chan_sip.so \
 	     chan_modem_aopen.so \
@@ -53,6 +54,9 @@
 
 ifeq ($(USE_MYSQL_FRIENDS),1)
 CFLAGS+=-DMYSQL_FRIENDS
+endif
+ifeq ($(USE_SIP_MYSQL_FRIENDS),1)
+CFLAGS+=-DSIP_MYSQL_FRIENDS
 endif
 
 CFLAGS+=#-DVOFRDUMPER

Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.292.2.20
retrieving revision 1.292.2.21
diff -u -d -r1.292.2.20 -r1.292.2.21
--- chan_sip.c	16 Mar 2004 17:15:45 -0000	1.292.2.20
+++ chan_sip.c	21 Mar 2004 21:24:31 -0000	1.292.2.21
@@ -54,7 +54,8 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
-#ifdef MYSQL_FRIENDS
+#ifdef SIP_MYSQL_FRIENDS
+#define MYSQL_FRIENDS
 #include <mysql/mysql.h>
 #endif