Mercurial > hg > xemacs-beta
diff src/device.c @ 5118:e0db3c197671 ben-lisp-object
merge up to latest default branch, doesn't compile yet
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 26 Dec 2009 21:18:49 -0600 |
| parents | 3742ea8250b5 141c2920ea48 |
| children | d1247f3cc363 |
line wrap: on
line diff
--- a/src/device.c Sat Dec 26 00:20:27 2009 -0600 +++ b/src/device.c Sat Dec 26 21:18:49 2009 -0600 @@ -86,12 +86,26 @@ +#ifndef NEW_GC extern const struct sized_memory_description gtk_device_data_description; extern const struct sized_memory_description mswindows_device_data_description; extern const struct sized_memory_description msprinter_device_data_description; extern const struct sized_memory_description x_device_data_description; +#endif /* not NEW_GC */ static const struct memory_description device_data_description_1 []= { +#ifdef NEW_GC +#ifdef HAVE_GTK + { XD_LISP_OBJECT, gtk_console }, +#endif +#ifdef HAVE_MS_WINDOWS + { XD_LISP_OBJECT, mswindows_console }, + { XD_LISP_OBJECT, msprinter_console }, +#endif +#ifdef HAVE_X_WINDOWS + { XD_LISP_OBJECT, x_console }, +#endif +#else /* not NEW_GC */ #ifdef HAVE_GTK { XD_BLOCK_PTR, gtk_console, 1, { >k_device_data_description} }, #endif @@ -102,6 +116,7 @@ #ifdef HAVE_X_WINDOWS { XD_BLOCK_PTR, x_console, 1, { &x_device_data_description} }, #endif +#endif /* not NEW_GC */ { XD_END } }; @@ -155,7 +170,7 @@ write_fmt_string (printcharfun, " 0x%x>", d->header.uid); } -DEFINE_NONDUMPABLE_LISP_OBJECT ("device", device, +DEFINE_NODUMP_LISP_OBJECT ("device", device, mark_device, print_device, 0, 0, 0, device_description, struct device);