From 44318d61689edb2ba4df2b20531c48a1d03ef0d2 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 10 Feb 2012 12:45:32 +0100 Subject: [PATCH] * include/grub/misc.h: Avoid evaluationg NEED_ENABLE_EXECUTE_STACK and NEED_REGISTER_FRAME_INFO in GRUB_UTIL. --- ChangeLog | 5 +++++ include/grub/misc.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53ce68f0c..87fa1d0bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-02-10 Vladimir Serbinenko + + * include/grub/misc.h: Avoid evaluationg NEED_ENABLE_EXECUTE_STACK and + NEED_REGISTER_FRAME_INFO in GRUB_UTIL. + 2012-02-10 Vladimir Serbinenko * grub-core/partmap/bsdlabel.c (iterate_real): Fix freeing of static diff --git a/include/grub/misc.h b/include/grub/misc.h index 2d5f8e1b2..7582d754e 100644 --- a/include/grub/misc.h +++ b/include/grub/misc.h @@ -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