Mercurial > hg > octave-nkf
changeset 4196:f874c6c68845
[project @ 2002-11-20 22:27:01 by jwe]
| author | jwe |
|---|---|
| date | Wed, 20 Nov 2002 22:27:01 +0000 |
| parents | f6be18b3136e |
| children | 40f76ce7a051 |
| files | ChangeLog configure.in libcruft/ChangeLog libcruft/misc/quit.h |
| diffstat | 4 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2002-11-20 John W. Eaton <jwe@bevo.che.wisc.edu> + * configure.in (OCTAVE_CXX_PRAGMA_INTERFACE_IMPLEMENTATION): + Delete use. + * aclocal.m4 (OCTAVE_LANG_PROG_NO_CONFDEFS): Delete. (OCTAVE_CXX_PRAGMA_INTERFACE_IMPLEMENTATION): Delete.
--- a/configure.in +++ b/configure.in @@ -22,7 +22,7 @@ ### 02111-1307, USA. AC_INIT -AC_REVISION($Revision: 1.393 $) +AC_REVISION($Revision: 1.394 $) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -317,7 +317,6 @@ AC_SUBST(LD_STATIC_FLAG) OCTAVE_CXX_PREPENDS_UNDERSCORE -OCTAVE_CXX_PRAGMA_INTERFACE_IMPLEMENTATION ### Defaults for cross compiling. BUILD_CC and BUILD_CXX are ### the compilers that we use for building tools on the build system.
--- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -1,3 +1,9 @@ +2002-11-20 John W. Eaton <jwe@bevo.che.wisc.edu> + + * misc/quit.h (BEGIN_INTERRUPT_WITH_EXCEPTIONS, + END_INTERRUPT_WITH_EXCEPTIONS): Only define for C++ source. + Include <new> for C++ source. + 2002-11-15 John W. Eaton <jwe@bevo.che.wisc.edu> * misc/quit.h, misc/quit.cc [! USE_EXCEPTIONS_FOR_INTERRUPTS]):
--- a/libcruft/misc/quit.h +++ b/libcruft/misc/quit.h @@ -32,6 +32,10 @@ #include <signal.h> #include <setjmp.h> +#ifdef __cplusplus +#include <new> +#endif + #if defined (OCTAVE_HAVE_SIG_JUMP) typedef sigjmp_buf octave_jmp_buf; @@ -109,6 +113,8 @@ } \ while (0) +#ifdef __cplusplus + #define BEGIN_INTERRUPT_WITH_EXCEPTIONS \ sig_atomic_t saved_octave_interrupt_immediately = octave_interrupt_immediately; \ \ @@ -131,6 +137,7 @@ } \ \ octave_interrupt_immediately = saved_octave_interrupt_immediately +#endif #ifdef __cplusplus }