diff options
Diffstat (limited to 'channels')
-rwxr-xr-x | channels/Makefile | 8 | ||||
-rwxr-xr-x | channels/chan_zap.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/channels/Makefile b/channels/Makefile index d908a3712..a2d49cbb7 100755 --- a/channels/Makefile +++ b/channels/Makefile @@ -39,7 +39,8 @@ CFLAGS+=-I/usr/local/include PTLIB=-lpt_OpenBSD_x86_r H323LIB=-lh323_OpenBSD_x86_r CHANH323LIB=-L/usr/local/lib -else +endif +ifeq (${OSARCH},Linux) MYSQLLIB=-L/usr/lib/mysql -lmysqlclient PTLIB=-lpt_linux_x86_r H323LIB=-lh323_linux_x86_r @@ -50,6 +51,9 @@ ifneq (${OSARCH},Darwin) CHANNEL_LIBS+=chan_oss.so endif ifeq (${OSARCH},FreeBSD) +PTLIB=-lpt_FreeBSD_x86_r +H323LIB=-lh323_FreeBSD_x86_r +CHANH323LIB=-pthread SOLINK+=-L/usr/local/lib CHANNEL_LIBS+=chan_oss.so endif @@ -179,7 +183,7 @@ chan_vpb.so: chan_vpb.o $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl chan_h323.so: chan_h323.o h323/libchanh323.a - $(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lpthread -lcrypto -lssl -lexpat + $(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat #chan_modem.so : chan_modem.o diff --git a/channels/chan_zap.c b/channels/chan_zap.c index adcf06177..09db2807a 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -443,7 +443,6 @@ static struct zt_pvt { char language[MAX_LANGUAGE]; char musicclass[MAX_LANGUAGE]; char callerid[AST_MAX_EXTENSION]; - int callerton; char lastcallerid[AST_MAX_EXTENSION]; char *origcallerid; /* malloced original callerid */ char callwaitcid[AST_MAX_EXTENSION]; @@ -4410,7 +4409,6 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int tmp->callerid = strdup(i->callerid); tmp->ani = strdup(i->callerid); } - tmp->callerton = i->callerton; tmp->restrictcid = i->restrictcid; tmp->callingpres = i->callingpres; #ifdef ZAPATA_PRI @@ -7238,8 +7236,6 @@ static void *pri_dchannel(void *vpri) strncpy(pri->pvts[chanpos]->callerid, e->ring.callingnum, sizeof(pri->pvts[chanpos]->callerid)-1); } else pri->pvts[chanpos]->callerid[0] = '\0'; - /* Caller Type Of Number - used to distinguise NANPA from International */ - pri->pvts[chanpos]->callerton = ((e->ring.callingplan) >> 4) & 0x7; strncpy(pri->pvts[chanpos]->rdnis, e->ring.redirectingnum, sizeof(pri->pvts[chanpos]->rdnis) - 1); /* If immediate=yes go to s|1 */ if (pri->pvts[chanpos]->immediate) { |