From: Shamus Hammons <jlhamm@acm.org>
Date: Thu, 27 Apr 2017 13:14:08 +0000 (-0500)
Subject: Version bump for last commits. :-)
X-Git-Tag: v2.1.0~127
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=commitdiff_plain;h=26019087571ebcafae571c7d32f485ceb8af8c5d

Version bump for last commits. :-)
---

diff --git a/listing.c b/listing.c
index 68f75b7..2fcf315 100644
--- 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 e4bd7b7..1cddbf6 100644
--- 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 81a040a..4ec4872 100644
--- 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
 
diff --git a/version.h b/version.h
index 0d9cda6..61ada40 100644
--- 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__