diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 6 | ||||
| -rw-r--r-- | src/include/k5-int.h | 35 |
2 files changed, 11 insertions, 30 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 2cc0cb730..e05055b70 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,9 @@ +Thu Aug 15 16:31:20 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * k5-int.h: Since we are only supporting the db in the util/db2 + directory, just use db-ndbm.h, instead of hoping that the + system ndbm.h will be appropriate. + Fri Aug 2 14:15:26 1996 Ezra Peisach <epeisach@kangaroo.mit.edu> * krb5.hin: Add prototype for krb5_free_keyblock_contents diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 4b3e5a6df..198a4d33b 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -553,37 +553,12 @@ typedef struct _krb5_sam_response { */ #if !defined(_MACINTOSH) && !defined(_MSDOS) && !defined(_WIN32) -#ifndef ODBM -#include <ndbm.h> -#else /* ODBM */ -#ifdef unicos61 -#include <rpcsvc/dbm.h> -#else -#include <dbm.h> -#endif -#endif /*ODBM */ - -#ifndef ODBM -#define dbm_next(db,key) dbm_nextkey(db) -#else /* OLD DBM */ -typedef char DBM; - -/* Macros to convert ndbm names to dbm names. - * Note that dbm_nextkey() cannot be simply converted using a macro, since - * it is invoked giving the database, and nextkey() needs the previous key. - * - * Instead, all routines call "dbm_next" instead. - */ - -#define dbm_open(file, flags, mode) ((dbminit(file) == 0)?"":((char *)0)) -#define dbm_fetch(db, key) fetch(key) -#define dbm_store(db, key, content, flag) store(key, content) -#define dbm_delete(db, key) delete(key) -#define dbm_firstkey(db) firstkey() -#define dbm_next(db,key) nextkey(key) -#define dbm_close(db) dbmclose() -#endif /* OLD DBM */ +/* + * Since we are always using db, use the db-ndbm include header file. + */ +#include "db-ndbm.h" + #endif /* !MSDOS && !MACINTOSH */ /* * End "dbm.h" |