Copied from core compat string methods

This commit is contained in:
Francisco Javier Trujillo Mata 2018-10-25 02:22:11 +02:00
parent 17d30f9dd5
commit 99b77a2c9c
3 changed files with 23 additions and 20 deletions

View File

@ -803,8 +803,6 @@ uint64_t cpu_features_get(void)
cpu |= RETRO_SIMD_PS;
#endif
printf("CPU is %i\n", cpu);
if (cpu & RETRO_SIMD_MMX) strlcat(buf, " MMX", sizeof(buf));
if (cpu & RETRO_SIMD_MMXEXT) strlcat(buf, " MMXEXT", sizeof(buf));
if (cpu & RETRO_SIMD_SSE) strlcat(buf, " SSE", sizeof(buf));

View File

@ -6,31 +6,35 @@
#define ULLONG_MAX UINT64_C(0xffffffffffffffff)
char * strtok_r(char *str, const char *delim, char **nextp)
char *strtok_r(char *str, const char *delim, char **saveptr)
{
char *ret;
char *first = NULL;
if (!saveptr || !delim)
return NULL;
if (str == NULL) {
str = *nextp;
}
if (str)
*saveptr = str;
str += strspn(str, delim);
do
{
char *ptr = NULL;
first = *saveptr;
while (*first && strchr(delim, *first))
*first++ = '\0';
if (*str == '\0') {
return NULL;
}
if (*first == '\0')
return NULL;
ret = str;
ptr = first + 1;
str += strcspn(str, delim);
while (*ptr && !strchr(delim, *ptr))
ptr++;
if (*str) {
*str++ = '\0';
}
*saveptr = ptr + (*ptr ? 1 : 0);
*ptr = '\0';
} while (strlen(first) == 0);
*nextp = str;
return ret;
return first;
}
unsigned long long strtoull(const char * __restrict nptr, char ** __restrict endptr, int base)

View File

@ -1,8 +1,9 @@
#ifndef COMPAT_CTYPE_H
#define COMPAT_CTYPE_H
char *strtok_r(char *str, const char *delim, char **saveptr);
unsigned long long strtoull(const char * __restrict nptr, char ** __restrict endptr, int base);
char * strtok_r(char *str, const char *delim, char **nextp);
int link(const char *oldpath, const char *newpath);