From e9dd39f53b343fc00932e212f60720321caa87b9 Mon Sep 17 00:00:00 2001 From: youmetme <321640253@qq.com> Date: Wed, 30 Jul 2025 16:40:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dmsvc=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=5FNoreturn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conanfile.py | 2 +- include/ArgParse.h | 10 +++++++++- src/ArgParse.c | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index 8485c80..d952c58 100644 --- a/conanfile.py +++ b/conanfile.py @@ -6,7 +6,7 @@ import os class loggingRecipe(ConanFile): name = "cargparse" - version = "0.3.0" + version = "0.3.1" license = "MIT" author = "321640253@qq.com" url = "https://gitea.youmetme.wang/youmetme/logging" diff --git a/include/ArgParse.h b/include/ArgParse.h index ba42540..ed195d5 100644 --- a/include/ArgParse.h +++ b/include/ArgParse.h @@ -7,6 +7,14 @@ extern "C" { #endif + +#ifdef _MSC_VER + #define NORETURN __declspec(noreturn) +#else + #define NORETURN _Noreturn +#endif + + #define ARG_DEFAULT_HELP_FLAG "--help" typedef struct ArgParse ArgParse; // 解析器 @@ -303,7 +311,7 @@ char *argParseGenerateHelp(ArgParse *argParse); char * argParseGenerateArgErrorMsg(ArgParse *argParse, char *name, bool short_flag); -_Noreturn void argParseError(ArgParse *argParse, +NORETURN void argParseError(ArgParse *argParse, Command *lastCommand, const char *prefix, const char *suffix); diff --git a/src/ArgParse.c b/src/ArgParse.c index 1142849..f7a71d5 100644 --- a/src/ArgParse.c +++ b/src/ArgParse.c @@ -818,7 +818,7 @@ bool argParseCheckCommandTriggered(ArgParse *argParse, char *command_name) { return command->is_trigged; } -_Noreturn void argParseError(ArgParse *argParse, +NORETURN void argParseError(ArgParse *argParse, Command *lastCommand, const char *prefix, const char *suffix) {