diff options
| author | David Robillard <d@drobilla.net> | 2021-01-17 11:10:10 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2021-01-17 12:00:53 +0100 |
| commit | c4c4ec510dbeff61982e4aee7d1b379539319cd9 (patch) | |
| tree | 942e531045244973fa62537489220789d4b1c105 | |
| parent | 989417824307f10ae75f8b9e0d6aa639a619faaf (diff) | |
| download | serd-c4c4ec510dbeff61982e4aee7d1b379539319cd9.tar.gz serd-c4c4ec510dbeff61982e4aee7d1b379539319cd9.tar.bz2 serd-c4c4ec510dbeff61982e4aee7d1b379539319cd9.zip | |
Remove aligned_alloc support
This causes build issues when targeting older versions of MacOS. That could be
fixed, but I don't have the ability to reproduce it at the moment, and it's a
problem in the build system check code which is about to be entirely replaced
anyway.
Since, as far as I know, this does not actually add aligned allocation support
to any real system (they all support one of the other methods), just remove it
for now.
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | src/serd_config.h | 17 | ||||
| -rw-r--r-- | src/system.c | 2 | ||||
| -rw-r--r-- | wscript | 7 |
4 files changed, 2 insertions, 27 deletions
@@ -2,9 +2,10 @@ serd (0.30.9) unstable; * Add fallback configuration if documentation theme is unavailable * Fix SERD_DISABLE_DEPRECATED + * Fix building for older MacOS versions on newer MacOS * Fix documentation installation directory - -- David Robillard <d@drobilla.net> Sat, 16 Jan 2021 21:22:27 +0000 + -- David Robillard <d@drobilla.net> Sun, 17 Jan 2021 10:09:13 +0000 serd (0.30.8) stable; diff --git a/src/serd_config.h b/src/serd_config.h index 0cb83b2f..2566f4be 100644 --- a/src/serd_config.h +++ b/src/serd_config.h @@ -44,17 +44,6 @@ # endif # endif -// C99 and C++11: aligned_alloc() -# ifndef HAVE_ALIGNED_ALLOC -# if !defined(__APPLE__) && !defined(_WIN32) -# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L -# define HAVE_ALIGNED_ALLOC -# elif defined(__cplusplus) && __cplusplus >= 201103L -# define HAVE_ALIGNED_ALLOC -# endif -# endif -# endif - // POSIX.1-2001: fileno() # ifndef HAVE_FILENO # if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L @@ -88,12 +77,6 @@ if the build system defines them all. */ -#ifdef HAVE_ALIGNED_ALLOC -# define USE_ALIGNED_ALLOC 1 -#else -# define USE_ALIGNED_ALLOC 0 -#endif - #ifdef HAVE_FILENO # define USE_FILENO 1 #else diff --git a/src/system.c b/src/system.c index 12672d47..6bc93ca6 100644 --- a/src/system.c +++ b/src/system.c @@ -55,8 +55,6 @@ serd_malloc_aligned(const size_t alignment, const size_t size) { #if defined(_WIN32) return _aligned_malloc(size, alignment); -#elif USE_ALIGNED_ALLOC - return aligned_alloc(alignment, size); #elif USE_POSIX_MEMALIGN void* ptr = NULL; const int ret = posix_memalign(&ptr, alignment, size); @@ -123,13 +123,6 @@ def configure(conf): if Options.options.largefile: conf.env.append_unique('DEFINES', ['_FILE_OFFSET_BITS=64']) - conf.check_function('c', 'aligned_alloc', - header_name = 'stdlib.h', - return_type = 'void*', - arg_types = 'size_t,size_t', - define_name = 'HAVE_ALIGNED_ALLOC', - mandatory = False) - if not Options.options.no_posix: funcs = {'posix_memalign': ('stdlib.h', 'int', 'void**,size_t,size_t'), 'posix_fadvise': ('fcntl.h', 'int', 'int,off_t,off_t,int'), |