summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-09-23 14:02:16 +0000
committerUlrich Drepper <drepper@redhat.com>1998-09-23 14:02:16 +0000
commit24fd4cc4512102239f408ad965c7d65229be90d3 (patch)
treecccbe271bb9e2373a4beae0b0ae58773619b7856 /include
parent1cd9c90dc94714b358b7f968122f00088c852763 (diff)
downloadglibc-24fd4cc4512102239f408ad965c7d65229be90d3.tar.gz
glibc-24fd4cc4512102239f408ad965c7d65229be90d3.tar.xz
glibc-24fd4cc4512102239f408ad965c7d65229be90d3.zip
Update.
1998-09-23 13:52  Ulrich Drepper  <drepper@cygnus.com>

	* Makeconfig (all-subdirs): Add db.
	* Versions.def: Add definition for libdb1.
	* shlib-versions: Add definitions for libdb1.
	* db/Makefile (extra-libs): Replace by libdb1.
	(libdb-routines): Rename to libdb1-routines.
	(headers): Rename to db1-headers.
	(distribute): Add $(db1-headers).
	(install-others): Define to install symlink libdb.so.NN and the
	$(db1-headers).
	(CPPFLAGS): Add -USE_LIBDB1
	Remove rules to build makedb.
	* db/Versions: Rename libdb to libdb1.
	* include/db.h: If USE_LIBDB1 is defined include db/db.h.

	* scripts/versions.awk: Recognize digits in library names.

	* db/btree/bt_open.c: Fix compiler warnings.
	* db/btree/bt_put.c: Likewise.
	* db/btree/bt_split.c: Likewise.
	* db/hash/hash.c: Likewise.
	* db/hash/hash_bigkey.c: Likewise.
	* db/recno/rec_close.c: Likewise.
Diffstat (limited to 'include')
-rw-r--r--include/db.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/db.h b/include/db.h
index 64c7348ea6..383cef3831 100644
--- a/include/db.h
+++ b/include/db.h
@@ -1,9 +1,13 @@
 #ifndef _DB_H_
 
-#include <db2/db.h>
+#ifdef USE_LIBDB1
+# include <db/db.h>
+#else
+# include <db2/db.h>
 
 /* Internal interface for NSS.  */
 int __nss_db_open __P((const char *,
 		       DBTYPE, u_int32_t, int, DB_ENV *, DB_INFO *, DB **));
+#endif
 
 #endif