Skip to content

Commit 481e752

Browse files
committed
Whoops... removal of the last compat was just this bit premature. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95864 13f79535-47bb-0310-9956-ffa450edef68
1 parent 265c019 commit 481e752

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

modules/dav/fs/repos.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1823,7 +1823,7 @@ static const dav_hooks_repository dav_hooks_repository_fs =
18231823

18241824
static dav_prop_insert dav_fs_insert_prop(const dav_resource *resource,
18251825
int propid, dav_prop_insert what,
1826-
ap_text_header *phdr)
1826+
apr_text_header *phdr)
18271827
{
18281828
const char *value;
18291829
const char *s;
@@ -1923,7 +1923,7 @@ static dav_prop_insert dav_fs_insert_prop(const dav_resource *resource,
19231923
"D:namespace=\"%s\"/>" DEBUG_CR,
19241924
info->name, dav_fs_namespace_uris[info->ns]);
19251925
}
1926-
ap_text_append(p, phdr, s);
1926+
apr_text_append(p, phdr, s);
19271927

19281928
/* we inserted what was asked for */
19291929
return what;
@@ -1945,13 +1945,13 @@ static int dav_fs_is_writable(const dav_resource *resource, int propid)
19451945
}
19461946

19471947
static dav_error *dav_fs_patch_validate(const dav_resource *resource,
1948-
const ap_xml_elem *elem,
1948+
const apr_xml_elem *elem,
19491949
int operation,
19501950
void **context,
19511951
int *defer_to_dead)
19521952
{
1953-
const ap_text *cdata;
1954-
const ap_text *f_cdata;
1953+
const apr_text *cdata;
1954+
const apr_text *f_cdata;
19551955
char value;
19561956
dav_elem_private *priv = elem->priv;
19571957

@@ -2010,7 +2010,7 @@ static dav_error *dav_fs_patch_validate(const dav_resource *resource,
20102010
}
20112011

20122012
static dav_error *dav_fs_patch_exec(const dav_resource *resource,
2013-
const ap_xml_elem *elem,
2013+
const apr_xml_elem *elem,
20142014
int operation,
20152015
void *context,
20162016
dav_liveprop_rollback **rollback_ctx)
@@ -2120,7 +2120,7 @@ int dav_fs_find_liveprop(const dav_resource *resource,
21202120
}
21212121

21222122
void dav_fs_insert_all_liveprops(request_rec *r, const dav_resource *resource,
2123-
dav_prop_insert what, ap_text_header *phdr)
2123+
dav_prop_insert what, apr_text_header *phdr)
21242124
{
21252125
/* don't insert any liveprops if this isn't "our" resource */
21262126
if (resource->hooks != &dav_hooks_repository_fs)

modules/dav/fs/repos.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ int dav_fs_find_liveprop(const dav_resource *resource,
109109
const char *ns_uri, const char *name,
110110
const dav_hooks_liveprop **hooks);
111111
void dav_fs_insert_all_liveprops(request_rec *r, const dav_resource *resource,
112-
dav_prop_insert what, ap_text_header *phdr);
112+
dav_prop_insert what, apr_text_header *phdr);
113113

114114
void dav_fs_register(apr_pool_t *p);
115115

0 commit comments

Comments
 (0)