aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Love2003-09-19 15:50:56 +0000
committerDave Love2003-09-19 15:50:56 +0000
commitad5f3636c57ec07fdd0796d98ce2471337e36d40 (patch)
tree4c3830c0fa49d4b67cedb3bbeba6030a37565767 /src
parent8f5b9e349e4fcfa8d3a3a9538cb30cbedd9a2140 (diff)
downloademacs-ad5f3636c57ec07fdd0796d98ce2471337e36d40.tar.gz
emacs-ad5f3636c57ec07fdd0796d98ce2471337e36d40.zip
(GC_MALLOC_CHECK): Move conditional undef after lisp.h.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/alloc.c14
2 files changed, 13 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a3116af3f89..e7c737edb91 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12003-09-19 Dave Love <fx@gnu.org>
2
3 * alloc.c (GC_MALLOC_CHECK): Move conditional undef after lisp.h.
4
12003-09-19 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 52003-09-19 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 6
3 * xterm.c (x_set_offset): Take window manager decorations 7 * xterm.c (x_set_offset): Take window manager decorations
@@ -17,6 +21,8 @@
17 21
182003-09-18 Dave Love <fx@gnu.org> 222003-09-18 Dave Love <fx@gnu.org>
19 23
24 * alloc.c (GC_MALLOC_CHECK): Move conditional undef after lisp.h.
25
20 * process.c (Fnetwork_interface_info): Fix type error. 26 * process.c (Fnetwork_interface_info): Fix type error.
21 (Fnetwork_interface_list): Doc fix. 27 (Fnetwork_interface_list): Doc fix.
22 (read_process_output, read_process_output): Delete unused var. 28 (read_process_output, read_process_output): Delete unused var.
diff --git a/src/alloc.c b/src/alloc.c
index c84c2ebb26f..56a4c0b6ca0 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -31,13 +31,6 @@ Boston, MA 02111-1307, USA. */
31 31
32#include <signal.h> 32#include <signal.h>
33 33
34/* GC_MALLOC_CHECK defined means perform validity checks of malloc'd
35 memory. Can do this only if using gmalloc.c. */
36
37#if defined SYSTEM_MALLOC || defined DOUG_LEA_MALLOC
38#undef GC_MALLOC_CHECK
39#endif
40
41/* This file is part of the core Lisp implementation, and thus must 34/* This file is part of the core Lisp implementation, and thus must
42 deal with the real data structures. If the Lisp implementation is 35 deal with the real data structures. If the Lisp implementation is
43 replaced, this file likely will not be used. */ 36 replaced, this file likely will not be used. */
@@ -56,6 +49,13 @@ Boston, MA 02111-1307, USA. */
56#include "syssignal.h" 49#include "syssignal.h"
57#include <setjmp.h> 50#include <setjmp.h>
58 51
52/* GC_MALLOC_CHECK defined means perform validity checks of malloc'd
53 memory. Can do this only if using gmalloc.c. */
54
55#if defined SYSTEM_MALLOC || defined DOUG_LEA_MALLOC
56#undef GC_MALLOC_CHECK
57#endif
58
59#ifdef HAVE_UNISTD_H 59#ifdef HAVE_UNISTD_H
60#include <unistd.h> 60#include <unistd.h>
61#else 61#else