diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-06-04 00:30:34 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-04 00:30:34 +0300 |
| commit | b3b2ddced295c26134568cf879488a921a352865 (patch) | |
| tree | 2933bae2dd17545280f0bdcf38eca1e03d93d3bf /git-compat-util.h | |
| parent | 83937e9592832408670da38bfe6e96c90ad63521 (diff) | |
| parent | 89c6e450fe4a919ecb6fa698005a935531c732cf (diff) | |
Merge branch 'ds/bundle-uri'
Preliminary code refactoring around transport and bundle code.
* ds/bundle-uri:
bundle.h: make "fd" version of read_bundle_header() public
remote: allow relative_url() to return an absolute url
remote: move relative_url()
http: make http_get_file() external
fetch-pack: move --keep=* option filling to a function
fetch-pack: add a deref_without_lazy_fetch_extended()
dir API: add a generalized path_match_flags() function
connect.c: refactor sending of agent & object-format
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index ddc3fa2a4e..d9457b9aae 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -236,6 +236,12 @@ #include <sys/sysctl.h> #endif +/* Used by compat/win32/path-utils.h, and more */ +static inline int is_xplatform_dir_sep(int c) +{ + return c == '/' || c == '\\'; +} + #if defined(__CYGWIN__) #include "compat/win32/path-utils.h" #endif @@ -416,11 +422,11 @@ static inline int git_skip_dos_drive_prefix(char **path) #define skip_dos_drive_prefix git_skip_dos_drive_prefix #endif -#ifndef is_dir_sep static inline int git_is_dir_sep(int c) { return c == '/'; } +#ifndef is_dir_sep #define is_dir_sep git_is_dir_sep #endif |