vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

don't include linux/fs.h.

Browse source
This commit is contained in:
okuji 2000-08-27 11:21:25 +00:00
parent e705c4bdf8
commit 563b471fc7
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2000-08-27 OKUJI Yoshinori <okuji@gnu.org>
* lib/device.c [__linux__]: Don't include linux/fs.h.
[!BLKGETSIZE] (BLKGETSIZE): Defined as _IO(0x12,96).
* grub/asmstub.c [__linux__]: Don't include linux/fs.h.
2000-08-27 OKUJI Yoshinori <okuji@gnu.org> 2000-08-27 OKUJI Yoshinori <okuji@gnu.org>
Preserve a magic number used by Windows NT in a MBR. Shit! Preserve a magic number used by Windows NT in a MBR. Shit!

3
grub/asmstub.c
View file

@ -48,10 +48,9 @@ int grub_stage2 (void);
((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1))) ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1)))
/* Maybe libc doesn't have large file support. */ /* Maybe libc doesn't have large file support. */
# include <linux/unistd.h> /* _llseek */ # include <linux/unistd.h> /* _llseek */
# include <linux/fs.h> /* BLKFLSBUF */
# endif /* (GLIBC < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR < 1)) */ # endif /* (GLIBC < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR < 1)) */
# ifndef BLKFLSBUF # ifndef BLKFLSBUF
# define BLKFLSBUF _IO (0x12,97) # define BLKFLSBUF _IO (0x12,97) /* flush buffer cache */
# endif /* ! BLKFLSBUF */ # endif /* ! BLKFLSBUF */
#endif /* __linux__ */ #endif /* __linux__ */

4
lib/device.c
View file

@ -45,7 +45,9 @@
# include <linux/major.h> /* FLOPPY_MAJOR */ # include <linux/major.h> /* FLOPPY_MAJOR */
# include <linux/kdev_t.h> /* MAJOR */ # include <linux/kdev_t.h> /* MAJOR */
# include <linux/cdrom.h> /* CDROM_GET_CAPABILITY */ # include <linux/cdrom.h> /* CDROM_GET_CAPABILITY */
# include <linux/fs.h> /* BLKGETSIZE */ # ifndef BLKGETSIZE
# define BLKGETSIZE _IO(0x12,96) /* return device size */
# endif /* ! BLKGETSIZE */
#endif /* __linux__ */ #endif /* __linux__ */
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)