fix
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@192 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
3e0234219b
commit
0fd698a347
|
@ -42,7 +42,7 @@ fi
|
|||
|
||||
if [ -f $uncompressed/.complete ] ; then
|
||||
echo $uncompressed already installed
|
||||
exit
|
||||
exit 0
|
||||
fi
|
||||
|
||||
cd $uncompressed
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
all: $(MOD).so
|
||||
|
||||
$(MOD).so: $(MOD).c
|
||||
$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
|
||||
$(CC) $(SOLINK) $(MOD).o -o $(MOD).so $(LDFLAGS)
|
||||
|
||||
all: $(MOD).so
|
||||
|
||||
clean:
|
||||
rm -fr *.so *.o *~
|
||||
|
||||
|
|
|
@ -14,3 +14,4 @@ mod_iaxchan
|
|||
#mod_codec_g729
|
||||
mod_event_test
|
||||
mod_portaudio
|
||||
mod_xmpp_event
|
||||
|
|
|
@ -251,6 +251,8 @@ typedef apr_hash_index_t switch_hash_index_t;
|
|||
#define SWITCH_THREAD_FUNC APR_THREAD_FUNC
|
||||
#define switch_time_now apr_time_now
|
||||
#define switch_strftime apr_strftime
|
||||
#define switch_rfc822_date apr_rfc822_date
|
||||
#define switch_time_exp_gmt apr_time_exp_gmt
|
||||
#define switch_time_exp_get apr_time_exp_get
|
||||
#define switch_time_exp_lt apr_time_exp_lt
|
||||
#define switch_thread_create apr_thread_create
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
CFLAGS += -I/usr/local/include/libg729
|
||||
LDFLAGS +=-lg729
|
||||
|
||||
all: $(MOD).so
|
||||
|
||||
$(MOD).so: $(MOD).c
|
||||
$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
|
||||
$(CC) $(SOLINK) $(MOD).o -o $(MOD).so $(LDFLAGS) -lspeex
|
||||
|
||||
all: $(MOD).so
|
||||
|
||||
clean:
|
||||
rm -fr *.so *.o *~
|
||||
|
||||
|
|
|
@ -7,6 +7,8 @@ else
|
|||
LINKER=$(CC)
|
||||
endif
|
||||
|
||||
all: depends $(MOD).so
|
||||
|
||||
depends:
|
||||
$(BASE)/buildlib.sh $(BASE) install jthread-1.1.2.tar.gz
|
||||
$(BASE)/buildlib.sh $(BASE) install jrtplib-3.3.0.tar.gz
|
||||
|
@ -19,8 +21,6 @@ $(MOD).so: $(MOD).c
|
|||
$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
|
||||
$(LINKER) $(SOLINK) -o $(MOD).so $(MOD).o $(LDFLAGS)
|
||||
|
||||
all: depends $(MOD).so
|
||||
|
||||
clean:
|
||||
rm -fr *.so *.o *~
|
||||
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
LDFLAGS += -liax -L/usr/local/lib
|
||||
|
||||
all: depends $(MOD).so
|
||||
|
||||
depends:
|
||||
$(BASE)/buildlib.sh $(BASE) install iax --enable-newjb
|
||||
|
||||
|
@ -7,7 +9,6 @@ $(MOD).so: $(MOD).c
|
|||
$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
|
||||
$(CC) $(SOLINK) -o $(MOD).so $(MOD).o $(LDFLAGS)
|
||||
|
||||
all: depends $(MOD).so
|
||||
|
||||
clean:
|
||||
rm -fr *.so *.o *~
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
#CFLAGS += -I/usr/src/common/src
|
||||
LDFLAGS += -liax
|
||||
|
||||
all: $(MOD).so
|
||||
|
||||
$(MOD).so: $(MOD).c
|
||||
$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
|
||||
$(CC) $(SOLINK) -o $(MOD).so $(MOD).o $(LDFLAGS)
|
||||
|
||||
all: $(MOD).so
|
||||
|
||||
clean:
|
||||
rm -fr *.so *.o *~
|
||||
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
LDFLAGS += -lportaudio -L/usr/local/lib
|
||||
MYOBJS = pablio.o ringbuffer.o
|
||||
|
||||
all: depends $(MOD).so
|
||||
|
||||
depends:
|
||||
$(BASE)/buildlib.sh $(BASE) install portaudio.tar.gz
|
||||
%.o: %.c
|
||||
|
@ -10,7 +12,7 @@ $(MOD).so: $(MOD).c $(MYOBJS)
|
|||
$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
|
||||
$(CC) $(SOLINK) -o $(MOD).so $(MOD).o $(MYOBJS) $(LDFLAGS)
|
||||
|
||||
all: depends $(MOD).so
|
||||
|
||||
|
||||
clean:
|
||||
rm -fr *.so *.o *~
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
all: depends $(MOD).so
|
||||
|
||||
depends:
|
||||
$(BASE)/buildlib.sh $(BASE) install speex-1.1.11.1.tar.gz
|
||||
|
||||
|
@ -5,8 +7,6 @@ $(MOD).so: $(MOD).c
|
|||
$(CC) $(CFLAGS) -fPIC -c $(MOD).c -o $(MOD).o
|
||||
$(CC) $(SOLINK) $(MOD).o -o $(MOD).so $(LDFLAGS) -lspeex
|
||||
|
||||
all: depends $(MOD).so
|
||||
|
||||
clean:
|
||||
rm -fr *.so *.o *~
|
||||
|
||||
|
|
|
@ -1412,11 +1412,13 @@ SWITCH_DECLARE(void) switch_core_launch_thread(switch_thread_start_t func, void
|
|||
{
|
||||
switch_thread *thread;
|
||||
switch_threadattr_t *thd_attr;;
|
||||
switch_threadattr_create(&thd_attr, runtime.memory_pool);
|
||||
switch_threadattr_detach_set(thd_attr, 1);
|
||||
switch_core_thread_session *ts;
|
||||
switch_memory_pool *pool = NULL;
|
||||
|
||||
switch_threadattr_create(&thd_attr, runtime.memory_pool);
|
||||
switch_threadattr_detach_set(thd_attr, 1);
|
||||
|
||||
|
||||
if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
|
||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Could not allocate memory pool\n");
|
||||
return;
|
||||
|
|
|
@ -478,12 +478,13 @@ SWITCH_DECLARE(switch_status) switch_event_fire_detailed(char *file, char *func,
|
|||
return SWITCH_STATUS_FALSE;
|
||||
}
|
||||
|
||||
switch_time_exp_lt(&tm, switch_time_now());
|
||||
switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d", &tm);
|
||||
switch_event_add_header(*event, "event_date", date);
|
||||
|
||||
switch_strftime(date, &retsize, sizeof(date), "%T", &tm);
|
||||
switch_event_add_header(*event, "event_time", date);
|
||||
switch_rfc822_date(date, switch_time_now());
|
||||
switch_event_add_header(*event, "event_date_gmt", date);
|
||||
|
||||
switch_time_exp_lt(&tm, switch_time_now());
|
||||
switch_strftime(date, &retsize, sizeof(date), "%a, %d-%b-%Y %X", &tm);
|
||||
switch_event_add_header(*event, "event_date_local", date);
|
||||
|
||||
switch_event_add_header(*event, "event_file", file);
|
||||
switch_event_add_header(*event, "event_function", func);
|
||||
|
|
Loading…
Reference in New Issue