Added in DSP fixups to sect.c, misc. fixes for 6502 assembler.

[rmac] / listing.c

diff --git a/listing.c b/listing.c
index e1fd73a7f42420de4ca0747750edf3d890a80c87..87956af889aba508e531149fc16b7dcce20ebce7 100644 (file)
--- a/listing.c
+++ b/listing.c
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for all Atari computers
 // LISTING.C - Listing Output
-// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2019 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -432,19 +432,19 @@ int d_subttl(void)
        int ejectok;
        ejectok = 1;
 
-       if (*tok.u32 == '-')
+       if (*tok == '-')
        {
                ejectok = 0;
-               ++tok.u32;
+               ++tok;
        }
 
-       if (*tok.u32 != STRING)
+       if (*tok != STRING)
                return error("missing string");
 
-//     strcpy(subttl, (char *)tok.u32[1]);
-       strcpy(subttl, string[tok.u32[1]]);
+//     strcpy(subttl, (char *)tok[1]);
+       strcpy(subttl, string[tok[1]]);
 
-       tok.u32 += 2;
+       tok += 2;
 
        // Always eject on pages 2+
        if (ejectok && (subflag || pageno > 1))
@@ -462,12 +462,12 @@ int d_subttl(void)
 //
 int d_title(void)
 {
-       if (*tok.u32 != STRING)
+       if (*tok != STRING)
                return error("missing string");
 
-//     strcpy(title, (char*)tok.u32[1]);
-       strcpy(title, string[tok.u32[1]]);
-       tok.u32 += 2;
+//     strcpy(title, (char*)tok[1]);
+       strcpy(title, string[tok[1]]);
+       tok += 2;
 
        if (pageno > 1)
        {