aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-08-26 17:00:16 +0000
committerUlrich Drepper <drepper@redhat.com>2004-08-26 17:00:16 +0000
commit1114ffff54dfbd35cbff9c845376b8221c2c9ced (patch)
tree195ff47b6f74a1280d636e87082035617196d53f
parent86b2fd6e659b5e66439a3500919a5da9cdc35f55 (diff)
downloadglibc-1114ffff54dfbd35cbff9c845376b8221c2c9ced.tar
glibc-1114ffff54dfbd35cbff9c845376b8221c2c9ced.tar.gz
glibc-1114ffff54dfbd35cbff9c845376b8221c2c9ced.tar.bz2
glibc-1114ffff54dfbd35cbff9c845376b8221c2c9ced.zip
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.
-rw-r--r--ChangeLog15
-rw-r--r--nscd/connections.c1
-rw-r--r--sysdeps/unix/sysv/linux/mips/pread.c2
-rw-r--r--sysdeps/unix/sysv/linux/mips/pread64.c2
-rw-r--r--sysdeps/unix/sysv/linux/mips/pwrite.c2
-rw-r--r--sysdeps/unix/sysv/linux/sh/pread.c2
-rw-r--r--sysdeps/unix/sysv/linux/sh/pread64.c2
-rw-r--r--sysdeps/unix/sysv/linux/sh/pwrite.c2
-rw-r--r--sysdeps/unix/sysv/linux/sh/pwrite64.c2
9 files changed, 29 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e851efeea9..d1b41045ba 100644
--- 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 0018ed9ec7..313ca0dc45 100644
--- 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 d2a6c69db5..8fba0340b8 100644
--- 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 b63bb9c2aa..238c8e0d8b 100644
--- 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 50c8265236..d0e3fe538e 100644
--- 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 20f715c1bc..9ded53ebaa 100644
--- 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 7f89f39b01..5b22a395ec 100644
--- 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 0338b87455..b75a6a968e 100644
--- 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 0a8c1ead32..ae29280f85 100644
--- 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>