From: Tom Yu <tlyu@mit.edu>
Date: Fri, 13 Feb 1998 19:41:31 +0000 (+0000)
Subject: 	* db.h: Rename dbopen to avoid collision with NetBSD libc
X-Git-Tag: krb5-1.1-beta1~843
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3bbba4d6589f800f18caad7713853808054df9cc;p=krb5.git

	* db.h: Rename dbopen to avoid collision with NetBSD libc

	* db-ndbm.h: Rename lots of functions to avoid collisions with
	native dbm implementations.

	* db-int.h: Rename __hash_open to avoid potential collision with
	NetBSD libc.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10430 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/util/db2/include/ChangeLog b/src/util/db2/include/ChangeLog
index 4ec75bbb3..c3441611f 100644
--- a/src/util/db2/include/ChangeLog
+++ b/src/util/db2/include/ChangeLog
@@ -1,3 +1,13 @@
+Fri Feb 13 14:39:25 1998  Tom Yu  <tlyu@mit.edu>
+
+	* db.h: Rename dbopen to avoid collision with NetBSD libc.
+
+	* db-ndbm.h: Rename lots of functions to avoid collisions with
+	native dbm implementations.
+
+	* db-int.h: Rename __hash_open to avoid potential collision with
+	NetBSD libc.
+
 Thu Aug 15 15:41:12 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* db-ndbm.h: Add prototypes for missing functions dbm_error() and
diff --git a/src/util/db2/include/db-int.h b/src/util/db2/include/db-int.h
index f9da8a284..7c3fc1d08 100644
--- a/src/util/db2/include/db-int.h
+++ b/src/util/db2/include/db-int.h
@@ -135,6 +135,7 @@ typedef u_int32_t	recno_t;
 
 /* open functions for each database type, used in dbopen() */
 
+#define __hash_open	__kdb2_hash_open
 DB	*__bt_open __P((const char *, int, int, const BTREEINFO *, int));
 DB	*__hash_open __P((const char *, int, int, const HASHINFO *, int));
 DB	*__rec_open __P((const char *, int, int, const RECNOINFO *, int));
diff --git a/src/util/db2/include/db-ndbm.h b/src/util/db2/include/db-ndbm.h
index db03e697f..620144edf 100644
--- a/src/util/db2/include/db-ndbm.h
+++ b/src/util/db2/include/db-ndbm.h
@@ -62,6 +62,18 @@ typedef struct {
 typedef DB DBM;
 #define	dbm_pagfno(a)	DBM_PAGFNO_NOT_AVAILABLE
 
+#define dbm_close	kdb2_dbm_close
+#define dbm_delete	kdb2_dbm_delete
+#define dbm_fetch	kdb2_dbm_fetch
+#define dbm_firstkey	kdb2_dbm_firstkey
+#define dbm_forder	kdb2_dbm_forder
+#define dbm_nextkey	kdb2_dbm_nextkey
+#define dbm_open	kdb2_dbm_open
+#define dbm_store	kdb2_dbm_store
+#define dbm_dirinfo	kdb2_dbm_dirinfo
+#define dbm_error	kdb2_dbm_error
+#define dbm_clearerr	kdb2_dbm_clearerr
+
 __BEGIN_DECLS
 void	 dbm_close __P((DBM *));
 int	 dbm_delete __P((DBM *, datum));
diff --git a/src/util/db2/include/db.h b/src/util/db2/include/db.h
index 53c587b75..2eaf0bcf9 100644
--- a/src/util/db2/include/db.h
+++ b/src/util/db2/include/db.h
@@ -165,6 +165,7 @@ typedef struct {
 #define	__END_DECLS
 #endif
 
+#define dbopen	kdb2_dbopen
 __BEGIN_DECLS
 DB *dbopen __P((const char *, int, int, DBTYPE, const void *));
 __END_DECLS