comparison src/lisp.h @ 4969:cbe181529c34

Automatic merge
author Ben Wing <ben@xemacs.org>
date Wed, 03 Feb 2010 21:46:21 -0600
parents 0d4c9d0f6a8d 17362f371cc2
children 16112448d484 4aebb0131297
comparison
equal deleted inserted replaced
4968:4d35e52790f8 4969:cbe181529c34
1256 and line of the inline function, which is not very useful. */ 1256 and line of the inline function, which is not very useful. */
1257 1257
1258 /* Highly dubious kludge */ 1258 /* Highly dubious kludge */
1259 /* (thanks, Jamie, I feel better now -- ben) */ 1259 /* (thanks, Jamie, I feel better now -- ben) */
1260 MODULE_API void assert_failed (const Ascbyte *, int, const Ascbyte *); 1260 MODULE_API void assert_failed (const Ascbyte *, int, const Ascbyte *);
1261 #define ABORT() (assert_failed (__FILE__, __LINE__, "ABORT()")) 1261 #define ABORT() assert_failed (__FILE__, __LINE__, "ABORT()")
1262 #define abort_with_message(msg) assert_failed (__FILE__, __LINE__, msg)
1262 1263
1263 /* This used to be ((void) (0)) but that triggers lots of unused variable 1264 /* This used to be ((void) (0)) but that triggers lots of unused variable
1264 warnings. It's pointless to force all that code to be rewritten, with 1265 warnings. It's pointless to force all that code to be rewritten, with
1265 added ifdefs. Any reasonable compiler will eliminate an expression with 1266 added ifdefs. Any reasonable compiler will eliminate an expression with
1266 no effects. We keep this abstracted out like this in case we want to 1267 no effects. We keep this abstracted out like this in case we want to
6143 extern Lisp_Object Vautoload_queue, Vblank_menubar; 6144 extern Lisp_Object Vautoload_queue, Vblank_menubar;
6144 extern Lisp_Object Vcommand_history; 6145 extern Lisp_Object Vcommand_history;
6145 extern Lisp_Object Vcommand_line_args, Vconfigure_info_directory; 6146 extern Lisp_Object Vcommand_line_args, Vconfigure_info_directory;
6146 extern Lisp_Object Vconfigure_site_directory, Vconfigure_site_module_directory; 6147 extern Lisp_Object Vconfigure_site_directory, Vconfigure_site_module_directory;
6147 extern Lisp_Object Vconsole_list, Vcontrolling_terminal; 6148 extern Lisp_Object Vconsole_list, Vcontrolling_terminal;
6148 extern Lisp_Object Vcurrent_compiled_function_annotation, Vcurrent_load_list; 6149 extern Lisp_Object Vcurrent_load_list;
6149 extern Lisp_Object Vcurrent_mouse_event, Vcurrent_prefix_arg, Vdata_directory; 6150 extern Lisp_Object Vcurrent_mouse_event, Vcurrent_prefix_arg, Vdata_directory;
6150 extern Lisp_Object Vdirectory_sep_char, Vdisabled_command_hook; 6151 extern Lisp_Object Vdirectory_sep_char, Vdisabled_command_hook;
6151 extern Lisp_Object Vdoc_directory, Vinternal_doc_file_name; 6152 extern Lisp_Object Vdoc_directory, Vinternal_doc_file_name;
6152 extern Lisp_Object Vecho_area_buffer, Vemacs_major_version; 6153 extern Lisp_Object Vecho_area_buffer, Vemacs_major_version;
6153 extern Lisp_Object Vemacs_minor_version, Vexec_directory, Vexec_path; 6154 extern Lisp_Object Vemacs_minor_version, Vexec_directory, Vexec_path;