INTEGRATION: CWS ooo20040704 (1.37.76); FILE MERGED

2004/07/02 10:19:41 cmc 1.37.76.2: #i30891# revert header and namespace change
2004/06/28 10:37:28 cmc 1.37.76.1: #i30801 allow using system libs if possible
This commit is contained in:
Rüdiger Timm
2004-09-08 15:14:11 +00:00
parent 9e89123664
commit e69cca1ffd

View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: databases.cxx,v $ * $RCSfile: databases.cxx,v $
* *
* $Revision: 1.38 $ * $Revision: 1.39 $
* *
* last change: $Author: kz $ $Date: 2004-08-30 17:26:40 $ * last change: $Author: rt $ $Date: 2004-09-08 16:14:11 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -59,8 +59,11 @@
* *
************************************************************************/ ************************************************************************/
#ifdef SYSTEM_DB3
#include <db3/db_cxx.h>
#else
#include <berkeleydb/db_cxx.h> #include <berkeleydb/db_cxx.h>
#endif
#ifndef _VOS_DIAGNOSE_HXX_ #ifndef _VOS_DIAGNOSE_HXX_
#include <vos/diagnose.hxx> #include <vos/diagnose.hxx>
#endif #endif