From 816181bc95914cbc6ac033d5b53ca69e744e9296 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 9 Apr 2026 14:14:00 -0400 Subject: [PATCH] fs_shell: Adjust to work with the new libroot_build errno setup. I rebuilt fs_shell after the previous commit before pushing, but it didn't fail then. I guess Jam failed to do an incremental rebuild properly... --- headers/private/fs_shell/fssh_errno.h | 4 ++-- src/tools/fs_shell/errno.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/headers/private/fs_shell/fssh_errno.h b/headers/private/fs_shell/fssh_errno.h index 890da56e2b..5239bbca65 100644 --- a/headers/private/fs_shell/fssh_errno.h +++ b/headers/private/fs_shell/fssh_errno.h @@ -11,8 +11,8 @@ extern "C" #define FSSH_ENOERR 0 #define FSSH_EOK FSSH_ENOERR /* some code assumes EOK exists */ -extern int *_fssh_errnop(void); -#define fssh_errno (*(_fssh_errnop())) +extern int _fssh_errno(void); +#define fssh_errno (_fssh_errno()) extern int fssh_get_errno(void); extern void fssh_set_errno(int error); diff --git a/src/tools/fs_shell/errno.cpp b/src/tools/fs_shell/errno.cpp index 06fd7ef30a..cc916dc35a 100644 --- a/src/tools/fs_shell/errno.cpp +++ b/src/tools/fs_shell/errno.cpp @@ -10,10 +10,10 @@ #include -int * -_fssh_errnop(void) +int +_fssh_errno(void) { - return &errno; + return errno; }