diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 09:49:24 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 09:49:24 +0000 |
| commit | 008df9f559c9c081f918c4ad8c78880f1e816f63 (patch) | |
| tree | 8e194370cc77ccf1cbdecccbac99056f946947f5 /ucb/source/ucp/webdav/DAVSessionFactory.hxx | |
| parent | e23c5d57ef587470d4b923c59bef9596883bb183 (diff) | |
INTEGRATION: CWS hr33 (1.9.52); FILE MERGED
2006/11/03 15:54:21 hr 1.9.52.2: RESYNC: (1.9-1.10); FILE MERGED
2006/05/02 14:27:42 hr 1.9.52.1: #i52977#: workaround breakage if compiled mit system STL on Linux (undef min)
Diffstat (limited to 'ucb/source/ucp/webdav/DAVSessionFactory.hxx')
| -rw-r--r-- | ucb/source/ucp/webdav/DAVSessionFactory.hxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav/DAVSessionFactory.hxx index 408eed399f3b..866755c22ee4 100644 --- a/ucb/source/ucp/webdav/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx @@ -4,9 +4,9 @@ * * $RCSfile: DAVSessionFactory.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: hr $ $Date: 2006-06-20 05:34:49 $ + * last change: $Author: vg $ $Date: 2006-11-22 10:49:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,6 +35,9 @@ #ifndef _DAVSESSIONFACTORY_HXX_ #define _DAVSESSIONFACTORY_HXX_ +#ifdef min +#undef min // GNU libstdc++ <memory> includes <limit> which defines methods called min... +#endif #include <map> #include <memory> |