From 5b0aa1cb578914426a26573ba3a7b34dfd65bf04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eliseo=20Marti=CC=81nez?= Date: Sun, 20 Apr 2014 15:00:31 +0200 Subject: [PATCH] Use portable format specifiers: Adapt EMSGN/emsgn to use (int64_t). --- src/misc2.c | 4 ++-- src/misc2.h | 2 +- src/vim.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/misc2.c b/src/misc2.c index 452535d46e..a5a9393bcf 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -1365,10 +1365,10 @@ int emsg3(char_u *s, char_u *a1, char_u *a2) } /* - * Print an error message with one "%ld" and one long int argument. + * Print an error message with one "%" PRId64 and one (int64_t) argument. * This is not in message.c to avoid a warning for prototypes. */ -int emsgn(char_u *s, long n) +int emsgn(char_u *s, int64_t n) { if (emsg_not_now()) return TRUE; /* no error messages at the moment */ diff --git a/src/misc2.h b/src/misc2.h index 4762af08a9..ddac0dbd7e 100644 --- a/src/misc2.h +++ b/src/misc2.h @@ -61,7 +61,7 @@ int illegal_slash(char *name); int vim_chdir(char_u *new_dir); void sort_strings(char_u **files, int count); int emsg3(char_u *s, char_u *a1, char_u *a2); -int emsgn(char_u *s, long n); +int emsgn(char_u *s, int64_t n); int get2c(FILE *fd); int get3c(FILE *fd); int get4c(FILE *fd); diff --git a/src/vim.h b/src/vim.h index d4cc7181f8..d08b3b2558 100644 --- a/src/vim.h +++ b/src/vim.h @@ -1046,7 +1046,7 @@ typedef enum { #define EMSG2(s, p) emsg2((char_u *)(s), (char_u *)(p)) #define EMSG3(s, p, q) emsg3((char_u *)(s), (char_u *)(p), \ (char_u *)(q)) -#define EMSGN(s, n) emsgn((char_u *)(s), (long)(n)) +#define EMSGN(s, n) emsgn((char_u *)(s), (int64_t)(n)) #define EMSGU(s, n) emsgu((char_u *)(s), (long_u)(n)) #define OUT_STR(s) out_str((char_u *)(s)) #define OUT_STR_NF(s) out_str_nf((char_u *)(s))