Mercurial > hg > xemacs-beta
comparison src/glyphs.h @ 5125:b5df3737028a ben-lisp-object
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 24 Feb 2010 01:58:04 -0600 |
parents | d1247f3cc363 19a72041c5ed |
children | a9c41067dd88 |
comparison
equal
deleted
inserted
replaced
5124:623d57b7fbe8 | 5125:b5df3737028a |
---|---|
384 Lisp_Object make_image_instance_cache_hash_table (void); | 384 Lisp_Object make_image_instance_cache_hash_table (void); |
385 | 385 |
386 DECLARE_DOESNT_RETURN (incompatible_image_types (Lisp_Object instantiator, | 386 DECLARE_DOESNT_RETURN (incompatible_image_types (Lisp_Object instantiator, |
387 int given_dest_mask, | 387 int given_dest_mask, |
388 int desired_dest_mask)); | 388 int desired_dest_mask)); |
389 DECLARE_DOESNT_RETURN (signal_image_error (const char *, Lisp_Object)); | 389 DECLARE_DOESNT_RETURN (signal_image_error (const Ascbyte *reason, |
390 DECLARE_DOESNT_RETURN (signal_image_error_2 (const char *, Lisp_Object, | 390 Lisp_Object frob)); |
391 Lisp_Object)); | 391 DECLARE_DOESNT_RETURN (signal_image_error_2 (const Ascbyte *reason, |
392 DECLARE_DOESNT_RETURN (signal_double_image_error (const char *string1, | 392 Lisp_Object frob0, |
393 const char *string2, | 393 Lisp_Object frob1)); |
394 DECLARE_DOESNT_RETURN (signal_double_image_error (const Ascbyte *reason1, | |
395 const Ascbyte *reason2, | |
394 Lisp_Object data)); | 396 Lisp_Object data)); |
395 DECLARE_DOESNT_RETURN (signal_double_image_error_2 (const char *string1, | 397 DECLARE_DOESNT_RETURN (signal_double_image_error_2 (const Ascbyte *reason1, |
396 const char *string2, | 398 const Ascbyte *reason2, |
397 Lisp_Object data1, | 399 Lisp_Object data1, |
398 Lisp_Object data2)); | 400 Lisp_Object data2)); |
399 | 401 |
400 /************************************************************************/ | 402 /************************************************************************/ |
401 /* Image Specifier Object */ | 403 /* Image Specifier Object */ |