Tweak what's visible in the standalone environment. We define offsetof

in stand.h typically, but when this is included we can define it
multiple times. However, we don't define bool in stand.h at the
moment, so allow it to be defined inside types.h when we're building
for the standalone environment.

MFC After: 3 days
This commit is contained in:
Warner Losh 2020-09-14 23:27:51 +00:00
parent bb60ba7e22
commit 45472826b9

View file

@ -292,6 +292,10 @@ typedef __uint64_t uoff_t;
typedef char vm_memattr_t; /* memory attribute codes */
typedef struct vm_page *vm_page_t;
#define offsetof(type, field) __offsetof(type, field)
#endif /* _KERNEL */
#if defined(_KERNEL) || defined(_STANDALONE)
#if !defined(__bool_true_false_are_defined) && !defined(__cplusplus)
#define __bool_true_false_are_defined 1
#define false 0
@ -301,10 +305,7 @@ typedef int _Bool;
#endif
typedef _Bool bool;
#endif /* !__bool_true_false_are_defined && !__cplusplus */
#define offsetof(type, field) __offsetof(type, field)
#endif /* _KERNEL */
#endif /* KERNEL || _STANDALONE */
/*
* The following are all things that really shouldn't exist in this header,