comparison 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
comparison
equal deleted inserted replaced
5117:3742ea8250b5 5118:e0db3c197671
84 Lisp_Object Qdelete_device_hook; 84 Lisp_Object Qdelete_device_hook;
85 Lisp_Object Vdevice_class_list; 85 Lisp_Object Vdevice_class_list;
86 86
87 87
88 88
89 #ifndef NEW_GC
89 extern const struct sized_memory_description gtk_device_data_description; 90 extern const struct sized_memory_description gtk_device_data_description;
90 extern const struct sized_memory_description mswindows_device_data_description; 91 extern const struct sized_memory_description mswindows_device_data_description;
91 extern const struct sized_memory_description msprinter_device_data_description; 92 extern const struct sized_memory_description msprinter_device_data_description;
92 extern const struct sized_memory_description x_device_data_description; 93 extern const struct sized_memory_description x_device_data_description;
94 #endif /* not NEW_GC */
93 95
94 static const struct memory_description device_data_description_1 []= { 96 static const struct memory_description device_data_description_1 []= {
97 #ifdef NEW_GC
98 #ifdef HAVE_GTK
99 { XD_LISP_OBJECT, gtk_console },
100 #endif
101 #ifdef HAVE_MS_WINDOWS
102 { XD_LISP_OBJECT, mswindows_console },
103 { XD_LISP_OBJECT, msprinter_console },
104 #endif
105 #ifdef HAVE_X_WINDOWS
106 { XD_LISP_OBJECT, x_console },
107 #endif
108 #else /* not NEW_GC */
95 #ifdef HAVE_GTK 109 #ifdef HAVE_GTK
96 { XD_BLOCK_PTR, gtk_console, 1, { &gtk_device_data_description} }, 110 { XD_BLOCK_PTR, gtk_console, 1, { &gtk_device_data_description} },
97 #endif 111 #endif
98 #ifdef HAVE_MS_WINDOWS 112 #ifdef HAVE_MS_WINDOWS
99 { XD_BLOCK_PTR, mswindows_console, 1, { &mswindows_device_data_description} }, 113 { XD_BLOCK_PTR, mswindows_console, 1, { &mswindows_device_data_description} },
100 { XD_BLOCK_PTR, msprinter_console, 1, { &msprinter_device_data_description} }, 114 { XD_BLOCK_PTR, msprinter_console, 1, { &msprinter_device_data_description} },
101 #endif 115 #endif
102 #ifdef HAVE_X_WINDOWS 116 #ifdef HAVE_X_WINDOWS
103 { XD_BLOCK_PTR, x_console, 1, { &x_device_data_description} }, 117 { XD_BLOCK_PTR, x_console, 1, { &x_device_data_description} },
104 #endif 118 #endif
119 #endif /* not NEW_GC */
105 { XD_END } 120 { XD_END }
106 }; 121 };
107 122
108 static const struct sized_memory_description device_data_description = { 123 static const struct sized_memory_description device_data_description = {
109 sizeof (void *), device_data_description_1 124 sizeof (void *), device_data_description_1
153 if (DEVICE_LIVE_P (d) && !NILP (DEVICE_CONNECTION (d))) 168 if (DEVICE_LIVE_P (d) && !NILP (DEVICE_CONNECTION (d)))
154 write_fmt_string_lisp (printcharfun, " on %S", 1, DEVICE_CONNECTION (d)); 169 write_fmt_string_lisp (printcharfun, " on %S", 1, DEVICE_CONNECTION (d));
155 write_fmt_string (printcharfun, " 0x%x>", d->header.uid); 170 write_fmt_string (printcharfun, " 0x%x>", d->header.uid);
156 } 171 }
157 172
158 DEFINE_NONDUMPABLE_LISP_OBJECT ("device", device, 173 DEFINE_NODUMP_LISP_OBJECT ("device", device,
159 mark_device, print_device, 0, 0, 0, 174 mark_device, print_device, 0, 0, 0,
160 device_description, 175 device_description,
161 struct device); 176 struct device);
162 177
163 int 178 int