On Mon, Oct 11, 2010 at 11:26 PM, Joseph Powers <jpower...@cox.net> wrote: > I'm building for the Mac and the vos:: removal patch didn't include the mac > files. > > I found three files that have issues: > vcl/aqua/inc/salinst.h > vcl/aqua/source/app/salinst.cxx > vcl/aqua/source/gdi/salgdi.cxx > > A patch would be nice; however, suggestions on how to patch are also welcome. > > salinst.h:#include "vos/mutex.hxx" > salinst.h:class SalYieldMutex : public vos::OMutex > salinst.h:#define YIELD_GUARD vos::OGuard aGuard( > GetSalData()->mpFirstInstance->GetYieldMutex() ) > salinst.h: virtual vos::IMutex* GetYieldMutex(); > > salinst.cxx: vos::OGuard aGuard( *mpSalYieldMutex ); > salinst.cxx: maMainThread = vos::OThread::getCurrentIdentifier(); > salinst.cxx:vos::IMutex* AquaSalInstance::GetYieldMutex() > salinst.cxx: return vos::OThread::getCurrentIdentifier() == maMainThread; > > salgdi.cxx:#include "vos/mutex.hxx" > > I'm thinking salgdi.cxx would be just the removal of the #include. > > What where vos:IMutex, vos::OMutex, vos::OGuard & vos::OThread replaced with? OMutex and OGuard have not be replcaed yet.
vos::OThread is replaced by osl:Thread in commit 57ba3a55b9a9c7668cbc30a8ea7ffcadd162e9b4 but I apparently missed a couple in aqua. I pushed a fix: commit f49028b1bd734cb7ccfcad82df0acf8a950454ae in libs-gui Norbert > > Joe P. > > _______________________________________________ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
