Context Navigation

← Previous Changeset
Next Changeset →

Changeset 1211

Timestamp:

Apr 23, 2007 4:22:52 PM (18 years ago)

Author:

bennylp

Message:

Fixed mingw build

Location:

pjproject/branches/split-3rd-party

Files:

: 1 added
: 44 edited

pjnath/build/Makefile (modified) (1 diff)
pjnath/src/pjnath/ice_session.c (modified) (1 diff)
third_party/build/portaudio/src/pa_allocation.c (modified) (1 diff)
third_party/build/portaudio/src/pa_allocation.h (modified) (1 diff)
third_party/build/portaudio/src/pa_converters.c (modified) (1 diff)
third_party/build/portaudio/src/pa_converters.h (modified) (1 diff)
third_party/build/portaudio/src/pa_cpuload.c (modified) (1 diff)
third_party/build/portaudio/src/pa_cpuload.h (modified) (1 diff)
third_party/build/portaudio/src/pa_debugprint.c (modified) (1 diff)
third_party/build/portaudio/src/pa_debugprint.h (modified) (1 diff)
third_party/build/portaudio/src/pa_dither.c (modified) (1 diff)
third_party/build/portaudio/src/pa_dither.h (modified) (1 diff)
third_party/build/portaudio/src/pa_endianness.h (modified) (1 diff)
third_party/build/portaudio/src/pa_front.c (modified) (1 diff)
third_party/build/portaudio/src/pa_hostapi.h (modified) (1 diff)
third_party/build/portaudio/src/pa_linux_alsa.c (modified) (1 diff)
third_party/build/portaudio/src/pa_linux_alsa.h (modified) (1 diff)
third_party/build/portaudio/src/pa_mac_core.c (modified) (1 diff)
third_party/build/portaudio/src/pa_mac_core_blocking.c (modified) (1 diff)
third_party/build/portaudio/src/pa_mac_core_blocking.h (modified) (1 diff)
third_party/build/portaudio/src/pa_mac_core_internal.h (modified) (1 diff)
third_party/build/portaudio/src/pa_mac_core_old.c (modified) (1 diff)
third_party/build/portaudio/src/pa_mac_core_utilities.c (modified) (1 diff)
third_party/build/portaudio/src/pa_mac_core_utilities.h (modified) (1 diff)
third_party/build/portaudio/src/pa_mac_hostapis.c (modified) (1 diff)
third_party/build/portaudio/src/pa_process.c (modified) (1 diff)
third_party/build/portaudio/src/pa_process.h (modified) (1 diff)
third_party/build/portaudio/src/pa_ringbuffer.c (modified) (1 diff)
third_party/build/portaudio/src/pa_ringbuffer.h (modified) (1 diff)
third_party/build/portaudio/src/pa_skeleton.c (modified) (1 diff)
third_party/build/portaudio/src/pa_stream.c (modified) (1 diff)
third_party/build/portaudio/src/pa_stream.h (modified) (1 diff)
third_party/build/portaudio/src/pa_trace.c (modified) (1 diff)
third_party/build/portaudio/src/pa_trace.h (modified) (1 diff)
third_party/build/portaudio/src/pa_types.h (modified) (1 diff)
third_party/build/portaudio/src/pa_unix_hostapis.c (modified) (1 diff)
third_party/build/portaudio/src/pa_unix_oss.c (modified) (1 diff)
third_party/build/portaudio/src/pa_unix_util.c (modified) (1 diff)
third_party/build/portaudio/src/pa_unix_util.h (modified) (1 diff)
third_party/build/portaudio/src/pa_util.h (modified) (1 diff)
third_party/build/portaudio/src/pa_win_hostapis.c (modified) (1 diff)
third_party/build/portaudio/src/pa_win_util.c (modified) (1 diff)
third_party/build/portaudio/src/pa_win_wmme.c (modified) (1 diff)
third_party/build/portaudio/src/pa_win_wmme.h (added)
third_party/build/portaudio/src/portaudio.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

pjproject/branches/split-3rd-party/pjnath/build/Makefile

