svn commit: trunk/uClibc/libc/misc: file statfs

[psm at uclibc.org]

Author: psm
Date: 2005-12-15 16:51:04 -0800 (Thu, 15 Dec 2005)
New Revision: 12915

Log:
Correct some problems

Modified:
   trunk/uClibc/libc/misc/file/lockf.c
   trunk/uClibc/libc/misc/file/lockf64.c
   trunk/uClibc/libc/misc/statfs/fstatfs64.c
   trunk/uClibc/libc/misc/statfs/statfs64.c


Changeset:
Modified: trunk/uClibc/libc/misc/file/lockf.c
===================================================================
--- trunk/uClibc/libc/misc/file/lockf.c	2005-12-16 00:44:04 UTC (rev 12914)
+++ trunk/uClibc/libc/misc/file/lockf.c	2005-12-16 00:51:04 UTC (rev 12915)
@@ -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;

Modified: trunk/uClibc/libc/misc/file/lockf64.c
===================================================================
--- trunk/uClibc/libc/misc/file/lockf64.c	2005-12-16 00:44:04 UTC (rev 12914)
+++ trunk/uClibc/libc/misc/file/lockf64.c	2005-12-16 00:51:04 UTC (rev 12915)
@@ -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;

Modified: trunk/uClibc/libc/misc/statfs/fstatfs64.c
===================================================================
--- trunk/uClibc/libc/misc/statfs/fstatfs64.c	2005-12-16 00:44:04 UTC (rev 12914)
+++ trunk/uClibc/libc/misc/statfs/fstatfs64.c	2005-12-16 00:51:04 UTC (rev 12915)
@@ -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)
 {

Modified: trunk/uClibc/libc/misc/statfs/statfs64.c
===================================================================
--- trunk/uClibc/libc/misc/statfs/statfs64.c	2005-12-16 00:44:04 UTC (rev 12914)
+++ trunk/uClibc/libc/misc/statfs/statfs64.c	2005-12-16 00:51:04 UTC (rev 12915)
@@ -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)
 {