diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:14:13 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:27 -0500 |
commit | 84fc610c17d4a0e9777c99a326b9673f4a8788d9 (patch) | |
tree | 8d2d9448803c0c56bee129a76b1ef22228c5b761 | |
parent | abb03ac2ac85c67167d17277fefa8309a99f1100 (diff) |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
-rw-r--r-- | soldep/bootstrp/prj.cxx | 2 | ||||
-rw-r--r-- | soldep/inc/soldep/prj.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx index dcc14e12b..6654ba142 100644 --- a/soldep/bootstrp/prj.cxx +++ b/soldep/bootstrp/prj.cxx @@ -28,7 +28,7 @@ #include <stdlib.h> #include <stdio.h> #include <bootstrp/sstring.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #define ENABLE_BYTESTRING_STREAM_OPERATORS #include <tools/stream.hxx> diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx index d9c25088c..f02dbd87d 100644 --- a/soldep/inc/soldep/prj.hxx +++ b/soldep/inc/soldep/prj.hxx @@ -31,7 +31,7 @@ #include <tools/fsys.hxx> #include <tools/stream.hxx> #include <bootstrp/listmacr.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/string.hxx> #define XML_EXT "xlist" |