diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:20:00 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:38 -0500 |
commit | d88b292704957818eff9a348a524b5c90b40031b (patch) | |
tree | eabf039491304b2c13f3bd77ca0b6d58c3dba1b8 /tools/inc/bootstrp | |
parent | 98b2c08dff4d00b3e7a2e001c326ebe27dae4549 (diff) |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'tools/inc/bootstrp')
-rw-r--r-- | tools/inc/bootstrp/prj.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx index 3f7bdf78f809..e45fd11b0495 100644 --- a/tools/inc/bootstrp/prj.hxx +++ b/tools/inc/bootstrp/prj.hxx @@ -32,7 +32,7 @@ #include <tools/fsys.hxx> #include <tools/stream.hxx> #include "bootstrp/listmacr.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #define OS_NONE 0x0000 #define OS_WIN16 0x0001 @@ -265,7 +265,7 @@ private: static Link aDBNotFoundHdl; protected: - NAMESPACE_VOS( OMutex ) aMutex; + osl::Mutex aMutex; USHORT nStarMode; SolarFileList aFileList; |