[uClibc-cvs] uClibc/libc/misc/file lockf64.c,1.1,1.2 Makefile,1.3,1.4

[Erik Andersen]

Update of /var/cvs/uClibc/libc/misc/file
In directory winder:/tmp/cvs-serv11611

Modified Files:
	lockf64.c Makefile 
Log Message:
Only include lockf64 when large file support is enabled, fixing
a problem noticed by Jeff Mock.  Sorry about that.
 -Erik


Index: lockf64.c
===================================================================
RCS file: /var/cvs/uClibc/libc/misc/file/lockf64.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lockf64.c	10 Jan 2003 03:32:11 -0000	1.1
+++ lockf64.c	18 Jan 2003 19:46:17 -0000	1.2
@@ -16,6 +16,23 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include <features.h>
+
+#ifdef __UCLIBC_HAS_LFS__
+#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64 
+#undef _FILE_OFFSET_BITS
+#define	_FILE_OFFSET_BITS   64
+#endif
+#ifndef __USE_FILE_OFFSET64
+# define __USE_FILE_OFFSET64	1
+#endif
+#ifndef __USE_LARGEFILE64
+# define __USE_LARGEFILE64	1
+#endif
+#endif
+
+#define __USE_GNU
+
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -83,3 +100,4 @@
 
     return fcntl(fd, cmd, &fl);
 }
+

Index: Makefile
===================================================================
RCS file: /var/cvs/uClibc/libc/misc/file/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	10 Jan 2003 03:32:11 -0000	1.3
+++ Makefile	18 Jan 2003 19:46:17 -0000	1.4
@@ -24,7 +24,11 @@
 TOPDIR=../../../
 include $(TOPDIR)Rules.mak
 
-CSRC=lockf.c lockf64.c
+ifeq ($(strip $(UCLIBC_HAS_LFS)),y)
+CSRC = lockf.c lockf64.c
+else
+CSRC = lockf.c
+endif
 COBJS=$(patsubst %.c,%.o, $(CSRC))
 OBJS=$(COBJS)