[PATCH 1/2] mingw.h: permit arguments with side effects for is_dir_sep
- From
Johannes Sixt <j6t@kdbg.org>
- Date
- May 20, 2017, 06:28 UTC
- Message-ID
- <69bafb7c9e08ba837a9b92573bef165a62c5bf92.1495261020.git.j6t@kdbg.org>
- In-Reply-To
- <cover.1495261020.git.j6t@kdbg.org>
The implementation of is_dir_sep in git-compat-util.h uses an inline function. Use one also for the implementation in compat/mingw.h to support non-trivial argument expressions.
Signed-off-by: Johannes Sixt <j6t@kdbg.org> --- compat/mingw.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/compat/mingw.h b/compat/mingw.h index cdc112526a..5e8447019b 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -398,7 +398,11 @@ HANDLE winansi_get_osfhandle(int fd); (isalpha(*(path)) && (path)[1] == ':' ? 2 : 0) int mingw_skip_dos_drive_prefix(char **path); #define skip_dos_drive_prefix mingw_skip_dos_drive_prefix -#define is_dir_sep(c) ((c) == '/' || (c) == '\\') +static inline int mingw_is_dir_sep(int c) +{ + return c == '/' || c == '\\'; +} +#define is_dir_sep mingw_is_dir_sep static inline char *mingw_find_last_dir_sep(const char *path) { char *ret = NULL;
-- 2.13.0.55.g17b7d13330