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

unix/getroot: remove unused MAJOR definition

Browse source 
We use major() everywhere, these definitions just add to confusion.
This commit is contained in:
Andrei Borzenkov 2015-11-07 17:02:21 +03:00
parent c1fbc26203
commit dff8d0e3f5
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
grub-core/osdep/unix/getroot.c
View file

@ -45,12 +45,6 @@
#ifdef __linux__ #ifdef __linux__
#include <sys/ioctl.h> /* ioctl */ #include <sys/ioctl.h> /* ioctl */
#include <sys/mount.h> #include <sys/mount.h>
#ifndef MAJOR
# ifndef MINORBITS
# define MINORBITS 8
# endif /* ! MINORBITS */
# define MAJOR(dev) ((unsigned) ((dev) >> MINORBITS))
#endif /* ! MAJOR */
#ifndef FLOPPY_MAJOR #ifndef FLOPPY_MAJOR
# define FLOPPY_MAJOR 2 # define FLOPPY_MAJOR 2
#endif /* ! FLOPPY_MAJOR */ #endif /* ! FLOPPY_MAJOR */
@ -73,7 +67,6 @@
#include <grub/emu/getroot.h> #include <grub/emu/getroot.h>
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# define MAJOR(dev) major(dev)
# define FLOPPY_MAJOR 2 # define FLOPPY_MAJOR 2
#endif #endif
@ -90,7 +83,6 @@
#endif /* defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) */ #endif /* defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) */
#if defined(__NetBSD__) || defined(__OpenBSD__) #if defined(__NetBSD__) || defined(__OpenBSD__)
# define MAJOR(dev) major(dev)
# ifdef HAVE_GETRAWPARTITION # ifdef HAVE_GETRAWPARTITION
# include <util.h> /* getrawpartition */ # include <util.h> /* getrawpartition */
# endif /* HAVE_GETRAWPARTITION */ # endif /* HAVE_GETRAWPARTITION */