Merge remote-tracking branch 'origin/main' into 26-02-27-pjb-dev-2

include/dolphin/os.h

@@ -2,6 +2,7 @@
 #define _DOLPHIN_OS_H_
 
 #include <cstdio>
+#include <cstdint>
 
 #ifdef __REVOLUTION_SDK__
 #include <revolution/os.h>

include/dolphin/types.h

@@ -87,8 +87,12 @@ typedef unsigned int uint;
 #endif
 
 #ifndef NULL
-#ifdef  __cplusplus
+#ifdef __cplusplus
+#if __cplusplus >= 201103L
+#define NULL nullptr
+#else
 #define NULL 0
+#endif
 #else
 #define NULL ((void*)0)
 #endif