comparison src/device-impl.h @ 5495:1f0b15040456

Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 01 May 2011 18:44:03 +0100
parents 308d34e9f07d
children 0f2338afbabf
comparison
equal deleted inserted replaced
5494:861f2601a38b 5495:1f0b15040456
3 Copyright (C) 1995, 2002 Ben Wing 3 Copyright (C) 1995, 2002 Ben Wing
4 Copyright (C) 1995 Sun Microsystems 4 Copyright (C) 1995 Sun Microsystems
5 5
6 This file is part of XEmacs. 6 This file is part of XEmacs.
7 7
8 XEmacs is free software; you can redistribute it and/or modify it 8 XEmacs is free software: you can redistribute it and/or modify it
9 under the terms of the GNU General Public License as published by the 9 under the terms of the GNU General Public License as published by the
10 Free Software Foundation; either version 2, or (at your option) any 10 Free Software Foundation, either version 3 of the License, or (at your
11 later version. 11 option) any later version.
12 12
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 for more details. 16 for more details.
17 17
18 You should have received a copy of the GNU General Public License 18 You should have received a copy of the GNU General Public License
19 along with XEmacs; see the file COPYING. If not, write to 19 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
21 Boston, MA 02111-1307, USA. */
22 20
23 /* Synched up with: Not in FSF. */ 21 /* Synched up with: Not in FSF. */
24 22
25 /* Written by Chuck Thompson and Ben Wing. */ 23 /* Written by Chuck Thompson and Ben Wing. */
26 24
69 #define MAYBE_LISP_DEVMETH(d, m, args) \ 67 #define MAYBE_LISP_DEVMETH(d, m, args) \
70 MAYBE_LISP_CONTYPE_METH ((d)->devmeths, m, args) 68 MAYBE_LISP_CONTYPE_METH ((d)->devmeths, m, args)
71 69
72 struct device 70 struct device
73 { 71 {
74 struct LCRECORD_HEADER header; 72 NORMAL_LISP_OBJECT_HEADER header;
75 73
76 /* Methods for this device's console. This can also be retrieved 74 /* Methods for this device's console. This can also be retrieved
77 through device->console, but it's faster this way. */ 75 through device->console, but it's faster this way. */
78 struct console_methods *devmeths; 76 struct console_methods *devmeths;
79 77