# HG changeset patch
# User jwe
# Date 763247984 0
# Node ID 0b52c68ec81f0d6b5b80aa56bb72032ff7e6b0eb
# Parent  e02d6b6643947fefe4d4326f92754a690739f031
[project @ 1994-03-09 21:19:44 by jwe]

diff --git a/liboctave/idx-vector.h b/liboctave/idx-vector.h
--- a/liboctave/idx-vector.h
+++ b/liboctave/idx-vector.h
@@ -1,7 +1,7 @@
 // Very simple integer vectors for indexing              -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_idx_vector_h)
-#define _idx_vector_h 1
+#if !defined (octave_idx_vector_h)
+#define octave_idx_vector_h 1
 
 class ostream;
 class Matrix;
diff --git a/liboctave/statdefs.h b/liboctave/statdefs.h
--- a/liboctave/statdefs.h
+++ b/liboctave/statdefs.h
@@ -1,7 +1,7 @@
 // statdefs.h                                               -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_statdefs_h)
-#define _statdefs_h 1
+#if !defined (octave_statdefs_h)
+#define octave_statdefs_h 1
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/arith-ops.h b/src/arith-ops.h
--- a/src/arith-ops.h
+++ b/src/arith-ops.h
@@ -2,7 +2,7 @@
 // Used by the tree class.                    
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -22,8 +22,8 @@
 
 */
 
-#if !defined (_arith_ops_h)
-#define _arith_ops_h 1
+#if !defined (octave_arith_ops_h)
+#define octave_arith_ops_h 1
 
 #include "tree-base.h"
 
diff --git a/src/builtins.h b/src/builtins.h
--- a/src/builtins.h
+++ b/src/builtins.h
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_builtins_h)
-#define _builtins_h 1
+#if !defined (octave_builtins_h)
+#define octave_builtins_h 1
 
 class ostrstream;
 class Complex;
