Mercurial > hg > xemacs-beta

comparison src/lisp.h @ 3017:1e7cc382eb16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 ee35a8fdcfcd
children d30cd499e445
comparison
equal deleted inserted replaced
3016:f252275fb013 3017:1e7cc382eb16
2370 2370
2371 /*------------------------------ vector --------------------------------*/ 2371 /*------------------------------ vector --------------------------------*/
2372 2372
2373 struct Lisp_Vector 2373 struct Lisp_Vector
2374 { 2374 {
2375 #ifdef MC_ALLOC 2375 struct LCRECORD_HEADER header;
2376 struct lrecord_header header;
2377 #else /* MC_ALLOC */
2378 struct lcrecord_header header;
2379 #endif /* MC_ALLOC */
2380 long size; 2376 long size;
2381 Lisp_Object contents[1]; 2377 Lisp_Object contents[1];
2382 }; 2378 };
2383 typedef struct Lisp_Vector Lisp_Vector; 2379 typedef struct Lisp_Vector Lisp_Vector;
2384 2380
2411 #error You really have 128-bit integers?! 2407 #error You really have 128-bit integers?!
2412 #endif 2408 #endif
2413 2409
2414 struct Lisp_Bit_Vector 2410 struct Lisp_Bit_Vector
2415 { 2411 {
2416 #ifdef MC_ALLOC 2412 struct LCRECORD_HEADER lheader;
2417 struct lrecord_header lheader;
2418 #else /* MC_ALLOC */
2419 struct lcrecord_header lheader;
2420 #endif /* MC_ALLOC */
2421 Elemcount size; 2413 Elemcount size;
2422 unsigned long bits[1]; 2414 unsigned long bits[1];
2423 }; 2415 };
2424 typedef struct Lisp_Bit_Vector Lisp_Bit_Vector; 2416 typedef struct Lisp_Bit_Vector Lisp_Bit_Vector;
2425 2417
2776 2768
2777 /*---------------------------- weak boxes ------------------------------*/ 2769 /*---------------------------- weak boxes ------------------------------*/
2778 2770
2779 struct weak_box 2771 struct weak_box
2780 { 2772 {
2781 #ifdef MC_ALLOC 2773 struct LCRECORD_HEADER header;
2782 struct lrecord_header header;
2783 #else /* MC_ALLOC */
2784 struct lcrecord_header header;
2785 #endif /* MC_ALLOC */
2786 Lisp_Object value; 2774 Lisp_Object value;
2787 2775
2788 Lisp_Object next_weak_box; /* don't mark through this! */ 2776 Lisp_Object next_weak_box; /* don't mark through this! */
2789 }; 2777 };
2790 2778
2802 2790
2803 /*--------------------------- ephemerons ----------------------------*/ 2791 /*--------------------------- ephemerons ----------------------------*/
2804 2792
2805 struct ephemeron 2793 struct ephemeron
2806 { 2794 {
2807 #ifdef MC_ALLOC 2795 struct LCRECORD_HEADER header;
2808 struct lrecord_header header;
2809 #else /* MC_ALLOC */
2810 struct lcrecord_header header;
2811 #endif /* MC_ALLOC */
2812 2796
2813 Lisp_Object key; 2797 Lisp_Object key;
2814 2798
2815 /* This field holds a pair. The cdr of this cons points to the next 2799 /* This field holds a pair. The cdr of this cons points to the next
2816 ephemeron in Vall_ephemerons. The car points to another pair 2800 ephemeron in Vall_ephemerons. The car points to another pair
2865 WEAK_LIST_FULL_ASSOC 2849 WEAK_LIST_FULL_ASSOC
2866 }; 2850 };
2867 2851
2868 struct weak_list 2852 struct weak_list
2869 { 2853 {
2870 #ifdef MC_ALLOC 2854 struct LCRECORD_HEADER header;
2871 struct lrecord_header header;
2872 #else /* MC_ALLOC */
2873 struct lcrecord_header header;
2874 #endif /* MC_ALLOC */
2875 Lisp_Object list; /* don't mark through this! */ 2855 Lisp_Object list; /* don't mark through this! */
2876 enum weak_list_type type; 2856 enum weak_list_type type;
2877 Lisp_Object next_weak; /* don't mark through this! */ 2857 Lisp_Object next_weak; /* don't mark through this! */
2878 }; 2858 };
2879 2859