summaryrefslogtreecommitdiff
path: root/libc/misc/statfs
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2006-01-23 14:42:02 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2006-01-23 14:42:02 +0000
commitba9a21b2fa45a29a9e3dff6e0b199d8da5059811 (patch)
tree3185ae6223c0143df31281f9584cce9a93cd0440 /libc/misc/statfs
parent1129cd16b42185f258fbe8d53a0fb11f1d530f42 (diff)
Get rid of nested warnings
Diffstat (limited to 'libc/misc/statfs')
-rw-r--r--libc/misc/statfs/fstatvfs.c7
-rw-r--r--libc/misc/statfs/fstatvfs64.c7
-rw-r--r--libc/misc/statfs/internal_statvfs.c9
-rw-r--r--libc/misc/statfs/statvfs.c7
-rw-r--r--libc/misc/statfs/statvfs64.c7
5 files changed, 30 insertions, 7 deletions
diff --git a/libc/misc/statfs/fstatvfs.c b/libc/misc/statfs/fstatvfs.c
index a8c23992a..c28132022 100644
--- a/libc/misc/statfs/fstatvfs.c
+++ b/libc/misc/statfs/fstatvfs.c
@@ -27,6 +27,13 @@
#include <sys/statfs.h>
#include <sys/statvfs.h>
+libc_hidden_proto(memset)
+libc_hidden_proto(strcmp)
+libc_hidden_proto(strsep)
+libc_hidden_proto(setmntent)
+libc_hidden_proto(getmntent_r)
+libc_hidden_proto(endmntent)
+
libc_hidden_proto(fstatfs)
libc_hidden_proto(fstat)
libc_hidden_proto(stat)
diff --git a/libc/misc/statfs/fstatvfs64.c b/libc/misc/statfs/fstatvfs64.c
index 2e25fda2f..13e7b40a7 100644
--- a/libc/misc/statfs/fstatvfs64.c
+++ b/libc/misc/statfs/fstatvfs64.c
@@ -39,6 +39,13 @@
#include <sys/statfs.h>
#include <sys/statvfs.h>
+libc_hidden_proto(memset)
+libc_hidden_proto(strcmp)
+libc_hidden_proto(strsep)
+libc_hidden_proto(setmntent)
+libc_hidden_proto(getmntent_r)
+libc_hidden_proto(endmntent)
+
#undef stat
#define stat stat64
libc_hidden_proto(fstatfs64)
diff --git a/libc/misc/statfs/internal_statvfs.c b/libc/misc/statfs/internal_statvfs.c
index 2d561976e..27dad0890 100644
--- a/libc/misc/statfs/internal_statvfs.c
+++ b/libc/misc/statfs/internal_statvfs.c
@@ -17,13 +17,6 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-libc_hidden_proto(memset)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strsep)
-libc_hidden_proto(setmntent)
-libc_hidden_proto(getmntent_r)
-libc_hidden_proto(endmntent)
-
/* Now fill in the fields we have information for. */
buf->f_bsize = fsbuf.f_bsize;
/* Linux does not support f_frsize, so set it to the full block size. */
@@ -90,6 +83,7 @@ libc_hidden_proto(endmntent)
buf->f_flag |= ST_RDONLY;
else if (strcmp (opt, "nosuid") == 0)
buf->f_flag |= ST_NOSUID;
+#ifdef _GNU_SOURCE
else if (strcmp (opt, "noexec") == 0)
buf->f_flag |= ST_NOEXEC;
else if (strcmp (opt, "nodev") == 0)
@@ -102,6 +96,7 @@ libc_hidden_proto(endmntent)
buf->f_flag |= ST_NOATIME;
else if (strcmp (opt, "nodiratime") == 0)
buf->f_flag |= ST_NODIRATIME;
+#endif
/* We can stop looking for more entries. */
break;
diff --git a/libc/misc/statfs/statvfs.c b/libc/misc/statfs/statvfs.c
index 006b791ae..6c3bf7c56 100644
--- a/libc/misc/statfs/statvfs.c
+++ b/libc/misc/statfs/statvfs.c
@@ -27,6 +27,13 @@
#include <sys/statfs.h>
#include <sys/statvfs.h>
+libc_hidden_proto(memset)
+libc_hidden_proto(strcmp)
+libc_hidden_proto(strsep)
+libc_hidden_proto(setmntent)
+libc_hidden_proto(getmntent_r)
+libc_hidden_proto(endmntent)
+
libc_hidden_proto(statfs)
libc_hidden_proto(stat)
diff --git a/libc/misc/statfs/statvfs64.c b/libc/misc/statfs/statvfs64.c
index eec14983e..1a3dd2833 100644
--- a/libc/misc/statfs/statvfs64.c
+++ b/libc/misc/statfs/statvfs64.c
@@ -41,6 +41,13 @@
#include <sys/statfs.h>
#include <sys/statvfs.h>
+libc_hidden_proto(memset)
+libc_hidden_proto(strcmp)
+libc_hidden_proto(strsep)
+libc_hidden_proto(setmntent)
+libc_hidden_proto(getmntent_r)
+libc_hidden_proto(endmntent)
+
#undef stat
#define stat stat64
libc_hidden_proto(statfs64)