From: Joel Rosdahl <joel@rosdahl.net>
Date: Tue, 6 Jul 2021 06:44:25 +0000 (+0200)
Subject: Remove now mostly superfluous DIR_DELIM_CH macro
X-Git-Tag: v4.4~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01974656e4ad98af7e871e62e3a992ba6e3eea1f;p=thirdparty%2Fccache.git

Remove now mostly superfluous DIR_DELIM_CH macro
---

diff --git a/src/system.hpp b/src/system.hpp
index 191f5e30a..424891f7e 100644
--- a/src/system.hpp
+++ b/src/system.hpp
@@ -174,11 +174,9 @@ const mode_t S_IWUSR = mode_t(_S_IWRITE);
 #  define STDIN_FILENO 0
 #  define STDOUT_FILENO 1
 #  define STDERR_FILENO 2
-#  define DIR_DELIM_CH '\\'
 #  define PATH_DELIM ";"
 #else
 #  define DLLIMPORT
-#  define DIR_DELIM_CH '/'
 #  define PATH_DELIM ":"
 #endif
 
diff --git a/unittest/test_Util.cpp b/unittest/test_Util.cpp
index a96e64456..4720c8ba5 100644
--- a/unittest/test_Util.cpp
+++ b/unittest/test_Util.cpp
@@ -354,8 +354,8 @@ TEST_CASE("Util::get_extension")
 static inline std::string
 os_path(std::string path)
 {
-#if !defined(HAVE_DIRENT_H) && DIR_DELIM_CH != '/'
-  std::replace(path.begin(), path.end(), '/', DIR_DELIM_CH);
+#if defined(_WIN32) && !defined(HAVE_DIRENT_H)
+  std::replace(path.begin(), path.end(), '/', '\\');
 #endif
 
   return path;