Mercurial > octave
changeset 1465:3bb3848031a0
[project @ 1995-09-22 07:35:51 by jwe]
| author | jwe |
|---|---|
| date | Fri, 22 Sep 1995 07:45:28 +0000 |
| parents | 6548bc27329b |
| children | 2f85a175308f |
| files | src/load-save.cc src/oct-hist.cc src/octave.cc src/pt-plot.cc src/resource.cc src/symtab.cc src/sysdep.cc src/utils.cc src/variables.cc |
| diffstat | 9 files changed, 23 insertions(+), 52 deletions(-) [+] |
line wrap: on
line diff
--- a/src/load-save.cc Fri Sep 22 07:29:42 1995 +0000 +++ b/src/load-save.cc Fri Sep 22 07:45:28 1995 +0000 @@ -34,6 +34,10 @@ #include <fstream.h> #include <strstream.h> +#include <readline/tilde.h> + +#include "fnmatch.h" + #include "defun.h" #include "error.h" #include "gripes.h" @@ -49,13 +53,6 @@ #include "user-prefs.h" #include "utils.h" -extern "C" -{ -#include <readline/tilde.h> - -#include "fnmatch.h" -} - #if CHAR_BIT != 8 LOSE! LOSE! #endif
--- a/src/oct-hist.cc Fri Sep 22 07:29:42 1995 +0000 +++ b/src/oct-hist.cc Fri Sep 22 07:45:28 1995 +0000 @@ -46,6 +46,8 @@ #include <fcntl.h> +#include <readline/history.h> + #include "defun.h" #include "error.h" #include "input.h" @@ -59,11 +61,6 @@ #include "user-prefs.h" #include "utils.h" -extern "C" -{ -#include <readline/history.h> -} - // Nonzero means input is coming from temporary history file. int input_from_tmp_history_file = 0; @@ -352,11 +349,6 @@ return line; } -extern "C" -{ - HIST_ENTRY *history_get (); -} - // Use `command' to replace the last entry in the history list, which, // by this time, is `run_history blah...'. The intent is that the // new command become the history entry, and that `fc' should never
--- a/src/octave.cc Fri Sep 22 07:29:42 1995 +0000 +++ b/src/octave.cc Fri Sep 22 07:45:28 1995 +0000 @@ -78,7 +78,7 @@ #include "version.h" #if !defined (HAVE_ATEXIT) && defined (HAVE_ON_EXIT) -extern "C" { int on_exit (); } +extern "C" int on_exit (); #define atexit on_exit #endif
--- a/src/pt-plot.cc Fri Sep 22 07:29:42 1995 +0000 +++ b/src/pt-plot.cc Fri Sep 22 07:45:28 1995 +0000 @@ -40,6 +40,8 @@ #include <unistd.h> #endif +#include <readline/tilde.h> + #include "SLStack.h" #include "procstream.h" @@ -56,11 +58,6 @@ #include "user-prefs.h" #include "utils.h" -extern "C" -{ -#include <readline/tilde.h> -} - // The number of lines we've plotted so far. static int plot_line_count = 0;
--- a/src/resource.cc Fri Sep 22 07:29:42 1995 +0000 +++ b/src/resource.cc Fri Sep 22 07:45:28 1995 +0000 @@ -25,6 +25,10 @@ #include <config.h> #endif +#ifdef HAVE_SYS_RESOURCE_H +#include <sys/resource.h> +#endif + #include "defun.h" #include "help.h" #include "oct-map.h" @@ -33,13 +37,6 @@ #include "tree-const.h" #include "utils.h" -#ifdef HAVE_SYS_RESOURCE_H -extern "C" -{ -#include <sys/resource.h> -} -#endif - #ifndef RUSAGE_SELF #define RUSAGE_SELF 0 #endif
--- a/src/symtab.cc Fri Sep 22 07:29:42 1995 +0000 +++ b/src/symtab.cc Fri Sep 22 07:45:28 1995 +0000 @@ -29,6 +29,8 @@ #include <config.h> #endif +#include "fnmatch.h" + #include "error.h" #include "symtab.h" #include "tree-base.h" @@ -38,11 +40,6 @@ #include "utils.h" #include "variables.h" -extern "C" -{ -#include "fnmatch.h" -} - // Variables and functions. symbol_def::symbol_def (void)
--- a/src/sysdep.cc Fri Sep 22 07:29:42 1995 +0000 +++ b/src/sysdep.cc Fri Sep 22 07:45:28 1995 +0000 @@ -271,7 +271,6 @@ #if defined (EXCEPTION_IN_MATH) extern "C" -{ int matherr (struct exception *x) { @@ -294,8 +293,6 @@ return 1; } -} -#endif void sysdep_init (void)
--- a/src/utils.cc Fri Sep 22 07:29:42 1995 +0000 +++ b/src/utils.cc Fri Sep 22 07:45:28 1995 +0000 @@ -40,12 +40,6 @@ #include <Complex.h> -extern "C" -{ -#ifndef HAVE_STRNCASECMP -extern int strncasecmp (const char*, const char*, size_t); -#endif - #if defined (HAVE_TERMIOS_H) #include <termios.h> #elif defined (HAVE_TERMIO_H) @@ -57,7 +51,10 @@ #endif #include <readline/tilde.h> -} + +#ifndef HAVE_STRNCASECMP +extern "C" int strncasecmp (const char*, const char*, size_t); +#endif #include "SLStack.h"
--- a/src/variables.cc Fri Sep 22 07:29:42 1995 +0000 +++ b/src/variables.cc Fri Sep 22 07:45:28 1995 +0000 @@ -35,6 +35,10 @@ #include <unistd.h> #endif +#include <readline/readline.h> + +#include "fnmatch.h" + #include "defaults.h" #include "defun.h" #include "dirfns.h" @@ -60,13 +64,6 @@ #include "variables.h" #include "version.h" -extern "C" -{ -#include <readline/readline.h> - -#include "fnmatch.h" -} - // Symbol table for symbols at the top level. symbol_table *top_level_sym_tab = 0;