Mercurial > hg > octave-nkf
changeset 4064:b4fa31442a78
[project @ 2002-09-26 21:10:45 by jwe]
author | jwe |
---|---|
date | Thu, 26 Sep 2002 21:10:46 +0000 |
parents | 9de7822bbdc4 |
children | 2550915214e1 |
files | ChangeLog configure.in kpathsea/ChangeLog kpathsea/c-stat.h kpathsea/config.h liboctave/ChangeLog liboctave/lo-mappers.cc liboctave/lo-specfun.cc src/ChangeLog src/lex.l src/parse.y src/pt-bp.cc src/sighandlers.cc src/sysdep.cc src/utils.cc |
diffstat | 15 files changed, 74 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-09-26 Paul Kienzle <pkienzle@users.sf.net> + + * configure.in: Fix syntax errors in !HAVE_XXX_T. + Don't require terminal control for build. + 2002-09-23 John W. Eaton <jwe@bevo.che.wisc.edu> * configure.in: Fix typedefs used in AH_BOTTOM.
--- a/configure.in +++ b/configure.in @@ -22,7 +22,7 @@ ### 02111-1307, USA. AC_INIT -AC_REVISION($Revision: 1.366 $) +AC_REVISION($Revision: 1.367 $) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -828,7 +828,7 @@ || test "$have_sgtty_h" = yes; then true else - AC_MSG_ERROR([I couldn't find termios.h, termio.h, or sgtty.h!]) + AC_MSG_WARN([I couldn't find termios.h, termio.h, or sgtty.h!]) fi ## I'm told that setting LIBGLOB to be $(TOPDIR)/glob/libglob.a causes @@ -1246,19 +1246,19 @@ #endif #if !defined(HAVE_DEV_T) -typedef short dev_t +typedef short dev_t; #endif #if !defined(HAVE_INO_T) -typedef unsigned long ino_t +typedef unsigned long ino_t; #endif #if !defined(HAVE_NLINK_T) -typedef short nlink_t +typedef short nlink_t; #endif #if !defined(HAVE_SIGSET_T) -typedef int sigset_t +typedef int sigset_t; #endif ])
--- a/kpathsea/ChangeLog +++ b/kpathsea/ChangeLog @@ -1,3 +1,8 @@ +2002-09-26 Paul Kienzle <pkienzle@users.sf.net> + + * config.h: Remove MINGW32 conflicts with win32lib.h. + * c-stat.h: Ditto. + 2002-09-03 John W. Eaton <jwe@bevo.che.wisc.edu> * xstat.c: Delete forward decl for lstat. It apparently causes
--- a/kpathsea/c-stat.h +++ b/kpathsea/c-stat.h @@ -22,7 +22,7 @@ #include <kpathsea/systypes.h> #include <sys/stat.h> -#ifdef WIN32 +#if defined (WIN32) && !defined (__MINGW32__) #include <kpathsea/win32lib.h> #endif /* WIN32 */
--- a/kpathsea/config.h +++ b/kpathsea/config.h @@ -34,7 +34,11 @@ #define MONOCASE_FILENAMES /* case-insensitive filename comparisons */ #endif -#ifdef WIN32 +#if defined(__MINGW32__) +#include <windows.h> +#include <fcntl.h> +#include <dirent.h> +#elif defined(WIN32) #define __STDC__ 1 #include <kpathsea/win32lib.h> #endif /* not WIN32 */
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,8 @@ +2002-09-26 Paul Kienzle <pkienzle@users.sf.net> + + * lo-mappers.cc: Remove unused #define M_PI. + * lo-specfun.cc: Add #define M_PI if needed. + 2002-09-23 John W. Eaton <jwe@bevo.che.wisc.edu> * cmd-edit.cc (do_decode_prompt_string): Cope with possibility
--- a/liboctave/lo-mappers.cc +++ b/liboctave/lo-mappers.cc @@ -53,10 +53,6 @@ #define M_LOG10E 0.43429448190325182765 #endif -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif - // double -> double mappers. double
--- a/liboctave/lo-specfun.cc +++ b/liboctave/lo-specfun.cc @@ -35,6 +35,10 @@ #include "lo-specfun.h" #include "mx-inlines.cc" +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif + extern "C" { int F77_FUNC (zbesj, ZBESJ) (const double&, const double&,
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,18 @@ +2002-09-26 Paul Kienzle <pkienzle@users.sf.net> + + * pt-bp.cc (tree_breakpoint::visit_unwind_protect_command): + Rename lst1 and lst2 to avoid dlgs.h conflict. + + * parse.y: Replace TEXT with STRING to avoid winnt.h conflict. + * lex.l: Ditto. + + * sysdep.cc (raw_mode): Non-fatal warning if raw_mode is not + supported. + + * sighandlers.cc: Don't define handlers for non-existent signals. + + * utils.cc: Don't include unneeded termio headers. + 2002-09-19 John W. Eaton <jwe@bevo.che.wisc.edu> * BaseSLList.cc, BaseSLList.h, Cell.cc, Cell.h, DLList.cc,
--- a/src/lex.l +++ b/src/lex.l @@ -242,7 +242,7 @@ <TEXT_FCN>[\;\,] { if (lexer_flags.doing_set && strcmp (yytext, ",") == 0) { - TOK_PUSH_AND_RETURN (yytext, TEXT); + TOK_PUSH_AND_RETURN (yytext, STRING); } else { @@ -261,7 +261,7 @@ <TEXT_FCN>[^ \t\n\;\,\"\'][^ \t\n\;\,]*{S}* { std::string tok = strip_trailing_whitespace (yytext); - TOK_PUSH_AND_RETURN (tok, TEXT); + TOK_PUSH_AND_RETURN (tok, STRING); } %{ @@ -2016,7 +2016,7 @@ else if (delim == '\'') gripe_single_quote_string (); - return TEXT; + return STRING; } } }
--- a/src/parse.y +++ b/src/parse.y @@ -391,7 +391,7 @@ %token <tok_val> NAME %token <tok_val> END %token <tok_val> PLOT -%token <tok_val> TEXT STYLE AXES_TAG +%token <tok_val> STRING STYLE AXES_TAG %token <tok_val> FOR WHILE DO UNTIL %token <tok_val> IF ELSEIF ELSE %token <tok_val> SWITCH CASE OTHERWISE @@ -583,8 +583,8 @@ { $$ = make_constant (NUM, $1); } | IMAG_NUM { $$ = make_constant (IMAG_NUM, $1); } - | TEXT - { $$ = make_constant (TEXT, $1); } + | STRING + { $$ = make_constant (STRING, $1); } ; in_matrix_or_assign_lhs @@ -853,14 +853,14 @@ { $$ = make_index_expression ($1, $2, '('); } ; -word_list : TEXT +word_list : STRING { - tree_constant *tmp = make_constant (TEXT, $1); + tree_constant *tmp = make_constant (STRING, $1); $$ = new tree_argument_list (tmp); } - | word_list TEXT + | word_list STRING { - tree_constant *tmp = make_constant (TEXT, $2); + tree_constant *tmp = make_constant (STRING, $2); $1->append (tmp); $$ = $1; } @@ -1860,7 +1860,7 @@ } break; - case TEXT: + case STRING: { octave_value tmp (tok_val->text ()); retval = new tree_constant (tmp, l, c);
--- a/src/pt-bp.cc +++ b/src/pt-bp.cc @@ -692,15 +692,15 @@ if (cmd.line () >= line) take_action (cmd); - tree_statement_list *lst1 = cmd.body (); + tree_statement_list *lstA = cmd.body (); - if (lst1) - lst1->accept (*this); + if (lstA) + lstA->accept (*this); - tree_statement_list *lst2 = cmd.cleanup (); + tree_statement_list *lstB = cmd.cleanup (); - if (lst2) - lst2->accept (*this); + if (lstB) + lstB->accept (*this); } /*
--- a/src/sighandlers.cc +++ b/src/sighandlers.cc @@ -186,6 +186,7 @@ // Handle SIGCHLD. +#ifdef SIGCHLD static RETSIGTYPE sigchld_handler (int /* sig */) { @@ -245,7 +246,9 @@ SIGHANDLER_RETURN (0); } +#endif /* defined(SIGCHLD) */ +#ifdef SIGFPE #if defined (__alpha__) static RETSIGTYPE sigfpe_handler (int /* sig */) @@ -264,7 +267,8 @@ SIGHANDLER_RETURN (0); } -#endif +#endif /* defined(__alpha__) */ +#endif /* defined(SIGFPE) */ #if 0 #if defined (SIGWINCH) @@ -308,6 +312,7 @@ SIGHANDLER_RETURN (0); } +#ifdef SIGPIPE static RETSIGTYPE sigpipe_handler (int /* sig */) { @@ -325,6 +330,7 @@ SIGHANDLER_RETURN (0); } +#endif /* defined(SIGPIPE) */ octave_interrupt_handler octave_catch_interrupts (void)
--- a/src/sysdep.cc +++ b/src/sysdep.cc @@ -47,8 +47,6 @@ #include <termio.h> #elif defined (HAVE_SGTTY_H) #include <sgtty.h> -#else -LOSE! LOSE! #endif #if defined (HAVE_SYS_IOCTL_H) @@ -302,7 +300,10 @@ ioctl (tty_fd, TIOCSETN, &s); } #else -LOSE! LOSE! + warning ("no support for raw mode console I/O on this system"); + + // Make sure the current mode doesn't toggle. + on = curr_on; #endif curr_on = on;
--- a/src/utils.cc +++ b/src/utils.cc @@ -44,16 +44,6 @@ #include <setjmp.h> -#if defined (HAVE_TERMIOS_H) -#include <termios.h> -#elif defined (HAVE_TERMIO_H) -#include <termio.h> -#elif defined (HAVE_SGTTY_H) -#include <sgtty.h> -#else -LOSE! LOSE! -#endif - #include "SLStack.h" #include "dir-ops.h"