[Libreoffice-commits] core.git: Branch 'aoo/trunk' - ucb/source
Pedro Giffuni
pfg at apache.org
Fri Jan 23 10:10:15 PST 2015
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 +-
ucb/source/ucp/webdav/SerfSession.cxx | 2 +-
ucb/source/ucp/webdav/SerfTypes.hxx | 2 +-
ucb/source/ucp/webdav/SerfUri.hxx | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 44fda43ca6846b25201eaa7812eb90fc7f79faac
Author: Pedro Giffuni <pfg at apache.org>
Date: Fri Jan 23 17:44:53 2015 +0000
Fix webdav build with external serf.
Building with external serf (which is recommended) has been
broken for a while. Restore the proper include paths for
the external serf to work.
While testing this change, I noticed that downloading the old serf
can fail breaking the build but this is unrelated to this patch.
Authors: Don Lewis, maho@
Obtained from: FreeBSD port
diff --git a/ucb/source/ucp/webdav/SerfCallbacks.hxx b/ucb/source/ucp/webdav/SerfCallbacks.hxx
index 0f94c6a..840e3a3 100644
--- a/ucb/source/ucp/webdav/SerfCallbacks.hxx
+++ b/ucb/source/ucp/webdav/SerfCallbacks.hxx
@@ -23,7 +23,7 @@
#ifndef INCLUDED_CALLBACKS_HXX
#define INCLUDED_CALLBACKS_HXX
-#include <serf/serf.h>
+#include <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 a883e2c..4cb0796 100644
--- a/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
@@ -24,7 +24,7 @@
#include "SerfCopyReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
namespace http_dav_ucp
{
diff --git a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
index 11148d8..54b7190 100644
--- a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
@@ -24,7 +24,7 @@
#include "SerfDeleteReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
namespace http_dav_ucp
{
diff --git a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
index 9b73e9c..14692e1 100644
--- a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
@@ -24,7 +24,7 @@
#include "SerfMkColReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
namespace http_dav_ucp
{
diff --git a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
index 91a5463..391313f 100644
--- a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
@@ -24,7 +24,7 @@
#include "SerfMoveReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
namespace http_dav_ucp
{
diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
index 5d5e71d..e9a55d0 100644
--- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
@@ -24,7 +24,7 @@
#include "SerfPostReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
using namespace com::sun::star;
diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
index a3f5fba..f24f68d 100644
--- a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
@@ -26,7 +26,7 @@
#include "SerfPutReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
namespace http_dav_ucp
{
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
index c2ab235..673eb39 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
@@ -26,7 +26,7 @@
#include <apr_errno.h>
#include <apr_pools.h>
-#include <serf/serf.h>
+#include <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 57611ec..96b0d51 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
@@ -22,7 +22,7 @@
#ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
#define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
-#include <serf/serf.h>
+#include <serf.h>
#include <sal/types.h>
#include "DAVRequestEnvironment.hxx"
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index a5354eb..c639239 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -30,7 +30,7 @@
#include "ucbhelper/simplecertificatevalidationrequest.hxx"
#include "AprEnv.hxx"
-#include <apr/apr_strings.h>
+#include <apr_strings.h>
#include "DAVAuthListener.hxx"
#include "SerfTypes.hxx"
diff --git a/ucb/source/ucp/webdav/SerfTypes.hxx b/ucb/source/ucp/webdav/SerfTypes.hxx
index 23d8bee..d525d6b 100644
--- a/ucb/source/ucp/webdav/SerfTypes.hxx
+++ b/ucb/source/ucp/webdav/SerfTypes.hxx
@@ -24,7 +24,7 @@
#ifndef INCLUDED_SERFTYPES_HXX
#define INCLUDED_SERFTYPES_HXX
-#include <serf/serf.h>
+#include <serf.h>
typedef serf_connection_t SerfConnection;
diff --git a/ucb/source/ucp/webdav/SerfUri.hxx b/ucb/source/ucp/webdav/SerfUri.hxx
index 8bd45de..d6844a1 100644
--- a/ucb/source/ucp/webdav/SerfUri.hxx
+++ b/ucb/source/ucp/webdav/SerfUri.hxx
@@ -23,7 +23,7 @@
#ifndef INCLUDED_SERFURI_HXX
#define INCLUDED_SERFURI_HXX
-#include <apr-util/apr_uri.h>
+#include <apr_uri.h>
#include <rtl/ustring.hxx>
#include "DAVException.hxx"
More information about the Libreoffice-commits
mailing list