Mercurial > hg > xemacs-beta

comparison src/Makefile.in.in @ 4735:80d74fed5399

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove "old" GNU malloc in src/malloc.c, and all references to it. Drop the GNU_MALLOC define, which was only used to distinguish between "old" and "new" GNU malloc. See xemacs-patches message with ID <870180fe0911061348g168f85e2m5153e2b554b94803@mail.gmail.com>.
author Jerry James <james@xemacs.org>
date Mon, 09 Nov 2009 09:21:59 -0700
parents 1cecc3e9f0a0
children 5dc1b4681e33
comparison
equal deleted inserted replaced
4734:74a5eaa67982 4735:80d74fed5399
303 rallocobjs = ralloc.o 303 rallocobjs = ralloc.o
304 #endif 304 #endif
305 305
306 malloclib = $(libmcheck) 306 malloclib = $(libmcheck)
307 #ifndef SYSTEM_MALLOC 307 #ifndef SYSTEM_MALLOC
308 # ifdef GNU_MALLOC /* GNU malloc */ 308 # ifdef ERROR_CHECK_MALLOC
309 # ifdef ERROR_CHECK_MALLOC 309 # ifdef DOUG_LEA_MALLOC
310 #ifdef DOUG_LEA_MALLOC
311 mallocobjs = free-hook.o vm-limit.o 310 mallocobjs = free-hook.o vm-limit.o
312 #else 311 # else
313 mallocobjs = gmalloc.o free-hook.o vm-limit.o 312 mallocobjs = gmalloc.o free-hook.o vm-limit.o
314 #endif 313 # endif
315 mallocdocsrc = free-hook.c 314 mallocdocsrc = free-hook.c
316 # else /* New GNU malloc, sans error checking */ 315 # else /* GNU malloc, sans error checking */
317 #ifdef DOUG_LEA_MALLOC 316 # ifdef DOUG_LEA_MALLOC
318 mallocobjs = vm-limit.o 317 mallocobjs = vm-limit.o
319 #else 318 # else
320 mallocobjs = gmalloc.o vm-limit.o 319 mallocobjs = gmalloc.o vm-limit.o
321 #endif 320 # endif
322 mallocdocsrc = 321 mallocdocsrc =
323 # endif /* ERROR_CHECK_MALLOC */ 322 # endif /* ERROR_CHECK_MALLOC */
324 # else /* Older GNU malloc */
325 mallocobjs = malloc.o
326 mallocdocsrc =
327 # endif /* Older GNU malloc */
328 #else /* SYSTEM_MALLOC */ 323 #else /* SYSTEM_MALLOC */
329 mallocobjs = 324 mallocobjs =
330 mallocdocsrc = 325 mallocdocsrc =
331 #ifdef USE_DEBUG_MALLOC 326 # ifdef USE_DEBUG_MALLOC
332 malloclib = -ldmalloc 327 malloclib = -ldmalloc
333 #endif /* USE_DEBUG_MALLOC */ 328 # endif /* USE_DEBUG_MALLOC */
334 #endif /* SYSTEM_MALLOC */ 329 #endif /* SYSTEM_MALLOC */
335 330
336 #ifdef HAVE_X_WINDOWS 331 #ifdef HAVE_X_WINDOWS
337 332
338 lwlib_lib = ../lwlib/liblw.a 333 lwlib_lib = ../lwlib/liblw.a