fix the build of eagi-test on Solaris in combination with astmm

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@13630 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/agi/Makefile b/agi/Makefile
index a2f3bee057696d5faff133ac5a90018b53b6938f..e245877207654e874b538aac493e6be86defda4f 100644 (file)
--- a/agi/Makefile
+++ b/agi/Makefile
@@ -13,7 +13,7 @@
 
 AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
 
-CFLAGS+=
+CFLAGS+=-DNO_AST_MM
 
 LIBS=
 ifeq ($(OSARCH),SunOS)

diff --git a/strcompat.c b/strcompat.c
index 8c9916d23bbbcc1c548ec73cda6e3e2059d66f71..93a6b0c2b413fa65b2f3a2ad835c223e80bd899e 100644 (file)
--- a/strcompat.c
+++ b/strcompat.c
@@ -33,21 +33,18 @@ char* strsep(char** str, const char* delims)
 int setenv(const char *name, const char *value, int overwrite)
 {
        unsigned char *buf;
-       int buflen, ret;
+       int buflen;
 
        buflen = strlen(name) + strlen(value) + 2;
-       if ((buf = malloc(buflen)) == NULL)
+       if (!(buf = alloca(buflen)))
                return -1;
 
        if (!overwrite && getenv(name))
                return 0;
 
        snprintf(buf, buflen, "%s=%s", name, value);
-       ret = putenv(buf);
 
-       free(buf);
-
-       return ret;
+       return putenv(buf);
 }
 
 void unsetenv(const char *name)