From d166c4a022a4219eb488f6c0dbd3a6defdc974f7 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 11 Oct 2010 22:07:16 -0500 Subject: merge vosremoval-pipe.diff --- extensions/inc/pch/precompiled_extensions.hxx | 2 +- 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 #include #include -#include +#include #include #include #include -- cgit