From 53e9699b6d8562d1f64bb16b558811b766da4e8b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 18 Jan 2002 23:39:39 +0000 Subject: [PATCH] Update. * sysdeps/unix/sysv/linux/bits/statvfs.h: Avoid warning about comma at end of enum for !_GNU_SOURCE. * sysdeps/unix/sysv/linux/alpha/bits/statvfs.h: Likewise. * sysdeps/unix/sysv/linux/ia64/bits/statvfs.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/statvfs.h: Likewise. * sysdeps/mach/hurd/bits/statvfs.h: Don't define non-standard ST_* values unless _GNU_SOURCE. --- ChangeLog | 8 ++++++++ sysdeps/mach/hurd/bits/statvfs.h | 11 +++++++---- sysdeps/unix/sysv/linux/alpha/bits/statvfs.h | 5 +++-- sysdeps/unix/sysv/linux/bits/statvfs.h | 5 +++-- sysdeps/unix/sysv/linux/ia64/bits/statvfs.h | 5 +++-- sysdeps/unix/sysv/linux/sparc/bits/statvfs.h | 5 +++-- 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index a07abc9c18..dacb3a4d1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2002-01-18 Ulrich Drepper + * sysdeps/unix/sysv/linux/bits/statvfs.h: Avoid warning about comma at + end of enum for !_GNU_SOURCE. + * sysdeps/unix/sysv/linux/alpha/bits/statvfs.h: Likewise. + * sysdeps/unix/sysv/linux/ia64/bits/statvfs.h: Likewise. + * sysdeps/unix/sysv/linux/sparc/bits/statvfs.h: Likewise. + * sysdeps/mach/hurd/bits/statvfs.h: Don't define non-standard ST_* + values unless _GNU_SOURCE. + * iconvdata/tcvn5712-1.c: Minor cleanups. 2002-01-18 Andreas Schwab diff --git a/sysdeps/mach/hurd/bits/statvfs.h b/sysdeps/mach/hurd/bits/statvfs.h index a37915e37c..bbaf59a722 100644 --- a/sysdeps/mach/hurd/bits/statvfs.h +++ b/sysdeps/mach/hurd/bits/statvfs.h @@ -1,5 +1,5 @@ /* Definition of `struct statvfs', information about a filesystem. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 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 @@ -82,10 +82,13 @@ enum { ST_RDONLY = 1, #define ST_RDONLY ST_RDONLY - ST_NOSUID = 2, + ST_NOSUID = 2 #define ST_NOSUID ST_NOSUID +#ifdef __USE_GNU + , ST_NOEXEC = 8, -#define ST_NOEXEC ST_NOEXEC +# define ST_NOEXEC ST_NOEXEC ST_SYNCHRONOUS = 16 -#define ST_SYNCHRONOUS ST_SYNCHRONOUS +# define ST_SYNCHRONOUS ST_SYNCHRONOUS +#endif }; diff --git a/sysdeps/unix/sysv/linux/alpha/bits/statvfs.h b/sysdeps/unix/sysv/linux/alpha/bits/statvfs.h index d37d0ffcb6..6120cf7a1d 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/statvfs.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/statvfs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 2000, 2001, 2002 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 @@ -71,9 +71,10 @@ enum { ST_RDONLY = 1, /* Mount read-only. */ #define ST_RDONLY ST_RDONLY - ST_NOSUID = 2, /* Ignore suid and sgid bits. */ + ST_NOSUID = 2 /* Ignore suid and sgid bits. */ #define ST_NOSUID ST_NOSUID #ifdef __USE_GNU + , ST_NODEV = 4, /* Disallow access to device special files. */ # define ST_NODEV ST_NODEV ST_NOEXEC = 8, /* Disallow program execution. */ diff --git a/sysdeps/unix/sysv/linux/bits/statvfs.h b/sysdeps/unix/sysv/linux/bits/statvfs.h index 32e03f31ea..02b11da010 100644 --- a/sysdeps/unix/sysv/linux/bits/statvfs.h +++ b/sysdeps/unix/sysv/linux/bits/statvfs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 2000, 2001, 2002 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 @@ -74,9 +74,10 @@ enum { ST_RDONLY = 1, /* Mount read-only. */ #define ST_RDONLY ST_RDONLY - ST_NOSUID = 2, /* Ignore suid and sgid bits. */ + ST_NOSUID = 2 /* Ignore suid and sgid bits. */ #define ST_NOSUID ST_NOSUID #ifdef __USE_GNU + , ST_NODEV = 4, /* Disallow access to device special files. */ # define ST_NODEV ST_NODEV ST_NOEXEC = 8, /* Disallow program execution. */ diff --git a/sysdeps/unix/sysv/linux/ia64/bits/statvfs.h b/sysdeps/unix/sysv/linux/ia64/bits/statvfs.h index d37d0ffcb6..6120cf7a1d 100644 --- a/sysdeps/unix/sysv/linux/ia64/bits/statvfs.h +++ b/sysdeps/unix/sysv/linux/ia64/bits/statvfs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 2000, 2001, 2002 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 @@ -71,9 +71,10 @@ enum { ST_RDONLY = 1, /* Mount read-only. */ #define ST_RDONLY ST_RDONLY - ST_NOSUID = 2, /* Ignore suid and sgid bits. */ + ST_NOSUID = 2 /* Ignore suid and sgid bits. */ #define ST_NOSUID ST_NOSUID #ifdef __USE_GNU + , ST_NODEV = 4, /* Disallow access to device special files. */ # define ST_NODEV ST_NODEV ST_NOEXEC = 8, /* Disallow program execution. */ diff --git a/sysdeps/unix/sysv/linux/sparc/bits/statvfs.h b/sysdeps/unix/sysv/linux/sparc/bits/statvfs.h index 3dafcebf0b..aa14c03449 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/statvfs.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/statvfs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 2000, 2001, 2002 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 @@ -81,9 +81,10 @@ enum { ST_RDONLY = 1, /* Mount read-only. */ #define ST_RDONLY ST_RDONLY - ST_NOSUID = 2, /* Ignore suid and sgid bits. */ + ST_NOSUID = 2 /* Ignore suid and sgid bits. */ #define ST_NOSUID ST_NOSUID #ifdef __USE_GNU + , ST_NODEV = 4, /* Disallow access to device special files. */ # define ST_NODEV ST_NODEV ST_NOEXEC = 8, /* Disallow program execution. */ -- 2.11.4.GIT