Declare global __sf[] only once
Reduced number of global __sf[] declarations from two to one, simplifying initializations in sys/reent.h.
This commit is contained in:
parent
92896d4daa
commit
d041db3792
|
@ -293,6 +293,10 @@ typedef struct __sFILE __FILE;
|
||||||
#endif /* __LARGE64_FILES */
|
#endif /* __LARGE64_FILES */
|
||||||
#endif /* !__CUSTOM_FILE_IO__ */
|
#endif /* !__CUSTOM_FILE_IO__ */
|
||||||
|
|
||||||
|
#ifdef _REENT_GLOBAL_STDIO_STREAMS
|
||||||
|
extern __FILE __sf[3];
|
||||||
|
#endif
|
||||||
|
|
||||||
struct _glue
|
struct _glue
|
||||||
{
|
{
|
||||||
struct _glue *_next;
|
struct _glue *_next;
|
||||||
|
@ -426,7 +430,6 @@ struct _reent
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef _REENT_GLOBAL_STDIO_STREAMS
|
#ifdef _REENT_GLOBAL_STDIO_STREAMS
|
||||||
extern __FILE __sf[3];
|
|
||||||
|
|
||||||
# define _REENT_INIT(var) \
|
# define _REENT_INIT(var) \
|
||||||
{ 0, \
|
{ 0, \
|
||||||
|
@ -698,7 +701,6 @@ struct _reent
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef _REENT_GLOBAL_STDIO_STREAMS
|
#ifdef _REENT_GLOBAL_STDIO_STREAMS
|
||||||
extern __FILE __sf[3];
|
|
||||||
#define _REENT_STDIO_STREAM(var, index) &__sf[index]
|
#define _REENT_STDIO_STREAM(var, index) &__sf[index]
|
||||||
#else
|
#else
|
||||||
#define _REENT_STDIO_STREAM(var, index) &(var)->__sf[index]
|
#define _REENT_STDIO_STREAM(var, index) &(var)->__sf[index]
|
||||||
|
|
Loading…
Reference in New Issue