diff options
| -rwxr-xr-x | configure | 29 | ||||
| -rw-r--r-- | lib.c | 35 | ||||
| -rw-r--r-- | lib.h | 2 |
3 files changed, 0 insertions, 66 deletions
@@ -214,7 +214,6 @@ have_termios= have_winsize= termios_define= have_pkgconfig= -have_malloc_usable_size= libffi_cflags= darwin_target= solaris_target= @@ -3418,34 +3417,6 @@ int main(void) break done -printf "Checking for malloc_usable_size ... " - -for header in stdlib malloc malloc_np ; do - cat > conftest.c <<! -#include <$header.h> - -int main(int argc, char **argv) -{ - void *p = malloc(42); - size_t s = malloc_usable_size(p); - return 0; -} -! - - if conftest ; then - printf "yes (<%s.h>)\n" $header - printf "#define HAVE_MALLOC_USABLE_SIZE 1\n" >> config.h - if [ $header != stdlib ] ; then - header=$(printf "%s" $header | tr '[a-z]' '[A-Z]') - printf "#define HAVE_%s_H 1\n" $header >> config.h - fi - have_malloc_usable_size=y - break - fi -done - -[ "$have_malloc_usable_size" ] || printf "no\n" - printf "Checking for termios ... " cat > conftest.c <<! @@ -48,9 +48,6 @@ #if HAVE_MALLOC_H #include <malloc.h> #endif -#if HAVE_MALLOC_NP_H -#include <malloc_np.h> -#endif #include "lib.h" #include "gc.h" #include "arith.h" @@ -5238,9 +5235,7 @@ val string_own(wchar_t *str) obj->st.type = STR; obj->st.str = str; obj->st.len = nil; -#if !HAVE_MALLOC_USABLE_SIZE obj->st.alloc = 0; -#endif return obj; } @@ -5250,9 +5245,7 @@ val string(const wchar_t *str) obj->st.type = STR; obj->st.str = chk_strdup(str); obj->st.len = nil; -#if !HAVE_MALLOC_USABLE_SIZE obj->st.alloc = 0; -#endif return obj; } @@ -5262,9 +5255,7 @@ val string_utf8(const char *str) obj->st.type = STR; obj->st.str = utf8_dup_from(str); obj->st.len = nil; -#if !HAVE_MALLOC_USABLE_SIZE obj->st.alloc = 0; -#endif return obj; } @@ -5300,9 +5291,7 @@ val mkstring(val len, val ch_in) wmemset(str, c_chr(ch), l); str[l] = 0; s->st.len = len; -#if !HAVE_MALLOC_USABLE_SIZE s->st.alloc = c_num(len, self) + 1; -#endif return s; } @@ -5317,9 +5306,7 @@ val mkustring(val len) val s = string_own(str); str[l] = 0; s->st.len = len; -#if !HAVE_MALLOC_USABLE_SIZE s->st.alloc = c_num(len, self) + 1; -#endif return s; } @@ -5408,11 +5395,7 @@ val string_extend(val str, val tail, val finish_in) { val finish = default_null_arg(finish_in); cnum len = c_fixnum(length_str(str), self); -#if HAVE_MALLOC_USABLE_SIZE - cnum oalloc = malloc_usable_size(str->st.str) / sizeof str->st.str[0]; -#else cnum oalloc = str->st.alloc; -#endif cnum alloc = oalloc, delta, needed; if (stringp(tail)) @@ -5439,9 +5422,7 @@ val string_extend(val str, val tail, val finish_in) if (alloc != oalloc) { str->st.str = chk_wrealloc(str->st.str, alloc); -#if !HAVE_MALLOC_USABLE_SIZE str->st.alloc = alloc; -#endif } } @@ -5465,18 +5446,12 @@ val string_finish(val str) { cnum len = c_fixnum(length_str(str), self); -#if HAVE_MALLOC_USABLE_SIZE - cnum alloc = malloc_usable_size(str->st.str) / sizeof str->st.str[0]; -#else cnum alloc = str->st.alloc; -#endif if (alloc > len + 1) { alloc = len + 1; str->st.str = chk_wrealloc(str->st.str, alloc); -#if !HAVE_MALLOC_USABLE_SIZE str->st.alloc = alloc; -#endif } } @@ -5490,11 +5465,7 @@ val string_set_code(val str, val code) { cnum len = c_fixnum(length_str(str), self); -#if HAVE_MALLOC_USABLE_SIZE - cnum alloc = malloc_usable_size(str->st.str) / sizeof str->st.str[0]; -#else cnum alloc = str->st.alloc; -#endif if (alloc < len + 2) { string_extend(str, one, t); @@ -5516,11 +5487,7 @@ val string_get_code(val str) { cnum len = c_fixnum(length_str(str), self); -#if HAVE_MALLOC_USABLE_SIZE - cnum alloc = malloc_usable_size(str->st.str) / sizeof str->st.str[0]; -#else cnum alloc = str->st.alloc; -#endif if (alloc >= len + 2) return num(str->st.str[len + 1]); @@ -5566,9 +5533,7 @@ val length_str(val str) case STR: if (!str->st.len) { set(mkloc(str->st.len, str), num(wcslen(str->st.str))); -#if !HAVE_MALLOC_USABLE_SIZE str->st.alloc = c_num(str->st.len, self) + 1; -#endif } return str->st.len; default: @@ -160,9 +160,7 @@ struct string { obj_common; wchar_t *str; val len; -#if !HAVE_MALLOC_USABLE_SIZE cnum alloc; -#endif }; typedef struct { |