From 532acdc3ece847315f609e1436ef6839c9732862 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sat, 7 Jul 2018 15:04:54 +0100 Subject: [PATCH] Library: add strtok_r everywhere else --- Library/libs/Makefile.6502 | 2 +- Library/libs/Makefile.68000 | 4 ++-- Library/libs/Makefile.6809 | 2 +- Library/libs/Makefile.pdp11 | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Library/libs/Makefile.6502 b/Library/libs/Makefile.6502 index ec0db751..3ee1ee55 100644 --- a/Library/libs/Makefile.6502 +++ b/Library/libs/Makefile.6502 @@ -59,7 +59,7 @@ SRC_C += system.c time.c tmpfile.c tmpnam.c ttyname.c SRC_C += tzset.c umount.c ungetc.c usleep.c utent.c utimes.c utsname.c SRC_C += vfprintf.c vprintf.c wait.c xitoa.c pathconf.c SRC_C += gethostname.c sysconf.c confstr.c memccpy.c getpass.c -SRC_C += strtol.c +SRC_C += strtok_r.c strtol.c # ctype SRC_C += isalnum.c isalpha.c isascii.c isblank.c iscntrl.c isdigit.c SRC_C += isgraph.c islower.c isprint.c ispunct.c isspace.c isupper.c diff --git a/Library/libs/Makefile.68000 b/Library/libs/Makefile.68000 index 5fdd26d7..76b26d56 100644 --- a/Library/libs/Makefile.68000 +++ b/Library/libs/Makefile.68000 @@ -55,10 +55,10 @@ SRC_C += cfmakeraw.c cfspeed.c revoke.c SRC_C += fscanf.c scanf.c sscanf.c vfscanf.c vscanf.c vsscanf.c # Seems to give the compiler a hard time SRC_C += regexp.c -# Pieces we inherit in this case from the compiler library instead +# Pieces we inherit in other cases from the compiler library instead SRC_C += strcpy.c strlen.c abs.c atof.c atoi.c atol.c labs.c SRC_C += strcat.c strchr.c strcmp.c strcspn.c strncat.c strncmp.c -SRC_C += strncpy.c strpbrk.c strrchr.c strspn.c strstr.c strtok.c +SRC_C += strncpy.c strpbrk.c strrchr.c strspn.c strstr.c strtok.c strtok_r.c SRC_C += memchr.c memcmp.c memcpy.c memset.c memmove.c SRC_CT += termcap.c tgetent.c diff --git a/Library/libs/Makefile.6809 b/Library/libs/Makefile.6809 index 742e4d93..4cecd4d9 100644 --- a/Library/libs/Makefile.6809 +++ b/Library/libs/Makefile.6809 @@ -60,7 +60,7 @@ SRC_HARD += regexp.c # Pieces we inherit in this case from the compiler library instead SRC_C += strcpy.c strlen.c abs.c atof.c atoi.c atol.c labs.c SRC_C += strcat.c strchr.c strcmp.c strcspn.c strncat.c strncmp.c -SRC_C += strncpy.c strpbrk.c strrchr.c strspn.c strstr.c strtok.c +SRC_C += strncpy.c strpbrk.c strrchr.c strspn.c strstr.c strtok.c strtok_r.c SRC_C += memchr.c memcmp.c memcpy.c memset.c memmove.c SRC_CT += termcap.c tgetent.c diff --git a/Library/libs/Makefile.pdp11 b/Library/libs/Makefile.pdp11 index c12f008c..6b8e5cd7 100644 --- a/Library/libs/Makefile.pdp11 +++ b/Library/libs/Makefile.pdp11 @@ -57,10 +57,10 @@ SRC_C += cfmakeraw.c cfspeed.c revoke.c SRC_C += fscanf.c scanf.c sscanf.c vfscanf.c vscanf.c vsscanf.c # Seems to give the compiler a hard time SRC_HARD += regexp.c -# Pieces we inherit in this case from the compiler library instead +# Pieces we inherit in some cases from the compiler library instead SRC_C += strcpy.c strlen.c abs.c atof.c atoi.c atol.c labs.c SRC_C += strcat.c strchr.c strcmp.c strcspn.c strncat.c strncmp.c -SRC_C += strncpy.c strpbrk.c strrchr.c strspn.c strstr.c strtok.c +SRC_C += strncpy.c strpbrk.c strrchr.c strspn.c strstr.c strtok.c strtok_r.c SRC_C += memchr.c memcmp.c memcpy.c memset.c memmove.c SRC_CT += termcap.c tgetent.c -- 2.34.1