diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2020-05-19 07:47:59 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2020-05-19 07:47:59 +0000 |
| commit | cd8a6b943e6728e5a3ac607510af4f574a3f87fd (patch) | |
| tree | e07fe11e0ef9f3d0abe3692afb025e9478f8e74f /include | |
| parent | 0951a97ca9534c0b7e850306673ef0eb8d35c039 (diff) | |
| download | src-cd8a6b943e6728e5a3ac607510af4f574a3f87fd.tar.gz src-cd8a6b943e6728e5a3ac607510af4f574a3f87fd.zip | |
MFC r360983:
Clear namespace pollution in include/malloc_np.h
Notes
Notes:
svn path=/stable/12/; revision=361244
Diffstat (limited to 'include')
| -rw-r--r-- | include/malloc_np.h | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/include/malloc_np.h b/include/malloc_np.h index dca0dd50a62a..fc91cdbf9a90 100644 --- a/include/malloc_np.h +++ b/include/malloc_np.h @@ -33,29 +33,33 @@ #ifndef _MALLOC_NP_H_ #define _MALLOC_NP_H_ -#include <sys/cdefs.h> + #include <sys/types.h> -#include <stdbool.h> -#include <strings.h> + +#ifdef __cplusplus +#define __MyBool bool +#else +#define __MyBool _Bool +#endif __BEGIN_DECLS typedef struct extent_hooks_s extent_hooks_t; -typedef void *(extent_alloc_t)(extent_hooks_t *, void *, size_t, size_t, bool *, - bool *, unsigned); -typedef bool (extent_dalloc_t)(extent_hooks_t *, void *, size_t, bool, - unsigned); -typedef void (extent_destroy_t)(extent_hooks_t *, void *, size_t, bool, +typedef void *(extent_alloc_t)(extent_hooks_t *, void *, size_t, size_t, + __MyBool *, __MyBool *, unsigned); +typedef __MyBool (extent_dalloc_t)(extent_hooks_t *, void *, size_t, __MyBool, unsigned); -typedef bool (extent_commit_t)(extent_hooks_t *, void *, size_t, size_t, size_t, +typedef void (extent_destroy_t)(extent_hooks_t *, void *, size_t, __MyBool, unsigned); -typedef bool (extent_decommit_t)(extent_hooks_t *, void *, size_t, size_t, +typedef __MyBool (extent_commit_t)(extent_hooks_t *, void *, size_t, size_t, 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); -typedef bool (extent_split_t)(extent_hooks_t *, void *, size_t, size_t, size_t, - bool, unsigned); -typedef bool (extent_merge_t)(extent_hooks_t *, void *, size_t, void *, size_t, - bool, unsigned); +typedef __MyBool (extent_split_t)(extent_hooks_t *, void *, size_t, size_t, size_t, + __MyBool, unsigned); +typedef __MyBool (extent_merge_t)(extent_hooks_t *, void *, size_t, void *, size_t, + __MyBool, unsigned); struct extent_hooks_s { extent_alloc_t *alloc; 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); __END_DECLS +#undef __MyBool + #endif /* _MALLOC_NP_H_ */ |