diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:18:35 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:33 -0500 |
| commit | 1979ac8a7c2ae9be2fa1b75450f2428b3bf0ef75 (patch) | |
| tree | 127c4b92c30f6dcf21b8a121b66a1fdf21a8f9a9 /ucb | |
| parent | 4ec839be778e5541c09b0f1a6e3b707ca29bae6d (diff) | |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/inc/pch/precompiled_ucb.hxx | 2 | ||||
| -rw-r--r-- | ucb/workben/ucb/ucbdemo.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ucb/inc/pch/precompiled_ucb.hxx b/ucb/inc/pch/precompiled_ucb.hxx index 0928337a8c..7673ca7e4e 100644 --- a/ucb/inc/pch/precompiled_ucb.hxx +++ b/ucb/inc/pch/precompiled_ucb.hxx @@ -176,7 +176,7 @@ #include "ucbhelper/proxydecider.hxx" #include "osl/diagnose.h" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "vos/process.hxx" //---MARKER--- diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx index f19811e98a..4dc3c920c5 100644 --- a/ucb/workben/ucb/ucbdemo.cxx +++ b/ucb/workben/ucb/ucbdemo.cxx @@ -31,7 +31,7 @@ #include <stack> #include <rtl/ustrbuf.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vos/process.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/bootstrap.hxx> |