Mercurial > hg > xemacs-beta
comparison src/database.c @ 3017:1e7cc382eb16
[xemacs-hg @ 2005-10-24 10:07:26 by ben]
refactor mc-alloc dependencies
next-error.el, occur.el: Fix some byte-compile warnings.
alloc.c, buffer.c, buffer.h, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, console-impl.h, console-msw-impl.h, console.c, data.c, database.c, device-impl.h, device-msw.c, device.c, dialog-msw.c, elhash.c, events.h, extents-impl.h, extents.c, faces.c, faces.h, file-coding.c, file-coding.h, frame-impl.h, frame.c, glyphs.c, glyphs.h, gui.c, gui.h, keymap.c, lisp.h, lrecord.h, lstream.c, lstream.h, mule-charset.c, objects-impl.h, objects.c, opaque.c, opaque.h, print.c, process.c, procimpl.h, rangetab.c, rangetab.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, specifier.c, specifier.h, symbols.c, symeval.h, toolbar.c, toolbar.h, tooltalk.c, ui-gtk.c, ui-gtk.h, unicode.c, window-impl.h, window.c:
Eliminate the majority of #ifdef MC_ALLOC occurrences through
macros LCRECORD_HEADER, ALLOC_LCRECORD_TYPE, MALLOCED_STORAGE_SIZE,
etc. (defined in lrecord.h).
author | ben |
---|---|
date | Mon, 24 Oct 2005 10:07:42 +0000 |
parents | 6fa9919a9a0b |
children | facf3239ba30 |
comparison
equal
deleted
inserted
replaced
3016:f252275fb013 | 3017:1e7cc382eb16 |
---|---|
96 Lisp_Object (*last_error) (Lisp_Database *); | 96 Lisp_Object (*last_error) (Lisp_Database *); |
97 } DB_FUNCS; | 97 } DB_FUNCS; |
98 | 98 |
99 struct Lisp_Database | 99 struct Lisp_Database |
100 { | 100 { |
101 #ifdef MC_ALLOC | 101 struct LCRECORD_HEADER header; |
102 struct lrecord_header header; | |
103 #else /* MC_ALLOC */ | |
104 struct lcrecord_header header; | |
105 #endif /* MC_ALLOC */ | |
106 Lisp_Object fname; | 102 Lisp_Object fname; |
107 int mode; | 103 int mode; |
108 int access_; | 104 int access_; |
109 int dberrno; | 105 int dberrno; |
110 int live_p; | 106 int live_p; |
133 | 129 |
134 | 130 |
135 static Lisp_Database * | 131 static Lisp_Database * |
136 allocate_database (void) | 132 allocate_database (void) |
137 { | 133 { |
138 #ifdef MC_ALLOC | 134 Lisp_Database *db = ALLOC_LCRECORD_TYPE (Lisp_Database, &lrecord_database); |
139 Lisp_Database *db = alloc_lrecord_type (Lisp_Database, &lrecord_database); | |
140 #else /* not MC_ALLOC */ | |
141 Lisp_Database *db = alloc_lcrecord_type (Lisp_Database, &lrecord_database); | |
142 #endif /* not MC_ALLOC */ | |
143 | 135 |
144 db->fname = Qnil; | 136 db->fname = Qnil; |
145 db->live_p = 0; | 137 db->live_p = 0; |
146 #ifdef HAVE_BERKELEY_DB | 138 #ifdef HAVE_BERKELEY_DB |
147 db->db_handle = NULL; | 139 db->db_handle = NULL; |