Update.

2004-08-26  Kaz Kojima  <kkojima@rr.iij4u.or.jp>

	* sysdeps/unix/sysv/linux/mips/pread.c: Include sgidefs.h only if
	NO_SGIDEFS_H isn't defined.
	* sysdeps/unix/sysv/linux/mips/pwrite.c: Likewise.
	* sysdeps/unix/sysv/linux/mips/pread64.c: Likewise.

	* sysdeps/unix/sysv/linux/sh/pread.c: Define NO_SGIDEFS_H and
	_MIPS_SIM.
	* sysdeps/unix/sysv/linux/sh/pwrite.c: Likewise.
	* sysdeps/unix/sysv/linux/sh/pread64.c: Likewise.
	* sysdeps/unix/sysv/linux/sh/pwrite64.c: Likewise.

	* nscd/connections.c (nscd_run): atomic_increment was not missing.

diff --git a/ChangeLog b/ChangeLog
index e851efe..d1b4104 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
+2004-08-26  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+       * sysdeps/unix/sysv/linux/mips/pread.c: Include sgidefs.h only if
+       NO_SGIDEFS_H isn't defined.
+       * sysdeps/unix/sysv/linux/mips/pwrite.c: Likewise.
+       * sysdeps/unix/sysv/linux/mips/pread64.c: Likewise.
+
+       * sysdeps/unix/sysv/linux/sh/pread.c: Define NO_SGIDEFS_H and
+       _MIPS_SIM.
+       * sysdeps/unix/sysv/linux/sh/pwrite.c: Likewise.
+       * sysdeps/unix/sysv/linux/sh/pread64.c: Likewise.
+       * sysdeps/unix/sysv/linux/sh/pwrite64.c: Likewise.
+
 2004-08-26  Ulrich Drepper  <drepper@redhat.com>
 
+       * nscd/connections.c (nscd_run): atomic_increment was not missing.
+
        * sysdeps/gnu/Makefile (libdl-sysdep_routines): Don't add eval.
        Patch by Greg Schafer.
 

diff --git a/nscd/connections.c b/nscd/connections.c
index 0018ed9..313ca0d 100644 (file)
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -484,7 +484,6 @@ nscd_run (void *p)
              prune_cache (&dbs[my_number], time(NULL));
              now = time (NULL);
              next_prune = now + CACHE_PRUNE_INTERVAL;
-             atomic_increment (&nready);
              goto try_get;
            }
        }

diff --git a/sysdeps/unix/sysv/linux/mips/pread.c b/sysdeps/unix/sysv/linux/mips/pread.c
index d2a6c69..8fba034 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/pread.c
+++ b/sysdeps/unix/sysv/linux/mips/pread.c
@@ -28,7 +28,9 @@
 #include <bp-checks.h>
 
 #include <kernel-features.h>
+#ifndef NO_SGIDEFS_H
 #include <sgidefs.h>
+#endif
 
 #ifdef __NR_pread64             /* Newer kernels renamed but it's the same.  */
 # ifdef __NR_pread

diff --git a/sysdeps/unix/sysv/linux/mips/pread64.c b/sysdeps/unix/sysv/linux/mips/pread64.c
index b63bb9c..238c8e0 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/pread64.c
+++ b/sysdeps/unix/sysv/linux/mips/pread64.c
@@ -27,7 +27,9 @@
 #include <bp-checks.h>
 
 #include <kernel-features.h>
+#ifndef NO_SGIDEFS_H
 #include <sgidefs.h>
+#endif
 
 #ifdef __NR_pread64             /* Newer kernels renamed but it's the same.  */
 # ifdef __NR_pread

diff --git a/sysdeps/unix/sysv/linux/mips/pwrite.c b/sysdeps/unix/sysv/linux/mips/pwrite.c
index 50c8265..d0e3fe5 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/pwrite.c
+++ b/sysdeps/unix/sysv/linux/mips/pwrite.c
@@ -28,7 +28,9 @@
 #include <bp-checks.h>
 
 #include <kernel-features.h>
+#ifndef NO_SGIDEFS_H
 #include <sgidefs.h>
+#endif
 
 #ifdef __NR_pwrite64            /* Newer kernels renamed but it's the same.  */
 # ifdef __NR_pwrite

diff --git a/sysdeps/unix/sysv/linux/sh/pread.c b/sysdeps/unix/sysv/linux/sh/pread.c
index 20f715c..9ded53e 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/pread.c
+++ b/sysdeps/unix/sysv/linux/sh/pread.c
@@ -1 +1,3 @@
+#define NO_SGIDEFS_H
+#define _MIPS_SIM -1
 #include <sysdeps/unix/sysv/linux/mips/pread.c>

diff --git a/sysdeps/unix/sysv/linux/sh/pread64.c b/sysdeps/unix/sysv/linux/sh/pread64.c
index 7f89f39..5b22a39 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/pread64.c
+++ b/sysdeps/unix/sysv/linux/sh/pread64.c
@@ -1 +1,3 @@
+#define NO_SGIDEFS_H
+#define _MIPS_SIM -1
 #include <sysdeps/unix/sysv/linux/mips/pread64.c>

diff --git a/sysdeps/unix/sysv/linux/sh/pwrite.c b/sysdeps/unix/sysv/linux/sh/pwrite.c
index 0338b87..b75a6a9 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/pwrite.c
+++ b/sysdeps/unix/sysv/linux/sh/pwrite.c
@@ -1 +1,3 @@
+#define NO_SGIDEFS_H
+#define _MIPS_SIM -1
 #include <sysdeps/unix/sysv/linux/mips/pwrite.c>

diff --git a/sysdeps/unix/sysv/linux/sh/pwrite64.c b/sysdeps/unix/sysv/linux/sh/pwrite64.c
index 0a8c1ea..ae29280 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/pwrite64.c
+++ b/sysdeps/unix/sysv/linux/sh/pwrite64.c
@@ -1 +1,3 @@
+#define NO_SGIDEFS_H
+#define _MIPS_SIM -1
 #include <sysdeps/unix/sysv/linux/mips/pwrite64.c>