Version bump for last commits. :-)
authorShamus Hammons <jlhamm@acm.org>
Thu, 27 Apr 2017 13:14:08 +0000 (08:14 -0500)
committerShamus Hammons <jlhamm@acm.org>
Thu, 27 Apr 2017 13:14:08 +0000 (08:14 -0500)
listing.c
rmac.c
token.c
version.h

index 68f75b7068b1e2f6deaf55efa0ee0f947d779c3c..2fcf315c48739d057dbd46ddad1d3cc1acdd9534 100644 (file)
--- a/listing.c
+++ b/listing.c
@@ -217,30 +217,30 @@ void ship_ln(const char * ln)
        if (listing <= 0)
                return;
 
-    if (list_pag)
-    {
-        // Notice bottom of page
-        if (nlines >= pagelen - BOT_MAR)
-            eject();
-
-        // Print title, boilerplate, and subtitle at top of page
-        if (nlines == 0)
-        {
-            pageno++;
-            println("");
-            date_string(datestr, dos_date());
-            time_string(timestr, dos_time());
-            sprintf(buf,
-                "%-40s%-20s Page %-4d    %s %s        RMAC %01i.%01i.%02i (%s)",
-                title, curfname, pageno, timestr, datestr, MAJOR, MINOR, PATCH,
-                PLATFORM);
-            println(buf);
-            sprintf(buf, "%s", subttl);
-            println(buf);
-            println("");
-            nlines = 4;
-        }
-    }
+       if (list_pag)
+       {
+               // Notice bottom of page
+               if (nlines >= pagelen - BOT_MAR)
+                       eject();
+
+               // Print title, boilerplate, and subtitle at top of page
+               if (nlines == 0)
+               {
+                       pageno++;
+                       println("");
+                       date_string(datestr, dos_date());
+                       time_string(timestr, dos_time());
+                       sprintf(buf,
+                               "%-40s%-20s Page %-4d    %s %s        RMAC %01i.%01i.%02i (%s)",
+                               title, curfname, pageno, timestr, datestr, MAJOR, MINOR, PATCH,
+                               PLATFORM);
+                       println(buf);
+                       sprintf(buf, "%s", subttl);
+                       println(buf);
+                       println("");
+                       nlines = 4;
+               }
+       }
 
        println(ln);
        nlines++;
diff --git a/rmac.c b/rmac.c
index e4bd7b78091578f475343a88806a339782210fad..1cddbf6972674598479e67bc2efce9b9a1edd9c1 100644 (file)
--- a/rmac.c
+++ b/rmac.c
@@ -25,7 +25,7 @@
 
 int perm_verb_flag;                            // Permanently verbose, interactive mode
 int list_flag;                                 // "-l" listing flag on command line
-int list_pag = 1;               // Enable listing pagination by default
+int list_pag = 1;                              // Enable listing pagination by default
 int verb_flag;                                 // Be verbose about what's going on
 int m6502;                                             // 1, assembling 6502 code
 int as68_flag;                                 // as68 kludge mode
@@ -135,7 +135,7 @@ void DisplayHelp(void)
                "                    x: com/exe/xex (Atari 800)\n"
                "  -i[path]          Directory to search for include files\n"
                "  -l[filename]      Create an output listing file\n"
-        "  -l*[filename]     Create an output listing file without pagination\n"
+               "  -l*[filename]     Create an output listing file without pagination\n"
                "  -n                Don't do things behind your back in RISC assembler\n"
                "  -o file           Output file name\n"
                "  +o[value]         Turn a specific optimisation on\n"
@@ -345,15 +345,16 @@ int Process(int argc, char ** argv)
                                break;
                        case 'l':                               // Produce listing file
                        case 'L':
-                if (*(argv[argno] + 2) == '*')
-                {
-                    list_fname = argv[argno] + 3;
-                    list_pag = 0;    // Special case - turn off pagination
-                }
-                else
-                {
-                    list_fname = argv[argno] + 2;
-                }
+                               if (*(argv[argno] + 2) == '*')
+                               {
+                                       list_fname = argv[argno] + 3;
+                                       list_pag = 0;    // Special case - turn off pagination
+                               }
+                               else
+                               {
+                                       list_fname = argv[argno] + 2;
+                               }
+
                                listing = 1;
                                list_flag = 1;
                                lnsave++;
diff --git a/token.c b/token.c
index 81a040a958aefc6971baf53ef30f8186cbc3e070..4ec487204ea74a6eec2ea0b8a4553e82b4458aaf 100644 (file)
--- a/token.c
+++ b/token.c
@@ -521,7 +521,7 @@ DEBUG printf("ExM: SYMBOL=\"%s\"", d);
 //         to choke on legitimate code... Need to investigate this further
 //         before changing anything else here!
                                                        case CONST:
-                                                               sprintf(numbuf, "$%lx", (LONG)*tk++);
+                                                               sprintf(numbuf, "$%lx", (long unsigned int)*tk++);
                                                                d = numbuf;
                                                                break;
                                                        case DEQUALS:
@@ -648,7 +648,6 @@ char * GetNextMacroLine(void)
 //
 char * GetNextRepeatLine(void)
 {
-
        IREPT * irept = cur_inobj->inobj.irept;
        LONG * strp = irept->ir_nextln;                 // initial null
 
index 0d9cda684b596440a5c5ae001ff7b4d22fea0963..61ada40779c494d8af37a0f65c4e62c6bd0e4ab3 100644 (file)
--- a/version.h
+++ b/version.h
@@ -15,7 +15,7 @@
 
 #define MAJOR   1              // Major version number
 #define MINOR   6              // Minor version number
-#define PATCH   5              // Patch release number
+#define PATCH   6              // Patch release number
 
 #endif // __VERSION_H__