summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-12-16 00:51:04 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-12-16 00:51:04 +0000
commita9e4cbde64ecadb003bb779e096d3f89303c62b1 (patch)
tree52cade2df7aefbc68553a23d0baa4aafe80aabe7
parent42d2cb36eeaa15c78cf309acda5a802491873abe (diff)
Correct some problems
-rw-r--r--libc/misc/file/lockf.c4
-rw-r--r--libc/misc/file/lockf64.c2
-rw-r--r--libc/misc/statfs/fstatfs64.c3
-rw-r--r--libc/misc/statfs/statfs64.c4
4 files changed, 12 insertions, 1 deletions
diff --git a/libc/misc/file/lockf.c b/libc/misc/file/lockf.c
index 63d6a39c9..2ba81de9a 100644
--- a/libc/misc/file/lockf.c
+++ b/libc/misc/file/lockf.c
@@ -16,6 +16,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <features.h>
+#undef __lockf
+
#include <sys/types.h>
#include <unistd.h>
#include <fcntl.h>
@@ -24,6 +27,7 @@
/* lockf is a simplified interface to fcntl's locking facilities. */
+#undef lockf
int attribute_hidden __lockf (int fd, int cmd, off_t len)
{
struct flock fl;
diff --git a/libc/misc/file/lockf64.c b/libc/misc/file/lockf64.c
index 8440202d5..1e294d9a6 100644
--- a/libc/misc/file/lockf64.c
+++ b/libc/misc/file/lockf64.c
@@ -17,6 +17,7 @@
Boston, MA 02111-1307, USA. */
#include <features.h>
+#undef __lockf64
#ifdef __UCLIBC_HAS_LFS__
#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64
@@ -51,6 +52,7 @@
/* lockf is a simplified interface to fcntl's locking facilities. */
+#undef lockf64
int attribute_hidden __lockf64 (int fd, int cmd, off64_t len64)
{
struct flock fl;
diff --git a/libc/misc/statfs/fstatfs64.c b/libc/misc/statfs/fstatfs64.c
index 5fd1d60f6..63bd640b7 100644
--- a/libc/misc/statfs/fstatfs64.c
+++ b/libc/misc/statfs/fstatfs64.c
@@ -18,6 +18,8 @@
02111-1307 USA. */
#include <features.h>
+#undef __fstatfs64
+#undef __fstatfs
#ifdef __UCLIBC_HAS_LFS__
@@ -40,6 +42,7 @@
#include <sys/statvfs.h>
#include <stddef.h>
+#undef fstatfs64
/* Return information about the filesystem on which FD resides. */
int attribute_hidden __fstatfs64 (int fd, struct statfs64 *buf)
{
diff --git a/libc/misc/statfs/statfs64.c b/libc/misc/statfs/statfs64.c
index 7a8f2bc36..9d326f1f8 100644
--- a/libc/misc/statfs/statfs64.c
+++ b/libc/misc/statfs/statfs64.c
@@ -18,6 +18,8 @@
02111-1307 USA. */
#include <features.h>
+#undef __statfs64
+#undef __statfs
#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64
#undef _FILE_OFFSET_BITS
@@ -37,7 +39,7 @@
#include <sys/statfs.h>
#if defined __UCLIBC_HAS_LFS__
-
+#undef statfs64
/* Return information about the filesystem on which FILE resides. */
int attribute_hidden __statfs64 (const char *file, struct statfs64 *buf)
{