1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
|
--- ucb/source/ucp/webdav/SerfUri.hxx_ 2014-02-04 14:39:02.000000000 +0900
+++ ucb/source/ucp/webdav/SerfUri.hxx 2014-02-04 14:39:18.000000000 +0900
@@ -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"
--- ucb/source/ucp/webdav/SerfSession.cxx_ 2014-02-04 14:40:19.000000000 +0900
+++ ucb/source/ucp/webdav/SerfSession.cxx 2014-02-04 14:40:26.000000000 +0900
@@ -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"
--- ucb/source/ucp/webdav/SerfTypes.hxx 2014-01-24 03:33:21.000000000 +0900
+++ ucb/source/ucp/webdav/SerfTypes.hxx 2014-02-04 14:38:44.000000000 +0900
@@ -24,7 +24,7 @@
#ifndef INCLUDED_SERFTYPES_HXX
#define INCLUDED_SERFTYPES_HXX
-#include <serf/serf.h>
+#include <serf.h>
typedef serf_connection_t SerfConnection;
--- ucb/source/ucp/webdav/SerfCallbacks.hxx.orig 2014-02-25 00:24:42.000000000 -0800
+++ ucb/source/ucp/webdav/SerfCallbacks.hxx 2014-07-28 01:11:38.000000000 -0700
@@ -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,
--- ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx.orig 2014-02-25 00:24:43.000000000 -0800
+++ ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx 2014-07-28 01:11:43.000000000 -0700
@@ -24,7 +24,7 @@
#include "SerfCopyReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
namespace http_dav_ucp
{
--- ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx.orig 2014-02-25 00:24:42.000000000 -0800
+++ ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx 2014-07-28 01:11:47.000000000 -0700
@@ -24,7 +24,7 @@
#include "SerfDeleteReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
namespace http_dav_ucp
{
--- ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx.orig 2014-02-25 00:24:43.000000000 -0800
+++ ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx 2014-07-28 01:11:51.000000000 -0700
@@ -24,7 +24,7 @@
#include "SerfMkColReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
namespace http_dav_ucp
{
--- ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx.orig 2014-02-25 00:24:43.000000000 -0800
+++ ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx 2014-07-28 01:11:57.000000000 -0700
@@ -24,7 +24,7 @@
#include "SerfMoveReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
namespace http_dav_ucp
{
--- ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx.orig 2014-02-25 00:24:43.000000000 -0800
+++ ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx 2014-07-28 01:12:00.000000000 -0700
@@ -24,7 +24,7 @@
#include "SerfPostReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
using namespace com::sun::star;
--- ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx.orig 2014-02-25 00:24:43.000000000 -0800
+++ ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx 2014-07-28 01:12:05.000000000 -0700
@@ -26,7 +26,7 @@
#include "SerfPutReqProcImpl.hxx"
-#include <serf/serf.h>
+#include <serf.h>
namespace http_dav_ucp
{
--- ucb/source/ucp/webdav/SerfRequestProcessor.hxx.orig 2014-02-25 00:24:43.000000000 -0800
+++ ucb/source/ucp/webdav/SerfRequestProcessor.hxx 2014-07-28 01:12:10.000000000 -0700
@@ -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"
--- ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx.orig 2014-02-25 00:24:42.000000000 -0800
+++ ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx 2014-07-28 01:12:14.000000000 -0700
@@ -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"
|
