Mercurial > hg > octave-nkf
changeset 11232:88e4ea8b2c19
eliminate special cases for NeXT systems
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 10 Nov 2010 21:01:54 -0500 |
parents | 2f29b765c0ef |
children | 1dfbcc9eee92 |
files | ChangeLog configure.ac liboctave/ChangeLog liboctave/syswait.h src/ChangeLog src/sysdep.cc |
diffstat | 6 files changed, 13 insertions(+), 62 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-11-10 John W. Eaton <jwe@octave.org> + + * configure.ac: Eliminate special cases for nextstep. + 2010-11-10 John W. Eaton <jwe@octave.org> * configure.ac: Eliminate special checks for SCO systems.
--- a/configure.ac +++ b/configure.ac @@ -511,8 +511,6 @@ ### Look for math library. If found, this will add -lm to LIBS. case "$canonical_host_type" in - *-*-nextstep*) - ;; *-*-linux*) AC_CHECK_LIB(m, sin, , , -lc) ;; @@ -1547,17 +1545,6 @@ AC_CHECK_HEADERS(fnmatch.h, have_fnmatch_h=yes, have_fnmatch_h=no) AC_CHECK_HEADERS(conio.h, have_conio_h=yes, have_conio_h=no) -### I'm told that termios.h is broken on NeXT systems. - -case "$canonical_host_type" in - *-*-nextstep*) - if test "$have_termios_h" = yes; then - AC_MSG_WARN([Ignoring termios.h on NeXT systems.]) - have_termios_h=no - fi - ;; -esac - if test "$have_termios_h" = yes \ || test "$have_termio_h" = yes \ || test "$have_sgtty_h" = yes; then
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,7 @@ +2010-11-10 John W. Eaton <jwe@octave.org> + + * syswait.h: Delete special cases for NeXT systems. + 2010-11-10 John W. Eaton <jwe@octave.org> * lo-sysdep.cc (octave_chdir): Delete special case for __EMX__.
--- a/liboctave/syswait.h +++ b/liboctave/syswait.h @@ -31,34 +31,10 @@ #include <sys/types.h> -#if defined (NeXT) && ! defined (_POSIX_SOURCE) -#define HAVE_SYS_WAIT_H -#endif - #if defined HAVE_SYS_WAIT_H #include <sys/wait.h> #endif -#if defined (NeXT) -#define HAVE_WAITPID 1 -#define WAITPID(a, b, c) \ - wait4 ((a) == -1 ? 0 : (a), (union wait *)(b), c, 0) - -/* Use the defaults below. */ -#undef WIFEXITED -#undef WEXITSTATUS -#undef WIFSIGNALLED -#endif - -/* NeXT has sys/wait.h, but it is not compatible with POSIX.1, so we - try to define waitpid in terms of wait4. */ - -#if defined (NeXT) -#include <sys/wait.h> -#define waitpid(a, b, c) \ - wait4 ((a) == -1 ? 0 : (a), (union wait *)(b), c, 0) -#endif - #ifndef WIFEXITED #define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-11-10 John W. Eaton <jwe@octave.org> + + * sysdep.cc (sysdep_init): Eliminate special case for NeXT systems. + (malloc_handler, NeXT_init): Delete. + 2010-11-10 John W. Eaton <jwe@octave.org> * sighandlers.cc (MAYBE_ACK_SIGNAL): Delete macro and all uses.
--- a/src/sysdep.cc +++ b/src/sysdep.cc @@ -247,29 +247,6 @@ #endif -#if defined (NeXT) -extern "C" -{ - typedef void (*_cplus_fcn_int) (int); - extern void (*malloc_error (_cplus_fcn_int)) (int); -} - -static void -malloc_handler (int code) -{ - if (code == 5) - warning ("hopefully recoverable malloc error: freeing wild pointer"); - else - panic ("probably irrecoverable malloc error: code %d", code); -} - -static void -NeXT_init (void) -{ - malloc_error (malloc_handler); -} -#endif - void sysdep_init (void) { @@ -279,8 +256,6 @@ MINGW_init (); #elif defined (_MSC_VER) MSVC_init (); -#elif defined (NeXT) - NeXT_init (); #endif octave_ieee_init ();