From 6dec7db5158447b66f31a3f786ce2916cab83cec Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sun, 14 Mar 2021 16:06:57 +0100
Subject: Maaany fixes :)

I don't have the motivation to write better commit messages...
---
 libc/alloc.c   | 2 --
 libc/inc/def.h | 3 +++
 libc/inc/sys.h | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'libc')

diff --git a/libc/alloc.c b/libc/alloc.c
index 4ccf35f..be986dc 100644
--- a/libc/alloc.c
+++ b/libc/alloc.c
@@ -86,8 +86,6 @@ struct liballoc_minor {
 
 #define MAJOR_SIZE (ALIGN_UP(sizeof(struct liballoc_major), 16))
 #define MINOR_SIZE (ALIGN_UP(sizeof(struct liballoc_minor), 16))
-#define MIN(__x, __y) ((__x) < (__y) ? (__x) : (__y))
-#define MAX(__x, __y) ((__x) > (__y) ? (__x) : (__y))
 
 static struct liballoc_major *l_mem_root = NULL;
 static struct liballoc_major *l_best_bet = NULL;
diff --git a/libc/inc/def.h b/libc/inc/def.h
index db1c95e..c334fcb 100644
--- a/libc/inc/def.h
+++ b/libc/inc/def.h
@@ -25,6 +25,9 @@ typedef unsigned long long u64;
 
 #define UNUSED(a) ((void)(a))
 
+#define MIN(a, b) (((a) < (b)) ? (a) : (b))
+#define MAX(a, b) (((a) > (b)) ? (a) : (b))
+
 #define NORETURN __attribute__((noreturn))
 #define NO_SANITIZE __attribute__((no_sanitize("undefined")))
 #define PACKED __attribute__((packed))
diff --git a/libc/inc/sys.h b/libc/inc/sys.h
index 3125cb0..8add0de 100644
--- a/libc/inc/sys.h
+++ b/libc/inc/sys.h
@@ -93,7 +93,9 @@ int sysv(enum sys num, ...);
 
 static inline u32 getpid(void)
 {
-	u32 buf = 0;
+	static u32 buf = 0;
+	if (buf)
+		return buf;
 	read("/proc/self/pid", &buf, 0, sizeof(buf));
 	return buf;
 }
-- 
cgit v1.2.3