mirror of
https://github.com/RubyMetric/chsrc.git
synced 2025-02-02 12:12:59 +08:00
Fix conflicts
This commit is contained in:
parent
890bf23b28
commit
565d9a55e8
8
helper.h
8
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
|
||||
|
|
Loading…
Reference in New Issue
Block a user