Mercurial > octave
changeset 21241:bae38398f5f1
use consistent style for all liboctave and libinterp include guards
* mex.h, mexproto.h, mxarray.in.h, oct-obj.h, octave-default-image.h:
Use include guard style that is consistent with other files in Octave.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 10 Feb 2016 12:21:36 -0500 |
parents | 7af5ca01ecac |
children | ae03a16f3343 |
files | libinterp/corefcn/mex.h libinterp/corefcn/mexproto.h libinterp/corefcn/mxarray.in.h libinterp/corefcn/oct-obj.h libinterp/corefcn/octave-default-image.h |
diffstat | 5 files changed, 15 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/mex.h Wed Feb 10 11:57:17 2016 -0500 +++ b/libinterp/corefcn/mex.h Wed Feb 10 12:21:36 2016 -0500 @@ -45,8 +45,8 @@ /* mex.h is for use in C-programs only; do NOT include it in mex.cc */ -#if ! defined (MEX_H) -#define MEX_H +#if ! defined (octave_mex_h) +#define octave_mex_h 1 #define HAVE_OCTAVE
--- a/libinterp/corefcn/mexproto.h Wed Feb 10 11:57:17 2016 -0500 +++ b/libinterp/corefcn/mexproto.h Wed Feb 10 12:21:36 2016 -0500 @@ -45,8 +45,8 @@ /* mex.h is for use in C-programs only; do NOT include it in mex.cc */ -#if ! defined (MEXPROTO_H) -#define MEXPROTO_H +#if ! defined (octave_mexproto_h) +#define octave_mexproto_h 1 #if defined (__cplusplus) # include <cstdlib>
--- a/libinterp/corefcn/mxarray.in.h Wed Feb 10 11:57:17 2016 -0500 +++ b/libinterp/corefcn/mxarray.in.h Wed Feb 10 12:21:36 2016 -0500 @@ -44,8 +44,8 @@ */ -#if ! defined (MXARRAY_H) -#define MXARRAY_H +#if ! defined (octave_mxarray_h) +#define octave_mxarray_h 1 typedef enum {
--- a/libinterp/corefcn/oct-obj.h Wed Feb 10 11:57:17 2016 -0500 +++ b/libinterp/corefcn/oct-obj.h Wed Feb 10 12:21:36 2016 -0500 @@ -25,6 +25,11 @@ // version 4.6. //////////////////////////////////////////////////////////////////////// +#if ! defined (octave_oct_obj_h) +#define octave_oct_obj_h 1 + #warning oct-obj.h has been deprecated; use ovl.h instead #include "ovl.h" + +#endif
--- a/libinterp/corefcn/octave-default-image.h Wed Feb 10 11:57:17 2016 -0500 +++ b/libinterp/corefcn/octave-default-image.h Wed Feb 10 12:21:36 2016 -0500 @@ -20,6 +20,9 @@ */ +#if ! defined (octave_octave_default_image_h) +#define octave_octave_default_image_h 1 + static char default_im_data[] = { 31,31,31,31,31,31,31,31,31,31,31,31,31,31,31,31, @@ -280,3 +283,4 @@ 31,31,31,31,31,31,31,31,31,31,31,31,31,31,31,31 }; +#endif