From 8d1b805fcc57be47d3269a13eb01d993fe768295 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Thu, 15 Mar 2018 10:02:51 -0300 Subject: [PATCH] restrict -> pg_restrict MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So that it works on MSVC, too. Author: Michaël Paquier Discussion: https://postgr.es/m/29889.1520968202@sss.pgh.pa.us --- src/common/string.c | 2 +- src/include/common/string.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/string.c b/src/common/string.c index a45e9b88580..3260d37a84e 100644 --- a/src/common/string.c +++ b/src/common/string.c @@ -47,7 +47,7 @@ pg_str_endswith(const char *str, const char *end) * strtoint --- just like strtol, but returns int not long */ int -strtoint(const char *restrict str, char **restrict endptr, int base) +strtoint(const char *pg_restrict str, char **pg_restrict endptr, int base) { long val; diff --git a/src/include/common/string.h b/src/include/common/string.h index 23e2e01f0e7..63c3e81a644 100644 --- a/src/include/common/string.h +++ b/src/include/common/string.h @@ -11,6 +11,7 @@ #define COMMON_STRING_H extern bool pg_str_endswith(const char *str, const char *end); -extern int strtoint(const char *restrict str, char **restrict endptr, int base); +extern int strtoint(const char *pg_restrict str, char **pg_restrict endptr, + int base); #endif /* COMMON_STRING_H */