Bogdan, Ah, yes, come to think of it I think you provided some custom debug enhancements to help diagnose an issue I was having. Sounds easy enough to fix. Thanks.
- Jeff On May 24, 2010, at 8:18 AM, Bogdan-Andrei Iancu wrote: > Hi Jeff, > > The "<<<<" and ">>>" markers are added by SVN when a SVN merge (between > repo and local checkout) is encountered. Probably you locally modified > the file and, during a "svn update", SVN failed to merge - you need to > correct the merging by hand. > > Regards, > Bogdan > > Jeff Pyle wrote: >> Hello, >> >> I'm receiving the following error when trying to compile revision 6888 from >> the 1.6 trunk: >> >> gcc -fPIC -DPIC -g -O9 -funroll-loops -Wcast-align -Wall >> -minline-all-stringops -falign-loops -ftree-vectorize -mtune=prescott >> -Wold-style-definition -Wmissing-field-initializers -Wredundant-decls >> -DMOD_NAME='"uac"' -DNAME='"opensips"' -DVERSION='"1.6.2-notls"' >> -DARCH='"i386"' -DOS='"linux"' -DCOMPILER='"gcc 4.1.2"' -D__CPU_i386 >> -D__OS_linux -D__SMP_yes -DCFG_DIR='"/usr/local/etc/opensips/"' -DPKG_MALLOC >> -DSHM_MEM -DSHM_MMAP -DUSE_IPV6 -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE >> -DHAVE_RESOLV_RES -DSTATISTICS -DCHANGEABLE_DEBUG_LEVEL -DF_MALLOC >> -DSVNREVISION='"2:6888M"' -DFAST_LOCK -DADAPTIVE_WAIT >> -DADAPTIVE_WAIT_LOOPS=1024 -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN >> -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL >> -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_EPOLL -DHAVE_SIGIO_RT -DHAVE_SELECT -c >> replace.c -o replace.o >> replace.c: In function ‘restore_uri’: >> replace.c:461: error: expected expression before ‘<<’ token >> replace.c:468: error: expected expression before ‘==’ token >> replace.c:475: error: expected expression before ‘>>’ token >> make[1]: *** [replace.o] Error 1 >> make[1]: Leaving directory `/usr/local/src/opensips_1.6/modules/uac' >> make: *** [modules] Error 2 >> >> Previously I compiled build 6617 with no issue. >> >> Any thoughts? >> >> >> Thanks, >> Jeff >> _______________________________________________ >> Users mailing list >> [email protected] >> http://lists.opensips.org/cgi-bin/mailman/listinfo/users >> >> > > > -- > Bogdan-Andrei Iancu > www.voice-system.ro > > > _______________________________________________ > Users mailing list > [email protected] > http://lists.opensips.org/cgi-bin/mailman/listinfo/users _______________________________________________ Users mailing list [email protected] http://lists.opensips.org/cgi-bin/mailman/listinfo/users
