# HG changeset patch # User Rik # Date 1454718548 28800 # Node ID fcac5dbbf9ed76ac10cade200d47c39acfff80a0 # Parent dd6605e1eaea11eca483cae1b5491cdd67487a6d maint: Indent #ifdef blocks in libinterp. * builtins.h, Cell.cc, __contourc__.cc, __dispatch__.cc, __dsearchn__.cc, __ichol__.cc, __ilu__.cc, __lin_interpn__.cc, __pchip_deriv__.cc, __qp__.cc, balance.cc, besselj.cc, betainc.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, cellfun.cc, colloc.cc, comment-list.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, defaults.cc, defaults.in.h, defun-dld.h, defun.cc, defun.h, det.cc, dirfns.cc, display.cc, dlmread.cc, dot.cc, dynamic-ld.cc, eig.cc, ellipj.cc, error.cc, errwarn.cc, event-queue.cc, fft.cc, fft2.cc, fftn.cc, file-io.cc, filter.cc, find.cc, gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc, gl-render.cc, gl2ps-print.cc, graphics.cc, graphics.in.h, gripes.cc, hash.cc, help.cc, hess.cc, hex2num.cc, input.cc, inv.cc, jit-ir.cc, jit-typeinfo.cc, jit-util.cc, jit-util.h, kron.cc, load-path.cc, load-save.cc, lookup.cc, ls-ascii-helper.cc, ls-hdf5.cc, ls-mat-ascii.cc, ls-mat4.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc, ls-oct-text.h, ls-utils.cc, ls-utils.h, lsode.cc, lu.cc, luinc.cc, mappers.cc, matrix_type.cc, max.cc, mex.h, mexproto.h, mgorth.cc, nproc.cc, oct-errno.in.cc, oct-fstrm.cc, oct-hdf5-types.cc, oct-hdf5.h, oct-hist.cc, oct-iostrm.cc, oct-lvalue.cc, oct-map.cc, oct-prcstrm.cc, oct-procbuf.cc, oct-stream.cc, oct-strstrm.cc, octave-link.cc, ordschur.cc, pager.cc, pinv.cc, pr-output.cc, procstream.cc, profiler.cc, psi.cc, pt-jit.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, sighandlers.cc, sparse-xdiv.cc, sparse-xpow.cc, sparse.cc, spparms.cc, sqrtm.cc, str2double.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symtab.cc, syscalls.cc, sysdep.cc, sysdep.h, time.cc, toplev.cc, tril.cc, tsearch.cc, txt-eng-ft.cc, txt-eng.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc, xdiv.cc, xnorm.cc, xpow.cc, zfstream.cc, __delaunayn__.cc, __eigs__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __magick_read__.cc, __osmesa_print__.cc, __voronoi__.cc, amd.cc, audiodevinfo.cc, audioread.cc, ccolamd.cc, chol.cc, colamd.cc, convhulln.cc, dmperm.cc, fftw.cc, oct-qhull.h, qr.cc, symbfact.cc, symrcm.cc, oct-conf.in.cc, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc, ov-base-scalar.cc, ov-base-sparse.cc, ov-base.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.cc, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-classdef.cc, ov-colon.cc, ov-complex.cc, ov-cs-list.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-fcn.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-java.cc, ov-lazy-idx.cc, ov-mex-fcn.cc, ov-null-mat.cc, ov-oncleanup.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc, ov.cc, ovl.cc, octave.cc, op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.cc, op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-dm-template.cc, op-dms-template.cc, op-double-conv.cc, op-fcdm-fcdm.cc, op-fcdm-fdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-float-conv.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc, op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc, op-int-conv.cc, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc, op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.cc, pt-arg-list.cc, pt-array-list.cc, pt-assign.cc, pt-binop.cc, pt-bp.cc, pt-cbinop.cc, pt-cell.cc, pt-check.cc, pt-classdef.cc, pt-cmd.cc, pt-colon.cc, pt-colon.h, pt-const.cc, pt-decl.cc, pt-eval.cc, pt-except.cc, pt-exp.cc, pt-fcn-handle.cc, pt-funcall.cc, pt-id.cc, pt-idx.cc, pt-jump.cc, pt-loop.cc, pt-mat.cc, pt-misc.cc, pt-pr-code.cc, pt-select.cc, pt-stmt.cc, pt-unop.cc, pt.cc, token.cc, Array-jit.cc, Array-os.cc, Array-sym.cc, Array-tc.cc, version.cc: Indent #ifdef blocks in libinterp. diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/builtins.h --- a/libinterp/builtins.h Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/builtins.h Fri Feb 05 16:29:08 2016 -0800 @@ -24,7 +24,7 @@ #define octave_builtins_h 1 #if ! defined (MAKE_BUILTINS) -#include "builtin-defun-decls.h" +# include "builtin-defun-decls.h" #endif extern OCTINTERP_API void install_builtins (void); diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/Cell.cc --- a/libinterp/corefcn/Cell.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/Cell.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "idx-vector.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/__contourc__.cc --- a/libinterp/corefcn/__contourc__.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/__contourc__.cc Fri Feb 05 16:29:08 2016 -0800 @@ -33,7 +33,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/__dispatch__.cc --- a/libinterp/corefcn/__dispatch__.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/__dispatch__.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/__dsearchn__.cc --- a/libinterp/corefcn/__dsearchn__.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/__dsearchn__.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/__ichol__.cc --- a/libinterp/corefcn/__ichol__.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/__ichol__.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "oct-locbuf.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/__ilu__.cc --- a/libinterp/corefcn/__ilu__.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/__ilu__.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "oct-locbuf.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/__lin_interpn__.cc --- a/libinterp/corefcn/__lin_interpn__.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/__lin_interpn__.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "lo-ieee.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/__pchip_deriv__.cc --- a/libinterp/corefcn/__pchip_deriv__.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/__pchip_deriv__.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/__qp__.cc --- a/libinterp/corefcn/__qp__.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/__qp__.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/balance.cc --- a/libinterp/corefcn/balance.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/balance.cc Fri Feb 05 16:29:08 2016 -0800 @@ -24,7 +24,7 @@ // Author: A. S. Hodel #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/besselj.cc --- a/libinterp/corefcn/besselj.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/besselj.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "lo-specfun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/betainc.cc --- a/libinterp/corefcn/betainc.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/betainc.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "lo-specfun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/bitfcns.cc --- a/libinterp/corefcn/bitfcns.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/bitfcns.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/bsxfun.cc --- a/libinterp/corefcn/bsxfun.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/bsxfun.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/c-file-ptr-stream.cc --- a/libinterp/corefcn/c-file-ptr-stream.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/c-file-ptr-stream.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -29,15 +29,15 @@ #include "c-file-ptr-stream.h" #ifndef SEEK_SET -#define SEEK_SET 0 +# define SEEK_SET 0 #endif #ifndef SEEK_CUR -#define SEEK_CUR 1 +# define SEEK_CUR 1 #endif #ifndef SEEK_END -#define SEEK_END 2 +# define SEEK_END 2 #endif c_file_ptr_buf::~c_file_ptr_buf (void) diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/c-file-ptr-stream.h --- a/libinterp/corefcn/c-file-ptr-stream.h Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/c-file-ptr-stream.h Fri Feb 05 16:29:08 2016 -0800 @@ -140,7 +140,7 @@ #ifdef HAVE_ZLIB #ifdef HAVE_ZLIB_H -#include +# include #endif class diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/cellfun.cc --- a/libinterp/corefcn/cellfun.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/cellfun.cc Fri Feb 05 16:29:08 2016 -0800 @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/colloc.cc --- a/libinterp/corefcn/colloc.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/colloc.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/comment-list.cc --- a/libinterp/corefcn/comment-list.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/comment-list.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "lo-utils.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/conv2.cc --- a/libinterp/corefcn/conv2.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/conv2.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "oct-convn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/daspk.cc --- a/libinterp/corefcn/daspk.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/daspk.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/dasrt.cc --- a/libinterp/corefcn/dasrt.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/dasrt.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/dassl.cc --- a/libinterp/corefcn/dassl.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/dassl.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/data.cc --- a/libinterp/corefcn/data.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/data.cc Fri Feb 05 16:29:08 2016 -0800 @@ -24,14 +24,14 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include #include #ifdef HAVE_SYS_RESOURCE_H -#include +# include #endif #include @@ -70,16 +70,16 @@ #include "xnorm.h" #if ! defined (CLOCKS_PER_SEC) -#if defined (CLK_TCK) -#define CLOCKS_PER_SEC CLK_TCK -#else -#error "no definition for CLOCKS_PER_SEC!" -#endif +# if defined (CLK_TCK) +# define CLOCKS_PER_SEC CLK_TCK +# else +# error "no definition for CLOCKS_PER_SEC!" +# endif #endif #if ! defined (HAVE_HYPOTF) && defined (HAVE__HYPOTF) -#define hypotf _hypotf -#define HAVE_HYPOTF 1 +# define hypotf _hypotf +# define HAVE_HYPOTF 1 #endif static void diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/debug.cc --- a/libinterp/corefcn/debug.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/debug.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -199,7 +199,7 @@ } #ifdef DBSTOP_NANINF -#include "sigfpe.cc" +# include "sigfpe.cc" #endif enum diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/defaults.cc --- a/libinterp/corefcn/defaults.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/defaults.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/defaults.in.h --- a/libinterp/corefcn/defaults.in.h Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/defaults.in.h Fri Feb 05 16:29:08 2016 -0800 @@ -29,163 +29,163 @@ #include "pathsearch.h" #ifndef OCTAVE_CANONICAL_HOST_TYPE -#define OCTAVE_CANONICAL_HOST_TYPE %OCTAVE_CANONICAL_HOST_TYPE% +# define OCTAVE_CANONICAL_HOST_TYPE %OCTAVE_CANONICAL_HOST_TYPE% #endif #ifndef OCTAVE_DEFAULT_PAGER -#define OCTAVE_DEFAULT_PAGER %OCTAVE_DEFAULT_PAGER% +# define OCTAVE_DEFAULT_PAGER %OCTAVE_DEFAULT_PAGER% #endif #ifndef OCTAVE_ARCHLIBDIR -#define OCTAVE_ARCHLIBDIR %OCTAVE_ARCHLIBDIR% +# define OCTAVE_ARCHLIBDIR %OCTAVE_ARCHLIBDIR% #endif #ifndef OCTAVE_BINDIR -#define OCTAVE_BINDIR %OCTAVE_BINDIR% +# define OCTAVE_BINDIR %OCTAVE_BINDIR% #endif #ifndef OCTAVE_DATADIR -#define OCTAVE_DATADIR %OCTAVE_DATADIR% +# define OCTAVE_DATADIR %OCTAVE_DATADIR% #endif #ifndef OCTAVE_DATAROOTDIR -#define OCTAVE_DATAROOTDIR %OCTAVE_DATAROOTDIR% +# define OCTAVE_DATAROOTDIR %OCTAVE_DATAROOTDIR% #endif #ifndef OCTAVE_DOC_CACHE_FILE -#define OCTAVE_DOC_CACHE_FILE %OCTAVE_DOC_CACHE_FILE% +# define OCTAVE_DOC_CACHE_FILE %OCTAVE_DOC_CACHE_FILE% #endif #ifndef OCTAVE_TEXI_MACROS_FILE -#define OCTAVE_TEXI_MACROS_FILE %OCTAVE_TEXI_MACROS_FILE% +# define OCTAVE_TEXI_MACROS_FILE %OCTAVE_TEXI_MACROS_FILE% #endif #ifndef OCTAVE_EXEC_PREFIX -#define OCTAVE_EXEC_PREFIX %OCTAVE_EXEC_PREFIX% +# define OCTAVE_EXEC_PREFIX %OCTAVE_EXEC_PREFIX% #endif #ifndef OCTAVE_FCNFILEDIR -#define OCTAVE_FCNFILEDIR %OCTAVE_FCNFILEDIR% +# define OCTAVE_FCNFILEDIR %OCTAVE_FCNFILEDIR% #endif #ifndef OCTAVE_IMAGEDIR -#define OCTAVE_IMAGEDIR %OCTAVE_IMAGEDIR% +# define OCTAVE_IMAGEDIR %OCTAVE_IMAGEDIR% #endif #ifndef OCTAVE_INCLUDEDIR -#define OCTAVE_INCLUDEDIR %OCTAVE_INCLUDEDIR% +# define OCTAVE_INCLUDEDIR %OCTAVE_INCLUDEDIR% #endif #ifndef OCTAVE_INFODIR -#define OCTAVE_INFODIR %OCTAVE_INFODIR% +# define OCTAVE_INFODIR %OCTAVE_INFODIR% #endif #ifndef OCTAVE_INFOFILE -#define OCTAVE_INFOFILE %OCTAVE_INFOFILE% +# define OCTAVE_INFOFILE %OCTAVE_INFOFILE% #endif #ifndef OCTAVE_LIBDIR -#define OCTAVE_LIBDIR %OCTAVE_LIBDIR% +# define OCTAVE_LIBDIR %OCTAVE_LIBDIR% #endif #ifndef OCTAVE_LIBEXECDIR -#define OCTAVE_LIBEXECDIR %OCTAVE_LIBEXECDIR% +# define OCTAVE_LIBEXECDIR %OCTAVE_LIBEXECDIR% #endif #ifndef OCTAVE_LIBEXECDIR -#define OCTAVE_LIBEXECDIR %OCTAVE_LIBEXECDIR% +# define OCTAVE_LIBEXECDIR %OCTAVE_LIBEXECDIR% #endif #ifndef OCTAVE_LOCALAPIFCNFILEDIR -#define OCTAVE_LOCALAPIFCNFILEDIR %OCTAVE_LOCALAPIFCNFILEDIR% +# define OCTAVE_LOCALAPIFCNFILEDIR %OCTAVE_LOCALAPIFCNFILEDIR% #endif #ifndef OCTAVE_LOCALAPIOCTFILEDIR -#define OCTAVE_LOCALAPIOCTFILEDIR %OCTAVE_LOCALAPIOCTFILEDIR% +# define OCTAVE_LOCALAPIOCTFILEDIR %OCTAVE_LOCALAPIOCTFILEDIR% #endif #ifndef OCTAVE_LOCALARCHLIBDIR -#define OCTAVE_LOCALARCHLIBDIR %OCTAVE_LOCALARCHLIBDIR% +# define OCTAVE_LOCALARCHLIBDIR %OCTAVE_LOCALARCHLIBDIR% #endif #ifndef OCTAVE_LOCALFCNFILEDIR -#define OCTAVE_LOCALFCNFILEDIR %OCTAVE_LOCALFCNFILEDIR% +# define OCTAVE_LOCALFCNFILEDIR %OCTAVE_LOCALFCNFILEDIR% #endif #ifndef OCTAVE_LOCALOCTFILEDIR -#define OCTAVE_LOCALOCTFILEDIR %OCTAVE_LOCALOCTFILEDIR% +# define OCTAVE_LOCALOCTFILEDIR %OCTAVE_LOCALOCTFILEDIR% #endif #ifndef OCTAVE_LOCALSTARTUPFILEDIR -#define OCTAVE_LOCALSTARTUPFILEDIR %OCTAVE_LOCALSTARTUPFILEDIR% +# define OCTAVE_LOCALSTARTUPFILEDIR %OCTAVE_LOCALSTARTUPFILEDIR% #endif #ifndef OCTAVE_LOCALAPIARCHLIBDIR -#define OCTAVE_LOCALAPIARCHLIBDIR %OCTAVE_LOCALAPIARCHLIBDIR% +# define OCTAVE_LOCALAPIARCHLIBDIR %OCTAVE_LOCALAPIARCHLIBDIR% #endif #ifndef OCTAVE_LOCALVERARCHLIBDIR -#define OCTAVE_LOCALVERARCHLIBDIR %OCTAVE_LOCALVERARCHLIBDIR% +# define OCTAVE_LOCALVERARCHLIBDIR %OCTAVE_LOCALVERARCHLIBDIR% #endif #ifndef OCTAVE_LOCALVERFCNFILEDIR -#define OCTAVE_LOCALVERFCNFILEDIR %OCTAVE_LOCALVERFCNFILEDIR% +# define OCTAVE_LOCALVERFCNFILEDIR %OCTAVE_LOCALVERFCNFILEDIR% #endif #ifndef OCTAVE_LOCALVEROCTFILEDIR -#define OCTAVE_LOCALVEROCTFILEDIR %OCTAVE_LOCALVEROCTFILEDIR% +# define OCTAVE_LOCALVEROCTFILEDIR %OCTAVE_LOCALVEROCTFILEDIR% #endif #ifndef OCTAVE_MAN1DIR -#define OCTAVE_MAN1DIR %OCTAVE_MAN1DIR% +# define OCTAVE_MAN1DIR %OCTAVE_MAN1DIR% #endif #ifndef OCTAVE_MAN1EXT -#define OCTAVE_MAN1EXT %OCTAVE_MAN1EXT% +# define OCTAVE_MAN1EXT %OCTAVE_MAN1EXT% #endif #ifndef OCTAVE_MANDIR -#define OCTAVE_MANDIR %OCTAVE_MANDIR% +# define OCTAVE_MANDIR %OCTAVE_MANDIR% #endif #ifndef OCTAVE_OCTDATADIR -#define OCTAVE_OCTDATADIR %OCTAVE_OCTDATADIR% +# define OCTAVE_OCTDATADIR %OCTAVE_OCTDATADIR% #endif #ifndef OCTAVE_OCTFILEDIR -#define OCTAVE_OCTFILEDIR %OCTAVE_OCTFILEDIR% +# define OCTAVE_OCTFILEDIR %OCTAVE_OCTFILEDIR% #endif #ifndef OCTAVE_OCTETCDIR -#define OCTAVE_OCTETCDIR %OCTAVE_OCTETCDIR% +# define OCTAVE_OCTETCDIR %OCTAVE_OCTETCDIR% #endif #ifndef OCTAVE_OCTLOCALEDIR -#define OCTAVE_OCTLOCALEDIR %OCTAVE_OCTLOCALEDIR% +# define OCTAVE_OCTLOCALEDIR %OCTAVE_OCTLOCALEDIR% #endif #ifndef OCTAVE_OCTINCLUDEDIR -#define OCTAVE_OCTINCLUDEDIR %OCTAVE_OCTINCLUDEDIR% +# define OCTAVE_OCTINCLUDEDIR %OCTAVE_OCTINCLUDEDIR% #endif #ifndef OCTAVE_OCTLIBDIR -#define OCTAVE_OCTLIBDIR %OCTAVE_OCTLIBDIR% +# define OCTAVE_OCTLIBDIR %OCTAVE_OCTLIBDIR% #endif #ifndef OCTAVE_OCTTESTSDIR -#define OCTAVE_OCTTESTSDIR %OCTAVE_OCTTESTSDIR% +# define OCTAVE_OCTTESTSDIR %OCTAVE_OCTTESTSDIR% #endif #ifndef OCTAVE_PREFIX -#define OCTAVE_PREFIX %OCTAVE_PREFIX% +# define OCTAVE_PREFIX %OCTAVE_PREFIX% #endif #ifndef OCTAVE_STARTUPFILEDIR -#define OCTAVE_STARTUPFILEDIR %OCTAVE_STARTUPFILEDIR% +# define OCTAVE_STARTUPFILEDIR %OCTAVE_STARTUPFILEDIR% #endif #ifndef OCTAVE_RELEASE -#define OCTAVE_RELEASE %OCTAVE_RELEASE% +# define OCTAVE_RELEASE %OCTAVE_RELEASE% #endif extern OCTINTERP_API std::string Voctave_home; diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/defun-dld.h --- a/libinterp/corefcn/defun-dld.h Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/defun-dld.h Fri Feb 05 16:29:08 2016 -0800 @@ -24,7 +24,7 @@ #define octave_defun_dld_h 1 #if defined (octave_defun_h) -#error defun.h and defun-dld.h both included in same file! +# error defun.h and defun-dld.h both included in same file! #endif #include "defun-int.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/defun.cc --- a/libinterp/corefcn/defun.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/defun.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/defun.h --- a/libinterp/corefcn/defun.h Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/defun.h Fri Feb 05 16:29:08 2016 -0800 @@ -24,7 +24,7 @@ #define octave_defun_h 1 #if defined (octave_defun_dld_h) -#error defun.h and defun-dld.h both included in same file! +# error defun.h and defun-dld.h both included in same file! #endif #include "defun-int.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/det.cc --- a/libinterp/corefcn/det.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/det.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "DET.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/dirfns.cc --- a/libinterp/corefcn/dirfns.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/dirfns.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/display.cc --- a/libinterp/corefcn/display.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/display.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "singleton-cleanup.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/dlmread.cc --- a/libinterp/corefcn/dlmread.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/dlmread.cc Fri Feb 05 16:29:08 2016 -0800 @@ -25,7 +25,7 @@ // Habel, but core code has been completely re-written. #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/dot.cc --- a/libinterp/corefcn/dot.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/dot.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "f77-fcn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/dynamic-ld.cc --- a/libinterp/corefcn/dynamic-ld.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/dynamic-ld.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/eig.cc --- a/libinterp/corefcn/eig.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/eig.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "EIG.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/ellipj.cc --- a/libinterp/corefcn/ellipj.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/ellipj.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/error.cc --- a/libinterp/corefcn/error.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/error.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/errwarn.cc --- a/libinterp/corefcn/errwarn.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/errwarn.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/event-queue.cc --- a/libinterp/corefcn/event-queue.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/event-queue.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "error.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/fft.cc --- a/libinterp/corefcn/fft.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/fft.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "lo-mappers.h" @@ -34,9 +34,9 @@ #include "utils.h" #if defined (HAVE_FFTW) -#define FFTSRC "@sc{fftw}" +# define FFTSRC "@sc{fftw}" #else -#define FFTSRC "@sc{fftpack}" +# define FFTSRC "@sc{fftpack}" #endif static octave_value diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/fft2.cc --- a/libinterp/corefcn/fft2.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/fft2.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "lo-mappers.h" @@ -36,9 +36,9 @@ // This function should be merged with Fifft. #if defined (HAVE_FFTW) -#define FFTSRC "@sc{fftw}" +# define FFTSRC "@sc{fftw}" #else -#define FFTSRC "@sc{fftpack}" +# define FFTSRC "@sc{fftpack}" #endif static octave_value diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/fftn.cc --- a/libinterp/corefcn/fftn.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/fftn.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "lo-mappers.h" @@ -35,9 +35,9 @@ // This function should be merged with Fifft. #if defined (HAVE_FFTW) -#define FFTSRC "@sc{fftw}" +# define FFTSRC "@sc{fftw}" #else -#define FFTSRC "@sc{fftpack}" +# define FFTSRC "@sc{fftpack}" #endif static octave_value diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/file-io.cc --- a/libinterp/corefcn/file-io.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/file-io.cc Fri Feb 05 16:29:08 2016 -0800 @@ -35,7 +35,7 @@ // April 1996. #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -51,7 +51,7 @@ #include #ifdef HAVE_ZLIB_H -#include +# include #endif #include "error.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/filter.cc --- a/libinterp/corefcn/filter.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/filter.cc Fri Feb 05 16:29:08 2016 -0800 @@ -29,7 +29,7 @@ // jwe, Wed Nov 1 19:15:29 1995. #ifdef HAVE_CONFIG_H -#include +# include #endif #include "quit.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/find.cc --- a/libinterp/corefcn/find.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/find.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "quit.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/gammainc.cc --- a/libinterp/corefcn/gammainc.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/gammainc.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "lo-specfun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/gcd.cc --- a/libinterp/corefcn/gcd.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/gcd.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "dNDArray.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/getgrent.cc --- a/libinterp/corefcn/getgrent.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/getgrent.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/getpwent.cc --- a/libinterp/corefcn/getpwent.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/getpwent.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/getrusage.cc --- a/libinterp/corefcn/getrusage.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/getrusage.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -29,11 +29,11 @@ #include #ifdef HAVE_SYS_RESOURCE_H -#include +# include #endif #if defined (HAVE_SYS_PARAM_H) -#include +# include #endif #include "defun.h" @@ -44,17 +44,17 @@ #include "utils.h" #if ! defined (HZ) -#if defined (CLK_TCK) -#define HZ CLK_TCK -#elif defined (USG) -#define HZ 100 -#else -#define HZ 60 -#endif +# if defined (CLK_TCK) +# define HZ CLK_TCK +# elif defined (USG) +# define HZ 100 +# else +# define HZ 60 +# endif #endif #ifndef RUSAGE_SELF -#define RUSAGE_SELF 0 +# define RUSAGE_SELF 0 #endif // System resource functions. diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/givens.cc --- a/libinterp/corefcn/givens.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/givens.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ // Originally written by A. S. Hodel #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/gl-render.cc --- a/libinterp/corefcn/gl-render.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/gl-render.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #if defined (HAVE_OPENGL) @@ -29,8 +29,8 @@ #include #ifdef HAVE_WINDOWS_H -#define WIN32_LEAN_AND_MEAN -#include +# define WIN32_LEAN_AND_MEAN +# include #endif #include @@ -74,7 +74,7 @@ // GLU callback functions. Define it to empty on // other platforms. #ifndef CALLBACK -#define CALLBACK +# define CALLBACK #endif class diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/gl2ps-print.cc --- a/libinterp/corefcn/gl2ps-print.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/gl2ps-print.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/graphics.cc --- a/libinterp/corefcn/graphics.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/graphics.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -6168,7 +6168,7 @@ axes::properties::update_font (void) { #ifdef HAVE_FREETYPE -#ifdef HAVE_FONTCONFIG +# ifdef HAVE_FONTCONFIG text_renderer.set_font (get ("fontname").string_value (), get ("fontweight").string_value (), get ("fontangle").string_value (), @@ -7944,7 +7944,7 @@ text::properties::update_font (void) { #ifdef HAVE_FREETYPE -#ifdef HAVE_FONTCONFIG +# ifdef HAVE_FONTCONFIG renderer.set_font (get ("fontname").string_value (), get ("fontweight").string_value (), get ("fontangle").string_value (), diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/graphics.in.h --- a/libinterp/corefcn/graphics.in.h Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/graphics.in.h Fri Feb 05 16:29:08 2016 -0800 @@ -24,7 +24,7 @@ #define octave_graphics_h 1 #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/gripes.cc --- a/libinterp/corefcn/gripes.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/gripes.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ // FIXME: All gripe_XXX functions deprecated in 4.2. Remove file in 4.6 #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun.h" @@ -200,14 +200,14 @@ octave_execution_exception e; #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif gripe_user_supplied_eval (e, name); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif } @@ -231,14 +231,14 @@ octave_execution_exception e; #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif gripe_wrong_type_arg (e, name, s, is_error); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif } @@ -258,14 +258,14 @@ octave_execution_exception e; #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif gripe_wrong_type_arg (e, name, s.c_str (), is_error); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif } @@ -274,14 +274,14 @@ const char *name, const std::string& s, bool is_error) { #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif gripe_wrong_type_arg (e, name, s.c_str (), is_error); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif } @@ -292,14 +292,14 @@ octave_execution_exception e; #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif gripe_wrong_type_arg (e, name, tc, is_error); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif } @@ -311,14 +311,14 @@ std::string type = tc.type_name (); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif gripe_wrong_type_arg (e, name, type, is_error); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif } @@ -329,14 +329,14 @@ octave_execution_exception e; #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif gripe_wrong_type_arg (e, name, tc, is_error); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif } @@ -346,14 +346,14 @@ bool is_error) { #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif gripe_wrong_type_arg (e, name.c_str (), tc, is_error); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif } @@ -363,14 +363,14 @@ octave_execution_exception e; #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif gripe_wrong_type_arg (e, s, is_error); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif } @@ -390,14 +390,14 @@ octave_execution_exception e; #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif gripe_wrong_type_arg (e, s, is_error); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif } @@ -406,14 +406,14 @@ const std::string& s, bool is_error) { #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif gripe_wrong_type_arg (e, s.c_str (), is_error); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif } @@ -423,14 +423,14 @@ octave_execution_exception e; #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif gripe_wrong_type_arg (e, tc, is_error); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif } @@ -441,14 +441,14 @@ std::string type = tc.type_name (); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif gripe_wrong_type_arg (e, type, is_error); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif } diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/hash.cc --- a/libinterp/corefcn/hash.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/hash.cc Fri Feb 05 16:29:08 2016 -0800 @@ -35,7 +35,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/help.cc --- a/libinterp/corefcn/help.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/help.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/hess.cc --- a/libinterp/corefcn/hess.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/hess.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "CmplxHESS.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/hex2num.cc --- a/libinterp/corefcn/hex2num.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/hex2num.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/input.cc --- a/libinterp/corefcn/input.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/input.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ // Get command input interactively or from files. #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/inv.cc --- a/libinterp/corefcn/inv.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/inv.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/jit-ir.cc --- a/libinterp/corefcn/jit-ir.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/jit-ir.cc Fri Feb 05 16:29:08 2016 -0800 @@ -27,7 +27,7 @@ #define __STDC_CONSTANT_MACROS #ifdef HAVE_CONFIG_H -#include +# include #endif #ifdef HAVE_LLVM @@ -35,11 +35,11 @@ #include "jit-ir.h" #ifdef HAVE_LLVM_IR_FUNCTION_H -#include -#include +# include +# include #else -#include -#include +# include +# include #endif #include "error.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/jit-typeinfo.cc --- a/libinterp/corefcn/jit-typeinfo.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/jit-typeinfo.cc Fri Feb 05 16:29:08 2016 -0800 @@ -27,7 +27,7 @@ #define __STDC_CONSTANT_MACROS #ifdef HAVE_CONFIG_H -#include +# include #endif #ifdef HAVE_LLVM @@ -35,33 +35,33 @@ #include "jit-typeinfo.h" #ifdef HAVE_LLVM_IR_VERIFIER_H -#include +# include #else -#include +# include #endif #include #ifdef HAVE_LLVM_IR_FUNCTION_H -#include -#include -#include -#include -#include +# include +# include +# include +# include +# include #else -#include -#include -#include -#include -#include +# include +# include +# include +# include +# include #endif #ifdef HAVE_LLVM_SUPPORT_IRBUILDER_H -#include -#elif defined(HAVE_LLVM_IR_IRBUILDER_H) -#include +# include +# elif defined(HAVE_LLVM_IR_IRBUILDER_H) +# include #else -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/jit-util.cc --- a/libinterp/corefcn/jit-util.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/jit-util.cc Fri Feb 05 16:29:08 2016 -0800 @@ -27,15 +27,15 @@ #define __STDC_CONSTANT_MACROS #ifdef HAVE_CONFIG_H -#include +# include #endif #ifdef HAVE_LLVM #ifdef HAVE_LLVM_IR_FUNCTION_H -#include +# include #else -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/jit-util.h --- a/libinterp/corefcn/jit-util.h Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/jit-util.h Fri Feb 05 16:29:08 2016 -0800 @@ -32,7 +32,7 @@ #include #if defined (HAVE_LLVM_IR_DATALAYOUT_H) || defined (HAVE_LLVM_DATALAYOUT_H) -#define HAVE_LLVM_DATALAYOUT +# define HAVE_LLVM_DATALAYOUT #endif // we don't want to include llvm headers here, as they require diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/kron.cc --- a/libinterp/corefcn/kron.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/kron.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ // Author: Paul Kienzle #ifdef HAVE_CONFIG_H -#include +# include #endif #include "dMatrix.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/load-path.cc --- a/libinterp/corefcn/load-path.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/load-path.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/load-save.cc --- a/libinterp/corefcn/load-save.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/load-save.cc Fri Feb 05 16:29:08 2016 -0800 @@ -25,7 +25,7 @@ // Matlab v5 support by James R. Van Zandt #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -82,14 +82,14 @@ // Remove gnulib definitions, if any. #ifdef close -#undef close +# undef close #endif #ifdef open -#undef open +# undef open #endif #ifdef HAVE_ZLIB -#include "zfstream.h" +# include "zfstream.h" #endif // Write octave-workspace file if Octave crashes or is killed by a signal. diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/lookup.cc --- a/libinterp/corefcn/lookup.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/lookup.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ // Author: Jaroslav Hajek #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/ls-ascii-helper.cc --- a/libinterp/corefcn/ls-ascii-helper.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/ls-ascii-helper.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "ls-ascii-helper.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/ls-hdf5.cc --- a/libinterp/corefcn/ls-hdf5.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/ls-hdf5.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ // Author: Steven G. Johnson #ifdef HAVE_CONFIG_H -#include +# include #endif #if defined (HAVE_HDF5) diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/ls-mat-ascii.cc --- a/libinterp/corefcn/ls-mat-ascii.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/ls-mat-ascii.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/ls-mat4.cc --- a/libinterp/corefcn/ls-mat4.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/ls-mat4.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/ls-mat5.cc --- a/libinterp/corefcn/ls-mat5.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/ls-mat5.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ // Author: James R. Van Zandt #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -78,7 +78,7 @@ #include "defaults.h" #ifdef HAVE_ZLIB -#include +# include #endif #define READ_PAD(is_small_data_element, l) ((is_small_data_element) ? 4 : (((l)+7)/8)*8) diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/ls-oct-binary.cc --- a/libinterp/corefcn/ls-oct-binary.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/ls-oct-binary.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/ls-oct-text.cc --- a/libinterp/corefcn/ls-oct-text.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/ls-oct-text.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ // Author: John W. Eaton. #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/ls-oct-text.h --- a/libinterp/corefcn/ls-oct-text.h Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/ls-oct-text.h Fri Feb 05 16:29:08 2016 -0800 @@ -38,7 +38,7 @@ // Used when converting Inf to something that gnuplot can read. #ifndef OCT_RBV -#define OCT_RBV (std::numeric_limits::max () / 100.0) +# define OCT_RBV (std::numeric_limits::max () / 100.0) #endif extern OCTINTERP_API std::string diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/ls-utils.cc --- a/libinterp/corefcn/ls-utils.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/ls-utils.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "data-conv.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/ls-utils.h --- a/libinterp/corefcn/ls-utils.h Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/ls-utils.h Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #if ! defined (octave_ls_utils_h) -#define octave_ls_utils 1 +# define octave_ls_utils 1 extern save_type get_save_type (double max_val, double min_val); diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/lsode.cc --- a/libinterp/corefcn/lsode.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/lsode.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/lu.cc --- a/libinterp/corefcn/lu.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/lu.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "CmplxLU.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/luinc.cc --- a/libinterp/corefcn/luinc.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/luinc.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/mappers.cc --- a/libinterp/corefcn/mappers.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/mappers.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/matrix_type.cc --- a/libinterp/corefcn/matrix_type.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/matrix_type.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/max.cc --- a/libinterp/corefcn/max.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/max.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "lo-ieee.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/mex.h --- a/libinterp/corefcn/mex.h Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/mex.h Fri Feb 05 16:29:08 2016 -0800 @@ -58,8 +58,8 @@ /* -V4 stuff */ #if defined (V4) -#define Matrix mxArray -#define REAL mxREAL +# define Matrix mxArray +# define REAL mxREAL #endif #define mxMAXNAME 64 @@ -107,67 +107,67 @@ /* Apparently these are also defined. */ #ifndef UINT64_T -#define UINT64_T uint64_t +# define UINT64_T uint64_t #endif #ifndef uint64_T -#define uint64_T uint64_t +# define uint64_T uint64_t #endif #ifndef INT64_T -#define INT64_T int64_t +# define INT64_T int64_t #endif #ifndef int64_T -#define int64_T int64_t +# define int64_T int64_t #endif #ifndef UINT32_T -#define UINT32_T uint32_t +# define UINT32_T uint32_t #endif #ifndef uint32_T -#define uint32_T uint32_t +# define uint32_T uint32_t #endif #ifndef INT32_T -#define INT32_T int32_t +# define INT32_T int32_t #endif #ifndef int32_T -#define int32_T int32_t +# define int32_T int32_t #endif #ifndef UINT16_T -#define UINT16_T uint16_t +# define UINT16_T uint16_t #endif #ifndef uint16_T -#define uint16_T uint16_t +# define uint16_T uint16_t #endif #ifndef INT16_T -#define INT16_T int16_t +# define INT16_T int16_t #endif #ifndef int16_T -#define int16_T int16_t +# define int16_T int16_t #endif #ifndef UINT8_T -#define UINT8_T uint8_t +# define UINT8_T uint8_t #endif #ifndef uint8_T -#define uint8_T uint8_t +# define uint8_T uint8_t #endif #ifndef INT8_T -#define INT8_T int8_t +# define INT8_T int8_t #endif #ifndef int8_T -#define int8_T int8_t +# define int8_T int8_t #endif #if defined (__cplusplus) diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/mexproto.h --- a/libinterp/corefcn/mexproto.h Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/mexproto.h Fri Feb 05 16:29:08 2016 -0800 @@ -49,22 +49,22 @@ #define MEXPROTO_H #if defined (__cplusplus) -#include +# include extern "C" { #else -#include +# include #endif /* The definition of OCTINTERP_API is normally provided by Octave's config.h file. This is provided for the case of mex.h included by user programs that don't use Octave's config.h. */ #if ! defined (OCTINTERP_API) -#if defined (_MSC_VER) -#define OCTINTERP_API __declspec(dllimport) -#else -/* All other compilers, at least for now. */ -#define OCTINTERP_API -#endif +# if defined (_MSC_VER) +# define OCTINTERP_API __declspec(dllimport) +# else + /* All other compilers, at least for now. */ +# define OCTINTERP_API +# endif #endif #define MXARRAY_TYPEDEFS_ONLY @@ -274,31 +274,31 @@ /* Miscellaneous. */ #ifdef NDEBUG -#define mxAssert(expr, msg) \ - do \ - { \ - if (! expr) \ - { \ - mexPrintf ("Assertion failed: %s, at line %d of file \"%s\".\n%s\n", \ - #expr, __LINE__, __FILE__, msg); \ - } \ - } \ - while (0) +# define mxAssert(expr, msg) \ + do \ + { \ + if (! expr) \ + { \ + mexPrintf ("Assertion failed: %s, at line %d of file \"%s\".\n%s\n", \ + #expr, __LINE__, __FILE__, msg); \ + } \ + } \ + while (0) -#define mxAssertS(expr, msg) \ - do \ - { \ - if (! expr) \ - { \ - mexPrintf ("Assertion failed at line %d of file \"%s\".\n%s\n", \ - __LINE__, __FILE__, msg); \ - abort (); \ - } \ - } \ - while (0) +# define mxAssertS(expr, msg) \ + do \ + { \ + if (! expr) \ + { \ + mexPrintf ("Assertion failed at line %d of file \"%s\".\n%s\n", \ + __LINE__, __FILE__, msg); \ + abort (); \ + } \ + } \ + while (0) #else -#define mxAssert(expr, msg) -#define mxAssertS(expr, msg) +# define mxAssert(expr, msg) +# define mxAssertS(expr, msg) #endif extern OCTINTERP_API mwIndex mxCalcSingleSubscript (const mxArray *ptr, diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/mgorth.cc --- a/libinterp/corefcn/mgorth.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/mgorth.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "oct-norm.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/nproc.cc --- a/libinterp/corefcn/nproc.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/nproc.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/oct-errno.in.cc --- a/libinterp/corefcn/oct-errno.in.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/oct-errno.in.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/oct-fstrm.cc --- a/libinterp/corefcn/oct-fstrm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/oct-fstrm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/oct-hdf5-types.cc --- a/libinterp/corefcn/oct-hdf5-types.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/oct-hdf5-types.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "error.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/oct-hdf5.h --- a/libinterp/corefcn/oct-hdf5.h Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/oct-hdf5.h Fri Feb 05 16:29:08 2016 -0800 @@ -21,21 +21,21 @@ */ #if ! defined (octave_oct_hdf5_h) -#define octave_hdf5_h 1 +# define octave_hdf5_h 1 #if defined (HAVE_HDF5) -#if defined (HAVE_HDF5_H) -#include -#endif +# if defined (HAVE_HDF5_H) +# include +# endif -#include "oct-hdf5-types.h" +# include "oct-hdf5-types.h" -#if defined (ENABLE_64) -#define H5T_NATIVE_IDX H5T_NATIVE_INT64 -#else -#define H5T_NATIVE_IDX H5T_NATIVE_INT -#endif +# if defined (ENABLE_64) +# define H5T_NATIVE_IDX H5T_NATIVE_INT64 +# else +# define H5T_NATIVE_IDX H5T_NATIVE_INT +# endif #endif diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/oct-hist.cc --- a/libinterp/corefcn/oct-hist.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/oct-hist.cc Fri Feb 05 16:29:08 2016 -0800 @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/oct-iostrm.cc --- a/libinterp/corefcn/oct-iostrm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/oct-iostrm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "error.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/oct-lvalue.cc --- a/libinterp/corefcn/oct-lvalue.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/oct-lvalue.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "error.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/oct-map.cc --- a/libinterp/corefcn/oct-map.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/oct-map.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "Array-util.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/oct-prcstrm.cc --- a/libinterp/corefcn/oct-prcstrm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/oct-prcstrm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/oct-procbuf.cc --- a/libinterp/corefcn/oct-procbuf.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/oct-procbuf.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -43,7 +43,7 @@ #include "utils.h" #ifndef SHELL_PATH -#define SHELL_PATH "/bin/sh" +# define SHELL_PATH "/bin/sh" #endif // This class is based on the procbuf class from libg++, written by @@ -52,7 +52,7 @@ static octave_procbuf *octave_procbuf_list = 0; #ifndef BUFSIZ -#define BUFSIZ 1024 +# define BUFSIZ 1024 #endif octave_procbuf * diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/oct-stream.cc --- a/libinterp/corefcn/oct-stream.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/oct-stream.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/oct-strstrm.cc --- a/libinterp/corefcn/oct-strstrm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/oct-strstrm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "oct-strstrm.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/octave-link.cc --- a/libinterp/corefcn/octave-link.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/octave-link.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "cmd-edit.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/ordschur.cc --- a/libinterp/corefcn/ordschur.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/ordschur.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/pager.cc --- a/libinterp/corefcn/pager.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/pager.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/pinv.cc --- a/libinterp/corefcn/pinv.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/pinv.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/pr-output.cc --- a/libinterp/corefcn/pr-output.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/pr-output.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/procstream.cc --- a/libinterp/corefcn/procstream.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/procstream.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/profiler.cc --- a/libinterp/corefcn/profiler.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/profiler.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/psi.cc --- a/libinterp/corefcn/psi.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/psi.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "ov.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/pt-jit.cc --- a/libinterp/corefcn/pt-jit.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/pt-jit.cc Fri Feb 05 16:29:08 2016 -0800 @@ -26,7 +26,7 @@ #define __STDC_CONSTANT_MACROS #ifdef HAVE_CONFIG_H -#include +# include #endif #include "debug.h" @@ -53,9 +53,9 @@ #include #ifdef HAVE_LLVM_IR_VERIFIER_H -#include +# include #else -#include +# include #endif #include @@ -63,36 +63,36 @@ #include #ifdef LEGACY_PASSMANAGER -#include +# include #else -#include +# include #endif #ifdef HAVE_LLVM_IR_FUNCTION_H -#include -#include +# include +# include #else -#include -#include +# include +# include #endif #ifdef HAVE_LLVM_SUPPORT_IRBUILDER_H -#include +# include #elif defined(HAVE_LLVM_IR_IRBUILDER_H) -#include +# include #else -#include +# include #endif #include #include #ifdef HAVE_LLVM_IR_DATALAYOUT_H -#include +# include #elif defined(HAVE_LLVM_DATALAYOUT_H) -#include +# include #else -#include +# include #endif #include @@ -2510,9 +2510,9 @@ #endif #if defined (HAVE_LLVM) -#define UNUSED_WITHOUT_LLVM(x) x +# define UNUSED_WITHOUT_LLVM(x) x #else -#define UNUSED_WITHOUT_LLVM(x) x OCTAVE_UNUSED +# define UNUSED_WITHOUT_LLVM(x) x OCTAVE_UNUSED #endif DEFUN (jit_failcnt, UNUSED_WITHOUT_LLVM (args), diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/quad.cc --- a/libinterp/corefcn/quad.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/quad.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -45,7 +45,7 @@ #include "Quad-opts.cc" #if defined (quad) -#undef quad +# undef quad #endif // Global pointer for user defined function required by quadrature functions. diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/quadcc.cc --- a/libinterp/corefcn/quadcc.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/quadcc.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "lo-ieee.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/qz.cc --- a/libinterp/corefcn/qz.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/qz.cc Fri Feb 05 16:29:08 2016 -0800 @@ -29,7 +29,7 @@ #undef DEBUG_EIG #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -52,7 +52,7 @@ #include "ov.h" #include "pager.h" #if defined (DEBUG) || defined (DEBUG_SORT) -#include "pr-output.h" +# include "pr-output.h" #endif #include "symtab.h" #include "utils.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/rand.cc --- a/libinterp/corefcn/rand.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/rand.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,14 +23,14 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include #if defined (HAVE_UNORDERED_MAP) -#include +# include #elif defined (HAVE_TR1_UNORDERED_MAP) -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/rcond.cc --- a/libinterp/corefcn/rcond.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/rcond.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/regexp.cc --- a/libinterp/corefcn/regexp.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/regexp.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/schur.cc --- a/libinterp/corefcn/schur.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/schur.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/sighandlers.cc --- a/libinterp/corefcn/sighandlers.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/sighandlers.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -227,19 +227,19 @@ // Signal handler return type. #ifndef BADSIG -#define BADSIG (void (*)(int))-1 +# define BADSIG (void (*)(int))-1 #endif // The following is a workaround for an apparent bug in GCC 4.1.2 and // possibly earlier versions. See Octave bug report #30685 for details. #if defined (__GNUC__) -# if ! (__GNUC__ > 4 \ - || (__GNUC__ == 4 && (__GNUC_MINOR__ > 1 \ - || (__GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ > 2)))) -# undef GNULIB_NAMESPACE -# define GNULIB_NAMESPACE -# warning "disabling GNULIB_NAMESPACE for signal functions -- consider upgrading to a current version of GCC" -# endif +# if ! (__GNUC__ > 4 \ + || (__GNUC__ == 4 && (__GNUC_MINOR__ > 1 \ + || (__GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ > 2)))) +# undef GNULIB_NAMESPACE +# define GNULIB_NAMESPACE +# warning "disabling GNULIB_NAMESPACE for signal functions -- consider upgrading to a current version of GCC" +# endif #endif #define BLOCK_SIGNAL(sig, nvar, ovar) \ @@ -253,7 +253,7 @@ while (0) #if ! defined (SIGCHLD) && defined (SIGCLD) -#define SIGCHLD SIGCLD +# define SIGCHLD SIGCLD #endif #define BLOCK_CHILD(nvar, ovar) BLOCK_SIGNAL (SIGCHLD, nvar, ovar) @@ -365,15 +365,15 @@ #if defined (SIGALRM) if (sig == SIGALRM) { -#if defined (SA_INTERRUPT) +# if defined (SA_INTERRUPT) act.sa_flags |= SA_INTERRUPT; -#endif +# endif } #endif #if defined (SA_RESTART) -#if defined (SIGALRM) +# if defined (SIGALRM) else -#endif +# endif // FIXME: Do we also need to explicitly disable SA_RESTART? if (restart_syscalls) act.sa_flags |= SA_RESTART; @@ -405,8 +405,7 @@ } #endif -#ifdef SIGFPE -#if defined (__alpha__) +#if defined (SIGFPE) && defined (__alpha__) static void sigfpe_handler (int /* sig */) { @@ -420,7 +419,6 @@ } } #endif -#endif #if defined (SIGHUP) || defined (SIGTERM) static void @@ -455,7 +453,7 @@ #endif #if 0 -#if defined (SIGWINCH) +# if defined (SIGWINCH) static void sigwinch_handler (int /* sig */) { @@ -653,11 +651,11 @@ #endif #ifdef SIGFPE -#if defined (__alpha__) +# if defined (__alpha__) octave_set_signal_handler (SIGFPE, sigfpe_handler); -#else +# else octave_set_signal_handler (SIGFPE, generic_sig_handler); -#endif +# endif #endif #ifdef SIGHUP @@ -734,7 +732,7 @@ #endif #if 0 -#ifdef SIGWINCH +# ifdef SIGWINCH octave_set_signal_handler (SIGWINCH, sigwinch_handler); #endif #endif diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/sparse-xdiv.cc --- a/libinterp/corefcn/sparse-xdiv.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/sparse-xdiv.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/sparse-xpow.cc --- a/libinterp/corefcn/sparse-xpow.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/sparse-xpow.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/sparse.cc --- a/libinterp/corefcn/sparse.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/sparse.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/spparms.cc --- a/libinterp/corefcn/spparms.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/spparms.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/sqrtm.cc --- a/libinterp/corefcn/sqrtm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/sqrtm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/str2double.cc --- a/libinterp/corefcn/str2double.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/str2double.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/strfind.cc --- a/libinterp/corefcn/strfind.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/strfind.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/strfns.cc --- a/libinterp/corefcn/strfns.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/strfns.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/sub2ind.cc --- a/libinterp/corefcn/sub2ind.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/sub2ind.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "Array-util.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/svd.cc --- a/libinterp/corefcn/svd.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/svd.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "CmplxSVD.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/sylvester.cc --- a/libinterp/corefcn/sylvester.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/sylvester.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ // Author: A. S. Hodel #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/symtab.cc --- a/libinterp/corefcn/symtab.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/symtab.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/syscalls.cc --- a/libinterp/corefcn/syscalls.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/syscalls.cc Fri Feb 05 16:29:08 2016 -0800 @@ -27,7 +27,7 @@ // mkfifo unlink waitpid #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/sysdep.cc --- a/libinterp/corefcn/sysdep.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/sysdep.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -37,27 +37,27 @@ #include #if defined (HAVE_TERMIOS_H) -#include +# include #elif defined (HAVE_TERMIO_H) -#include +# include #elif defined (HAVE_SGTTY_H) -#include +# include #endif #if defined (HAVE_CONIO_H) -#include +# include #endif #if defined (HAVE_SYS_IOCTL_H) -#include +# include #endif #if defined (HAVE_FLOATINGPOINT_H) -#include +# include #endif #if defined (HAVE_IEEEFP_H) -#include +# include #endif #include "cmd-edit.h" @@ -86,20 +86,20 @@ #include "file-stat.h" #ifndef STDIN_FILENO -#define STDIN_FILENO 1 +# define STDIN_FILENO 1 #endif #if defined (__386BSD__) || defined (__FreeBSD__) || defined (__NetBSD__) static void BSD_init (void) { -#if defined (HAVE_FLOATINGPOINT_H) +# if defined (HAVE_FLOATINGPOINT_H) // Disable trapping on common exceptions. -#ifndef FP_X_DNML -#define FP_X_DNML 0 -#endif +# ifndef FP_X_DNML +# define FP_X_DNML 0 +# endif fpsetmask (~(FP_X_OFL|FP_X_INV|FP_X_DZ|FP_X_DNML|FP_X_UFL|FP_X_IMP)); -#endif +# endif } #endif diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/sysdep.h --- a/libinterp/corefcn/sysdep.h Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/sysdep.h Fri Feb 05 16:29:08 2016 -0800 @@ -47,9 +47,9 @@ #if defined (__WIN32__) && ! defined (_POSIX_VERSION) extern void MINGW_signal_cleanup (void); -#define MINGW_SIGNAL_CLEANUP() MINGW_signal_cleanup () +# define MINGW_SIGNAL_CLEANUP() MINGW_signal_cleanup () #else -#define MINGW_SIGNAL_CLEANUP() do { } while (0) +# define MINGW_SIGNAL_CLEANUP() do { } while (0) #endif extern OCTINTERP_API bool same_file_internal (const std::string&, diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/time.cc --- a/libinterp/corefcn/time.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/time.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/toplev.cc --- a/libinterp/corefcn/toplev.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/toplev.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -82,7 +82,7 @@ #include "version.h" #ifndef SHELL_PATH -#define SHELL_PATH "/bin/sh" +# define SHELL_PATH "/bin/sh" #endif void (*octave_exit) (int) = ::exit; diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/tril.cc --- a/libinterp/corefcn/tril.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/tril.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/tsearch.cc --- a/libinterp/corefcn/tsearch.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/tsearch.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ // Author: Andreas Stahel #ifdef HAVE_CONFIG_H -#include +# include #endif #include "lo-ieee.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/txt-eng-ft.cc --- a/libinterp/corefcn/txt-eng-ft.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/txt-eng-ft.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,13 +21,13 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #if defined (HAVE_FREETYPE) #if defined (HAVE_FONTCONFIG) -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/txt-eng.cc --- a/libinterp/corefcn/txt-eng.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/txt-eng.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "txt-eng.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/typecast.cc --- a/libinterp/corefcn/typecast.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/typecast.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/urlwrite.cc --- a/libinterp/corefcn/urlwrite.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/urlwrite.cc Fri Feb 05 16:29:08 2016 -0800 @@ -26,7 +26,7 @@ // Adapted-By: jwe #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/utils.cc --- a/libinterp/corefcn/utils.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/utils.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/variables.cc --- a/libinterp/corefcn/variables.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/variables.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/xdiv.cc --- a/libinterp/corefcn/xdiv.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/xdiv.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/xnorm.cc --- a/libinterp/corefcn/xnorm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/xnorm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ // author: Jaroslav Hajek #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/xpow.cc --- a/libinterp/corefcn/xpow.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/xpow.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/corefcn/zfstream.cc --- a/libinterp/corefcn/zfstream.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/corefcn/zfstream.cc Fri Feb 05 16:29:08 2016 -0800 @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/__delaunayn__.cc --- a/libinterp/dldfcn/__delaunayn__.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/__delaunayn__.cc Fri Feb 05 16:29:08 2016 -0800 @@ -39,7 +39,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -55,10 +55,10 @@ #include "unwind-prot.h" #if defined (HAVE_QHULL) -# include "oct-qhull.h" -# if defined (NEED_QHULL_VERSION) +# include "oct-qhull.h" +# if defined (NEED_QHULL_VERSION) char qh_version[] = "__delaunayn__.oct 2007-08-21"; -# endif +# endif #endif static void diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/__eigs__.cc --- a/libinterp/dldfcn/__eigs__.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/__eigs__.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun-dld.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/__fltk_uigetfile__.cc --- a/libinterp/dldfcn/__fltk_uigetfile__.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/__fltk_uigetfile__.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,13 +21,13 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #ifdef HAVE_FLTK #ifdef WIN32 -#define WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/__glpk__.cc --- a/libinterp/dldfcn/__glpk__.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/__glpk__.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -42,9 +42,9 @@ extern "C" { #if defined (HAVE_GLPK_GLPK_H) -#include +# include #else -#include +# include #endif } diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/__init_fltk__.cc --- a/libinterp/dldfcn/__init_fltk__.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/__init_fltk__.cc Fri Feb 05 16:29:08 2016 -0800 @@ -34,7 +34,7 @@ // PKG_ADD: if (__have_fltk__ () && have_window_system ()) register_graphics_toolkit ("fltk"); endif #ifdef HAVE_CONFIG_H -#include +# include #endif #include "builtin-defun-decls.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/__init_gnuplot__.cc --- a/libinterp/dldfcn/__init_gnuplot__.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/__init_gnuplot__.cc Fri Feb 05 16:29:08 2016 -0800 @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "builtins.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/__magick_read__.cc --- a/libinterp/dldfcn/__magick_read__.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/__magick_read__.cc Fri Feb 05 16:29:08 2016 -0800 @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "file-stat.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/__osmesa_print__.cc --- a/libinterp/dldfcn/__osmesa_print__.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/__osmesa_print__.cc Fri Feb 05 16:29:08 2016 -0800 @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "oct-locbuf.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/__voronoi__.cc --- a/libinterp/dldfcn/__voronoi__.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/__voronoi__.cc Fri Feb 05 16:29:08 2016 -0800 @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -49,10 +49,10 @@ #include "unwind-prot.h" #if defined (HAVE_QHULL) -# include "oct-qhull.h" -# if defined (NEED_QHULL_VERSION) +# include "oct-qhull.h" +# if defined (NEED_QHULL_VERSION) char qh_version[] = "__voronoi__.oct 2007-07-24"; -# endif +# endif #endif static void diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/amd.cc --- a/libinterp/dldfcn/amd.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/amd.cc Fri Feb 05 16:29:08 2016 -0800 @@ -24,7 +24,7 @@ // in the help of the functions. #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -46,9 +46,9 @@ #include "oct-locbuf.h" #if defined (ENABLE_64) -#define AMD_NAME(name) amd_l ## name +# define AMD_NAME(name) amd_l ## name #else -#define AMD_NAME(name) amd ## name +# define AMD_NAME(name) amd ## name #endif DEFUN_DLD (amd, args, nargout, diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/audiodevinfo.cc --- a/libinterp/dldfcn/audiodevinfo.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/audiodevinfo.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // requires c++11 diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/audioread.cc --- a/libinterp/dldfcn/audioread.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/audioread.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -38,7 +38,7 @@ #include "ov-struct.h" #ifdef HAVE_SNDFILE -#include +# include #endif #ifdef HAVE_SNDFILE diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/ccolamd.cc --- a/libinterp/dldfcn/ccolamd.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/ccolamd.cc Fri Feb 05 16:29:08 2016 -0800 @@ -24,7 +24,7 @@ // in the help of the functions. #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -45,11 +45,11 @@ #include "oct-locbuf.h" #if defined (ENABLE_64) -# define CCOLAMD_NAME(name) ccolamd_l ## name -# define CSYMAMD_NAME(name) csymamd_l ## name +# define CCOLAMD_NAME(name) ccolamd_l ## name +# define CSYMAMD_NAME(name) csymamd_l ## name #else -# define CCOLAMD_NAME(name) ccolamd ## name -# define CSYMAMD_NAME(name) csymamd ## name +# define CCOLAMD_NAME(name) ccolamd ## name +# define CSYMAMD_NAME(name) csymamd ## name #endif DEFUN_DLD (ccolamd, args, nargout, diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/chol.cc --- a/libinterp/dldfcn/chol.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/chol.cc Fri Feb 05 16:29:08 2016 -0800 @@ -24,7 +24,7 @@ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "CmplxCHOL.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/colamd.cc --- a/libinterp/dldfcn/colamd.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/colamd.cc Fri Feb 05 16:29:08 2016 -0800 @@ -25,7 +25,7 @@ // in the help of the functions. #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -46,11 +46,11 @@ #include "oct-locbuf.h" #if defined (ENABLE_64) -# define COLAMD_NAME(name) colamd_l ## name -# define SYMAMD_NAME(name) symamd_l ## name +# define COLAMD_NAME(name) colamd_l ## name +# define SYMAMD_NAME(name) symamd_l ## name #else -# define COLAMD_NAME(name) colamd ## name -# define SYMAMD_NAME(name) symamd ## name +# define COLAMD_NAME(name) colamd ## name +# define SYMAMD_NAME(name) symamd ## name #endif // The symmetric column elimination tree code take from the Davis LDL code. diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/convhulln.cc --- a/libinterp/dldfcn/convhulln.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/convhulln.cc Fri Feb 05 16:29:08 2016 -0800 @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "oct-locbuf.h" @@ -44,10 +44,10 @@ #include "unwind-prot.h" #if defined (HAVE_QHULL) -# include "oct-qhull.h" -# if defined (NEED_QHULL_VERSION) +# include "oct-qhull.h" +# if defined (NEED_QHULL_VERSION) char qh_version[] = "convhulln.oct 2007-07-24"; -# endif +# endif #endif static void diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/dmperm.cc --- a/libinterp/dldfcn/dmperm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/dmperm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun-dld.h" @@ -37,9 +37,9 @@ #include "sparse-qr.h" #if defined (ENABLE_64) -# define CXSPARSE_NAME(name) cs_dl ## name +# define CXSPARSE_NAME(name) cs_dl ## name #else -# define CXSPARSE_NAME(name) cs_di ## name +# define CXSPARSE_NAME(name) cs_di ## name #endif static RowVector diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/fftw.cc --- a/libinterp/dldfcn/fftw.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/fftw.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/oct-qhull.h --- a/libinterp/dldfcn/oct-qhull.h Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/oct-qhull.h Fri Feb 05 16:29:08 2016 -0800 @@ -28,31 +28,31 @@ extern "C" { #if defined (HAVE_LIBQHULL_LIBQHULL_H) -# include -# include -# include -# include -# include +# include +# include +# include +# include +# include #elif defined (HAVE_QHULL_LIBQHULL_H) || defined (HAVE_QHULL_QHULL_H) -# if defined (HAVE_QHULL_LIBQHULL_H) -# include -# else -# include -# endif -# include -# include -# include -# include -#elif defined (HAVE_LIBQHULL_H) || defined (HAVE_QHULL_H) -# if defined (HAVE_LIBQHULL_H) -# include -# else -# include -# endif -# include -# include -# include -# include +# if defined (HAVE_QHULL_LIBQHULL_H) +# include +# else +# include +# endif +# include +# include +# include +# include +# elif defined (HAVE_LIBQHULL_H) || defined (HAVE_QHULL_H) +# if defined (HAVE_LIBQHULL_H) +# include +# else +# include +# endif +# include +# include +# include +# include #endif } diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/qr.cc --- a/libinterp/dldfcn/qr.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/qr.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "CmplxQR.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/symbfact.cc --- a/libinterp/dldfcn/symbfact.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/symbfact.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "oct-locbuf.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/dldfcn/symrcm.cc --- a/libinterp/dldfcn/symrcm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/dldfcn/symrcm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -51,7 +51,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "ov.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/oct-conf.in.cc --- a/libinterp/oct-conf.in.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/oct-conf.in.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "oct-conf.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-base-diag.cc --- a/libinterp/octave-value/ov-base-diag.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-base-diag.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-base-int.cc --- a/libinterp/octave-value/ov-base-int.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-base-int.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-base-mat.cc --- a/libinterp/octave-value/ov-base-mat.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-base-mat.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-base-scalar.cc --- a/libinterp/octave-value/ov-base-scalar.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-base-scalar.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-base-sparse.cc --- a/libinterp/octave-value/ov-base-sparse.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-base-sparse.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-base.cc --- a/libinterp/octave-value/ov-base.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-base.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-bool-mat.cc --- a/libinterp/octave-value/ov-bool-mat.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-bool-mat.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-bool-sparse.cc --- a/libinterp/octave-value/ov-bool-sparse.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-bool-sparse.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-bool.cc --- a/libinterp/octave-value/ov-bool.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-bool.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-builtin.cc --- a/libinterp/octave-value/ov-builtin.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-builtin.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "error.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-cell.cc --- a/libinterp/octave-value/ov-cell.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-cell.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-ch-mat.cc --- a/libinterp/octave-value/ov-ch-mat.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-ch-mat.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-class.cc --- a/libinterp/octave-value/ov-class.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-class.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -47,7 +47,7 @@ #include "oct-hdf5.h" #include "ov-class.h" #ifdef HAVE_JAVA -#include "ov-java.h" +# include "ov-java.h" #endif #include "ov-fcn.h" #include "ov-usr-fcn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-classdef.cc --- a/libinterp/octave-value/ov-classdef.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-classdef.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-colon.cc --- a/libinterp/octave-value/ov-colon.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-colon.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-complex.cc --- a/libinterp/octave-value/ov-complex.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-complex.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-cs-list.cc --- a/libinterp/octave-value/ov-cs-list.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-cs-list.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-cx-diag.cc --- a/libinterp/octave-value/ov-cx-diag.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-cx-diag.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "byte-swap.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-cx-mat.cc --- a/libinterp/octave-value/ov-cx-mat.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-cx-mat.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-cx-sparse.cc --- a/libinterp/octave-value/ov-cx-sparse.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-cx-sparse.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-dld-fcn.cc --- a/libinterp/octave-value/ov-dld-fcn.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-dld-fcn.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "oct-shlib.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-fcn-handle.cc --- a/libinterp/octave-value/ov-fcn-handle.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-fcn-handle.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-fcn-inline.cc --- a/libinterp/octave-value/ov-fcn-inline.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-fcn-inline.cc Fri Feb 05 16:29:08 2016 -0800 @@ -25,7 +25,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-fcn.cc --- a/libinterp/octave-value/ov-fcn.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-fcn.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "error.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-float.cc --- a/libinterp/octave-value/ov-float.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-float.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-flt-complex.cc --- a/libinterp/octave-value/ov-flt-complex.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-flt-complex.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-flt-cx-diag.cc --- a/libinterp/octave-value/ov-flt-cx-diag.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-flt-cx-diag.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "byte-swap.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-flt-cx-mat.cc --- a/libinterp/octave-value/ov-flt-cx-mat.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-flt-cx-mat.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-flt-re-diag.cc --- a/libinterp/octave-value/ov-flt-re-diag.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-flt-re-diag.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "byte-swap.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-flt-re-mat.cc --- a/libinterp/octave-value/ov-flt-re-mat.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-flt-re-mat.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-int16.cc --- a/libinterp/octave-value/ov-int16.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-int16.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -41,7 +41,7 @@ #include "ov-base.h" #if defined (HAVE_HDF5) -#define HDF5_SAVE_TYPE H5T_NATIVE_INT16 +# define HDF5_SAVE_TYPE H5T_NATIVE_INT16 #endif #include "ov-base-int.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-int32.cc --- a/libinterp/octave-value/ov-int32.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-int32.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -41,7 +41,7 @@ #include "ov-base.h" #if defined (HAVE_HDF5) -#define HDF5_SAVE_TYPE H5T_NATIVE_INT32 +# define HDF5_SAVE_TYPE H5T_NATIVE_INT32 #endif #include "ov-base-int.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-int64.cc --- a/libinterp/octave-value/ov-int64.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-int64.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -41,7 +41,7 @@ #include "ov-base.h" #if defined (HAVE_HDF5) -#define HDF5_SAVE_TYPE H5T_NATIVE_INT64 +# define HDF5_SAVE_TYPE H5T_NATIVE_INT64 #endif #include "ov-base-int.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-int8.cc --- a/libinterp/octave-value/ov-int8.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-int8.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -41,7 +41,7 @@ #include "ov-base.h" #if defined (HAVE_HDF5) -#define HDF5_SAVE_TYPE H5T_NATIVE_INT8 +# define HDF5_SAVE_TYPE H5T_NATIVE_INT8 #endif #include "ov-base-int.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-java.cc --- a/libinterp/octave-value/ov-java.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-java.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun.h" @@ -29,13 +29,13 @@ #include "fpucw.h" #if HAVE_FPU_CONTROL_H -#include +# include #endif #if defined HAVE_JAVA #if defined (HAVE_WINDOWS_H) -#include +# include #endif #include @@ -421,11 +421,11 @@ } #ifndef _FPU_DEFAULT -#if defined __i386__ || defined __x86_64__ -#define _FPU_DEFAULT 0x037f -#else -#define _FPU_DEFAULT 0 -#endif +# if defined __i386__ || defined __x86_64__ +# define _FPU_DEFAULT 0x037f +# else +# define _FPU_DEFAULT 0 +# endif #endif static void @@ -508,17 +508,17 @@ #else // JAVA_LDPATH determined by configure and set in config.h -#if defined (__APPLE__) +# if defined (__APPLE__) std::string jvm_lib_path = JAVA_LDPATH + std::string ("/libjvm.dylib"); -#else +# else std::string jvm_lib_path = JAVA_LDPATH + std::string ("/libjvm.so"); -#endif +# endif #endif jsize nVMs = 0; -# if ! defined (__APPLE__) && ! defined (__MACH__) +#if ! defined (__APPLE__) && ! defined (__MACH__) octave_shlib lib (jvm_lib_path); @@ -600,7 +600,7 @@ vm_args.read_java_opts (initial_java_dir () + file_ops::dir_sep_str () + "java.opts"); -# if ! defined (__APPLE__) && ! defined (__MACH__) +#if ! defined (__APPLE__) && ! defined (__MACH__) if (create_vm (&jvm, ¤t_env, vm_args.to_args ()) != JNI_OK) throw std::string ("unable to start Java VM in ")+jvm_lib_path; @@ -2166,7 +2166,6 @@ Function will directly call initialize_java to create an instance of a JVM.\n\ @end deftypefn") { - #ifdef HAVE_JAVA octave_value retval; @@ -2239,9 +2238,7 @@ return ovl (octave_java::do_javaObject (current_env, classname, tmp)); #else - error ("javaObject: Octave was not compiled with Java interface"); - #endif } @@ -2313,9 +2310,7 @@ return retval; #else - error ("javaMethod: Octave was not compiled with Java interface"); - #endif } @@ -2377,9 +2372,7 @@ return retval; #else - error ("__java_get__: Octave was not compiled with Java interface"); - #endif } @@ -2435,9 +2428,7 @@ return retval; #else - error ("__java_set__: Octave was not compiled with Java interface"); - #endif } @@ -2469,9 +2460,7 @@ return retval; #else - error ("java2mat: Octave was not compiled with Java interface"); - #endif } diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-lazy-idx.cc --- a/libinterp/octave-value/ov-lazy-idx.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-lazy-idx.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "ov-lazy-idx.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-mex-fcn.cc --- a/libinterp/octave-value/ov-mex-fcn.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-mex-fcn.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "oct-shlib.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-null-mat.cc --- a/libinterp/octave-value/ov-null-mat.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-null-mat.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "ov-null-mat.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-oncleanup.cc --- a/libinterp/octave-value/ov-oncleanup.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-oncleanup.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-perm.cc --- a/libinterp/octave-value/ov-perm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-perm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "byte-swap.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-range.cc --- a/libinterp/octave-value/ov-range.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-range.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-re-diag.cc --- a/libinterp/octave-value/ov-re-diag.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-re-diag.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "byte-swap.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-re-mat.cc --- a/libinterp/octave-value/ov-re-mat.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-re-mat.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-re-sparse.cc --- a/libinterp/octave-value/ov-re-sparse.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-re-sparse.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-scalar.cc --- a/libinterp/octave-value/ov-scalar.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-scalar.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-str-mat.cc --- a/libinterp/octave-value/ov-str-mat.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-str-mat.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-struct.cc --- a/libinterp/octave-value/ov-struct.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-struct.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-typeinfo.cc --- a/libinterp/octave-value/ov-typeinfo.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-typeinfo.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "Array.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-uint16.cc --- a/libinterp/octave-value/ov-uint16.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-uint16.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -41,7 +41,7 @@ #include "ov-base.h" #if defined (HAVE_HDF5) -#define HDF5_SAVE_TYPE H5T_NATIVE_UINT16 +# define HDF5_SAVE_TYPE H5T_NATIVE_UINT16 #endif #include "ov-base-int.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-uint32.cc --- a/libinterp/octave-value/ov-uint32.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-uint32.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -41,7 +41,7 @@ #include "ov-base.h" #if defined (HAVE_HDF5) -#define HDF5_SAVE_TYPE H5T_NATIVE_UINT32 +# define HDF5_SAVE_TYPE H5T_NATIVE_UINT32 #endif #include "ov-base-int.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-uint64.cc --- a/libinterp/octave-value/ov-uint64.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-uint64.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -41,7 +41,7 @@ #include "ov-base.h" #if defined (HAVE_HDF5) -#define HDF5_SAVE_TYPE H5T_NATIVE_UINT64 +# define HDF5_SAVE_TYPE H5T_NATIVE_UINT64 #endif #include "ov-base-int.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-uint8.cc --- a/libinterp/octave-value/ov-uint8.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-uint8.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -41,7 +41,7 @@ #include "ov-base.h" #if defined (HAVE_HDF5) -#define HDF5_SAVE_TYPE H5T_NATIVE_UINT8 +# define HDF5_SAVE_TYPE H5T_NATIVE_UINT8 #endif #include "ov-base-int.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov-usr-fcn.cc --- a/libinterp/octave-value/ov-usr-fcn.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov-usr-fcn.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ov.cc --- a/libinterp/octave-value/ov.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ov.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "data-conv.h" @@ -78,7 +78,7 @@ #include "ov-null-mat.h" #include "ov-lazy-idx.h" #ifdef HAVE_JAVA -#include "ov-java.h" +# include "ov-java.h" #endif #include "defun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave-value/ovl.cc --- a/libinterp/octave-value/ovl.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave-value/ovl.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "error.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/octave.cc --- a/libinterp/octave.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/octave.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ // Born February 20, 1992. #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-b-b.cc --- a/libinterp/operators/op-b-b.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-b-b.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-b-bm.cc --- a/libinterp/operators/op-b-bm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-b-bm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-b-sbm.cc --- a/libinterp/operators/op-b-sbm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-b-sbm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-bm-b.cc --- a/libinterp/operators/op-bm-b.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-bm-b.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-bm-bm.cc --- a/libinterp/operators/op-bm-bm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-bm-bm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-bm-sbm.cc --- a/libinterp/operators/op-bm-sbm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-bm-sbm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-cdm-cdm.cc --- a/libinterp/operators/op-cdm-cdm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-cdm-cdm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-cell.cc --- a/libinterp/operators/op-cell.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-cell.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-chm.cc --- a/libinterp/operators/op-chm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-chm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-class.cc --- a/libinterp/operators/op-class.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-class.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "oct-time.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-cm-cm.cc --- a/libinterp/operators/op-cm-cm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-cm-cm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-cm-cs.cc --- a/libinterp/operators/op-cm-cs.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-cm-cs.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-cm-m.cc --- a/libinterp/operators/op-cm-m.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-cm-m.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-cm-m.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-cm-s.cc --- a/libinterp/operators/op-cm-s.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-cm-s.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-cm-s.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-cm-scm.cc --- a/libinterp/operators/op-cm-scm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-cm-scm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-cm-sm.cc --- a/libinterp/operators/op-cm-sm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-cm-sm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-cs-cm.cc --- a/libinterp/operators/op-cs-cm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-cs-cm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-cs-cs.cc --- a/libinterp/operators/op-cs-cs.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-cs-cs.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "Array-util.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-cs-m.cc --- a/libinterp/operators/op-cs-m.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-cs-m.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-cs-nda.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-cs-s.cc --- a/libinterp/operators/op-cs-s.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-cs-s.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-cs-scm.cc --- a/libinterp/operators/op-cs-scm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-cs-scm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-cs-sm.cc --- a/libinterp/operators/op-cs-sm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-cs-sm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-dm-dm.cc --- a/libinterp/operators/op-dm-dm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-dm-dm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-dm-scm.cc --- a/libinterp/operators/op-dm-scm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-dm-scm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-cm-s.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-dm-sm.cc --- a/libinterp/operators/op-dm-sm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-dm-sm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-dm-template.cc --- a/libinterp/operators/op-dm-template.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-dm-template.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // FIXME: it might be nice to only include the declarations of the @@ -33,7 +33,7 @@ #include LINCLUDE #include RINCLUDE #ifdef DEFINENULLASSIGNCONV -#include "ov-null-mat.h" +# include "ov-null-mat.h" #endif // matrix by diag matrix ops. @@ -43,11 +43,11 @@ DEFBINOP_OP (mul, LMATRIX, RMATRIX, *) #ifndef LDMATRIX -#define LDMATRIX LMATRIX +# define LDMATRIX LMATRIX #endif #ifndef RDMATRIX -#define RDMATRIX RMATRIX +# define RDMATRIX RMATRIX #endif #define OCTAVE_LMATRIX CONCAT2(octave_, LMATRIX) diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-dms-template.cc --- a/libinterp/operators/op-dms-template.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-dms-template.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "ops.h" @@ -33,11 +33,11 @@ // matrix by diag matrix ops. #ifndef SCALARV -#define SCALARV SCALAR +# define SCALARV SCALAR #endif #ifndef MATRIXV -#define MATRIXV MATRIX +# define MATRIXV MATRIX #endif DEFNDBINOP_OP (sdmmul, SCALAR, MATRIX, SCALARV, MATRIXV, *) diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-double-conv.cc --- a/libinterp/operators/op-double-conv.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-double-conv.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fcdm-fcdm.cc --- a/libinterp/operators/op-fcdm-fcdm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fcdm-fcdm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fcdm-fdm.cc --- a/libinterp/operators/op-fcdm-fdm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fcdm-fdm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fcm-fcm.cc --- a/libinterp/operators/op-fcm-fcm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fcm-fcm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fcm-fcs.cc --- a/libinterp/operators/op-fcm-fcs.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fcm-fcs.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fcm-fm.cc --- a/libinterp/operators/op-fcm-fm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fcm-fm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-fcm-fm.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fcm-fs.cc --- a/libinterp/operators/op-fcm-fs.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fcm-fs.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-fcnda-fs.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fcn.cc --- a/libinterp/operators/op-fcn.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fcn.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fcs-fcm.cc --- a/libinterp/operators/op-fcs-fcm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fcs-fcm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fcs-fcs.cc --- a/libinterp/operators/op-fcs-fcs.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fcs-fcs.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fcs-fm.cc --- a/libinterp/operators/op-fcs-fm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fcs-fm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-fcs-fnda.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fcs-fs.cc --- a/libinterp/operators/op-fcs-fs.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fcs-fs.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fdm-fdm.cc --- a/libinterp/operators/op-fdm-fdm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fdm-fdm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-float-conv.cc --- a/libinterp/operators/op-float-conv.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-float-conv.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fm-fcm.cc --- a/libinterp/operators/op-fm-fcm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fm-fcm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-fm-fcm.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fm-fcs.cc --- a/libinterp/operators/op-fm-fcs.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fm-fcs.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-fm-fcs.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fm-fm.cc --- a/libinterp/operators/op-fm-fm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fm-fm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fm-fs.cc --- a/libinterp/operators/op-fm-fs.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fm-fs.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fs-fcm.cc --- a/libinterp/operators/op-fs-fcm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fs-fcm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-fs-fcm.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fs-fcs.cc --- a/libinterp/operators/op-fs-fcs.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fs-fcs.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fs-fm.cc --- a/libinterp/operators/op-fs-fm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fs-fm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-fs-fs.cc --- a/libinterp/operators/op-fs-fs.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-fs-fs.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "Array-util.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-i16-i16.cc --- a/libinterp/operators/op-i16-i16.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-i16-i16.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-i16nda-i8.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-i32-i32.cc --- a/libinterp/operators/op-i32-i32.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-i32-i32.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-i32nda-i8.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-i64-i64.cc --- a/libinterp/operators/op-i64-i64.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-i64-i64.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-i64nda-i8.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-i8-i8.cc --- a/libinterp/operators/op-i8-i8.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-i8-i8.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-i8nda-ui8.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-int-concat.cc --- a/libinterp/operators/op-int-concat.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-int-concat.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-int-conv.cc --- a/libinterp/operators/op-int-conv.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-int-conv.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-m-cm.cc --- a/libinterp/operators/op-m-cm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-m-cm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-m-cm.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-m-cs.cc --- a/libinterp/operators/op-m-cs.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-m-cs.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-m-cs.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-m-m.cc --- a/libinterp/operators/op-m-m.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-m-m.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-m-s.cc --- a/libinterp/operators/op-m-s.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-m-s.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-m-scm.cc --- a/libinterp/operators/op-m-scm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-m-scm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-m-sm.cc --- a/libinterp/operators/op-m-sm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-m-sm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-pm-pm.cc --- a/libinterp/operators/op-pm-pm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-pm-pm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-pm-scm.cc --- a/libinterp/operators/op-pm-scm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-pm-scm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-pm-sm.cc --- a/libinterp/operators/op-pm-sm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-pm-sm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-pm-template.cc --- a/libinterp/operators/op-pm-template.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-pm-template.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // FIXME: it might be nice to only include the declarations of the @@ -32,22 +32,22 @@ #include MINCLUDE #include "ops.h" #ifdef DEFINENULLASSIGNCONV -#include "ov-null-mat.h" +# include "ov-null-mat.h" #endif #ifndef LDMATRIX -#define LDMATRIX LMATRIX +# define LDMATRIX LMATRIX #endif #define OCTAVE_LMATRIX CONCAT2(octave_, LMATRIX) #define OCTAVE_LDMATRIX CONCAT2(octave_, LDMATRIX) #define OCTAVE_RMATRIX CONCAT2(octave_, RMATRIX) #ifdef LEFT -#define LMATRIX_VALUE perm_matrix_value -#define RMATRIX_VALUE CONCAT2(RMATRIX, _value) +# define LMATRIX_VALUE perm_matrix_value +# define RMATRIX_VALUE CONCAT2(RMATRIX, _value) #else -#define LMATRIX_VALUE CONCAT2(LMATRIX, _value) -#define RMATRIX_VALUE perm_matrix_value +# define LMATRIX_VALUE CONCAT2(LMATRIX, _value) +# define RMATRIX_VALUE perm_matrix_value #endif DEFBINOP (mul, LMATRIX, RMATRIX) diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-range.cc --- a/libinterp/operators/op-range.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-range.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-s-cm.cc --- a/libinterp/operators/op-s-cm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-s-cm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-s-cm.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-s-cs.cc --- a/libinterp/operators/op-s-cs.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-s-cs.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-s-m.cc --- a/libinterp/operators/op-s-m.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-s-m.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-s-s.cc --- a/libinterp/operators/op-s-s.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-s-s.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "Array-util.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-s-scm.cc --- a/libinterp/operators/op-s-scm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-s-scm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-s-sm.cc --- a/libinterp/operators/op-s-sm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-s-sm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-sbm-b.cc --- a/libinterp/operators/op-sbm-b.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-sbm-b.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-sbm-bm.cc --- a/libinterp/operators/op-sbm-bm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-sbm-bm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-sbm-sbm.cc --- a/libinterp/operators/op-sbm-sbm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-sbm-sbm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-scm-cm.cc --- a/libinterp/operators/op-scm-cm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-scm-cm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-scm-cs.cc --- a/libinterp/operators/op-scm-cs.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-scm-cs.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-scm-m.cc --- a/libinterp/operators/op-scm-m.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-scm-m.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-scm-s.cc --- a/libinterp/operators/op-scm-s.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-scm-s.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-scm-scm.cc --- a/libinterp/operators/op-scm-scm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-scm-scm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" @@ -38,7 +38,7 @@ #include "ov-cx-sparse.h" #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-scm-sm.cc --- a/libinterp/operators/op-scm-sm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-scm-sm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-sm-cm.cc --- a/libinterp/operators/op-sm-cm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-sm-cm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-sm-cs.cc --- a/libinterp/operators/op-sm-cs.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-sm-cs.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-sm-m.cc --- a/libinterp/operators/op-sm-m.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-sm-m.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-sm-s.cc --- a/libinterp/operators/op-sm-s.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-sm-s.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-sm-scm.cc --- a/libinterp/operators/op-sm-scm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-sm-scm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-sm-sm.cc --- a/libinterp/operators/op-sm-sm.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-sm-sm.cc Fri Feb 05 16:29:08 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-str-m.cc --- a/libinterp/operators/op-str-m.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-str-m.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-str-s.cc --- a/libinterp/operators/op-str-s.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-str-s.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-str-str.cc --- a/libinterp/operators/op-str-str.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-str-str.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-struct.cc --- a/libinterp/operators/op-struct.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-struct.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "errwarn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-ui16-ui16.cc --- a/libinterp/operators/op-ui16-ui16.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-ui16-ui16.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-ui16nda-i8.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-ui32-ui32.cc --- a/libinterp/operators/op-ui32-ui32.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-ui32-ui32.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-ui32nda-i8.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-ui64-ui64.cc --- a/libinterp/operators/op-ui64-ui64.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-ui64-ui64.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-ui64nda-i8.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/operators/op-ui8-ui8.cc --- a/libinterp/operators/op-ui8-ui8.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/operators/op-ui8-ui8.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "mx-ui8nda-i8.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-arg-list.cc --- a/libinterp/parse-tree/pt-arg-list.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-arg-list.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-array-list.cc --- a/libinterp/parse-tree/pt-array-list.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-array-list.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-assign.cc --- a/libinterp/parse-tree/pt-assign.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-assign.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-binop.cc --- a/libinterp/parse-tree/pt-binop.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-binop.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "error.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-bp.cc --- a/libinterp/parse-tree/pt-bp.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-bp.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "ov-usr-fcn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-cbinop.cc --- a/libinterp/parse-tree/pt-cbinop.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-cbinop.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "error.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-cell.cc --- a/libinterp/parse-tree/pt-cell.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-cell.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-check.cc --- a/libinterp/parse-tree/pt-check.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-check.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "error.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-classdef.cc --- a/libinterp/parse-tree/pt-classdef.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-classdef.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "ov-classdef.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-cmd.cc --- a/libinterp/parse-tree/pt-cmd.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-cmd.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "pt-cmd.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-colon.cc --- a/libinterp/parse-tree/pt-colon.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-colon.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "error.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-colon.h --- a/libinterp/parse-tree/pt-colon.h Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-colon.h Fri Feb 05 16:29:08 2016 -0800 @@ -21,9 +21,9 @@ */ #if ! defined (octave_pt_colon_h) -#define octave_tree_colon 1 +# define octave_tree_colon 1 -#include +# include class tree_walker; @@ -31,8 +31,8 @@ class octave_value_list; class octave_lvalue; -#include "pt-exp.h" -#include "symtab.h" +# include "pt-exp.h" +# include "symtab.h" // Colon expressions. diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-const.cc --- a/libinterp/parse-tree/pt-const.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-const.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-decl.cc --- a/libinterp/parse-tree/pt-decl.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-decl.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defun.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-eval.cc --- a/libinterp/parse-tree/pt-eval.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-eval.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-except.cc --- a/libinterp/parse-tree/pt-except.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-except.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "quit.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-exp.cc --- a/libinterp/parse-tree/pt-exp.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-exp.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-fcn-handle.cc --- a/libinterp/parse-tree/pt-fcn-handle.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-fcn-handle.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-funcall.cc --- a/libinterp/parse-tree/pt-funcall.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-funcall.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "ov-fcn.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-id.cc --- a/libinterp/parse-tree/pt-id.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-id.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "error.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-idx.cc --- a/libinterp/parse-tree/pt-idx.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-idx.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "Cell.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-jump.cc --- a/libinterp/parse-tree/pt-jump.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-jump.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "error.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-loop.cc --- a/libinterp/parse-tree/pt-loop.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-loop.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "quit.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-mat.cc --- a/libinterp/parse-tree/pt-mat.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-mat.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-misc.cc --- a/libinterp/parse-tree/pt-misc.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-misc.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "Cell.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-pr-code.cc --- a/libinterp/parse-tree/pt-pr-code.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-pr-code.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-select.cc --- a/libinterp/parse-tree/pt-select.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-select.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "error.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-stmt.cc --- a/libinterp/parse-tree/pt-stmt.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-stmt.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt-unop.cc --- a/libinterp/parse-tree/pt-unop.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt-unop.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "error.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/pt.cc --- a/libinterp/parse-tree/pt.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/pt.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/parse-tree/token.cc --- a/libinterp/parse-tree/token.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/parse-tree/token.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/template-inst/Array-jit.cc --- a/libinterp/template-inst/Array-jit.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/template-inst/Array-jit.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ // Author: Max Brister #ifdef HAVE_CONFIG_H -#include +# include #endif #ifdef HAVE_LLVM @@ -40,8 +40,8 @@ INSTANTIATE_ARRAY (jit_function, OCTINTERP_API); #ifdef Cell_h -#error Must not include Cell.h in Array-jit.h -#error This causes problems on MSVC +# error Must not include Cell.h in Array-jit.h +# error This causes problems on MSVC #endif #endif diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/template-inst/Array-os.cc --- a/libinterp/template-inst/Array-os.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/template-inst/Array-os.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ // Instantiate Arrays of octave_stream objects. #ifdef HAVE_CONFIG_H -#include +# include #endif #include "Array.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/template-inst/Array-sym.cc --- a/libinterp/template-inst/Array-sym.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/template-inst/Array-sym.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ // Instantiate Arrays of octave_child objects. #ifdef HAVE_CONFIG_H -#include +# include #endif #include "Array.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/template-inst/Array-tc.cc --- a/libinterp/template-inst/Array-tc.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/template-inst/Array-tc.cc Fri Feb 05 16:29:08 2016 -0800 @@ -23,7 +23,7 @@ // Instantiate Arrays of octave_values. #ifdef HAVE_CONFIG_H -#include +# include #endif #include "Array.h" diff -r dd6605e1eaea -r fcac5dbbf9ed libinterp/version.cc --- a/libinterp/version.cc Thu Feb 04 18:07:46 2016 -0500 +++ b/libinterp/version.cc Fri Feb 05 16:29:08 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include