From ad7164b0cbaf9b720ceec32edd5345bfa81df538 Mon Sep 17 00:00:00 2001 From: Greg Eisenhauer Date: Thu, 1 Aug 2024 09:28:55 -0500 Subject: [PATCH] ffs 2024-08-01 (ca70df06) (#4281) Code extracted from: https://github.com/GTkorvo/ffs.git at commit ca70df069f89f78f71fd1129cce7036657b7b559 (master). Upstream Shortlog ----------------- Co-authored-by: ffs Upstream --- thirdparty/ffs/ffs/CMakeLists.txt | 2 +- thirdparty/ffs/ffs/cod/standard.c | 30 ------------------------------ thirdparty/ffs/ffs/version.c | 2 +- 3 files changed, 2 insertions(+), 32 deletions(-) diff --git a/thirdparty/ffs/ffs/CMakeLists.txt b/thirdparty/ffs/ffs/CMakeLists.txt index 3cd2733e9d..18552a04d0 100644 --- a/thirdparty/ffs/ffs/CMakeLists.txt +++ b/thirdparty/ffs/ffs/CMakeLists.txt @@ -7,7 +7,7 @@ if(POLICY CMP0074) cmake_policy(SET CMP0074 NEW) endif() -project(FFS VERSION 3.0.0) +project(FFS VERSION 3.1.1) # Some boilerplate to setup nice output directories include(GNUInstallDirs) diff --git a/thirdparty/ffs/ffs/cod/standard.c b/thirdparty/ffs/ffs/cod/standard.c index df9c7145dd..91311f4995 100644 --- a/thirdparty/ffs/ffs/cod/standard.c +++ b/thirdparty/ffs/ffs/cod/standard.c @@ -525,33 +525,6 @@ char *strtok(char *s1, const char *s2);\n\ int strxfrm(char *s1, const char *s2, int size);\n\ "; -static cod_extern_entry strings_externs[] = -{ -#ifndef _MSC_VER - {"bcmp", (void*)(intptr_t)bcmp}, - {"bcopy", (void*)(intptr_t)bcopy}, - {"bzero", (void*)(intptr_t)bzero}, - {"index", (void*)(intptr_t)index}, - {"rindex", (void*)(intptr_t)rindex}, - {"ffs", (void*)(intptr_t)ffs}, - {"strcasecmp", (void*)(intptr_t)strcasecmp}, - {"strncasecmp", (void*)(intptr_t)strncasecmp}, -#endif - {NULL, NULL} -}; - -static char strings_extern_string[] = "\n\ -int bcmp(const void *m1, const void *m2, int size);\n\ -void bcopy(const void *m1, void *m2, int size);\n\ -void bzero(void *m, int size);\n\ -char *index(const char *s1, int c);\n\ -char *rindex(const char *s1, int c);\n\ -int ffs(int);\n\ -int strcasecmp(const char *s1, const char *s2);\n\ -int strncasecmp(const char *s1, const char *s2, int size);\n\ -"; - - #include static cod_extern_entry math_externs[] = @@ -694,9 +667,6 @@ cod_process_include(char *name, cod_parse_context context) if (strncmp(name, "string", char_count) == 0) { cod_assoc_externs(context, string_externs); cod_parse_for_context(string_extern_string, context); - } else if (strncmp(name, "strings", char_count) == 0) { - cod_assoc_externs(context, strings_externs); - cod_parse_for_context(strings_extern_string, context); } else if (strncmp(name, "math", char_count) == 0) { dlload_externs("libm", math_externs); cod_assoc_externs(context, math_externs); diff --git a/thirdparty/ffs/ffs/version.c b/thirdparty/ffs/ffs/version.c index 8d7e3ee75f..6eed704828 100755 --- a/thirdparty/ffs/ffs/version.c +++ b/thirdparty/ffs/ffs/version.c @@ -1,6 +1,6 @@ #include -static char *FFS_version = "FFS Version 3.0.0 - Sun May 14 17:04:30 EDT 2023\n"; +static char *FFS_version = "FFS Version 3.1.1 - Thu Aug 1 06:18:53 CDT 2024\n"; void FFSprint_version()