r1210	r1211
10	10	PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT)
11	11	PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT)
12		~~PJNATH_LIB:=../../pjnath~~/lib/libpjnath-$(TARGET_NAME)$(LIBEXT)
	12	export PJNATH_LIB:=../lib/libpjnath-$(TARGET_NAME)$(LIBEXT)
13	13
14	14	###############################################################################

pjproject/branches/split-3rd-party/pjnath/src/pjnath/ice_session.c

-                      r1210
+                      r1211
     /* Cannot start check because there's no suitable candidate pair.
+     * Set checklist state to Completed.
+     */
+    if (start_count==0) {
+        clist_set_state(ice, clist, PJ_ICE_SESS_CHECKLIST_ST_COMPLETED);
+    } else {
+     */
+    if (start_count!=0) {
         /* Schedule for next timer */
         pj_time_val timeout = {0, PJ_ICE_TA_VAL};

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_allocation.c

r1181	r1211
1		link ../../../portaudio/src/common/pa_allocation.c
	1	#include "../../../portaudio/src/common/pa_allocation.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_allocation.h

r1181	r1211
1		link ../../../portaudio/src/common/pa_allocation.h
	1	#include "../../../portaudio/src/common/pa_allocation.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_converters.c

r1181	r1211
1		link ../../../portaudio/src/common/pa_converters.c
	1	#include "../../../portaudio/src/common/pa_converters.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_converters.h

r1181	r1211
1		link ../../../portaudio/src/common/pa_converters.h
	1	#include "../../../portaudio/src/common/pa_converters.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_cpuload.c

r1181	r1211
1		link ../../../portaudio/src/common/pa_cpuload.c
	1	#include "../../../portaudio/src/common/pa_cpuload.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_cpuload.h

r1181	r1211
1		link ../../../portaudio/src/common/pa_cpuload.h
	1	#include "../../../portaudio/src/common/pa_cpuload.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_debugprint.c

r1181	r1211
1		link ../../../portaudio/src/common/pa_debugprint.c
	1	#include "../../../portaudio/src/common/pa_debugprint.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_debugprint.h

r1181	r1211
1		link ../../../portaudio/src/common/pa_debugprint.h
	1	#include "../../../portaudio/src/common/pa_debugprint.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_dither.c

r1181	r1211
1		link ../../../portaudio/src/common/pa_dither.c
	1	#include "../../../portaudio/src/common/pa_dither.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_dither.h

r1181	r1211
1		link ../../../portaudio/src/common/pa_dither.h
	1	#include "../../../portaudio/src/common/pa_dither.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_endianness.h

r1181	r1211
1		link ../../../portaudio/src/common/pa_endianness.h
	1	#include "../../../portaudio/src/common/pa_endianness.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_front.c

r1181	r1211
1		link ../../../portaudio/src/common/pa_front.c
	1	#include "../../../portaudio/src/common/pa_front.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_hostapi.h

r1181	r1211
1		link ../../../portaudio/src/common/pa_hostapi.h
	1	#include "../../portaudio/src/common/pa_hostapi.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_linux_alsa.c

r1181	r1211
1		link ../../../portaudio/src/hostapi/alsa/pa_linux_alsa.c
	1	#include "../../../portaudio/src/hostapi/alsa/pa_linux_alsa.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_linux_alsa.h

r1201	r1211
1		link ../../../portaudio/include/pa_linux_alsa.h
	1	#include "../../../portaudio/include/pa_linux_alsa.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_mac_core.c

r1181	r1211
1		link ../../../portaudio/src/hostapi/coreaudio/pa_mac_core.c
	1	#include "../../../portaudio/src/hostapi/coreaudio/pa_mac_core.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_mac_core_blocking.c

r1181	r1211
1		link ../../../portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c
	1	#include "../../../portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_mac_core_blocking.h

r1181	r1211
1		link ../../../portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h
	1	#include "../../../portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_mac_core_internal.h

r1181	r1211
1		link ../../../portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h
	1	#include "../../../portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_mac_core_old.c

r1181	r1211
1		link ../../../portaudio/src/hostapi/coreaudio/pa_mac_core_old.c
	1	#include "../../../portaudio/src/hostapi/coreaudio/pa_mac_core_old.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_mac_core_utilities.c

r1181	r1211
1		link ../../../portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c
	1	#include "../../../portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_mac_core_utilities.h

r1181	r1211
1		link ../../../portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h
	1	#include "../../../portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_mac_hostapis.c

r1181	r1211
1		link ../../../portaudio/src/os/mac_osx/pa_mac_hostapis.c
	1	#include "../../../portaudio/src/os/mac_osx/pa_mac_hostapis.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_process.c

r1181	r1211
1		link ../../../portaudio/src/common/pa_process.c
	1	#include "../../../portaudio/src/common/pa_process.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_process.h

r1181	r1211
1		link ../../../portaudio/src/common/pa_process.h
	1	#include "../../../portaudio/src/common/pa_process.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_ringbuffer.c

r1181	r1211
1		link ../../../portaudio/src/common/pa_ringbuffer.c
	1	#include "../../../portaudio/src/common/pa_ringbuffer.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_ringbuffer.h

r1181	r1211
1		link ../../../portaudio/src/common/pa_ringbuffer.h
	1	#include "../../../portaudio/src/common/pa_ringbuffer.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_skeleton.c

r1181	r1211
1		link ../../../portaudio/src/common/pa_skeleton.c
	1	#include "../../../portaudio/src/common/pa_skeleton.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_stream.c

r1181	r1211
1		link ../../../portaudio/src/common/pa_stream.c
	1	#include "../../../portaudio/src/common/pa_stream.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_stream.h

r1181	r1211
1		link ../../../portaudio/src/common/pa_stream.h
	1	#include "../../../portaudio/src/common/pa_stream.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_trace.c

r1181	r1211
1		link ../../../portaudio/src/common/pa_trace.c
	1	#include "../../../portaudio/src/common/pa_trace.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_trace.h

r1181	r1211
1		link ../../../portaudio/src/common/pa_trace.h
	1	#include "../../../portaudio/src/common/pa_trace.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_types.h

r1181	r1211
1		link ../../../portaudio/src/common/pa_types.h
	1	#include "../../../portaudio/src/common/pa_types.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_unix_hostapis.c

r1181	r1211
1		link ../../../portaudio/src/os/unix/pa_unix_hostapis.c
	1	#include "../../../portaudio/src/os/unix/pa_unix_hostapis.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_unix_oss.c

r1181	r1211
1		link ../../../portaudio/src/hostapi/oss/pa_unix_oss.c
	1	#include "../../../portaudio/src/hostapi/oss/pa_unix_oss.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_unix_util.c

r1181	r1211
1		link ../../../portaudio/src/os/unix/pa_unix_util.c
	1	#include "../../../portaudio/src/os/unix/pa_unix_util.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_unix_util.h

r1181	r1211
1		link ../../../portaudio/src/os/unix/pa_unix_util.h
	1	#include "../../../portaudio/src/os/unix/pa_unix_util.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_util.h

r1181	r1211
1		link ../../../portaudio/src/common/pa_util.h
	1	#include "../../../portaudio/src/common/pa_util.h"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_win_hostapis.c

r1181	r1211
1		link ../../../portaudio/src/os/win/pa_win_hostapis.c
	1	#include "../../portaudio/src/os/win/pa_win_hostapis.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_win_util.c

r1181	r1211
1		link ../../../portaudio/src/os/win/pa_win_util.c
	1	#include "../../../portaudio/src/os/win/pa_win_util.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/pa_win_wmme.c

r1181	r1211
1		link ../../../portaudio/src/hostapi/wmme/pa_win_wmme.c
	1	#include "../../../portaudio/src/hostapi/wmme/pa_win_wmme.c"

pjproject/branches/split-3rd-party/third_party/build/portaudio/src/portaudio.h

r1182	r1211
1		link ../../../portaudio/include/portaudio.h
	1	#include "../../../portaudio/include/portaudio.h"

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 1211

Legend:

Download in other formats: