Author: ydario
Date: Mon Feb 17 16:32:25 2014
New Revision: 1569046
URL: http://svn.apache.org/r1569046
Log:
#i123744# use only one way to include serf headers.
Modified:
openoffice/trunk/main/ucb/source/ucp/webdav/SerfCallbacks.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
Modified: openoffice/trunk/main/ucb/source/ucp/webdav/SerfCallbacks.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfCallbacks.hxx?rev=1569046&r1=1569045&r2=1569046&view=diff
==============================================================================
--- openoffice/trunk/main/ucb/source/ucp/webdav/SerfCallbacks.hxx (original)
+++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfCallbacks.hxx Mon Feb 17
16:32:25 2014
@@ -23,7 +23,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,
@@ -37,8 +37,8 @@ extern "C" apr_status_t Serf_Credentials
void *baton,
int code,
const char *authn_type,
- const char *realm,
- apr_pool_t *pool );
+ const char *realm,
+ apr_pool_t *pool );
extern "C" apr_status_t Serf_CertificateChainValidation(
void* pSerfSession,
Modified: openoffice/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx?rev=1569046&r1=1569045&r2=1569046&view=diff
==============================================================================
--- openoffice/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
(original)
+++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx Mon Feb
17 16:32:25 2014
@@ -24,7 +24,7 @@
#include "SerfCopyReqProcImpl.hxx"
-#include <serf.h>
+#include <serf/serf.h>
namespace http_dav_ucp
{
Modified: openoffice/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx?rev=1569046&r1=1569045&r2=1569046&view=diff
==============================================================================
--- openoffice/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
(original)
+++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx Mon
Feb 17 16:32:25 2014
@@ -24,7 +24,7 @@
#include "SerfDeleteReqProcImpl.hxx"
-#include <serf.h>
+#include <serf/serf.h>
namespace http_dav_ucp
{
Modified: openoffice/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx?rev=1569046&r1=1569045&r2=1569046&view=diff
==============================================================================
--- openoffice/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
(original)
+++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx Mon
Feb 17 16:32:25 2014
@@ -24,7 +24,7 @@
#include "SerfMkColReqProcImpl.hxx"
-#include <serf.h>
+#include <serf/serf.h>
namespace http_dav_ucp
{
Modified: openoffice/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx?rev=1569046&r1=1569045&r2=1569046&view=diff
==============================================================================
--- openoffice/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
(original)
+++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx Mon Feb
17 16:32:25 2014
@@ -24,7 +24,7 @@
#include "SerfMoveReqProcImpl.hxx"
-#include <serf.h>
+#include <serf/serf.h>
namespace http_dav_ucp
{
Modified: openoffice/trunk/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx?rev=1569046&r1=1569045&r2=1569046&view=diff
==============================================================================
--- openoffice/trunk/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
(original)
+++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx Mon Feb
17 16:32:25 2014
@@ -24,7 +24,7 @@
#include "SerfPostReqProcImpl.hxx"
-#include <serf.h>
+#include <serf/serf.h>
using namespace com::sun::star;
Modified: openoffice/trunk/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx?rev=1569046&r1=1569045&r2=1569046&view=diff
==============================================================================
--- openoffice/trunk/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
(original)
+++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx Mon Feb
17 16:32:25 2014
@@ -26,7 +26,7 @@
#include "SerfPutReqProcImpl.hxx"
-#include <serf.h>
+#include <serf/serf.h>
namespace http_dav_ucp
{
Modified: openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx?rev=1569046&r1=1569045&r2=1569046&view=diff
==============================================================================
--- openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
(original)
+++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx Mon
Feb 17 16:32:25 2014
@@ -26,7 +26,7 @@
#include <apr_errno.h>
#include <apr_pools.h>
-#include <serf.h>
+#include <serf/serf.h>
#include "DAVTypes.hxx"
#include "DAVResource.hxx"
Modified:
openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx?rev=1569046&r1=1569045&r2=1569046&view=diff
==============================================================================
--- openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
(original)
+++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
Mon Feb 17 16:32:25 2014
@@ -22,7 +22,7 @@
#ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
#define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
-#include <serf.h>
+#include <serf/serf.h>
#include <sal/types.h>
#include "DAVRequestEnvironment.hxx"
