d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clear namespace pollution in include/malloc_np.h

Browse Source 
Do not include stdbool.h, it makes the header incompatible with some
third-party code that typedefs bool manually.
Remove inclusion of strings.h, which typically conflicts with the use
of symbol 'index'.
Separate inclusion of sys/cdefs.h is not needed because sys/types.h
already handles that.

Exp-run by:	antoine (PR 245366)
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D24297
This commit is contained in:
Konstantin Belousov 2020-05-12 18:12:20 +00:00
parent bc74b81991
commit 4f5f00d82d
1 changed files with 21 additions and 15 deletions

36
include/malloc_np.h

@ -33,29 +33,33 @@
#ifndef _MALLOC_NP_H_ #ifndef _MALLOC_NP_H_
#define _MALLOC_NP_H_ #define _MALLOC_NP_H_
#include <sys/cdefs.h>
#include <sys/types.h> #include <sys/types.h>
#include <stdbool.h>
#include <strings.h> #ifdef __cplusplus
#define __MyBool bool
#else
#define __MyBool _Bool
#endif
__BEGIN_DECLS __BEGIN_DECLS
typedef struct extent_hooks_s extent_hooks_t; typedef struct extent_hooks_s extent_hooks_t;
typedef void *(extent_alloc_t)(extent_hooks_t *, void *, size_t, size_t, bool *, typedef void *(extent_alloc_t)(extent_hooks_t *, void *, size_t, size_t,
bool *, unsigned); __MyBool *, __MyBool *, unsigned);
typedef bool (extent_dalloc_t)(extent_hooks_t *, void *, size_t, bool, typedef __MyBool (extent_dalloc_t)(extent_hooks_t *, void *, size_t, __MyBool,
unsigned); unsigned);
typedef void (extent_destroy_t)(extent_hooks_t *, void *, size_t, bool, typedef void (extent_destroy_t)(extent_hooks_t *, void *, size_t, __MyBool,
unsigned); unsigned);
typedef bool (extent_commit_t)(extent_hooks_t *, void *, size_t, size_t, size_t, typedef __MyBool (extent_commit_t)(extent_hooks_t *, void *, size_t, size_t,
unsigned);
typedef bool (extent_decommit_t)(extent_hooks_t *, void *, size_t, size_t,
size_t, unsigned); size_t, unsigned);
typedef bool (extent_purge_t)(extent_hooks_t *, void *, size_t, size_t, size_t, typedef __MyBool (extent_decommit_t)(extent_hooks_t *, void *, size_t, size_t,
size_t, unsigned);
typedef __MyBool (extent_purge_t)(extent_hooks_t *, void *, size_t, size_t, size_t,
unsigned); unsigned);
typedef bool (extent_split_t)(extent_hooks_t *, void *, size_t, size_t, size_t, typedef __MyBool (extent_split_t)(extent_hooks_t *, void *, size_t, size_t, size_t,
bool, unsigned); __MyBool, unsigned);
typedef bool (extent_merge_t)(extent_hooks_t *, void *, size_t, void *, size_t, typedef __MyBool (extent_merge_t)(extent_hooks_t *, void *, size_t, void *, size_t,
bool, unsigned); __MyBool, unsigned);
struct extent_hooks_s { struct extent_hooks_s {
extent_alloc_t *alloc; extent_alloc_t *alloc;
extent_dalloc_t *dalloc; extent_dalloc_t *dalloc;
@ -120,4 +124,6 @@ void __sdallocx(void *ptr, size_t size, int flags);
size_t __nallocx(size_t size, int flags); size_t __nallocx(size_t size, int flags);
__END_DECLS __END_DECLS
#undef __MyBool
#endif /* _MALLOC_NP_H_ */ #endif /* _MALLOC_NP_H_ */