Mercurial > octave-nkf
changeset 6107:6465ca8e4f0c
[project @ 2006-10-26 22:00:12 by jwe]
| author | jwe |
|---|---|
| date | Thu, 26 Oct 2006 22:00:12 +0000 |
| parents | 82fff8a063c2 |
| children | 143b556ce725 |
| files | libcruft/ChangeLog libcruft/misc/f77-fcn.h libcruft/misc/lo-error.h libcruft/misc/quit.h |
| diffstat | 4 files changed, 46 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/libcruft/ChangeLog Thu Oct 26 21:52:14 2006 +0000 +++ b/libcruft/ChangeLog Thu Oct 26 22:00:12 2006 +0000 @@ -7,6 +7,24 @@ (cruft.def): New target. (libraries): Depend on cruft.def. + * misc/f77-fcn.h (f77_exception_encountered, xstopx): + Tag with CRUFT_API. + * misc/lo-error.h (current_liboctave_error_handler, + current_liboctave_warning_handler, + current_liboctave_warning_with_id_handler, + set_liboctave_error_handler, set_liboctave_warning_handler, + set_liboctave_warning_with_id_handler): Likewise. + * misc/quit.h (w32_sigint_init, w32_raise_final, + w32_raise, w32_in_main_thread, current_context, + octave_save_current_context, octave_restore_current_context, + octave_jump_to_enclosing_context, octave_save_signal_mask, + octave_restore_signal_mask, octave_interrupt_immediately, + octave_interrupt_state, octave_allocation_error, + octave_signal_caught, octave_handle_signal, + octave_throw_interrupt_exception, octave_throw_bad_alloc, + octave_signal_hook, octave_interrupt_hook, octave_bad_alloc_hook): + Likewise. + 2006-10-26 John W. Eaton <jwe@octave.org> * Makefile.in ($(CRUFT_DEFS)): Depend on $(SUBDIRS).
--- a/libcruft/misc/f77-fcn.h Thu Oct 26 21:52:14 2006 +0000 +++ b/libcruft/misc/f77-fcn.h Thu Oct 26 22:00:12 2006 +0000 @@ -78,7 +78,7 @@ while (0) /* So we can check to see if an exception has occurred. */ -extern int f77_exception_encountered; +CRUFT_API extern int f77_exception_encountered; #if !defined (F77_FCN) #define F77_FCN(f, F) F77_FUNC (f, F) @@ -222,7 +222,7 @@ cs[F77_CHAR_ARG_LEN_USE(s, len)] = '\0' -extern F77_RET_T +extern CRUFT_API F77_RET_T F77_FUNC (xstopx, XSTOPX) (F77_CONST_CHAR_ARG_DECL F77_CHAR_ARG_LEN_DECL) GCC_ATTR_NORETURN;
--- a/libcruft/misc/lo-error.h Thu Oct 26 21:52:14 2006 +0000 +++ b/libcruft/misc/lo-error.h Thu Oct 26 22:00:12 2006 +0000 @@ -42,17 +42,17 @@ /* Would be nice to make these pointers private, but we want to share them among all the liboctave classes. */ -extern liboctave_error_handler current_liboctave_error_handler; +CRUFT_API extern liboctave_error_handler current_liboctave_error_handler; -extern liboctave_warning_handler current_liboctave_warning_handler; +CRUFT_API extern liboctave_warning_handler current_liboctave_warning_handler; -extern liboctave_warning_with_id_handler current_liboctave_warning_with_id_handler; +CRUFT_API extern liboctave_warning_with_id_handler current_liboctave_warning_with_id_handler; -extern void set_liboctave_error_handler (liboctave_error_handler f); +CRUFT_API extern void set_liboctave_error_handler (liboctave_error_handler f); -extern void set_liboctave_warning_handler (liboctave_warning_handler f); +CRUFT_API extern void set_liboctave_warning_handler (liboctave_warning_handler f); -extern void set_liboctave_warning_with_id_handler (liboctave_warning_with_id_handler f); +CRUFT_API extern void set_liboctave_warning_with_id_handler (liboctave_warning_with_id_handler f); #ifdef __cplusplus }
--- a/libcruft/misc/quit.h Thu Oct 26 21:52:14 2006 +0000 +++ b/libcruft/misc/quit.h Thu Oct 26 22:00:12 2006 +0000 @@ -38,10 +38,10 @@ #include <windows.h> -extern void w32_sigint_init (void); /* setup */ -extern void w32_raise_final (void); /* tear down */ -extern void w32_raise (int sig); /* raise signal in main thread */ -extern int w32_in_main_thread (void); /* return true if in main thread */ +CRUFT_API extern void w32_sigint_init (void); /* setup */ +CRUFT_API extern void w32_raise_final (void); /* tear down */ +CRUFT_API extern void w32_raise (int sig); /* raise signal in main thread */ +CRUFT_API extern int w32_in_main_thread (void); /* return true if in main thread */ #endif @@ -59,17 +59,17 @@ #endif -extern octave_jmp_buf current_context; +CRUFT_API extern octave_jmp_buf current_context; -extern void octave_save_current_context (void *); +CRUFT_API extern void octave_save_current_context (void *); -extern void octave_restore_current_context (void *); +CRUFT_API extern void octave_restore_current_context (void *); -extern void octave_jump_to_enclosing_context (void) GCC_ATTR_NORETURN; +CRUFT_API extern void octave_jump_to_enclosing_context (void) GCC_ATTR_NORETURN; -extern void octave_save_signal_mask (void); +CRUFT_API extern void octave_save_signal_mask (void); -extern void octave_restore_signal_mask (void); +CRUFT_API extern void octave_restore_signal_mask (void); #ifdef __cplusplus class @@ -78,24 +78,24 @@ }; #endif -extern sig_atomic_t octave_interrupt_immediately; +CRUFT_API extern sig_atomic_t octave_interrupt_immediately; /* > 0: interrupt pending 0: no interrupt pending < 0: handling interrupt */ -extern sig_atomic_t octave_interrupt_state; +CRUFT_API extern sig_atomic_t octave_interrupt_state; -extern sig_atomic_t octave_allocation_error; +CRUFT_API extern sig_atomic_t octave_allocation_error; -extern sig_atomic_t octave_signal_caught; +CRUFT_API extern sig_atomic_t octave_signal_caught; -extern void octave_handle_signal (void); +CRUFT_API extern void octave_handle_signal (void); -extern void octave_throw_interrupt_exception (void) GCC_ATTR_NORETURN; +CRUFT_API extern void octave_throw_interrupt_exception (void) GCC_ATTR_NORETURN; -extern void octave_throw_bad_alloc (void) GCC_ATTR_NORETURN; +CRUFT_API extern void octave_throw_bad_alloc (void) GCC_ATTR_NORETURN; #define OCTAVE_QUIT \ do \ @@ -185,9 +185,9 @@ /* These should only be declared for C++ code, and should also be outside of any extern "C" block. */ -extern void (*octave_signal_hook) (void); -extern void (*octave_interrupt_hook) (void); -extern void (*octave_bad_alloc_hook) (void); +extern CRUFT_API void (*octave_signal_hook) (void); +extern CRUFT_API void (*octave_interrupt_hook) (void); +extern CRUFT_API void (*octave_bad_alloc_hook) (void); #endif