diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-10-23 13:24:58 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-10-23 13:24:58 +0000 |
| commit | 0b63f1a2b945ddf1d64cadc422af031f1509cc96 (patch) | |
| tree | 3b91f4b3eaa20f4bb05c23acabe7e5692eb6717d | |
| parent | cd8ec51acf5d153080fe622a28cbf1a81b5bcaaf (diff) | |
| download | gnutls-0b63f1a2b945ddf1d64cadc422af031f1509cc96.tar.gz | |
some alloca-related fixes. Patch by Philip Brown <phil@bolthole.com>.
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | lib/gnutls_mem.h | 3 | ||||
| -rw-r--r-- | lib/minitasn1/mem.h | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 78fcd738e1..b64c9d4af1 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ AC_DEFINE_UNQUOTED(T_OS, "$target_os", [OS name]) dnl Gnutls Version GNUTLS_MAJOR_VERSION=0 GNUTLS_MINOR_VERSION=9 -GNUTLS_MICRO_VERSION=91 +GNUTLS_MICRO_VERSION=92 GNUTLS_VERSION=$GNUTLS_MAJOR_VERSION.$GNUTLS_MINOR_VERSION.$GNUTLS_MICRO_VERSION AC_DEFINE_UNQUOTED(GNUTLS_VERSION, "$GNUTLS_VERSION", [version of gnutls]) @@ -155,7 +155,7 @@ AC_MSG_RESULT([*** AC_HEADER_STDC AC_HEADER_TIME -AC_CHECK_HEADERS(unistd.h strings.h stddef.h) +AC_CHECK_HEADERS(unistd.h strings.h stddef.h alloca.h) AC_CHECK_HEADERS(sys/stat.h sys/types.h sys/socket.h) AC_CHECK_HEADERS(errno.h sys/time.h time.h) AC_CHECK_FUNCS(memmove strnstr mmap,,) diff --git a/lib/gnutls_mem.h b/lib/gnutls_mem.h index 5a95d1da59..2526ec8d58 100644 --- a/lib/gnutls_mem.h +++ b/lib/gnutls_mem.h @@ -12,6 +12,9 @@ typedef void svoid; /* for functions that allocate using gnutls_secure_malloc */ * support alloca. */ #ifdef HAVE_ALLOCA +# ifdef HAVE_ALLOCA_H +# include <alloca.h> +# endif # define gnutls_alloca alloca # define gnutls_afree(x) #else diff --git a/lib/minitasn1/mem.h b/lib/minitasn1/mem.h index e4af84445d..292212a560 100644 --- a/lib/minitasn1/mem.h +++ b/lib/minitasn1/mem.h @@ -5,7 +5,11 @@ * memory leaks may occur in systems which do not * support alloca. */ +#include "../config.h" #ifdef HAVE_ALLOCA +# ifdef HAVE_ALLOCA_H +# include <alloca.h> +# endif # define _asn1_alloca alloca # define _asn1_afree(x) #else |