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

Fix variable name collision

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-11 13:40:59 +01:00
parent d2601bb7bc
commit b56495543a
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/i386/relocator.c
View file

@ -35,11 +35,11 @@ extern grub_uint8_t grub_relocator_backward_end;
extern void *grub_relocator_backward_dest;
extern void *grub_relocator_backward_src;
extern grub_size_t grub_relocator_backward_size;
extern grub_size_t grub_relocator_backward_chunk_size;
extern void *grub_relocator_forward_dest;
extern void *grub_relocator_forward_src;
extern grub_size_t grub_relocator_forward_size;
extern grub_size_t grub_relocator_forward_chunk_size;
extern grub_uint32_t grub_relocator32_eax;
extern grub_uint32_t grub_relocator32_ebx;
@ -85,7 +85,7 @@ grub_cpu_relocator_backward (void *ptr, void *src, void *dest,
{
grub_relocator_backward_dest = dest;
grub_relocator_backward_src = src;
grub_relocator_backward_size = size;
grub_relocator_backward_chunk_size = size;
grub_memmove (ptr,
&grub_relocator_backward_start,
@ -98,7 +98,7 @@ grub_cpu_relocator_forward (void *ptr, void *src, void *dest,
{
grub_relocator_forward_dest = dest;
grub_relocator_forward_src = src;
grub_relocator_forward_size = size;
grub_relocator_forward_chunk_size = size;
grub_memmove (ptr,
&grub_relocator_forward_start,