[syslinux:master] adv: Remove double defintion
syslinux-bot for H. Peter Anvin
hpa at linux.intel.com
Mon Jun 9 15:06:04 PDT 2014
Commit-ID: 415d571ea785c86167301056c6eff744f3cec615
Gitweb: http://www.syslinux.org/commit/415d571ea785c86167301056c6eff744f3cec615
Author: H. Peter Anvin <hpa at linux.intel.com>
AuthorDate: Mon, 9 Jun 2014 15:04:04 -0700
Committer: H. Peter Anvin <hpa at linux.intel.com>
CommitDate: Mon, 9 Jun 2014 15:04:04 -0700
adv: Remove double defintion
__syslinux_adv_* symbols are now part of the core, so don't export
them again elsewhere. This broke all uses of the ADV, including
--once.
Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
---
com32/elflink/ldlinux/adv.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/com32/elflink/ldlinux/adv.c b/com32/elflink/ldlinux/adv.c
index 677fe92..0cbbe27 100644
--- a/com32/elflink/ldlinux/adv.c
+++ b/com32/elflink/ldlinux/adv.c
@@ -34,9 +34,7 @@
#include <syslinux/adv.h>
#include <syslinux/firmware.h>
#include <klibc/compiler.h>
-
-__export void *__syslinux_adv_ptr;
-__export size_t __syslinux_adv_size;
+#include <syslinux/adv.h>
void __constructor __syslinux_init(void)
{
More information about the Syslinux-commits
mailing list