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

	NEED_REGISTER_FRAME_INFO in GRUB_UTIL.

diff --git a/ChangeLog b/ChangeLog
index 53ce68f0c67a647a56b60e7c1c662f742f3e48c1..87fa1d0bf8f1beaf0cf2116837fa083884284df2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/include/grub/misc.h b/include/grub/misc.h
index 2d5f8e1b270fc6c719ac374113de54e321a3883d..7582d754e737dd2083fa318ad93a39f90fcb55d8 100644 (file)
--- 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