https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8719ee865e429b130ee38...
commit c8719ee865e429b130ee3823c3c981c23aeafe05 Author: Hervé Poussineau hpoussin@reactos.org AuthorDate: Sat Mar 30 22:33:33 2019 +0100 Commit: Hervé Poussineau hpoussin@reactos.org CommitDate: Mon Apr 1 11:38:32 2019 +0200
[CRT] Correctly share get_ioinfo()/release_ioinfo() functions between code units
This fixes the following compiler errors:
../sdk/lib/crt/stdio/stat64.c:7:13: error: inline function 'release_ioinfo' declared but never defined [-Werror] inline void release_ioinfo(ioinfo *info); ^~~~~~~~~~~~~~ ../sdk/lib/crt/stdio/stat64.c:6:16: error: inline function 'get_ioinfo' declared but never defined [-Werror] inline ioinfo* get_ioinfo(int fd); ^~~~~~~~~~ ../sdk/lib/crt/stdio/file.c:186:5: error: 'init_ioinfo_cs' is static but used in inline function 'get_ioinfo' which is not static [-Werror] init_ioinfo_cs(ret); ^~~~~~~~~~~~~~ ../sdk/lib/crt/stdio/file.c:183:19: error: 'get_ioinfo_nolock' is static but used in inline function 'get_ioinfo' which is not static [-Werror] ioinfo *ret = get_ioinfo_nolock(fd); --- sdk/lib/crt/stdio/file.c | 4 ++-- sdk/lib/crt/stdio/stat64.c | 4 ++-- sdk/lib/crt/time/futime.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sdk/lib/crt/stdio/file.c b/sdk/lib/crt/stdio/file.c index 2357d99bfc..0793a3fffa 100644 --- a/sdk/lib/crt/stdio/file.c +++ b/sdk/lib/crt/stdio/file.c @@ -178,7 +178,7 @@ static inline void init_ioinfo_cs(ioinfo *info) } }
-/*static*/ inline ioinfo* get_ioinfo(int fd) +ioinfo* get_ioinfo(int fd) { ioinfo *ret = get_ioinfo_nolock(fd); if(ret == &__badioinfo) @@ -260,7 +260,7 @@ static inline ioinfo* get_ioinfo_alloc(int *fd) return &__badioinfo; }
-/*static*/ inline void release_ioinfo(ioinfo *info) +void release_ioinfo(ioinfo *info) { if(info!=&__badioinfo && info->exflag & EF_CRIT_INIT) LeaveCriticalSection(&info->crit); diff --git a/sdk/lib/crt/stdio/stat64.c b/sdk/lib/crt/stdio/stat64.c index 26feb528a5..b0791c5700 100644 --- a/sdk/lib/crt/stdio/stat64.c +++ b/sdk/lib/crt/stdio/stat64.c @@ -3,8 +3,8 @@ #include <direct.h> #include <internal/wine/msvcrt.h>
-inline ioinfo* get_ioinfo(int fd); -inline void release_ioinfo(ioinfo *info); +ioinfo* get_ioinfo(int fd); +void release_ioinfo(ioinfo *info);
#define ALL_S_IREAD (_S_IREAD | (_S_IREAD >> 3) | (_S_IREAD >> 6)) #define ALL_S_IWRITE (_S_IWRITE | (_S_IWRITE >> 3) | (_S_IWRITE >> 6)) diff --git a/sdk/lib/crt/time/futime.c b/sdk/lib/crt/time/futime.c index 535012c05e..3c6a20409a 100644 --- a/sdk/lib/crt/time/futime.c +++ b/sdk/lib/crt/time/futime.c @@ -41,8 +41,8 @@ #include "bitsfixup.h" #include <internal/wine/msvcrt.h>
-inline ioinfo* get_ioinfo(int fd); -inline void release_ioinfo(ioinfo *info); +ioinfo* get_ioinfo(int fd); +void release_ioinfo(ioinfo *info);
/****************************************************************************** * \name _futime