Mercurial > octave

comparison liboctave/cruft/misc/lo-error.h @ 21227:25150962bfd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate CRUFT_API macro * oct-conf-post.in.h (CRUFT_API): Delete definition. * f77-fcn.h, lo-error.h, quit.h: Use OCTAVE_API instead of CRUFT_API.
author John W. Eaton <jwe@octave.org>
date Mon, 08 Feb 2016 20:40:55 -0500
parents 3e7cfee5f786
children 1473547f50f5
comparison
equal deleted inserted replaced
21226:a55b8ece1ecd 21227:25150962bfd3
25 25
26 #ifdef __cplusplus 26 #ifdef __cplusplus
27 extern "C" { 27 extern "C" {
28 #endif 28 #endif
29 29
30 OCTAVE_NORETURN extern void liboctave_fatal (const char *fmt, ...); 30 OCTAVE_NORETURN extern void
31 liboctave_fatal (const char *fmt, ...);
31 32
32 OCTAVE_NORETURN extern 33 OCTAVE_NORETURN extern
33 void liboctave_fatal_with_id (const char *id, const char *fmt, ...); 34 void liboctave_fatal_with_id (const char *id, const char *fmt, ...);
34 35
35 extern void liboctave_warning (const char *fmt, ...); 36 extern void
37 liboctave_warning (const char *fmt, ...);
36 38
37 extern void liboctave_warning_with_id (const char *id, const char *fmt, ...); 39 extern void
40 liboctave_warning_with_id (const char *id, const char *fmt, ...);
38 41
39 typedef void (*liboctave_error_handler) (const char *, ...); 42 typedef void (*liboctave_error_handler) (const char *, ...);
40 43
41 typedef void (*liboctave_error_with_id_handler) (const char *, const char *, ...); 44 typedef void (*liboctave_error_with_id_handler) (const char *, const char *, ...);
42 45
44 47
45 typedef void (*liboctave_warning_with_id_handler) (const char *, const char *, ...); 48 typedef void (*liboctave_warning_with_id_handler) (const char *, const char *, ...);
46 49
47 /* Would be nice to make these pointers private, but we want to share 50 /* Would be nice to make these pointers private, but we want to share
48 them among all the liboctave classes. */ 51 them among all the liboctave classes. */
49 OCTAVE_NORETURN CRUFT_API extern liboctave_error_handler current_liboctave_error_handler; 52 OCTAVE_NORETURN OCTAVE_API extern liboctave_error_handler current_liboctave_error_handler;
50 53
51 OCTAVE_NORETURN CRUFT_API extern liboctave_error_with_id_handler current_liboctave_error_with_id_handler; 54 OCTAVE_NORETURN OCTAVE_API extern liboctave_error_with_id_handler current_liboctave_error_with_id_handler;
52 55
53 CRUFT_API extern liboctave_warning_handler current_liboctave_warning_handler; 56 OCTAVE_API extern liboctave_warning_handler current_liboctave_warning_handler;
54 57
55 CRUFT_API extern liboctave_warning_with_id_handler current_liboctave_warning_with_id_handler; 58 OCTAVE_API extern liboctave_warning_with_id_handler current_liboctave_warning_with_id_handler;
56 59
57 CRUFT_API extern void set_liboctave_error_handler (OCTAVE_NORETURN liboctave_error_handler f); 60 OCTAVE_API extern void
61 set_liboctave_error_handler (OCTAVE_NORETURN liboctave_error_handler f);
58 62
59 CRUFT_API extern void set_liboctave_error_with_id_handler (OCTAVE_NORETURN liboctave_error_with_id_handler f); 63 OCTAVE_API extern void
64 set_liboctave_error_with_id_handler (OCTAVE_NORETURN liboctave_error_with_id_handler f);
60 65
61 CRUFT_API extern void set_liboctave_warning_handler (liboctave_warning_handler f); 66 OCTAVE_API extern void
67 set_liboctave_warning_handler (liboctave_warning_handler f);
62 68
63 CRUFT_API extern void set_liboctave_warning_with_id_handler (liboctave_warning_with_id_handler f); 69 OCTAVE_API extern void
70 set_liboctave_warning_with_id_handler (liboctave_warning_with_id_handler f);
64 71
65 #ifdef __cplusplus 72 #ifdef __cplusplus
66 } 73 }
67 #endif 74 #endif
68 75