Hello!

CVS/current /sbin/grub doesn't compile on vanilla RedHat 6.0 due to a
conflict between definitions for off_t in GLibc-2.1.1 and
shared_src/defs.h

In fact, off_t is not used in Grub, so it's safe to remove its definition.
Patch attached.

Pavel Roskin
Index: shared_src/defs.h
===================================================================
RCS file: /gd/gnu/anoncvsroot/grub/shared_src/defs.h,v
retrieving revision 1.2
diff -u -r1.2 defs.h
--- defs.h      1999/02/28 18:37:34     1.2
+++ defs.h      1999/05/11 11:18:58
@@ -59,7 +59,6 @@
 
 typedef unsigned int time_t;   /* an unsigned int */
 typedef unsigned int daddr_t;  /* an unsigned int */
-typedef unsigned int off_t;    /* another unsigned int */
 
 typedef unsigned short uid_t;
 typedef unsigned short gid_t;
Index: shared_src/fs.h
===================================================================
RCS file: /gd/gnu/anoncvsroot/grub/shared_src/fs.h,v
retrieving revision 1.2
diff -u -r1.2 fs.h
--- fs.h        1999/02/28 18:37:37     1.2
+++ fs.h        1999/05/11 11:18:58
@@ -69,8 +69,6 @@
  */
 #define BBSIZE         8192
 #define SBSIZE         8192
-#define        BBOFF           ((off_t)(0))
-#define        SBOFF           ((off_t)(BBOFF + BBSIZE))
 #define        BBLOCK          ((daddr_t)(0))
 #define        SBLOCK          ((daddr_t)(BBLOCK + BBSIZE / DEV_BSIZE))
 
Index: shared_src/fsys_ext2fs.c
===================================================================
RCS file: /gd/gnu/anoncvsroot/grub/shared_src/fsys_ext2fs.c,v
retrieving revision 1.7
diff -u -r1.7 fsys_ext2fs.c
--- fsys_ext2fs.c       1999/03/27 23:35:35     1.7
+++ fsys_ext2fs.c       1999/05/11 11:18:59
@@ -166,9 +166,6 @@
 /* linux/limits.h */
 #define NAME_MAX         255   /* # chars in a file name */
 
-/* linux/posix_type.h */
-typedef long off_t;
-
 /* linux/ext2fs.h */
 #define EXT2_NAME_LEN 255
 struct ext2_dir_entry

Reply via email to