Mercurial > hg > xemacs-beta
comparison src/tooltalk.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 | 172fb92bd156 |
children | facf3239ba30 |
comparison
equal
deleted
inserted
replaced
3016:f252275fb013 | 3017:1e7cc382eb16 |
---|---|
145 | 145 |
146 Lisp_Object Qtooltalk_messagep; | 146 Lisp_Object Qtooltalk_messagep; |
147 | 147 |
148 struct Lisp_Tooltalk_Message | 148 struct Lisp_Tooltalk_Message |
149 { | 149 { |
150 #ifdef MC_ALLOC | 150 struct LCRECORD_HEADER header; |
151 struct lrecord_header header; | |
152 #else /* MC_ALLOC */ | |
153 struct lcrecord_header header; | |
154 #endif /* MC_ALLOC */ | |
155 Lisp_Object plist_sym, callback; | 151 Lisp_Object plist_sym, callback; |
156 Tt_message m; | 152 Tt_message m; |
157 }; | 153 }; |
158 | 154 |
159 static const struct memory_description tooltalk_message_description [] = { | 155 static const struct memory_description tooltalk_message_description [] = { |
193 static Lisp_Object | 189 static Lisp_Object |
194 make_tooltalk_message (Tt_message m) | 190 make_tooltalk_message (Tt_message m) |
195 { | 191 { |
196 Lisp_Object val; | 192 Lisp_Object val; |
197 Lisp_Tooltalk_Message *msg = | 193 Lisp_Tooltalk_Message *msg = |
198 #ifdef MC_ALLOC | 194 ALLOC_LCRECORD_TYPE (Lisp_Tooltalk_Message, &lrecord_tooltalk_message); |
199 alloc_lrecord_type (Lisp_Tooltalk_Message, &lrecord_tooltalk_message); | |
200 #else /* not MC_ALLOC */ | |
201 alloc_lcrecord_type (Lisp_Tooltalk_Message, &lrecord_tooltalk_message); | |
202 #endif /* not MC_ALLOC */ | |
203 | 195 |
204 msg->m = m; | 196 msg->m = m; |
205 msg->callback = Qnil; | 197 msg->callback = Qnil; |
206 msg->plist_sym = Fmake_symbol (Tooltalk_Message_plist_str); | 198 msg->plist_sym = Fmake_symbol (Tooltalk_Message_plist_str); |
207 return wrap_tooltalk_message (msg); | 199 return wrap_tooltalk_message (msg); |
231 | 223 |
232 Lisp_Object Qtooltalk_patternp; | 224 Lisp_Object Qtooltalk_patternp; |
233 | 225 |
234 struct Lisp_Tooltalk_Pattern | 226 struct Lisp_Tooltalk_Pattern |
235 { | 227 { |
236 #ifdef MC_ALLOC | 228 struct LCRECORD_HEADER header; |
237 struct lrecord_header header; | |
238 #else /* MC_ALLOC */ | |
239 struct lcrecord_header header; | |
240 #endif /* MC_ALLOC */ | |
241 Lisp_Object plist_sym, callback; | 229 Lisp_Object plist_sym, callback; |
242 Tt_pattern p; | 230 Tt_pattern p; |
243 }; | 231 }; |
244 | 232 |
245 static const struct memory_description tooltalk_pattern_description [] = { | 233 static const struct memory_description tooltalk_pattern_description [] = { |
278 | 266 |
279 static Lisp_Object | 267 static Lisp_Object |
280 make_tooltalk_pattern (Tt_pattern p) | 268 make_tooltalk_pattern (Tt_pattern p) |
281 { | 269 { |
282 Lisp_Tooltalk_Pattern *pat = | 270 Lisp_Tooltalk_Pattern *pat = |
283 #ifdef MC_ALLOC | 271 ALLOC_LCRECORD_TYPE (Lisp_Tooltalk_Pattern, &lrecord_tooltalk_pattern); |
284 alloc_lrecord_type (Lisp_Tooltalk_Pattern, &lrecord_tooltalk_pattern); | |
285 #else /* not MC_ALLOC */ | |
286 alloc_lcrecord_type (Lisp_Tooltalk_Pattern, &lrecord_tooltalk_pattern); | |
287 #endif /* not MC_ALLOC */ | |
288 Lisp_Object val; | 272 Lisp_Object val; |
289 | 273 |
290 pat->p = p; | 274 pat->p = p; |
291 pat->callback = Qnil; | 275 pat->callback = Qnil; |
292 pat->plist_sym = Fmake_symbol (Tooltalk_Pattern_plist_str); | 276 pat->plist_sym = Fmake_symbol (Tooltalk_Pattern_plist_str); |