summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Herrera2018-03-15 13:02:51 +0000
committerAlvaro Herrera2018-03-15 13:02:59 +0000
commit8d1b805fcc57be47d3269a13eb01d993fe768295 (patch)
tree3ee51009a6f645b5fc399350c98b780a1ba37b54
parente69f5e0efcaf3f26381e56a1507cdf401bf1bdfd (diff)
restrict -> pg_restrict
So that it works on MSVC, too. Author: MichaĆ«l Paquier Discussion: https://postgr.es/m/[email protected]
-rw-r--r--src/common/string.c2
-rw-r--r--src/include/common/string.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/common/string.c b/src/common/string.c
index a45e9b8858..3260d37a84 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 23e2e01f0e..63c3e81a64 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 */