From: H. Peter Anvin <hpa@zytor.com>
Date: Sun, 14 Nov 2010 21:13:25 +0000 (-0800)
Subject: memdisk: use char array for external symbols
X-Git-Tag: syslinux-4.04-pre1~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=89d5fe9a7f96b29d1a24e4a8ab7f81764c52e2e6;p=platform%2Fupstream%2Fsyslinux.git

memdisk: use char array for external symbols

Use "extern const char foo[];" for an external symbol rather than
"extern void" (gcc 4.5 fix.)

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

diff --git a/memdisk/setup.c b/memdisk/setup.c
index 3f69cd3..4315189 100644
--- a/memdisk/setup.c
+++ b/memdisk/setup.c
@@ -119,7 +119,7 @@ static const char *getcmditem(const char *what)
  */
 #define UNZIP_ALIGN 512
 
-extern void _end;		/* Symbol signalling end of data */
+extern const char _end[];		/* Symbol signalling end of data */
 
 void unzip_if_needed(uint32_t * where_p, uint32_t * size_p)
 {
@@ -171,8 +171,8 @@ void unzip_if_needed(uint32_t * where_p, uint32_t * size_p)
 			? 0xFFFFFFFF : (uint32_t) ranges[i + 1].start);
 
 	    /* Make sure we don't overwrite ourselves */
-	    if (startrange < (uint32_t) & _end)
-		startrange = (uint32_t) & _end;
+	    if (startrange < (uint32_t) _end)
+		startrange = (uint32_t) _end;
 
 	    /* Allow for alignment */
 	    startrange =