diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-11 22:07:16 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:29 -0500 |
| commit | d166c4a022a4219eb488f6c0dbd3a6defdc974f7 (patch) | |
| tree | 6dcc9ba5e697984bf28462811c80c6d437c31791 | |
| parent | 312466f9d486a2e9607717e6ee5b06c88121f53e (diff) | |
merge vosremoval-pipe.diff
| -rw-r--r-- | extensions/inc/pch/precompiled_extensions.hxx | 2 | ||||
| -rw-r--r-- | extensions/source/plugin/inc/plugin/unx/mediator.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx index 06a86f999c74..0b5544486453 100644 --- a/extensions/inc/pch/precompiled_extensions.hxx +++ b/extensions/inc/pch/precompiled_extensions.hxx @@ -474,6 +474,7 @@ #include "osl/module.hxx" #include "osl/mutex.hxx" #include "osl/nlsupport.h" +#include "osl/pipe.hxx" #include "osl/process.h" #include "osl/security.hxx" #include "osl/thread.h" @@ -540,7 +541,6 @@ #include "vos/macros.hxx" #include "vos/module.hxx" #include "vos/mutex.hxx" -#include "vos/pipe.hxx" #include "vos/ref.hxx" #include "vos/refernce.hxx" diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx index 8610211bb1a8..4156c6bf24c4 100644 --- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx +++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx @@ -31,7 +31,7 @@ #include <stdarg.h> #include <tools/string.hxx> #include <tools/link.hxx> -#include <vos/pipe.hxx> +#include <osl/pipe.hxx> #include <vos/mutex.hxx> #include <osl/conditn.hxx> #include <osl/thread.hxx> |