From 86fa7b296caa091918bb4a778fcd98ef62be7870 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Mon, 3 Jul 2023 06:42:21 -0700
Subject: [PATCH] Rename SDL_strtokr() to SDL_strtok_r()
---
src/codecs/timidity/timidity.c | 4 ++--
src/music.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/codecs/timidity/timidity.c b/src/codecs/timidity/timidity.c
index f5d81c5c..96ff8104 100644
--- a/src/codecs/timidity/timidity.c
+++ b/src/codecs/timidity/timidity.c
@@ -84,13 +84,13 @@ static int read_config_file(const char *name, int rcf_count)
{
line++;
words=0;
- w[0]=SDL_strtokr(tmp, " \t\240", &endp);
+ w[0]=SDL_strtok_r(tmp, " \t\240", &endp);
if (!w[0]) continue;
/* Originally the TiMidity++ extensions were prefixed like this */
if (SDL_strcmp(w[0], "#extension") == 0)
{
- w[0]=SDL_strtokr(0, " \t\240", &endp);
+ w[0]=SDL_strtok_r(0, " \t\240", &endp);
if (!w[0]) continue;
}
diff --git a/src/music.c b/src/music.c
index 1458bbcc..ad95bb27 100644
--- a/src/music.c
+++ b/src/music.c
@@ -1565,8 +1565,8 @@ int Mix_EachSoundFont(int (SDLCALL *function)(const char*, void*), void *data)
#else
#define PATHSEP ":;"
#endif
- for (path = SDL_strtokr(paths, PATHSEP, &context); path;
- path = SDL_strtokr(NULL, PATHSEP, &context)) {
+ for (path = SDL_strtok_r(paths, PATHSEP, &context); path;
+ path = SDL_strtok_r(NULL, PATHSEP, &context)) {
if (!function(path, data)) {
continue;
}