From 2f373dee564b1217d73716f2de07e79cccc314bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Pierre=20Andr=C3=A9?= Date: Wed, 30 Sep 2015 09:08:35 +0200 Subject: [PATCH] ntfsprogs Builds on Windows use macroes to translate printing formats, and these macroes redefined "buf" in a way which causes trouble when "buf" has another meaning. Use "_b" instead. --- ntfsprogs/utils.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ntfsprogs/utils.h b/ntfsprogs/utils.h index 396f698e..6335924e 100644 --- a/ntfsprogs/utils.h +++ b/ntfsprogs/utils.h @@ -109,17 +109,17 @@ int mft_next_record(struct mft_search_ctx *ctx); char *ntfs_utils_reformat(char *out, int sz, const char *fmt); char *ntfs_utils_unix_path(const char *in); #define ntfs_log_redirect(fn,fi,li,le,d,fmt, args...) \ - do { char buf[MAX_FMT]; ntfs_log_redirect(fn,fi,li,le,d, \ - ntfs_utils_reformat(buf,MAX_FMT,fmt), args); } while (0) + do { char _b[MAX_FMT]; ntfs_log_redirect(fn,fi,li,le,d, \ + ntfs_utils_reformat(_b,MAX_FMT,fmt), args); } while (0) #define printf(fmt, args...) \ - do { char buf[MAX_FMT]; \ - printf(ntfs_utils_reformat(buf,MAX_FMT,fmt), args); } while (0) + do { char _b[MAX_FMT]; \ + printf(ntfs_utils_reformat(_b,MAX_FMT,fmt), args); } while (0) #define fprintf(str, fmt, args...) \ - do { char buf[MAX_FMT]; \ - fprintf(str, ntfs_utils_reformat(buf,MAX_FMT,fmt), args); } while (0) + do { char _b[MAX_FMT]; \ + fprintf(str, ntfs_utils_reformat(_b,MAX_FMT,fmt), args); } while (0) #define vfprintf(file, fmt, args) \ - do { char buf[MAX_FMT]; vfprintf(file, \ - ntfs_utils_reformat(buf,MAX_FMT,fmt), args); } while (0) + do { char _b[MAX_FMT]; vfprintf(file, \ + ntfs_utils_reformat(_b,MAX_FMT,fmt), args); } while (0) #endif /**