ucb/source/ucp/webdav/SerfCallbacks.hxx | 2 +- ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx | 2 +- ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx | 2 +- ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx | 2 +- ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx | 2 +- ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx | 2 +- ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx | 2 +- ucb/source/ucp/webdav/SerfRequestProcessor.hxx | 2 +- ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)
New commits: commit d280756b12cf30112901633f827d6509ce00c7f2 Author: Yuri Dario <yda...@apache.org> Date: Mon Feb 17 16:32:25 2014 +0000 Resolves: #i123744# use only one way to include serf headers (cherry picked from commit bc34afebf4562ad3a8c48484f3fb9841ab4809b0) Change-Id: I0ef0d1a8b35ed6eb30db3d116bb102a911006ca0 diff --git a/ucb/source/ucp/webdav/SerfCallbacks.hxx b/ucb/source/ucp/webdav/SerfCallbacks.hxx index af3be03..78b0d06 100644 --- a/ucb/source/ucp/webdav/SerfCallbacks.hxx +++ b/ucb/source/ucp/webdav/SerfCallbacks.hxx @@ -21,7 +21,7 @@ #ifndef INCLUDED_CALLBACKS_HXX #define INCLUDED_CALLBACKS_HXX -#include <serf.h> +#include <serf/serf.h> extern "C" apr_status_t Serf_ConnectSetup( apr_socket_t *skt, serf_bucket_t **read_bkt, diff --git a/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx index 1bc2098..f098b80 100644 --- a/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx @@ -19,7 +19,7 @@ #include "SerfCopyReqProcImpl.hxx" -#include <serf.h> +#include <serf/serf.h> namespace http_dav_ucp { diff --git a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx index 9287408..893c407 100644 --- a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx @@ -19,7 +19,7 @@ #include "SerfDeleteReqProcImpl.hxx" -#include <serf.h> +#include <serf/serf.h> namespace http_dav_ucp { diff --git a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx index 07c6725..b7b2105 100644 --- a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx @@ -19,7 +19,7 @@ #include "SerfMkColReqProcImpl.hxx" -#include <serf.h> +#include <serf/serf.h> namespace http_dav_ucp { diff --git a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx index b0cb2cc..4518fcd 100644 --- a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx @@ -19,7 +19,7 @@ #include "SerfMoveReqProcImpl.hxx" -#include <serf.h> +#include <serf/serf.h> namespace http_dav_ucp { diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx index 86e2f36..5bf1ce9 100644 --- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx @@ -19,7 +19,7 @@ #include "SerfPostReqProcImpl.hxx" -#include <serf.h> +#include <serf/serf.h> using namespace com::sun::star; diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx index 78b454a..e3617f9 100644 --- a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx @@ -21,7 +21,7 @@ #include "SerfPutReqProcImpl.hxx" -#include <serf.h> +#include <serf/serf.h> namespace http_dav_ucp { diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx index 9addb34..d1bfe97 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx @@ -24,7 +24,7 @@ #include <apr_errno.h> #include <apr_pools.h> -#include <serf.h> +#include <serf/serf.h> #include "DAVTypes.hxx" #include "DAVResource.hxx" diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx index cea80bd..1c15621 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX #define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX -#include <serf.h> +#include <serf/serf.h> #include <sal/types.h> #include "DAVRequestEnvironment.hxx" _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits