Now, revert r719466. Must quit using commit -m ""

git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@719468 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 11 insertions, 11 deletions

diff --git a/include/apr_dbm.h b/include/apr_dbm.h
index ad1b4f39..9f6e8b47 100644
--- a/include/apr_dbm.h
+++ b/include/apr_dbm.h
@@ -63,10 +63,10 @@ typedef struct
  * @param dbm The newly opened database
  * @param type The type of the DBM (not all may be available at run time)
  * <pre>
- *  db   for Berkeley DB files
- *  gdbm for GDBM files
- *  ndbm for NDBM files
- *  sdbm for SDBM files (always available)
+ *  GDBM for GDBM files
+ *  SDBM for SDBM files
+ *  DB   for berkeley DB files
+ *  NDBM for NDBM files
  *  default for the default DBM type
  *  </pre>
  * @param name The dbm file name to open
@@ -81,9 +81,6 @@ typedef struct
  * @param cntxt The pool to use when creating the dbm
  * @remark The dbm name may not be a true file name, as many dbm packages
  * append suffixes for seperate data and index files.
- * @bug In apr-util 0.9 and 1.x, the type arg was case insensitive.  This
- * was highly inefficient, and as of 2.x the dbm name must be provided in
- * the correct case (lower case for all bundled providers)
  */
 
 APU_DECLARE(apr_status_t) apr_dbm_open_ex(apr_dbm_t **dbm, const char* type, 
@@ -187,7 +184,7 @@ APU_DECLARE(char *) apr_dbm_geterror(apr_dbm_t *dbm, int *errcode,
  * actual file/path names which would be (created and) used. At most, two
  * files may be used; used2 may be NULL if only one file is used.
  * @param pool The pool for allocating used1 and used2.
- * @param type The type of DBM you require info on @see apr_dbm_open_ex
+ * @param type The type of DBM you require info on
  * @param pathname The path name to generate used-names from.
  * @param used1 The first pathname used by the apr_dbm implementation.
  * @param used2 The second pathname used by apr_dbm. If only one file is
diff --git a/include/apu.hw b/include/apu.hw
index cdc3fb8a..b0b0b3ca 100644
--- a/include/apu.hw
+++ b/include/apu.hw
@@ -108,13 +108,14 @@
 #define APU_HAVE_DB_VERSION     0
 #endif
 
+#ifndef APU_DBD_DSO_BUILD
 #define APU_HAVE_PGSQL          0
 #define APU_HAVE_MYSQL          0
 #define APU_HAVE_SQLITE3        0
 #define APU_HAVE_SQLITE2        0
 #define APU_HAVE_ORACLE         0
 #define APU_HAVE_FREETDS        0
-
+#endif
 /* Windows always has ODBC */
 #define APU_HAVE_ODBC           1
 
diff --git a/include/private/apr_dbm_private.h b/include/private/apr_dbm_private.h
index f92cce77..c598752f 100644
--- a/include/private/apr_dbm_private.h
+++ b/include/private/apr_dbm_private.h
@@ -110,11 +110,13 @@ struct apr_dbm_t
 
 /* Declare all of the builtin DBM providers */
 APU_DECLARE_DATA extern const apr_dbm_type_t apr_dbm_type_sdbm;
-#ifndef DSO_BUILD
 APU_DECLARE_DATA extern const apr_dbm_type_t apr_dbm_type_gdbm;
 APU_DECLARE_DATA extern const apr_dbm_type_t apr_dbm_type_ndbm;
+APU_DECLARE_DATA extern const apr_dbm_type_t apr_dbm_type_db1;
+APU_DECLARE_DATA extern const apr_dbm_type_t apr_dbm_type_db2;
+APU_DECLARE_DATA extern const apr_dbm_type_t apr_dbm_type_db3;
+APU_DECLARE_DATA extern const apr_dbm_type_t apr_dbm_type_db4;
 APU_DECLARE_DATA extern const apr_dbm_type_t apr_dbm_type_db;
-#endif
 
 #ifdef __cplusplus
 }