comparison src/scrollbar.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 b7f26b2f78bd
comparison
equal deleted inserted replaced
3016:f252275fb013 3017:1e7cc382eb16
197 static struct scrollbar_instance * 197 static struct scrollbar_instance *
198 create_scrollbar_instance (struct frame *f, int vertical) 198 create_scrollbar_instance (struct frame *f, int vertical)
199 { 199 {
200 struct device *d = XDEVICE (f->device); 200 struct device *d = XDEVICE (f->device);
201 struct scrollbar_instance *instance = 201 struct scrollbar_instance *instance =
202 #ifdef MC_ALLOC 202 ALLOC_LCRECORD_TYPE (struct scrollbar_instance,
203 alloc_lrecord_type (struct scrollbar_instance,
204 &lrecord_scrollbar_instance);
205 #else /* not MC_ALLOC */
206 alloc_lcrecord_type (struct scrollbar_instance,
207 &lrecord_scrollbar_instance); 203 &lrecord_scrollbar_instance);
208 #endif /* not MC_ALLOC */
209 204
210 MAYBE_DEVMETH (d, create_scrollbar_instance, (f, vertical, instance)); 205 MAYBE_DEVMETH (d, create_scrollbar_instance, (f, vertical, instance));
211 206
212 return instance; 207 return instance;
213 } 208 }
275 if (HAS_DEVMETH_P(d, compute_scrollbar_instance_usage)) 270 if (HAS_DEVMETH_P(d, compute_scrollbar_instance_usage))
276 total += DEVMETH (d, compute_scrollbar_instance_usage, (d, inst, ovstats)); 271 total += DEVMETH (d, compute_scrollbar_instance_usage, (d, inst, ovstats));
277 272
278 while (inst) 273 while (inst)
279 { 274 {
280 #ifdef MC_ALLOC 275 total += MALLOCED_STORAGE_SIZE (inst, sizeof (*inst), ovstats);
281 total += mc_alloced_storage_size (sizeof (*inst), ovstats);
282 #else /* not MC_ALLOC */
283 total += malloced_storage_size (inst, sizeof (*inst), ovstats);
284 #endif /* not MC_ALLOC */
285 inst = inst->next; 276 inst = inst->next;
286 } 277 }
287 278
288 return total; 279 return total;
289 } 280 }