comparison src/device.c @ 5920:0f2338afbabf cygwin

Minimum necessary to get started: sufficient to compile OK, run -nw, but not with window
author Henry Thompson <ht@markup.co.uk>
date Mon, 21 Apr 2014 11:42:50 +0100
parents 56144c8593a8
children
comparison
equal deleted inserted replaced
5919:2800105fcc9f 5920:0f2338afbabf
494 494
495 DEVICE_LOOP_NO_BREAK (devcons, concons) 495 DEVICE_LOOP_NO_BREAK (devcons, concons)
496 { 496 {
497 Lisp_Object device = XCAR (devcons); 497 Lisp_Object device = XCAR (devcons);
498 498
499 if (EQ (CONMETH_TYPE (meths), DEVICE_TYPE (XDEVICE (device))) 499 if (EQ (CONMETH_TYPE (meths), DEVICE_TYPE_X (XDEVICE (device)))
500 && internal_equal (DEVICE_CANON_CONNECTION (XDEVICE (device)), 500 && internal_equal (DEVICE_CANON_CONNECTION (XDEVICE (device)),
501 canon, 0)) 501 canon, 0))
502 return device; 502 return device;
503 } 503 }
504 504
907 MAYBE_DEVMETH (d, delete_device, (d)); 907 MAYBE_DEVMETH (d, delete_device, (d));
908 908
909 /* Now see if we're the default device, and thus need to be changed. */ 909 /* Now see if we're the default device, and thus need to be changed. */
910 { 910 {
911 /* Device type still OK, not set to null till down below. */ 911 /* Device type still OK, not set to null till down below. */
912 Lisp_Object dt = DEVICE_TYPE (d); 912 Lisp_Object dt = DEVICE_TYPE_X (d);
913 913
914 if (EQ (device, get_default_device (dt))) 914 if (EQ (device, get_default_device (dt)))
915 { 915 {
916 Lisp_Object devcons, concons; 916 Lisp_Object devcons, concons;
917 /* #### handle deleting last device */ 917 /* #### handle deleting last device */