aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2003-08-20 15:47:57 +0000
committerDave Love2003-08-20 15:47:57 +0000
commitac06b30be555b80969e2b02dd78f5abde4ec498a (patch)
tree565d72b486a85db8ab8beb40533f0f998a7f2be2
parent70d762721047e474506b4981e7cfb3855ca1a6d8 (diff)
downloademacs-ac06b30be555b80969e2b02dd78f5abde4ec498a.tar.gz
emacs-ac06b30be555b80969e2b02dd78f5abde4ec498a.zip
Remove obsolete references to alloca.
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/Makefile.in15
2 files changed, 7 insertions, 12 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e6b6b4c2ef7..96d2b27ed74 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
12003-08-20 Dave Love <fx@gnu.org>
2
3 * Makefile.in: Remove obsolete references to alloca.
4
12003-07-29 Ken Brush <ken@wirex.com> 52003-07-29 Ken Brush <ken@wirex.com>
2 6
3 * emacsclient.c (main) 7 * emacsclient.c (main)
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 1554b347113..85eef17df63 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -27,7 +27,6 @@ SHELL = /bin/sh
27 27
28CC=@CC@ 28CC=@CC@
29CFLAGS=@CFLAGS@ 29CFLAGS=@CFLAGS@
30ALLOCA=@ALLOCA@
31version=@version@ 30version=@version@
32configuration=@configuration@ 31configuration=@configuration@
33EXEEXT=@EXEEXT@ 32EXEEXT=@EXEEXT@
@@ -145,12 +144,6 @@ MOVE_FLAGS=
145#define NOT_C_CODE 144#define NOT_C_CODE
146#include "../src/config.h" 145#include "../src/config.h"
147 146
148/* We won't really call alloca;
149 don't let the file name alloca.c get messed up. */
150#ifdef alloca
151#undef alloca
152#endif
153
154/* Some machines don\'t find the standard C libraries in the usual place. */ 147/* Some machines don\'t find the standard C libraries in the usual place. */
155#ifndef ORDINARY_LINK 148#ifndef ORDINARY_LINK
156#ifndef LIB_STANDARD_LIBSRC 149#ifndef LIB_STANDARD_LIBSRC
@@ -389,14 +382,12 @@ test-distrib${EXEEXT}: ${srcdir}/test-distrib.c
389 $(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c 382 $(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
390 ./test-distrib ${srcdir}/testfile 383 ./test-distrib ${srcdir}/testfile
391 384
392GETOPTOBJS = getopt.o getopt1.o $(ALLOCA) 385GETOPTOBJS = getopt.o getopt1.o
393GETOPTDEPS = $(GETOPTOBJS) ${srcdir}/getopt.h 386GETOPTDEPS = $(GETOPTOBJS) ${srcdir}/getopt.h
394getopt.o: ${srcdir}/getopt.c ${srcdir}/getopt.h 387getopt.o: ${srcdir}/getopt.c ${srcdir}/getopt.h
395 ${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt.c 388 ${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt.c
396getopt1.o: ${srcdir}/getopt1.c ${srcdir}/getopt.h 389getopt1.o: ${srcdir}/getopt1.c ${srcdir}/getopt.h
397 ${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c 390 ${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c
398alloca.o: ${srcdir}/alloca.c
399 ${CC} -Demacs -c ${BASE_CFLAGS} ${srcdir}/alloca.c
400 391
401#ifdef REGEXP_IN_LIBC 392#ifdef REGEXP_IN_LIBC
402REGEXPOBJ = 393REGEXPOBJ =
@@ -429,8 +420,8 @@ make-docfile${EXEEXT}: ${srcdir}/make-docfile.c ../src/config.h
429digest-doc${EXEEXT}: ${srcdir}/digest-doc.c 420digest-doc${EXEEXT}: ${srcdir}/digest-doc.c
430 $(CC) ${ALL_CFLAGS} ${srcdir}/digest-doc.c $(LOADLIBES) -o digest-doc 421 $(CC) ${ALL_CFLAGS} ${srcdir}/digest-doc.c $(LOADLIBES) -o digest-doc
431 422
432sorted-doc${EXEEXT}: ${srcdir}/sorted-doc.c ${ALLOCA} 423sorted-doc${EXEEXT}: ${srcdir}/sorted-doc.c
433 $(CC) ${ALL_CFLAGS} ${srcdir}/sorted-doc.c ${ALLOCA} $(LOADLIBES) -o sorted-doc 424 $(CC) ${ALL_CFLAGS} ${srcdir}/sorted-doc.c $(LOADLIBES) -o sorted-doc
434 425
435b2m${EXEEXT}: ${srcdir}/b2m.c ../src/config.h $(GETOPTDEPS) 426b2m${EXEEXT}: ${srcdir}/b2m.c ../src/config.h $(GETOPTDEPS)
436 $(CC) ${ALL_CFLAGS} ${srcdir}/b2m.c -DVERSION="\"${version}\"" \ 427 $(CC) ${ALL_CFLAGS} ${srcdir}/b2m.c -DVERSION="\"${version}\"" \