This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
| Other format: | [Raw text] | |
Hi,
SH pread/pwrite*.c include MIPS implementations and now some of them
include sgidefs.h twice without NO_SGIDEFS_H guards. The appended
patch fixes it.
Regards,
kaz
--
2004-11-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. Don't include sgidefs.h twice.
* sysdeps/unix/sysv/linux/mips/pwrite.c: Likewise.
* sysdeps/unix/sysv/linux/mips/pread64.c: Likewise.
* sysdeps/unix/sysv/linux/mips/pwrite64.c: Likewise.
diff -uprN ORIG/libc/sysdeps/unix/sysv/linux/mips/pread.c LOCAL/libc/sysdeps/unix/sysv/linux/mips/pread.c
--- ORIG/libc/sysdeps/unix/sysv/linux/mips/pread.c 2004-11-26 11:47:53.000000000 +0900
+++ LOCAL/libc/sysdeps/unix/sysv/linux/mips/pread.c 2004-11-26 12:42:15.000000000 +0900
@@ -20,7 +20,9 @@
#include <assert.h>
#include <errno.h>
+#ifndef NO_SGIDEFS_H
#include <sgidefs.h>
+#endif
#include <unistd.h>
#include <endian.h>
@@ -29,9 +31,6 @@
#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 -uprN ORIG/libc/sysdeps/unix/sysv/linux/mips/pread64.c LOCAL/libc/sysdeps/unix/sysv/linux/mips/pread64.c
--- ORIG/libc/sysdeps/unix/sysv/linux/mips/pread64.c 2004-11-26 11:47:53.000000000 +0900
+++ LOCAL/libc/sysdeps/unix/sysv/linux/mips/pread64.c 2004-11-26 12:39:35.000000000 +0900
@@ -19,7 +19,9 @@
02111-1307 USA. */
#include <errno.h>
+#ifndef NO_SGIDEFS_H
#include <sgidefs.h>
+#endif
#include <unistd.h>
#include <endian.h>
@@ -28,9 +30,6 @@
#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 -uprN ORIG/libc/sysdeps/unix/sysv/linux/mips/pwrite.c LOCAL/libc/sysdeps/unix/sysv/linux/mips/pwrite.c
--- ORIG/libc/sysdeps/unix/sysv/linux/mips/pwrite.c 2004-11-26 11:47:53.000000000 +0900
+++ LOCAL/libc/sysdeps/unix/sysv/linux/mips/pwrite.c 2004-11-26 12:40:04.000000000 +0900
@@ -20,7 +20,9 @@
#include <assert.h>
#include <errno.h>
+#ifndef NO_SGIDEFS_H
#include <sgidefs.h>
+#endif
#include <unistd.h>
#include <endian.h>
@@ -29,9 +31,6 @@
#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 -uprN ORIG/libc/sysdeps/unix/sysv/linux/mips/pwrite64.c LOCAL/libc/sysdeps/unix/sysv/linux/mips/pwrite64.c
--- ORIG/libc/sysdeps/unix/sysv/linux/mips/pwrite64.c 2004-11-26 11:47:53.000000000 +0900
+++ LOCAL/libc/sysdeps/unix/sysv/linux/mips/pwrite64.c 2004-11-26 12:40:35.000000000 +0900
@@ -19,7 +19,9 @@
02111-1307 USA. */
#include <errno.h>
+#ifndef NO_SGIDEFS_H
#include <sgidefs.h>
+#endif
#include <unistd.h>
#include <endian.h>
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |