# HG changeset patch
# User Christian Kamm <kamm incasoftware de>
# Date 1217759231 -7200
# Node ID f7ba5f705d59747cb75cb1372b8132e15b79828d
# Parent  2b28fd92bab86ddfa76536993b8468a864d377dd
Path combining on Windows didn't work with / properly.

diff -r 2b28fd92bab8 -r f7ba5f705d59 dmd/root.c
--- a/dmd/root.c	Sun Aug 03 12:26:43 2008 +0200
+++ b/dmd/root.c	Sun Aug 03 12:27:11 2008 +0200
@@ -324,17 +324,16 @@
     f = (char *)mem.malloc(pathlen + 1 + namelen + 1);
     memcpy(f, path, pathlen);
 
-    if (path[pathlen - 1] != '/')
+    if (
+	path[pathlen - 1] != '/'
+#if _WIN32
+	&& path[pathlen - 1] != '\\' && path[pathlen - 1] != ':'
+#endif
+    )
     {	f[pathlen] = '/';
 	pathlen++;
     }
 
-#if _WIN32
-    if (path[pathlen - 1] != '\\' && path[pathlen - 1] != ':')
-    {	f[pathlen] = '\\';
-	pathlen++;
-    }
-#endif
     memcpy(f + pathlen, name, namelen + 1);
     return f;
 }