aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-11-14 13:13:25 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-11-14 13:13:25 -0800
commit89d5fe9a7f96b29d1a24e4a8ab7f81764c52e2e6 (patch)
treeacf383f077b8b6f3fa436c7d074c63603123b0e6
parent51d2e40990ce9d2360300a81562b1b2f7610d336 (diff)
downloadsyslinux-89d5fe9a7f96b29d1a24e4a8ab7f81764c52e2e6.tar.gz
syslinux-89d5fe9a7f96b29d1a24e4a8ab7f81764c52e2e6.tar.xz
syslinux-89d5fe9a7f96b29d1a24e4a8ab7f81764c52e2e6.zip
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>
-rw-r--r--memdisk/setup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/memdisk/setup.c b/memdisk/setup.c
index 3f69cd35..43151898 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 =