Skip to content

[CF] One malloc_default_zone macro for non-macOS. #2632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 29, 2020
Merged

[CF] One malloc_default_zone macro for non-macOS. #2632

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions CoreFoundation/Base.subproj/CoreFoundation_Prefix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,8 @@ CF_INLINE uint64_t mach_absolute_time() {
return (uint64_t)ts.tv_nsec + (uint64_t)ts.tv_sec * 1000000000UL;
#endif
}

#define malloc_default_zone() (void *)0
#endif // TARGET_OS_LINUX || TARGET_OS_BSD || TARGET_OS_WIN32

#if TARGET_OS_LINUX || TARGET_OS_WIN32 || defined(__OpenBSD__)
Expand Down Expand Up @@ -268,9 +270,6 @@ typedef unsigned long fd_mask;
CF_INLINE size_t malloc_size(void *memblock) {
return malloc_usable_size(memblock);
}

#define malloc_default_zone() (void *)0

#endif

#if TARGET_OS_BSD
Expand Down Expand Up @@ -324,7 +323,6 @@ CF_EXPORT int _NS_access(const char *name, int amode);

#define __PRETTY_FUNCTION__ __FUNCTION__

#define malloc_default_zone() (void *)0
#define malloc_zone_from_ptr(a) (void *)0
#define malloc_zone_malloc(zone,size) malloc(size)
#define malloc_zone_memalign(zone,align,size) malloc(size)
Expand Down