diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-01-20 13:19:37 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-01-20 13:19:37 +0000 |
| commit | fc107c3b2069fe01b238fa946213f965d244022e (patch) | |
| tree | 76b04174a7ff71f6370ff1efc128d777cb06b06d /ucb/source | |
| parent | 7b822f3035b2b44d7fd4cb4696970be5070205e3 (diff) | |
INTEGRATION: CWS pj48 (1.6.34); FILE MERGED
2006/01/07 10:12:03 pjanik 1.6.34.1: #i53335#: Include system neon properly.
Diffstat (limited to 'ucb/source')
| -rw-r--r-- | ucb/source/ucp/webdav/LinkSequence.cxx | 8 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav/LockEntrySequence.cxx | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/ucb/source/ucp/webdav/LinkSequence.cxx b/ucb/source/ucp/webdav/LinkSequence.cxx index a105035659b9..68ee8da90b77 100644 --- a/ucb/source/ucp/webdav/LinkSequence.cxx +++ b/ucb/source/ucp/webdav/LinkSequence.cxx @@ -4,9 +4,9 @@ * * $RCSfile: LinkSequence.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-09 16:09:49 $ + * last change: $Author: obo $ $Date: 2006-01-20 14:19:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,8 +36,12 @@ #include <string.h> #ifndef NE_XML_H +#ifdef SYSTEM_NEON +#include <ne_xml.h> +#else #include <neon/ne_xml.h> #endif +#endif #ifndef _LINKSEQUENCE_HXX_ #include "LinkSequence.hxx" diff --git a/ucb/source/ucp/webdav/LockEntrySequence.cxx b/ucb/source/ucp/webdav/LockEntrySequence.cxx index 9ad6c7e6442d..2e15c9c177e9 100644 --- a/ucb/source/ucp/webdav/LockEntrySequence.cxx +++ b/ucb/source/ucp/webdav/LockEntrySequence.cxx @@ -4,9 +4,9 @@ * * $RCSfile: LockEntrySequence.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-09 16:10:25 $ + * last change: $Author: obo $ $Date: 2006-01-20 14:19:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,8 +36,12 @@ #include <string.h> #ifndef NE_XML_H +#ifdef SYSTEM_NEON +#include <ne_xml.h> +#else #include <neon/ne_xml.h> #endif +#endif #ifndef _LOCKENTRYSEQUENCE_HXX_ #include "LockEntrySequence.hxx" |