diff options
| author | Colin Watson <cjwatson@debian.org> | 2014-01-14 02:08:54 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2014-01-14 02:10:29 +0000 |
| commit | 974a6fad3937bf83db452bc690a90d6113dc2859 (patch) | |
| tree | 482060d4737feb06a63b2f15d617ded26693a673 | |
| parent | cb8693ff90e7df51d594245b6b956fc2bd064a7a (diff) | |
Define symbols that were formerly libc-only
We aren't in libc any more, so we don't have to worry about polluting
libnss_db's namespace.
Bug-Debian: http://bugs.debian.org/163264
Forwarded: no
Last-Update: 2010-03-26
Patch-Name: libc-symbols.patch
| -rw-r--r-- | btree/btree.h | 4 | ||||
| -rw-r--r-- | db/db.c | 8 | ||||
| -rw-r--r-- | mpool/mpool.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/btree/btree.h b/btree/btree.h index 45f7c94..4579cca 100644 --- a/btree/btree.h +++ b/btree/btree.h @@ -43,7 +43,7 @@ #include <mpool.h> -#ifdef _LIBC +/* #ifdef _LIBC */ /* In the GNU C library we must not pollute the namespace because libdb is needed by libnss_db. */ #define mpool_open __mpool_open @@ -53,7 +53,7 @@ #define mpool_put __mpool_put #define mpool_sync __mpool_sync #define mpool_close __mpool_close -#endif +/* #endif */ #define DEFMINKEYPAGE (2) /* Minimum keys per page */ #define MINCACHE (5) /* Minimum cached pages */ @@ -44,11 +44,11 @@ static char sccsid[] = "@(#)db.c 8.4 (Berkeley) 2/21/94"; #include <db.h> -#ifdef _LIBC +/* #ifdef _LIBC */ /* In the GNU C library we must not pollute the namespace, because libdb is needed by libnss_db. */ #define dbopen __dbopen -#endif +/* #endif */ DB * dbopen(fname, flags, mode, type, openinfo) @@ -78,10 +78,10 @@ dbopen(fname, flags, mode, type, openinfo) errno = EINVAL; return (NULL); } -#ifdef _LIBC +/* #ifdef _LIBC */ #undef dbopen weak_alias (__dbopen, dbopen) -#endif +/* #endif */ static int __dberr __P((void)) diff --git a/mpool/mpool.c b/mpool/mpool.c index 7ced76f..478d77f 100644 --- a/mpool/mpool.c +++ b/mpool/mpool.c @@ -50,7 +50,7 @@ static char sccsid[] = "@(#)mpool.c 8.5 (Berkeley) 7/26/94"; #define __MPOOLINTERFACE_PRIVATE #include <mpool.h> -#ifdef _LIBC +/* #ifdef _LIBC */ /* In the GNU C library we must not pollute the namespace because libdb is needed by libnss_db. */ #define mpool_open __mpool_open @@ -60,7 +60,7 @@ static char sccsid[] = "@(#)mpool.c 8.5 (Berkeley) 7/26/94"; #define mpool_put __mpool_put #define mpool_sync __mpool_sync #define mpool_close __mpool_close -#endif +/* #endif */ static BKT *mpool_bkt __P((MPOOL *)); static BKT *mpool_look __P((MPOOL *, pgno_t)); @@ -313,7 +313,7 @@ mpool_sync(mp) return (fsync(mp->fd) ? RET_ERROR : RET_SUCCESS); } -#ifdef _LIBC +/* #ifdef _LIBC */ #undef mpool_open #undef mpool_filter #undef mpool_new @@ -328,7 +328,7 @@ weak_alias (__mpool_get, mpool_get) weak_alias (__mpool_put, mpool_put) weak_alias (__mpool_close, mpool_close) weak_alias (__mpool_sync, mpool_sync) -#endif +/* #endif */ /* * mpool_bkt |