diff --git a/include/hermit/stdlib.h b/include/hermit/stdlib.h index e79ede32a..4eadb7e99 100644 --- a/include/hermit/stdlib.h +++ b/include/hermit/stdlib.h @@ -121,17 +121,17 @@ void page_free(void* addr, size_t sz); * * @return Long value of the parsed numerical string */ -long __strtol(const char* str, char** endptr, int base); +long _strtol(const char* str, char** endptr, int base); -#define strtol(str, endptr, base) __strtol((str), (endptr), (base)) +#define strtol(str, endptr, base) _strtol((str), (endptr), (base)) /** @brief String to unsigned long * * @return Unsigned long value of the parsed numerical string */ -unsigned long __strtoul(const char* nptr, char** endptr, int base); +unsigned long _strtoul(const char* nptr, char** endptr, int base); -#define strtoul(nptr, endptr, base) __strtoul((nptr), (endptr), (base)) +#define strtoul(nptr, endptr, base) _strtoul((nptr), (endptr), (base)) /** @brief ASCII to integer * @@ -141,7 +141,7 @@ unsigned long __strtoul(const char* nptr, char** endptr, int base); */ static inline int atoi(const char *str) { - return (int)strtol(str, (char **)NULL, 10); + return (int)_strtol(str, (char **)NULL, 10); } #ifdef __cplusplus diff --git a/include/hermit/string.h b/include/hermit/string.h index cc3410d92..2624f6d98 100644 --- a/include/hermit/string.h +++ b/include/hermit/string.h @@ -42,56 +42,56 @@ extern "C" { #endif #if !HAVE_ARCH_MEMCPY -void *__memcpy(void *dest, const void *src, size_t count); +void *_memcpy(void *dest, const void *src, size_t count); -#define memcpy(dest, src, count) __memcpy((dest), (src), (count)) +#define memcpy(dest, src, count) _memcpy((dest), (src), (count)) #endif #if !HAVE_ARCH_MEMSET -void *__memset(void *dest, int val, size_t count); +void *_memset(void *dest, int val, size_t count); -#define memset(dest, val, count) __memset((dest), (val), (count)) +#define memset(dest, val, count) _memset((dest), (val), (count)) #endif #if !HAVE_ARCH_MEMCMP -int __memcmp(const void *s1, const void *s2, size_t n); +int _memcmp(const void *s1, const void *s2, size_t n); -#define memcmp(s1, s2, n) __memcmp((s1), (s2), (n)) +#define memcmp(s1, s2, n) _memcmp((s1), (s2), (n)) #endif #if !HAVE_ARCH_STRLEN -size_t __strlen(const char *str); +size_t _strlen(const char *str); -#define strlen(str) __strlen((str)) +#define strlen(str) _strlen((str)) #endif #if !HAVE_ARCH_STRNCPY -char *__strncpy(char *dest, const char *src, size_t n); +char *_strncpy(char *dest, const char *src, size_t n); -#define strncpy(dest, src, n) __strncpy((dest), (src), (n)) +#define strncpy(dest, src, n) _strncpy((dest), (src), (n)) #endif #if !HAVE_ARCH_STRCPY -char *__strcpy(char *dest, const char *src); +char *_strcpy(char *dest, const char *src); -#define strcpy(dest, src) __strcpy((dest), (src)) +#define strcpy(dest, src) _strcpy((dest), (src)) #endif #if !HAVE_ARCH_STRCMP -int __strcmp(const char *s1, const char *s2); +int _strcmp(const char *s1, const char *s2); -#define strcmp(s1, s2) __strcmp((s1), (s2)) +#define strcmp(s1, s2) _strcmp((s1), (s2)) #endif #if !HAVE_ARCH_STRNCMP -int __strncmp(const char *s1, const char *s2, size_t n); +int _strncmp(const char *s1, const char *s2, size_t n); -#define strncmp(s1, s2, n) __strncmp((s1), (s2), (n)) +#define strncmp(s1, s2, n) _strncmp((s1), (s2), (n)) #endif -char *__strstr(const char *s, const char *find); +char *_strstr(const char *s, const char *find); -#define strstr(s, find) __strstr((s), (find)) +#define strstr(s, find) _strstr((s), (find)) #ifdef __cplusplus } diff --git a/libkern/string.c b/libkern/string.c index 83130da83..31ba69b8b 100644 --- a/libkern/string.c +++ b/libkern/string.c @@ -11,7 +11,7 @@ #include #if !HAVE_ARCH_MEMCPY -void *__memcpy(void *dest, const void *src, size_t count) +void *_memcpy(void *dest, const void *src, size_t count) { size_t i; @@ -26,7 +26,7 @@ void *__memcpy(void *dest, const void *src, size_t count) #endif #if !HAVE_ARCH_MEMSET -void *__memset(void *dest, int val, size_t count) +void *_memset(void *dest, int val, size_t count) { size_t i; @@ -41,7 +41,7 @@ void *__memset(void *dest, int val, size_t count) #endif #if !HAVE_ARCH_MEMCMP -int __memcmp(const void *s1, const void *s2, size_t n) +int _memcmp(const void *s1, const void *s2, size_t n) { if (n != 0) { const unsigned char *p1 = s1, *p2 = s2; @@ -57,7 +57,7 @@ int __memcmp(const void *s1, const void *s2, size_t n) #endif #if !HAVE_ARCH_STRLEN -size_t __strlen(const char *str) +size_t _strlen(const char *str) { size_t len = 0; @@ -72,7 +72,7 @@ size_t __strlen(const char *str) #endif #if !HAVE_ARCH_STRNCPY -char* __strncpy(char *dest, const char *src, size_t n) +char* _strncpy(char *dest, const char *src, size_t n) { size_t i; @@ -91,7 +91,7 @@ char* __strncpy(char *dest, const char *src, size_t n) #endif #if !HAVE_ARCH_STRCPY -char* __strcpy(char *dest, const char *src) +char* _strcpy(char *dest, const char *src) { size_t i; @@ -107,7 +107,7 @@ char* __strcpy(char *dest, const char *src) #endif #if !HAVE_ARCH_STRCMP -int __strcmp(const char *s1, const char *s2) +int _strcmp(const char *s1, const char *s2) { while (*s1 != '\0' && *s1 == *s2) { s1++; @@ -119,7 +119,7 @@ int __strcmp(const char *s1, const char *s2) #endif #if !HAVE_ARCH_STRNCMP -int __strncmp(const char *s1, const char *s2, size_t n) +int _strncmp(const char *s1, const char *s2, size_t n) { if (BUILTIN_EXPECT(n == 0, 0)) return 0; diff --git a/libkern/strstr.c b/libkern/strstr.c index 5ca08146f..ae0898ebc 100644 --- a/libkern/strstr.c +++ b/libkern/strstr.c @@ -48,7 +48,7 @@ * Find the first occurrence of find in s. */ char * -__strstr(s, find) +_strstr(s, find) const char *s, *find; { char c, sc; diff --git a/libkern/strtol.c b/libkern/strtol.c index 94f098c05..7c1998831 100644 --- a/libkern/strtol.c +++ b/libkern/strtol.c @@ -50,7 +50,7 @@ * alphabets and digits are each contiguous. */ long -__strtol(nptr, endptr, base) +_strtol(nptr, endptr, base) const char *nptr; char **endptr; int base; diff --git a/libkern/strtoul.c b/libkern/strtoul.c index a2029a335..a934927e5 100644 --- a/libkern/strtoul.c +++ b/libkern/strtoul.c @@ -50,7 +50,7 @@ * alphabets and digits are each contiguous. */ unsigned long -__strtoul(nptr, endptr, base) +_strtoul(nptr, endptr, base) const char *nptr; char **endptr; int base;