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

* include/grub/misc.h: Avoid evaluationg NEED_ENABLE_EXECUTE_STACK and 

NEED_REGISTER_FRAME_INFO in GRUB_UTIL.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-10 12:45:32 +01:00
parent 31a2600267
commit 44318d6168
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/misc.h: Avoid evaluationg NEED_ENABLE_EXECUTE_STACK and
NEED_REGISTER_FRAME_INFO in GRUB_UTIL.
2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/partmap/bsdlabel.c (iterate_real): Fix freeing of static

4
include/grub/misc.h
View File

@ -359,11 +359,11 @@ grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,
grub_uint64_t d,
grub_uint64_t *r);
#if NEED_ENABLE_EXECUTE_STACK && !defined(GRUB_UTIL)
#if !defined(GRUB_UTIL) && NEED_ENABLE_EXECUTE_STACK
void EXPORT_FUNC(__enable_execute_stack) (void *addr);
#endif
#if NEED_REGISTER_FRAME_INFO && !defined(GRUB_UTIL)
#if !defined(GRUB_UTIL) && NEED_REGISTER_FRAME_INFO
void EXPORT_FUNC (__register_frame_info) (void);
void EXPORT_FUNC (__deregister_frame_info) (void);
#endif