* include/grub/symbol.h (EXT_C) [GRUB_UTIL]: Removed.

	(FUNCTION) [GRUB_UTIL]: Likewise.
	(VARIABLE) [GRUB_UTIL]: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 87fa1d0bf8f1beaf0cf2116837fa083884284df2..1ece607fe92f935a5e75ce1076bda3c8d3f057ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/symbol.h (EXT_C) [GRUB_UTIL]: Removed.
+       (FUNCTION) [GRUB_UTIL]: Likewise.
+       (VARIABLE) [GRUB_UTIL]: Likewise.
+
 2012-02-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/misc.h: Avoid evaluationg NEED_ENABLE_EXECUTE_STACK and

diff --git a/include/grub/symbol.h b/include/grub/symbol.h
index c6adb7ee3c914fa97c323dbfe2b4b0a7eec6b0a8..ddbb9b53f83b85d99063bd5cc790bcb4433ea5a7 100644 (file)
--- a/include/grub/symbol.h
+++ b/include/grub/symbol.h
@@ -25,6 +25,7 @@
 #define LOCAL(sym)     L_ ## sym
 
 /* Add an underscore to a C symbol in assembler code if needed. */
+#ifndef GRUB_UTIL
 #if HAVE_ASM_USCORE
 # define EXT_C(sym)    _ ## sym
 #else
@@ -42,6 +43,7 @@
 #define FUNCTION(x)    .globl EXT_C(x) ; .def EXT_C(x); .scl 2; .type 32; .endef; EXT_C(x):
 #define VARIABLE(x)    .globl EXT_C(x) ; .def EXT_C(x); .scl 2; .type 0; .endef; EXT_C(x):
 #endif
+#endif
 
 /* Mark an exported symbol.  */
 #ifndef GRUB_SYMBOL_GENERATOR