Mercurial > hg > xemacs-beta

comparison src/device-x.c @ 5178:97eb4942aec8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Mon, 29 Mar 2010 21:28:13 -0500
parents 8b2f75cecb89 a9c41067dd88
children 912c34f1d7c8
comparison
equal deleted inserted replaced
5177:b785049378e3 5178:97eb4942aec8
109 { XD_LISP_OBJECT, offsetof (struct x_device, WM_COMMAND_frame) }, 109 { XD_LISP_OBJECT, offsetof (struct x_device, WM_COMMAND_frame) },
110 { XD_END } 110 { XD_END }
111 }; 111 };
112 112
113 #ifdef NEW_GC 113 #ifdef NEW_GC
114 DEFINE_LRECORD_IMPLEMENTATION ("x-device", x_device, 114 DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT ("x-device", x_device,
115 1, /*dumpable-flag*/ 115 0, x_device_data_description_1,
116 0, 0, 0, 0, 0, 116 Lisp_X_Device);
117 x_device_data_description_1,
118 Lisp_X_Device);
119 #else /* not NEW_GC */ 117 #else /* not NEW_GC */
120 extern const struct sized_memory_description x_device_data_description; 118 extern const struct sized_memory_description x_device_data_description;
121 119
122 const struct sized_memory_description x_device_data_description = { 120 const struct sized_memory_description x_device_data_description = {
123 sizeof (struct x_device), x_device_data_description_1 121 sizeof (struct x_device), x_device_data_description_1
228 226
229 static void 227 static void
230 allocate_x_device_struct (struct device *d) 228 allocate_x_device_struct (struct device *d)
231 { 229 {
232 #ifdef NEW_GC 230 #ifdef NEW_GC
233 d->device_data = alloc_lrecord_type (struct x_device, &lrecord_x_device); 231 d->device_data = XX_DEVICE (ALLOC_NORMAL_LISP_OBJECT (x_device));
234 #else /* not NEW_GC */ 232 #else /* not NEW_GC */
235 d->device_data = xnew_and_zero (struct x_device); 233 d->device_data = xnew_and_zero (struct x_device);
236 #endif /* not NEW_GC */ 234 #endif /* not NEW_GC */
237 } 235 }
238 236
2106 2104
2107 void 2105 void
2108 syms_of_device_x (void) 2106 syms_of_device_x (void)
2109 { 2107 {
2110 #ifdef NEW_GC 2108 #ifdef NEW_GC
2111 INIT_LRECORD_IMPLEMENTATION (x_device); 2109 INIT_LISP_OBJECT (x_device);
2112 #endif /* NEW_GC */ 2110 #endif /* NEW_GC */
2113 2111
2114 DEFSUBR (Fx_debug_mode); 2112 DEFSUBR (Fx_debug_mode);
2115 DEFSUBR (Fx_get_resource); 2113 DEFSUBR (Fx_get_resource);
2116 DEFSUBR (Fx_get_resource_prefix); 2114 DEFSUBR (Fx_get_resource_prefix);