[BusyBox-cvs] busybox/util-linux Makefile.in, 1.7, 1.8 fdisk.c, 1.24, 1.25

[Erik Andersen,,,]

Update of /var/cvs/busybox/util-linux
In directory nail:/tmp/cvs-serv1671/util-linux

Modified Files:
	Makefile.in fdisk.c 
Log Message:
Per suggestion from Bastian Blank, be less evil when we force fdisk to
transparently remap 32-bit interfaces to actually use 64 bit interfaces.
 -Erik


Index: Makefile.in
===================================================================
RCS file: /var/cvs/busybox/util-linux/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/Makefile.in	26 May 2004 11:50:37 -0000	1.7
+++ b/Makefile.in	26 May 2004 11:59:19 -0000	1.8
@@ -49,3 +49,14 @@
 $(UTILLINUX_DIR)$(UTILLINUX_AR): $(patsubst %,$(UTILLINUX_DIR)%, $(UTILLINUX-y))
 	$(AR) -ro $@ $(patsubst %,$(UTILLINUX_DIR)%, $(UTILLINUX-y))
 
+ifneq ($(strip $(CONFIG_LFS)),y)
+ifeq ($(strip $(FDISK_SUPPORT_LARGE_DISKS)),y)
+
+$(UTILLINUX_DIR)fdisk.o: $(UTILLINUX_DIR)fdisk.c
+	$(CC) $(CFLAGS) \
+		-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
+		$(EXTRA_CFLAGS) -c -o $@ $<
+
+endif
+endif
+

Index: fdisk.c
===================================================================
RCS file: /var/cvs/busybox/util-linux/fdisk.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- a/fdisk.c	19 May 2004 10:49:17 -0000	1.24
+++ b/fdisk.c	26 May 2004 11:59:19 -0000	1.25
@@ -15,15 +15,6 @@
 #define PROC_PARTITIONS "/proc/partitions"
 
 #include <features.h>
-/* Force fdisk to transparently remap 32-bit interfaces
- * to instead really use 64 bit interfaces, at least for
- * glibc and uClibc... */
-#ifndef __USE_FILE_OFFSET64
-# ifdef FDISK_SUPPORT_LARGE_DISKS
-#   define __USE_FILE_OFFSET64    1
-# endif
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>           /* stat */
 #include <ctype.h>