ec4acbbd98
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
From c2e1e09485a5773dc3639d34eadc3a07ebce8fe5 Mon Sep 17 00:00:00 2001
|
|
From: William Jon McCann <william.jon.mccann@gmail.com>
|
|
Date: Fri, 7 Jun 2013 14:08:23 -0400
|
|
Subject: [PATCH 094/206] Fix border spacing now that we aren't displaying it
|
|
|
|
---
|
|
grub-core/normal/menu_text.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
|
|
index 64a83862f66..1062d64ee29 100644
|
|
--- a/grub-core/normal/menu_text.c
|
|
+++ b/grub-core/normal/menu_text.c
|
|
@@ -331,12 +331,12 @@ grub_menu_init_page (int nested, int edit,
|
|
int empty_lines = 1;
|
|
int version_msg = 1;
|
|
|
|
- geo->border = 1;
|
|
- geo->first_entry_x = 1 /* margin */ + 1 /* border */;
|
|
+ geo->border = 0;
|
|
+ geo->first_entry_x = 0 /* margin */ + 0 /* border */;
|
|
geo->entry_width = grub_term_width (term) - 5;
|
|
|
|
geo->first_entry_y = 2 /* two empty lines*/
|
|
- + 1 /* GNU GRUB version text */ + 1 /* top border */;
|
|
+ + 0 /* GNU GRUB version text */ + 1 /* top border */;
|
|
|
|
geo->timeout_lines = 2;
|
|
|
|
--
|
|
2.15.0
|
|
|