summaryrefslogtreecommitdiff
path: root/ucb/source
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-01-20 13:20:06 +0000
committerOliver Bolte <obo@openoffice.org>2006-01-20 13:20:06 +0000
commit745e8baf61d8d28ae22c2336f5c0e47afb238756 (patch)
treeabed97ae82fab9d73e15961b3030a8583b1577fe /ucb/source
parent3ec2e05350220a6b6e302d353220d6599b67a8aa (diff)
INTEGRATION: CWS pj48 (1.36.28); FILE MERGED
2006/01/07 10:12:04 pjanik 1.36.28.1: #i53335#: Include system neon properly.
Diffstat (limited to 'ucb/source')
-rw-r--r--ucb/source/ucp/webdav/NeonSession.cxx20
1 files changed, 18 insertions, 2 deletions
diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
index 261ebb7ea536..8cdc0d6750b1 100644
--- a/ucb/source/ucp/webdav/NeonSession.cxx
+++ b/ucb/source/ucp/webdav/NeonSession.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: NeonSession.cxx,v $
*
- * $Revision: 1.36 $
+ * $Revision: 1.37 $
*
- * last change: $Author: rt $ $Date: 2005-10-18 08:47:02 $
+ * last change: $Author: obo $ $Date: 2006-01-20 14:20:06 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -36,17 +36,33 @@
#include <string.h>
#ifndef NE_SOCKET_H
+#ifdef SYSTEM_NEON
+#include <ne_socket.h>
+#else
#include <neon/ne_socket.h>
#endif
+#endif
#ifndef NE_AUTH_H
+#ifdef SYSTEM_NEON
+#include <ne_auth.h>
+#else
#include <neon/ne_auth.h>
#endif
+#endif
#ifndef NE_REDIRECT_H
+#ifdef SYSTEM_NEON
+#include <ne_redirect.h>
+#else
#include <neon/ne_redirect.h>
#endif
+#endif
#ifndef NE_LOCKS_H
+#ifdef SYSTEM_NEON
+#include <ne_locks.h>
+#else
#include <neon/ne_locks.h>
#endif
+#endif
#ifndef __XML_PARSER_H__
#include "libxml/parser.h"