Mercurial > hg > xemacs-beta

comparison src/frame-x.c @ 5133:444a448b2f53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch ben-lisp-object into default branch
author Ben Wing <ben@xemacs.org>
date Sun, 07 Mar 2010 06:47:37 -0600
parents 7be849cb8828
children 97eb4942aec8
comparison
equal deleted inserted replaced
5113:b2dcf6a6d8ab 5133:444a448b2f53
73 { XD_LISP_OBJECT, offsetof (struct x_frame, icon_pixmap_mask) }, 73 { XD_LISP_OBJECT, offsetof (struct x_frame, icon_pixmap_mask) },
74 { XD_END } 74 { XD_END }
75 }; 75 };
76 76
77 #ifdef NEW_GC 77 #ifdef NEW_GC
78 DEFINE_LRECORD_IMPLEMENTATION ("x-frame", x_frame, 78 DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT ("x-frame", x_frame,
79 1, /*dumpable-flag*/ 79 0, x_frame_data_description_1,
80 0, 0, 0, 0, 0, 80 Lisp_X_Frame);
81 x_frame_data_description_1,
82 Lisp_X_Frame);
83 #else /* not NEW_GC */ 81 #else /* not NEW_GC */
84 extern const struct sized_memory_description x_frame_data_description; 82 extern const struct sized_memory_description x_frame_data_description;
85 83
86 const struct sized_memory_description x_frame_data_description = { 84 const struct sized_memory_description x_frame_data_description = {
87 sizeof (struct x_frame), x_frame_data_description_1 85 sizeof (struct x_frame), x_frame_data_description_1
2048 static void 2046 static void
2049 allocate_x_frame_struct (struct frame *f) 2047 allocate_x_frame_struct (struct frame *f)
2050 { 2048 {
2051 /* zero out all slots. */ 2049 /* zero out all slots. */
2052 #ifdef NEW_GC 2050 #ifdef NEW_GC
2053 f->frame_data = alloc_lrecord_type (struct x_frame, &lrecord_x_frame); 2051 f->frame_data = XX_FRAME (ALLOC_NORMAL_LISP_OBJECT (x_frame));
2054 #else /* not NEW_GC */ 2052 #else /* not NEW_GC */
2055 f->frame_data = xnew_and_zero (struct x_frame); 2053 f->frame_data = xnew_and_zero (struct x_frame);
2056 #endif /* not NEW_GC */ 2054 #endif /* not NEW_GC */
2057 2055
2058 /* yeah, except the lisp ones */ 2056 /* yeah, except the lisp ones */
2765 2763
2766 void 2764 void
2767 syms_of_frame_x (void) 2765 syms_of_frame_x (void)
2768 { 2766 {
2769 #ifdef NEW_GC 2767 #ifdef NEW_GC
2770 INIT_LRECORD_IMPLEMENTATION (x_frame); 2768 INIT_LISP_OBJECT (x_frame);
2771 #endif /* NEW_GC */ 2769 #endif /* NEW_GC */
2772 2770
2773 DEFSYMBOL (Qoverride_redirect); 2771 DEFSYMBOL (Qoverride_redirect);
2774 DEFSYMBOL (Qx_resource_name); 2772 DEFSYMBOL (Qx_resource_name);
2775 2773