diff --git a/src/dynamic-ld.h b/src/dynamic-ld.h
--- a/src/dynamic-ld.h
+++ b/src/dynamic-ld.h
@@ -1,7 +1,7 @@
 // dynamic-ld.h                                        -*- C++ -*-
 /*
 
-Copyright (C) 1993 John W. Eaton
+Copyright (C) 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_dynamic_ld_h)
-#define _dynamic_ld_h 1
+#if !defined (octave_dynamic_ld_h)
+#define octave_dynamic_ld_h 1
 
 class tree_constant;
 
diff --git a/src/error.h b/src/error.h
--- a/src/error.h
+++ b/src/error.h
@@ -1,7 +1,7 @@
 // error.h                                              -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_error_h)
-#define _error_h 1
+#if !defined (octave_error_h)
+#define octave_error_h 1
 
 #define panic_impossible() \
   panic ("impossible state reached in file `%s' at line %d", \
diff --git a/src/file-io.h b/src/file-io.h
--- a/src/file-io.h
+++ b/src/file-io.h
@@ -1,7 +1,7 @@
 // file-io.h                                              -*- C++ -*-
 /*
 
-Copyright (C) 1993 John W. Eaton
+Copyright (C) 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -23,8 +23,8 @@
 
 // Written by John C. Campbell <jcc@che.utexas.edu>.
 
-#if !defined (_files_h)
-#define _files_h 1
+#if !defined (octave_files_h)
+#define octave_files_h 1
 
 #include <Pix.h>
 
diff --git a/src/g-builtins.h b/src/g-builtins.h
--- a/src/g-builtins.h
+++ b/src/g-builtins.h
@@ -1,7 +1,7 @@
 // Builtin general function support.                          -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_g_builtins_h)
-#define _g_builtins_h 1
+#if !defined (octave_g_builtins_h)
+#define octave_g_builtins_h 1
 
 #include "tree-const.h"
 
diff --git a/src/gripes.h b/src/gripes.h
--- a/src/gripes.h
+++ b/src/gripes.h
@@ -1,7 +1,7 @@
 // gripes.h                                              -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_gripes_h)
-#define _gripes_h 1
+#if !defined (octave_gripes_h)
+#define octave_gripes_h 1
 
 extern void gripe_string_invalid (void);
 extern void gripe_range_invalid (void);
diff --git a/src/help.h b/src/help.h
--- a/src/help.h
+++ b/src/help.h
@@ -1,7 +1,7 @@
 // help.h                                              -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_help_h)
-#define _help_h 1
+#if !defined (octave_help_h)
+#define octave_help_h 1
 
 typedef struct help_list
 {
diff --git a/src/input.h b/src/input.h
--- a/src/input.h
+++ b/src/input.h
@@ -23,8 +23,8 @@
 
 // Use the GNU readline library for command line editing and hisory.
 
-#if !defined (_input_h)
-#define _input_h 1
+#if !defined (octave_input_h)
+#define octave_input_h 1
 
 #include <stdio.h>
 
diff --git a/src/lex.h b/src/lex.h
--- a/src/lex.h
+++ b/src/lex.h
@@ -1,7 +1,7 @@
 // lex.h                                                 -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_lex_h)
-#define _lex_h 1
+#if !defined (octave_lex_h)
+#define octave_lex_h 1
 
 // Arrange to get input via readline.
 
diff --git a/src/mappers.h b/src/mappers.h
--- a/src/mappers.h
+++ b/src/mappers.h
@@ -1,7 +1,7 @@
 // mappers.h                                           -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_mappers_h)
-#define _mappers_h 1
+#if !defined (octave_mappers_h)
+#define octave_mappers_h 1
 
 class Complex;
 
diff --git a/src/oct-hist.h b/src/oct-hist.h
--- a/src/oct-hist.h
+++ b/src/oct-hist.h
@@ -1,7 +1,7 @@
 // octave-hist.h                                        -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_octave_hist_h)
-#define _octave_hist_h 1
+#if !defined (octave_octave_hist_h)
+#define octave_octave_hist_h 1
 
 extern void initialize_history (void);
 extern void clean_up_history (void);
diff --git a/src/pager.h b/src/pager.h
--- a/src/pager.h
+++ b/src/pager.h
@@ -1,7 +1,7 @@
 // pager.h                                               -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_pager_h)
-#define _pager_h 1
+#if !defined (octave_pager_h)
+#define octave_pager_h 1
 
 class ostrstream;
 
diff --git a/src/parse.h b/src/parse.h
--- a/src/parse.h
+++ b/src/parse.h
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_parse_h)
-#define _parse_h 1
+#if !defined (octave_parse_h)
+#define octave_parse_h 1
 
 #include "SLStack.h"
 
diff --git a/src/pr-output.h b/src/pr-output.h
--- a/src/pr-output.h
+++ b/src/pr-output.h
@@ -1,7 +1,7 @@
 // pr-output.h                                               -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_pr_output_h)
-#define _pr_output_h 1
+#if !defined (octave_pr_output_h)
+#define octave_pr_output_h 1
 
 class ostrstream;
 
diff --git a/src/procstream.h b/src/procstream.h
--- a/src/procstream.h
+++ b/src/procstream.h
@@ -1,7 +1,7 @@
 // procstream.h                                         -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_procstream_h)
-#define _procstream_h 1
+#if !defined (octave_procstream_h)
+#define octave_procstream_h 1
 
 #include <iostream.h>
 #include <procbuf.h>
diff --git a/src/pt-base.h b/src/pt-base.h
--- a/src/pt-base.h
+++ b/src/pt-base.h
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_tree_base_h)
-#define _tree_base_h 1
+#if !defined (octave_tree_base_h)
+#define octave_tree_base_h 1
 
 #include <stdio.h>
 #include <time.h>
diff --git a/src/pt-const.h b/src/pt-const.h
--- a/src/pt-const.h
+++ b/src/pt-const.h
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_tree_const_h)
-#define _tree_const_h 1
+#if !defined (octave_tree_const_h)
+#define octave_tree_const_h 1
 
 #include <stdlib.h>
 
diff --git a/src/sighandlers.h b/src/sighandlers.h
--- a/src/sighandlers.h
+++ b/src/sighandlers.h
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_sighandlers_h)
-#define _sighandlers_h 1
+#if !defined (octave_sighandlers_h)
+#define octave_sighandlers_h 1
 
 // Signal handler return type.
 #ifndef RETSIGTYPE
diff --git a/src/symtab.h b/src/symtab.h
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_symtab_h)
-#define _symtab_h 1
+#if !defined (octave_symtab_h)
+#define octave_symtab_h 1
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/sysdep.h b/src/sysdep.h
--- a/src/sysdep.h
+++ b/src/sysdep.h
@@ -1,7 +1,7 @@
 // sysdep.h                                              -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_sysdep_h)
-#define _sysdep_h 1
+#if !defined (octave_sysdep_h)
+#define octave_sysdep_h 1
 
 extern void sysdep_init (void);
 
diff --git a/src/t-builtins.h b/src/t-builtins.h
--- a/src/t-builtins.h
+++ b/src/t-builtins.h
@@ -1,7 +1,7 @@
 // builtin text function support.                          -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_t_builtins_h)
-#define _t_builtins_h 1
+#if !defined (octave_t_builtins_h)
+#define octave_t_builtins_h 1
 
 #include "tree-const.h"
 
diff --git a/src/token.h b/src/token.h
--- a/src/token.h
+++ b/src/token.h
@@ -1,7 +1,7 @@
 // token.h                                               -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_token_h)
-#define _token_h 1
+#if !defined (octave_token_h)
+#define octave_token_h 1
 
 class symbol_record;
 
diff --git a/src/toplev.h b/src/toplev.h
--- a/src/toplev.h
+++ b/src/toplev.h
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_octave_h)
-#define _octave_h 1
+#if !defined (octave_octave_h)
+#define octave_octave_h 1
 
 #include <stdio.h>
 
diff --git a/src/tree.h.old b/src/tree.h.old
--- a/src/tree.h.old
+++ b/src/tree.h.old
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_tree_h)
-#define _tree_h 1
+#if !defined (octave_tree_h)
+#define octave_tree_h 1
 
 #include <stdio.h>
 
diff --git a/src/unwind-prot.h b/src/unwind-prot.h
--- a/src/unwind-prot.h
+++ b/src/unwind-prot.h
@@ -1,7 +1,7 @@
 // unwind-prot.h                                              -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_unwind_prot_h)
-#define _unwind_prot_h 1
+#if !defined (octave_unwind_prot_h)
+#define octave_unwind_prot_h 1
 
 typedef void (*cleanup_func)(void *ptr);
 
diff --git a/src/user-prefs.h b/src/user-prefs.h
--- a/src/user-prefs.h
+++ b/src/user-prefs.h
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_user_prefs_h)
-#define _user_prefs_h 1
+#if !defined (octave_user_prefs_h)
+#define octave_user_prefs_h 1
 
 struct user_preferences
 {
diff --git a/src/utils.h b/src/utils.h
--- a/src/utils.h
+++ b/src/utils.h
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_utils_h)
-#define _utils_h 1
+#if !defined (octave_utils_h)
+#define octave_utils_h 1
 
 #include <time.h>
 
diff --git a/src/variables.h b/src/variables.h
--- a/src/variables.h
+++ b/src/variables.h
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_variables_h)
-#define _variables_h 1
+#if !defined (octave_variables_h)
+#define octave_variables_h 1
 
 class istream;
 class symbol_record;
diff --git a/src/xdiv.h b/src/xdiv.h
--- a/src/xdiv.h
+++ b/src/xdiv.h
@@ -1,7 +1,7 @@
 // xdiv.h                                               -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_xdiv_h)
-#define _xdiv_h 1
+#if !defined (octave_xdiv_h)
+#define octave_xdiv_h 1
 
 class Complex;
 class Matrix;
diff --git a/src/xpow.h b/src/xpow.h
--- a/src/xpow.h
+++ b/src/xpow.h
@@ -1,7 +1,7 @@
 // xpow.h                                               -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -21,8 +21,8 @@
 
 */
 
-#if !defined (_xpow_h)
-#define _xpow_h 1
+#if !defined (octave_xpow_h)
+#define octave_xpow_h 1
 
 class Complex;
 class Matrix;