octave-maintainers
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

MSVC compiler support [patch 15]: CRUFT.DLL exported symbols (C)


From: Michael Goffioul
Subject: MSVC compiler support [patch 15]: CRUFT.DLL exported symbols (C)
Date: Tue, 17 Oct 2006 21:50:10 +0200
User-agent: Thunderbird 1.5.0.7 (Windows/20060909)

Defines additional symbols exported by cruft DLL.

Index: libcruft/misc/f77-fcn.h
===================================================================
RCS file: /cvs/octave/libcruft/misc/f77-fcn.h,v
retrieving revision 1.21
diff -p -c -r1.21 f77-fcn.h
*** libcruft/misc/f77-fcn.h     24 Apr 2006 19:13:07 -0000      1.21
--- libcruft/misc/f77-fcn.h     17 Oct 2006 11:07:41 -0000
*************** extern "C" {
*** 78,84 ****
    while (0)
  
  /* So we can check to see if an exception has occurred. */
! extern int f77_exception_encountered;
  
  #if !defined (F77_FCN)
  #define F77_FCN(f, F) F77_FUNC (f, F)
--- 78,84 ----
    while (0)
  
  /* So we can check to see if an exception has occurred. */
! CRUFT_API extern int f77_exception_encountered;
  
  #if !defined (F77_FCN)
  #define F77_FCN(f, F) F77_FUNC (f, F)
*************** octave_make_cray_const_ftn_ch_dsc (const
*** 178,184 ****
  
  #endif
  
! extern F77_RET_T
  F77_FUNC (xstopx, XSTOPX) (F77_CONST_CHAR_ARG_DECL
                           F77_CHAR_ARG_LEN_DECL) GCC_ATTR_NORETURN;
  
--- 178,184 ----
  
  #endif
  
! extern CRUFT_API F77_RET_T
  F77_FUNC (xstopx, XSTOPX) (F77_CONST_CHAR_ARG_DECL
                           F77_CHAR_ARG_LEN_DECL) GCC_ATTR_NORETURN;
  
Index: libcruft/misc/lo-error.h
===================================================================
RCS file: /cvs/octave/libcruft/misc/lo-error.h,v
retrieving revision 1.5
diff -p -c -r1.5 lo-error.h
*** libcruft/misc/lo-error.h    2 May 2006 19:40:19 -0000       1.5
--- libcruft/misc/lo-error.h    17 Oct 2006 11:07:41 -0000
*************** typedef void (*liboctave_warning_with_id
*** 42,58 ****
  
  /* 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;
  
! extern liboctave_warning_handler current_liboctave_warning_handler;
  
! extern liboctave_warning_with_id_handler 
current_liboctave_warning_with_id_handler;
  
! extern void set_liboctave_error_handler (liboctave_error_handler f);
  
! extern void set_liboctave_warning_handler (liboctave_warning_handler f);
  
! extern void set_liboctave_warning_with_id_handler 
(liboctave_warning_with_id_handler f);
  
  #ifdef __cplusplus
  }
--- 42,58 ----
  
  /* Would be nice to make these pointers private, but we want to share
     them among all the liboctave classes. */
! CRUFT_API extern liboctave_error_handler current_liboctave_error_handler;
  
! CRUFT_API extern liboctave_warning_handler current_liboctave_warning_handler;
  
! CRUFT_API extern liboctave_warning_with_id_handler 
current_liboctave_warning_with_id_handler;
  
! CRUFT_API extern void set_liboctave_error_handler (liboctave_error_handler f);
  
! CRUFT_API extern void set_liboctave_warning_handler 
(liboctave_warning_handler f);
  
! CRUFT_API extern void set_liboctave_warning_with_id_handler 
(liboctave_warning_with_id_handler f);
  
  #ifdef __cplusplus
  }
Index: libcruft/misc/quit.h
===================================================================
RCS file: /cvs/octave/libcruft/misc/quit.h,v
retrieving revision 1.18
diff -p -c -r1.18 quit.h
*** libcruft/misc/quit.h        14 Apr 2006 04:01:37 -0000      1.18
--- libcruft/misc/quit.h        17 Oct 2006 11:07:41 -0000
*************** extern "C" {
*** 38,47 ****
  
  #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 */
  
  #endif
  
--- 38,47 ----
  
  #include <windows.h>
  
! 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
  
*************** typedef jmp_buf octave_jmp_buf;
*** 59,75 ****
  
  #endif
  
! extern octave_jmp_buf current_context;
  
! extern void octave_save_current_context (void *);
  
! extern void octave_restore_current_context (void *);
  
! extern void octave_jump_to_enclosing_context (void) GCC_ATTR_NORETURN;
  
! extern void octave_save_signal_mask (void);
  
! extern void octave_restore_signal_mask (void);
  
  #ifdef __cplusplus
  class
--- 59,75 ----
  
  #endif
  
! CRUFT_API extern octave_jmp_buf current_context;
  
! CRUFT_API extern void octave_save_current_context (void *);
  
! CRUFT_API extern void octave_restore_current_context (void *);
  
! CRUFT_API extern void octave_jump_to_enclosing_context (void) 
GCC_ATTR_NORETURN;
  
! CRUFT_API extern void octave_save_signal_mask (void);
  
! CRUFT_API extern void octave_restore_signal_mask (void);
  
  #ifdef __cplusplus
  class
*************** octave_interrupt_exception
*** 78,101 ****
  };
  #endif
  
! extern sig_atomic_t octave_interrupt_immediately;
  
  /*
    > 0: interrupt pending
      0: no interrupt pending
    < 0: handling interrupt
  */
! extern sig_atomic_t octave_interrupt_state;
  
! extern sig_atomic_t octave_allocation_error;
  
! extern sig_atomic_t octave_signal_caught;
  
! extern void octave_handle_signal (void);
  
! extern void octave_throw_interrupt_exception (void) GCC_ATTR_NORETURN;
  
! extern void octave_throw_bad_alloc (void) GCC_ATTR_NORETURN;
  
  #define OCTAVE_QUIT \
    do \
--- 78,101 ----
  };
  #endif
  
! CRUFT_API extern sig_atomic_t octave_interrupt_immediately;
  
  /*
    > 0: interrupt pending
      0: no interrupt pending
    < 0: handling interrupt
  */
! CRUFT_API extern sig_atomic_t octave_interrupt_state;
  
! CRUFT_API extern sig_atomic_t octave_allocation_error;
  
! CRUFT_API extern sig_atomic_t octave_signal_caught;
  
! CRUFT_API extern void octave_handle_signal (void);
  
! CRUFT_API extern void octave_throw_interrupt_exception (void) 
GCC_ATTR_NORETURN;
  
! CRUFT_API extern void octave_throw_bad_alloc (void) GCC_ATTR_NORETURN;
  
  #define OCTAVE_QUIT \
    do \
*************** extern void octave_throw_bad_alloc (void
*** 185,193 ****
  /* 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);
  
  #endif
  
--- 185,193 ----
  /* These should only be declared for C++ code, and should also be
     outside of any extern "C" block.  */
  
! 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
  

reply via email to

[Prev in Thread] Current Thread [Next in Thread]