which conflicts with C++ code defining a 'Lock' class. r=alexei.volkov. Modified Files: cmd/tests/manifest.mn lib/util/nssilckt.h Added Files: cmd/tests/conflict.c git-svn-id: svn://10.0.0.236/trunk@254646 18797224-902f-48f8-a5cc-f745e15eee43
which conflicts with C++ code defining a 'Lock' class. r=alexei.volkov. Modified Files: cmd/tests/manifest.mn lib/util/nssilckt.h Added Files: cmd/tests/conflict.c git-svn-id: svn://10.0.0.236/trunk@254646 18797224-902f-48f8-a5cc-f745e15eee43