From 565d9a55e8dbf62254bd2f72da3c1d94ae8198bf Mon Sep 17 00:00:00 2001
From: Heng Guo <2085471348@qq.com>
Date: Sun, 3 Sep 2023 12:06:42 +0800
Subject: [PATCH] Fix conflicts

---
 helper.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/helper.h b/helper.h
index bb0c136..f35c4f4 100644
--- a/helper.h
+++ b/helper.h
@@ -28,6 +28,8 @@
   static bool xy_on_macos   = false;
   static bool xy_on_bsds    = false;
 
+  static char* xy_os_devnull = "nul";
+
   #include <windows.h>
   #define xy_useutf8() SetConsoleOutputCP(65001)
 
@@ -38,6 +40,8 @@
   static bool xy_on_macos   = false;
   static bool xy_on_bsds    = false;
 
+  static char* xy_os_devnull = "/dev/null"
+
   #define xy_useutf8()
 
 #elif defined(TARGET_OS_MAC) ||defined(__MACOSX__)
@@ -47,6 +51,8 @@
   static bool xy_on_macos   = true;
   static bool xy_on_bsds    = false;
 
+  // set xy_os_devnull
+
   #define xy_useutf8()
 
 #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
@@ -56,6 +62,8 @@
   static bool xy_on_macos   = false;
   static bool xy_on_bsds    = true;
 
+  // set xy_os_devnull
+  
   #define xy_useutf8()
 
 #endif