From a86291ca75f95a6f5f1f581d1c6cf1a8c76f4454 Mon Sep 17 00:00:00 2001
From: Max Wash <mbswash@gmail.com>
Date: Sun, 27 Oct 2024 15:36:14 +0000
Subject: [PATCH] fix linux-specific compilation errors

---
 core-test/randomise.c         |  2 +-
 core/include/blue/core/misc.h |  4 ++++
 core/mt19937.c                |  2 +-
 core/sys/linux/random.c       |  6 +++---
 term/sys/linux/print.c        | 12 ++++++------
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/core-test/randomise.c b/core-test/randomise.c
index 2f3abcd..4905c49 100644
--- a/core-test/randomise.c
+++ b/core-test/randomise.c
@@ -1,5 +1,5 @@
 #include <blue/core/random.h>
-#include <printf.h>
+#include <stdio.h>
 
 #define NRAND_NUMBERS 12
 #define NRAND_BYTES   128
diff --git a/core/include/blue/core/misc.h b/core/include/blue/core/misc.h
index a99ed46..f706ce8 100644
--- a/core/include/blue/core/misc.h
+++ b/core/include/blue/core/misc.h
@@ -1,6 +1,10 @@
 #ifndef BLUELIB_MISB_H_
 #define BLUELIB_MISB_H_
 
+#ifndef _Nonnull
+#define _Nonnull
+#endif
+
 #define b_unbox(type, box, member)                                             \
 	((type *_Nonnull)((box) ? (uintptr_t)(box) - (offsetof(type, member)) : 0))
 
diff --git a/core/mt19937.c b/core/mt19937.c
index 9c67122..3e7523e 100644
--- a/core/mt19937.c
+++ b/core/mt19937.c
@@ -125,7 +125,7 @@ static void init_by_array64(
 }
 
 /* generates a random number on [0, 2^64-1]-interval */
-static unsigned long long genrand64_int64(struct b_random_ctx *context)
+static uint64_t genrand64_int64(struct b_random_ctx *context)
 {
 #if 0
 	/* This is the original implementation. It is replaced by the alternate implementation, below. */
diff --git a/core/sys/linux/random.c b/core/sys/linux/random.c
index 63172ec..7effc91 100644
--- a/core/sys/linux/random.c
+++ b/core/sys/linux/random.c
@@ -1,8 +1,8 @@
+#include <fcntl.h>
 #include <stdint.h>
 #include <unistd.h>
-#include <fcntl.h>
 
-uint64_t z__c_platform_random_seed()
+uint64_t z__b_platform_random_seed()
 {
 	int fd = open("/dev/urandom", O_RDONLY);
 	if (fd == -1) {
@@ -18,7 +18,7 @@ uint64_t z__c_platform_random_seed()
 	return v;
 }
 
-uint64_t z__c_platform_random_seed_secure()
+uint64_t z__b_platform_random_seed_secure()
 {
 	int fd = open("/dev/random", O_RDONLY);
 	if (fd == -1) {
diff --git a/term/sys/linux/print.c b/term/sys/linux/print.c
index ec82af3..e3484a8 100644
--- a/term/sys/linux/print.c
+++ b/term/sys/linux/print.c
@@ -1,15 +1,15 @@
 #include <stdio.h>
-#include <unistd.h>
 #include <string.h>
-#include <termios.h>
 #include <sys/ioctl.h>
+#include <termios.h>
+#include <unistd.h>
 
-int z__c_stream_is_tty(FILE *fp)
+int z__b_stream_is_tty(FILE *fp)
 {
 	return isatty(fileno(fp));
 }
 
-int z__c_stream_dimensions(FILE *fp, unsigned int *w, unsigned int *h)
+int z__b_stream_dimensions(FILE *fp, unsigned int *w, unsigned int *h)
 {
 	if (!isatty(fileno(fp))) {
 		return -1;
@@ -31,7 +31,7 @@ int z__c_stream_dimensions(FILE *fp, unsigned int *w, unsigned int *h)
 	return 0;
 }
 
-int z__c_stream_cursorpos(FILE *in, FILE *out, unsigned int *x, unsigned int *y)
+int z__b_stream_cursorpos(FILE *in, FILE *out, unsigned int *x, unsigned int *y)
 {
 	if (!isatty(fileno(in)) || !isatty(fileno(out))) {
 		return -1;
@@ -41,7 +41,7 @@ int z__c_stream_cursorpos(FILE *in, FILE *out, unsigned int *x, unsigned int *y)
 
 	tcgetattr(fileno(in), &term);
 	tcgetattr(fileno(in), &restore);
-	term.c_lflag &= ~(ICANON|ECHO);
+	term.c_lflag &= ~(ICANON | ECHO);
 	tcsetattr(fileno(in), TCSANOW, &term);
 
 	const char *cmd = "\033[6n";