[Asterisk-cvs] asterisk/channels Makefile,1.40,1.41 chan_sip.c,1.314,1.315

[markster at lists.digium.com]

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

Modified Files:
	Makefile chan_sip.c 
Log Message:
Fix mysql friends by type


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/Makefile,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- Makefile	16 Mar 2004 16:02:57 -0000	1.40
+++ Makefile	21 Mar 2004 21:24:40 -0000	1.41
@@ -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.314
retrieving revision 1.315
diff -u -d -r1.314 -r1.315
--- chan_sip.c	21 Mar 2004 19:25:13 -0000	1.314
+++ chan_sip.c	21 Mar 2004 21:24:40 -0000	1.315
@@ -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