+1999-06-14 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
+
+ * sysdeps/unix/sysv/linux/sys/sysmacros.h [!__GNUC__]: Use correct
+ word order.
+ * sysdeps/unix/sysv/linux/alpha/sys/sysmacros.h: New file.
+ * sysdeps/unix/sysv/linux/sparc/sys/sysmacros.h: New file.
+
+1999-06-15 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
+
+ * db2/db/db.c: Restore __nss_db_open alias.
+ * db2/db_int.h: Use <db.h> instead of "db.h" to find header in
+ include.
+ * db2/os/os_rw.c (__os_write): Maintain const correctness.
+ * db2/progs/db_load/db_load.c (main): Avoid ambiguous `else'.
+
1999-06-15 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/printf-parse.h (parse_one_spec): Don't set
} \
}
+#ifdef _LIBC
+#define db_open(fname, type, flags, mode, dbenv, dbinfo, dbpp) \
+ __nss_db_open(fname, type, flags, mode, dbenv, dbinfo, dbpp)
+#endif
+
/*
* db_open --
* Main library interface to the DB access methods.
return (ret);
}
+#ifdef _LIBC
+# undef db_open
+weak_alias (__nss_db_open, db_open)
+#endif
+
/*
* __db_close --
* Close a DB tree.
#ifndef _DB_INTERNAL_H_
#define _DB_INTERNAL_H_
-#include "db.h" /* Standard DB include file. */
+#include <db.h> /* Standard DB include file. */
#include "queue.h"
#include "shqueue.h"
{
size_t offset;
ssize_t nw;
- u_int8_t *taddr;
+ const u_int8_t *taddr;
for (taddr = addr,
offset = 0; offset < len; taddr += nw, offset += nw)
/* Get each key/data pair and add them to the database. */
for (recno = 1; !interrupted; ++recno) {
- if (dbtype == DB_RECNO)
+ if (dbtype == DB_RECNO) {
if (checkprint) {
if (dbt_rprint(&data))
break;
if (dbt_rdump(&data))
break;
}
- else
+ } else {
if (checkprint) {
if (dbt_rprint(&key))
break;
goto err;
}
}
+ }
switch (errno =
dbp->put(dbp, NULL, &key, &data, db_nooverwrite)) {
case 0:
--- /dev/null
+/* Definitions of macros to access `dev_t' values.
+ Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _SYS_SYSMACROS_H
+#define _SYS_SYSMACROS_H 1
+
+/* For compatibility we provide alternative names. */
+#define major(dev) ((int)(((dev) >> 8) & 0xff))
+#define minor(dev) ((int)((dev) & 0xff))
+#define makedev(major, minor) ((((unsigned int) (major)) << 8) \
+ | ((unsigned int) (minor)))
+
+#endif /* sys/sysmacros.h */
--- /dev/null
+/* Definitions of macros to access `dev_t' values.
+ Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _SYS_SYSMACROS_H
+#define _SYS_SYSMACROS_H 1
+
+#include <bits/wordsize.h>
+
+/* For compatibility we provide alternative names.
+
+ The problem here is that compilers other than GCC probably don't
+ have the `long long' type and so `dev_t' is actually an array. */
+#if __WORDSIZE == 64 || (defined __GNUC__ && __GNUC__ >= 2)
+# define major(dev) ((int)(((dev) >> 8) & 0xff))
+# define minor(dev) ((int)((dev) & 0xff))
+# define makedev(major, minor) ((((unsigned int) (major)) << 8) \
+ | ((unsigned int) (minor)))
+#else
+# define major(dev) (((dev).__val[1] >> 8) & 0xff)
+# define minor(dev) ((dev).__val[1] & 0xff)
+# define makedev(major, minor) { 0, ((((unsigned int) (major)) << 8) \
+ | ((unsigned int) (minor))) }
+#endif
+
+#endif /* sys/sysmacros.h */
# define makedev(major, minor) ((((unsigned int) (major)) << 8) \
| ((unsigned int) (minor)))
#else
-# define major(dev) (((dev).__val[0] >> 8) & 0xff)
-# define minor(dev) ((dev).__val[0] & 0xff)
-# define makedev(major, minor) { ((((unsigned int) (major)) << 8) \
- | ((unsigned int) (minor))), 0 }
+/* We need to know the word order here. This assumes that the word order
+ is consistent with the byte order. */
+# include <endian.h>
+# if __BYTE_ORDER == __BIG_ENDIAN
+# define major(dev) (((dev).__val[1] >> 8) & 0xff)
+# define minor(dev) ((dev).__val[1] & 0xff)
+# define makedev(major, minor) { 0, ((((unsigned int) (major)) << 8) \
+ | ((unsigned int) (minor))) }
+# else
+# define major(dev) (((dev).__val[0] >> 8) & 0xff)
+# define minor(dev) ((dev).__val[0] & 0xff)
+# define makedev(major, minor) { ((((unsigned int) (major)) << 8) \
+ | ((unsigned int) (minor))), 0 }
+# endif
#endif
#endif /* sys/sysmacros.h */
projects / platform / upstream / linaro-glibc.git / commitdiff