From bbf44cc000531dc7737d5321ccfa9f2f11b20127 Mon Sep 17 00:00:00 2001 From: Matthias Moulin Date: Mon, 24 Jun 2024 16:11:35 +0200 Subject: [PATCH] Defines are still needed for FMT_MODULE as well (#4027) --- src/os.cc | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/os.cc b/src/os.cc index 7bc18e2a..27366499 100644 --- a/src/os.cc +++ b/src/os.cc @@ -30,25 +30,6 @@ # define WIN32_LEAN_AND_MEAN # endif # include - -# ifndef S_IRUSR -# define S_IRUSR _S_IREAD -# endif -# ifndef S_IWUSR -# define S_IWUSR _S_IWRITE -# endif -# ifndef S_IRGRP -# define S_IRGRP 0 -# endif -# ifndef S_IWGRP -# define S_IWGRP 0 -# endif -# ifndef S_IROTH -# define S_IROTH 0 -# endif -# ifndef S_IWOTH -# define S_IWOTH 0 -# endif # endif // _WIN32 # endif // FMT_USE_FCNTL @@ -57,6 +38,27 @@ # endif #endif +#ifdef _WIN32 +# ifndef S_IRUSR +# define S_IRUSR _S_IREAD +# endif +# ifndef S_IWUSR +# define S_IWUSR _S_IWRITE +# endif +# ifndef S_IRGRP +# define S_IRGRP 0 +# endif +# ifndef S_IWGRP +# define S_IWGRP 0 +# endif +# ifndef S_IROTH +# define S_IROTH 0 +# endif +# ifndef S_IWOTH +# define S_IWOTH 0 +# endif +#endif + namespace { #ifdef _WIN32 // Return type of read and write functions.