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

fix a gcc warning in builtins.c.

Browse source
This commit is contained in:
okuji 2000-07-12 06:28:07 +00:00
parent 05581f3233
commit fa003769c5
4 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2000-07-12 OKUJI Yoshinori <okuji@gnu.org>
* stage2/Makefile.am (libgrub_a_CFLAGS): Added
-I$(top_srcdir)/lib.
* stage2/builtins.c [GRUB_UTIL]: Include device.h.
2000-07-12 OKUJI Yoshinori <okuji@gnu.org> 2000-07-12 OKUJI Yoshinori <okuji@gnu.org>
Segreate OS-specific helper functions from asmstub.c. Segreate OS-specific helper functions from asmstub.c.

6
stage2/Makefile.am
View file

@ -16,9 +16,9 @@ noinst_LIBRARIES = libgrub.a
libgrub_a_SOURCES = boot.c builtins.c common.c char_io.c cmdline.c \ libgrub_a_SOURCES = boot.c builtins.c common.c char_io.c cmdline.c \
disk_io.c gunzip.c fsys_ffs.c fsys_ext2fs.c fsys_fat.c \ disk_io.c gunzip.c fsys_ffs.c fsys_ext2fs.c fsys_fat.c \
fsys_minix.c fsys_reiserfs.c stage2.c fsys_minix.c fsys_reiserfs.c stage2.c
libgrub_a_CFLAGS = $(GRUB_CFLAGS) -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 \ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
-DFSYS_FAT=1 -DFSYS_FFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \ -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
-fwritable-strings -DFSYS_MINIX=1 -DFSYS_REISERFS=1 -fwritable-strings
# Stage 2 and Stage 1.5's. # Stage 2 and Stage 1.5's.
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)

6
stage2/Makefile.in
View file

@ -106,9 +106,9 @@ libgrub_a_SOURCES = boot.c builtins.c common.c char_io.c cmdline.c \
disk_io.c gunzip.c fsys_ffs.c fsys_ext2fs.c fsys_fat.c \ disk_io.c gunzip.c fsys_ffs.c fsys_ext2fs.c fsys_fat.c \
fsys_minix.c fsys_reiserfs.c stage2.c fsys_minix.c fsys_reiserfs.c stage2.c
libgrub_a_CFLAGS = $(GRUB_CFLAGS) -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 \ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
-DFSYS_FAT=1 -DFSYS_FFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \ -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
-fwritable-strings -DFSYS_MINIX=1 -DFSYS_REISERFS=1 -fwritable-strings
# Stage 2 and Stage 1.5's. # Stage 2 and Stage 1.5's.

10
stage2/builtins.c
View file

@ -26,10 +26,12 @@
# include <etherboot.h> # include <etherboot.h>
#endif #endif
#ifndef GRUB_UTIL #ifdef GRUB_UTIL
# include "apic.h" # include <device.h>
# include "smp-imps.h" #else /* ! GRUB_UTIL */
#endif # include <apic.h>
# include <smp-imps.h>
#endif /* ! GRUB_UTIL */
/* The type of kernel loaded. */ /* The type of kernel loaded. */
kernel_t kernel_type; kernel_t kernel_type;