Change concat to cygpath throughout. Change map_filename to cygpath

[cygwin-apps/setup.git] / concat.h

diff --git a/concat.h b/concat.h
index 4a827f8d33c37d1b6fe4c2e9a0e6365257654ccf..a9038c296236774ef32573f4828d3f92da932501 100644 (file)
--- a/concat.h
+++ b/concat.h
@@ -13,13 +13,23 @@
  *
  */
 
+#include <stdarg.h>
+
 /* Pass a null-terminated list of strings, and it concatenates them
    into a single string.  Warning - it assumes the result is a file
    name or URL, and will canonicalize the result accordingly
    (i.e. replace \ with /, collapse multiple /// to a single /, etc.)  */
 
-char * concat (char *s, ...);
+char * concat (const char *s, ...);
+char * vconcat (const char *, va_list);
 
 /* convert slashes to backslashes */
 
 char * backslash (char *s);
+
+/* Used when treating / and \ as equivalent. */
+#define SLASH_P(ch) \
+    ({ \
+        char __c = (ch); \
+        ((__c) == '/' || (__c) == '\\'); \
+    })