Mercurial > octave

changeset 21779:7db94853d12b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use consistent pattern for file inclusion guards * marker.h, ls-utils.h, oct-hdf5.h, pt-colon.h, pt-fcn-handle.h: Use consistent pattern for file inclusion guards. Ensure that symbols on the "#if ! defined" and "#define" lines match.
author John W. Eaton <jwe@octave.org>
date Thu, 26 May 2016 13:42:38 -0400
parents 895971cb50f0
children da4554d2342d
files libgui/src/m-editor/marker.h libinterp/corefcn/ls-utils.h libinterp/corefcn/oct-hdf5.h libinterp/parse-tree/pt-colon.h libinterp/parse-tree/pt-fcn-handle.h
diffstat 5 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/m-editor/marker.h	Wed May 25 16:59:05 2016 -0700
+++ b/libgui/src/m-editor/marker.h	Thu May 26 13:42:38 2016 -0400
@@ -19,8 +19,8 @@
 
 */
 
-#if ! defined (MARKER_H)
-#define MARKER_H
+#if ! defined (octave_marker_h)
+#define octave_marker_h 1
 
 #include <Qsci/qsciscintilla.h>
 #include <QObject>
--- a/libinterp/corefcn/ls-utils.h	Wed May 25 16:59:05 2016 -0700
+++ b/libinterp/corefcn/ls-utils.h	Thu May 26 13:42:38 2016 -0400
@@ -21,7 +21,7 @@
 */
 
 #if ! defined (octave_ls_utils_h)
-#  define octave_ls_utils 1
+#define octave_ls_utils_h 1
 
 #include "octave-config.h"
 
--- a/libinterp/corefcn/oct-hdf5.h	Wed May 25 16:59:05 2016 -0700
+++ b/libinterp/corefcn/oct-hdf5.h	Thu May 26 13:42:38 2016 -0400
@@ -21,7 +21,7 @@
 */
 
 #if ! defined (octave_oct_hdf5_h)
-#  define octave_hdf5_h 1
+#define octave_oct_hdf5_h 1
 
 #include "octave-config.h"
 
--- a/libinterp/parse-tree/pt-colon.h	Wed May 25 16:59:05 2016 -0700
+++ b/libinterp/parse-tree/pt-colon.h	Thu May 26 13:42:38 2016 -0400
@@ -21,11 +21,11 @@
 */
 
 #if ! defined (octave_pt_colon_h)
-#  define octave_tree_colon 1
+#define octave_pt_colon_h 1
 
 #include "octave-config.h"
 
-#  include <string>
+#include <string>
 
 class tree_walker;
 
@@ -33,8 +33,8 @@
 class octave_value_list;
 class octave_lvalue;
 
-#  include "pt-exp.h"
-#  include "symtab.h"
+#include "pt-exp.h"
+#include "symtab.h"
 
 // Colon expressions.
 
--- a/libinterp/parse-tree/pt-fcn-handle.h	Wed May 25 16:59:05 2016 -0700
+++ b/libinterp/parse-tree/pt-fcn-handle.h	Thu May 26 13:42:38 2016 -0400
@@ -21,7 +21,7 @@
 */
 
 #if ! defined (octave_pt_fcn_handle_h)
-#define octave_fcn_handle_h 1
+#define octave_pt_fcn_handle_h 1
 
 #include "octave-config.h"