Oops... Never mind. Looks like my darcs directory got mangled with my original TOS patch... Sorry for the spam...
Colin.. Colin Whittaker wrote: > Same problem in tport.c around line 855. > > > Colin Whittaker wrote: >> Looks like someone checked in tport_tag.h with some unresolved >> conflicts.... >> >> Around line 394: >> >> #define TPTAG_STUN_SERVER_REF(x) tptag_stun_server_ref, >> tag_bool_vr(&(x)) >> v v v v v v v >> >> TPORT_DLL extern tag_typedef_t tptag_tos; >> /** Sets the IP TOS for the socket. >> * >> * Use with tport_tcreate(), tport_tbind(), tport_set_params(), >> nua_create(), >> * nta_agent_create(), nta_agent_add_tport(), nth_engine_create(), or >> * initial nth_site_create(). >> */ >> #define TPTAG_TOS(x) tptag_tos, tag_int_v((x)) >> >> TPORT_DLL extern tag_typedef_t tptag_tos_ref; >> #define TPTAG_TOS_REF(x) tptag_tos_ref, tag_int_vr(&(x)) >> ************* >> >> TPORT_DLL extern tag_typedef_t tptag_tos; >> /** Sets the IP TOS for the socket. */ >> #define TPTAG_TOS(x) tptag_tos, tag_uint_v((x)) >> >> TPORT_DLL extern tag_typedef_t tptag_tos_ref; >> #define TPTAG_TOS_REF(x) tptag_tos_ref, tag_uint_vr(&(x)) >> ^ ^ ^ ^ ^ ^ ^ >> >> >> >> ------------------------------------------------------------------------- >> >> Using Tomcat but need to do more? Need to support web services, >> security? >> Get stuff done quickly with pre-integrated technology to make your >> job easier. >> Download IBM WebSphere Application Server v.1.0.1 based on Apache >> Geronimo >> http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 >> _______________________________________________ >> Sofia-sip-devel mailing list >> Sofia-sip-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/sofia-sip-devel >> ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier. Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Sofia-sip-devel mailing list Sofia-sip-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/sofia-sip-devel
