diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-09-09 07:14:12 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-09 07:14:12 +0000 |
commit | 7f0c96b65131a0e588ef6398ba65003091ed2e96 (patch) | |
tree | 621f00445e5bd57d66772476a833337353e0dbaf /desktop | |
parent | 3a2c598a4a09872326b9b103ce305bbf057f13e1 (diff) |
INTEGRATION: CWS ooo20040704 (1.3.10); FILE MERGED
2004/07/02 11:19:47 cmc 1.3.10.2: #i30891# revert header and namespace change
2004/06/28 13:13:37 cmc 1.3.10.1: #i30801# allow using system stl if possible
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/deployment/inc/dp_persmap.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h index 96c023c73a0b..ef7a9eb46291 100644 --- a/desktop/source/deployment/inc/dp_persmap.h +++ b/desktop/source/deployment/inc/dp_persmap.h @@ -2,9 +2,9 @@ * * $RCSfile: dp_persmap.h,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2004-08-12 12:06:02 $ + * last change: $Author: rt $ $Date: 2004-09-09 08:14:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,7 +63,11 @@ #define INCLUDED_DP_PERSMAP_H #include "rtl/ustring.hxx" +#ifdef SYSTEM_DB3 +#include <db3/db_cxx.h> +#else #include "berkeleydb/db_cxx.h" +#endif #include <hash_map> |