From 4a438db29d361b7e5f47b86ced1482a96cde86ea Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Thu, 16 Aug 2012 15:19:44 -0400 Subject: [PATCH] drop __restrict some more, to please old compilers Avoid the __restrict keyword in roken to appease older compilers. --- lib/roken/roken.h.in | 4 ++-- lib/roken/strtoll.c | 2 +- lib/roken/strtoull.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in index bf05de3d5..82c973b77 100644 --- a/lib/roken/roken.h.in +++ b/lib/roken/roken.h.in @@ -1051,7 +1051,7 @@ localtime_r(const time_t *, struct tm *); #define strtoll rk_strtoll #endif ROKEN_LIB_FUNCTION long long ROKEN_LIB_CALL -strtoll(const char * __restrict nptr, char ** __restrict endptr, int base); +strtoll(const char * nptr, char ** endptr, int base); #endif #if !defined(HAVE_STRTOULL) || defined(NEED_STRTOULL_PROTO) @@ -1059,7 +1059,7 @@ strtoll(const char * __restrict nptr, char ** __restrict endptr, int base); #define strtoull rk_strtoull #endif ROKEN_LIB_FUNCTION unsigned long long ROKEN_LIB_CALL -strtoull(const char * __restrict nptr, char ** __restrict endptr, int base); +strtoull(const char * nptr, char ** endptr, int base); #endif #if !defined(HAVE_STRSVIS) || defined(NEED_STRSVIS_PROTO) diff --git a/lib/roken/strtoll.c b/lib/roken/strtoll.c index 89e1a77d3..1be876131 100644 --- a/lib/roken/strtoll.c +++ b/lib/roken/strtoll.c @@ -53,7 +53,7 @@ * alphabets and digits are each contiguous. */ ROKEN_LIB_FUNCTION long long ROKEN_LIB_CALL -strtoll(const char * __restrict nptr, char ** __restrict endptr, int base) +strtoll(const char * nptr, char ** endptr, int base) { const char *s; unsigned long long acc; diff --git a/lib/roken/strtoull.c b/lib/roken/strtoull.c index b954a0706..cdf59448f 100644 --- a/lib/roken/strtoull.c +++ b/lib/roken/strtoull.c @@ -53,7 +53,7 @@ * alphabets and digits are each contiguous. */ ROKEN_LIB_FUNCTION unsigned long long ROKEN_LIB_CALL -strtoull(const char * __restrict nptr, char ** __restrict endptr, int base) +strtoull(const char * nptr, char ** endptr, int base) { const char *s; unsigned long long acc;