From: ol.sc <ol.sc@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Sun, 4 Nov 2012 20:31:23 +0000 (+0000)
Subject: Use array type declaration to avoid &-operator.
X-Git-Tag: V2.14~163
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=247223f3ae50a71398d5fcbcf3db43d898553031;p=cc65

Use array type declaration to avoid &-operator.

git-svn-id: svn://svn.cc65.org/cc65/trunk@5911 b7a2c559-68d2-44c3-8de9-860c34a00d81
---

diff --git a/samples/multidemo.c b/samples/multidemo.c
index 5e505083e..e44a34b96 100644
--- a/samples/multidemo.c
+++ b/samples/multidemo.c
@@ -21,10 +21,10 @@
  * linker. They contain the overlay area address and size specific to a
  * certain program.
  */
-extern void _OVERLAY1_LOAD__, _OVERLAY1_SIZE__;
-extern void _OVERLAY2_LOAD__, _OVERLAY2_SIZE__;
-extern void _OVERLAY3_LOAD__, _OVERLAY3_SIZE__;
-extern void _OVERLAY4_LOAD__, _OVERLAY4_SIZE__;
+extern void _OVERLAY1_LOAD__[], _OVERLAY1_SIZE__[];
+extern void _OVERLAY2_LOAD__[], _OVERLAY2_SIZE__[];
+extern void _OVERLAY3_LOAD__[], _OVERLAY3_SIZE__[];
+extern void _OVERLAY4_LOAD__[], _OVERLAY4_SIZE__[];
 
 struct {
     char     *name;
@@ -32,10 +32,10 @@ struct {
     void     *addr;
     unsigned size;
 } overlay[] =
-    {{"multdemo.1", -1, &_OVERLAY1_LOAD__, (unsigned)&_OVERLAY1_SIZE__},
-     {"multdemo.2", -1, &_OVERLAY2_LOAD__, (unsigned)&_OVERLAY2_SIZE__},
-     {"multdemo.3", -1, &_OVERLAY3_LOAD__, (unsigned)&_OVERLAY3_SIZE__},
-     {"multdemo.4", -1, &_OVERLAY4_LOAD__, (unsigned)&_OVERLAY4_SIZE__}};
+    {{"multdemo.1", -1, _OVERLAY1_LOAD__, (unsigned)_OVERLAY1_SIZE__},
+     {"multdemo.2", -1, _OVERLAY2_LOAD__, (unsigned)_OVERLAY2_SIZE__},
+     {"multdemo.3", -1, _OVERLAY3_LOAD__, (unsigned)_OVERLAY3_SIZE__},
+     {"multdemo.4", -1, _OVERLAY4_LOAD__, (unsigned)_OVERLAY4_SIZE__}};
 
 /* Copy overlays into extended memory up to overlay 3. Overlay 4 is known to
  * to be loaded only once for onetime initialization purposes so there's no