Remove commented-out C-only macro features

src/asm/symbol.cpp

@@ -498,7 +498,7 @@ Symbol *sym_AddAnonLabel()
 }
 
 // Write an anonymous label's name to a buffer
-void sym_WriteAnonLabelName(char buf[MIN_NB_ELMS(MAXSYMLEN + 1)], uint32_t ofs, bool neg)
+void sym_WriteAnonLabelName(char buf[/* MAXSYMLEN + 1 */], uint32_t ofs, bool neg)
 {
 	uint32_t id = 0;
 

src/error.cpp

@@ -7,9 +7,8 @@
 #include <string.h>
 
 #include "error.hpp"
-#include "platform.hpp"
 
-static void vwarn(char const NONNULL(fmt), va_list ap)
+static void vwarn(char const *fmt, va_list ap)
 {
 	const char *error = strerror(errno);
 
@@ -18,14 +17,14 @@ static void vwarn(char const NONNULL(fmt), va_list ap)
 	fprintf(stderr, ": %s\n", error);
 }
 
-static void vwarnx(char const NONNULL(fmt), va_list ap)
+static void vwarnx(char const *fmt, va_list ap)
 {
 	fprintf(stderr, "warning: ");
 	vfprintf(stderr, fmt, ap);
 	putc('\n', stderr);
 }
 
-[[noreturn]] static void verr(char const NONNULL(fmt), va_list ap)
+[[noreturn]] static void verr(char const *fmt, va_list ap)
 {
 	const char *error = strerror(errno);
 
@@ -36,7 +35,7 @@ static void vwarnx(char const NONNULL(fmt), va_list ap)
 	exit(1);
 }
 
-[[noreturn]] static void verrx(char const NONNULL(fmt), va_list ap)
+[[noreturn]] static void verrx(char const *fmt, va_list ap)
 {
 	fprintf(stderr, "error: ");
 	vfprintf(stderr, fmt, ap);
@@ -45,7 +44,7 @@ static void vwarnx(char const NONNULL(fmt), va_list ap)
 	exit(1);
 }
 
-void warn(char const NONNULL(fmt), ...)
+void warn(char const *fmt, ...)
 {
 	va_list ap;
 
@@ -54,7 +53,7 @@ void warn(char const NONNULL(fmt), ...)
 	va_end(ap);
 }
 
-void warnx(char const NONNULL(fmt), ...)
+void warnx(char const *fmt, ...)
 {
 	va_list ap;
 
@@ -63,7 +62,7 @@ void warnx(char const NONNULL(fmt), ...)
 	va_end(ap);
 }
 
-[[noreturn]] void err(char const NONNULL(fmt), ...)
+[[noreturn]] void err(char const *fmt, ...)
 {
 	va_list ap;
 
@@ -71,7 +70,7 @@ void warnx(char const NONNULL(fmt), ...)
 	verr(fmt, ap);
 }
 
-[[noreturn]] void errx(char const NONNULL(fmt), ...)
+[[noreturn]] void errx(char const *fmt, ...)
 {
 	va_list ap;
 

src/link/output.cpp

@@ -20,7 +20,6 @@
 #include "error.hpp"
 #include "itertools.hpp"
 #include "linkdefs.hpp"
-#include "platform.hpp" // For `MIN_NB_ELMS` and `AT`
 
 #define BANK_SIZE 0x4000
 

src/link/sdas_obj.cpp

@@ -72,7 +72,7 @@ retry:
 	}
 }
 
-static uint32_t readNumber(char const *restrict str, char const **endptr, enum NumberType base) {
+static uint32_t readNumber(char const *str, char const **endptr, enum NumberType base) {
 	uint32_t res = 0;
 
 	for (;;) {
@@ -88,7 +88,7 @@ static uint32_t readNumber(char const *restrict str, char const **endptr, enum N
 	}
 }
 
-static uint32_t parseNumber(FileStackNode const *where, uint32_t lineNo, char const *restrict str, enum NumberType base) {
+static uint32_t parseNumber(FileStackNode const *where, uint32_t lineNo, char const *str, enum NumberType base) {
 	if (str[0] == '\0')
 		fatal(where, lineNo, "Expected number, got empty string");
 
@@ -100,7 +100,7 @@ static uint32_t parseNumber(FileStackNode const *where, uint32_t lineNo, char co
 	return res;
 }
 
-static uint8_t parseByte(FileStackNode const *where, uint32_t lineNo, char const *restrict str, enum NumberType base) {
+static uint8_t parseByte(FileStackNode const *where, uint32_t lineNo, char const *str, enum NumberType base) {
 	uint32_t num = parseNumber(where, lineNo, str, base);
 
 	if (num > UINT8_MAX)