Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 21:21:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CRT] Correctly share get_ioinfo()/release_ioinfo() functions between code units

Browse source 
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);
This commit is contained in:
Hervé Poussineau 2019-03-30 22:33:33 +01:00
parent c3e2a54789
commit c8719ee865
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sdk/lib/crt/stdio/file.c
View file

@ -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); ioinfo *ret = get_ioinfo_nolock(fd);
if(ret == &__badioinfo) if(ret == &__badioinfo)
@ -260,7 +260,7 @@ static inline ioinfo* get_ioinfo_alloc(int *fd)
return &__badioinfo; return &__badioinfo;
} }
/*static*/ inline void release_ioinfo(ioinfo *info) void release_ioinfo(ioinfo *info)
{ {
if(info!=&__badioinfo && info->exflag & EF_CRIT_INIT) if(info!=&__badioinfo && info->exflag & EF_CRIT_INIT)
LeaveCriticalSection(&info->crit); LeaveCriticalSection(&info->crit);

4
sdk/lib/crt/stdio/stat64.c
View file

@ -3,8 +3,8 @@
#include <direct.h> #include <direct.h>
#include <internal/wine/msvcrt.h> #include <internal/wine/msvcrt.h>
inline ioinfo* get_ioinfo(int fd); ioinfo* get_ioinfo(int fd);
inline void release_ioinfo(ioinfo *info); void release_ioinfo(ioinfo *info);
#define ALL_S_IREAD (_S_IREAD | (_S_IREAD >> 3) | (_S_IREAD >> 6)) #define ALL_S_IREAD (_S_IREAD | (_S_IREAD >> 3) | (_S_IREAD >> 6))
#define ALL_S_IWRITE (_S_IWRITE | (_S_IWRITE >> 3) | (_S_IWRITE >> 6)) #define ALL_S_IWRITE (_S_IWRITE | (_S_IWRITE >> 3) | (_S_IWRITE >> 6))

4
sdk/lib/crt/time/futime.c
View file

@ -41,8 +41,8 @@
#include "bitsfixup.h" #include "bitsfixup.h"
#include <internal/wine/msvcrt.h> #include <internal/wine/msvcrt.h>
inline ioinfo* get_ioinfo(int fd); ioinfo* get_ioinfo(int fd);
inline void release_ioinfo(ioinfo *info); void release_ioinfo(ioinfo *info);
/****************************************************************************** /******************************************************************************
* \name _futime * \name _futime