# HG changeset patch # User Rik # Date 1454769613 28800 # Node ID f7121e11199125ad4f1552614463151c4ec2f4ee # Parent 88b41a4711e2bb043de105aaf3fac9fa8f578ddd maint: indent #ifdef blocks in liboctave and src directories. * Array-C.cc, Array-b.cc, Array-ch.cc, Array-d.cc, Array-f.cc, Array-fC.cc, Array-i.cc, Array-idx-vec.cc, Array-s.cc, Array-str.cc, Array-util.cc, Array-voidp.cc, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CRowVector.cc, CSparse.cc, CSparse.h, DiagArray2.cc, MArray-C.cc, MArray-d.cc, MArray-f.cc, MArray-fC.cc, MArray-i.cc, MArray-s.cc, MArray.cc, MDiagArray2.cc, MSparse-C.cc, MSparse-d.cc, MSparse.h, MatrixType.cc, PermMatrix.cc, Range.cc, Sparse-C.cc, Sparse-b.cc, Sparse-d.cc, Sparse.cc, boolMatrix.cc, boolNDArray.cc, boolSparse.cc, chMatrix.cc, chNDArray.cc, dColVector.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, dSparse.h, dim-vector.cc, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fColVector.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc, idx-vector.cc, int16NDArray.cc, int32NDArray.cc, int64NDArray.cc, int8NDArray.cc, intNDArray.cc, uint16NDArray.cc, uint32NDArray.cc, uint64NDArray.cc, uint8NDArray.cc, blaswrap.c, cquit.c, f77-extern.cc, f77-fcn.c, f77-fcn.h, lo-error.c, quit.cc, quit.h, CmplxAEPBAL.cc, CmplxCHOL.cc, CmplxGEPBAL.cc, CmplxHESS.cc, CmplxLU.cc, CmplxQR.cc, CmplxQRP.cc, CmplxSCHUR.cc, CmplxSVD.cc, CollocWt.cc, DASPK.cc, DASRT.cc, DASSL.cc, EIG.cc, LSODE.cc, ODES.cc, Quad.cc, base-lu.cc, base-qr.cc, dbleAEPBAL.cc, dbleCHOL.cc, dbleGEPBAL.cc, dbleHESS.cc, dbleLU.cc, dbleQR.cc, dbleQRP.cc, dbleSCHUR.cc, dbleSVD.cc, eigs-base.cc, fCmplxAEPBAL.cc, fCmplxCHOL.cc, fCmplxGEPBAL.cc, fCmplxHESS.cc, fCmplxLU.cc, fCmplxQR.cc, fCmplxQRP.cc, fCmplxSCHUR.cc, fCmplxSVD.cc, fEIG.cc, floatAEPBAL.cc, floatCHOL.cc, floatGEPBAL.cc, floatHESS.cc, floatLU.cc, floatQR.cc, floatQRP.cc, floatSCHUR.cc, floatSVD.cc, lo-mappers.cc, lo-specfun.cc, oct-convn.cc, oct-fftw.cc, oct-fftw.h, oct-norm.cc, oct-rand.cc, oct-spparms.cc, randgamma.c, randmtzig.c, randpoisson.c, sparse-chol.cc, sparse-dmsolve.cc, sparse-lu.cc, sparse-qr.cc, mx-defs.h, dir-ops.cc, file-ops.cc, file-stat.cc, lo-sysdep.cc, mach-info.cc, oct-env.cc, oct-group.cc, oct-openmp.h, oct-passwd.cc, oct-syscalls.cc, oct-time.cc, oct-uname.cc, pathlen.h, sysdir.h, syswait.h, cmd-edit.cc, cmd-hist.cc, data-conv.cc, f2c-main.c, glob-match.cc, lo-array-errwarn.cc, lo-array-gripes.cc, lo-cutils.c, lo-cutils.h, lo-ieee.cc, lo-math.h, lo-regexp.cc, lo-utils.cc, oct-base64.cc, oct-glob.cc, oct-inttypes.cc, oct-inttypes.h, oct-locbuf.cc, oct-mutex.cc, oct-refcount.h, oct-rl-edit.c, oct-rl-hist.c, oct-shlib.cc, oct-sort.cc, pathsearch.cc, singleton-cleanup.cc, sparse-sort.cc, sparse-util.cc, statdefs.h, str-vec.cc, unwind-prot.cc, url-transfer.cc, display-available.h, main-cli.cc, main-gui.cc, main.in.cc, mkoctfile.in.cc, octave-config.in.cc, shared-fcns.h: indent #ifdef blocks in liboctave and src directories. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Array-C.cc --- a/liboctave/array/Array-C.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Array-C.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // Instantiate Arrays of Complex values. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Array-b.cc --- a/liboctave/array/Array-b.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Array-b.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // Instantiate Arrays of bool values. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Array-ch.cc --- a/liboctave/array/Array-ch.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Array-ch.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // Instantiate Arrays of char values. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Array-d.cc --- a/liboctave/array/Array-d.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Array-d.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // Instantiate Arrays of double values. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Array-f.cc --- a/liboctave/array/Array-f.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Array-f.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // Instantiate Arrays of float values. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Array-fC.cc --- a/liboctave/array/Array-fC.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Array-fC.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // Instantiate Arrays of FloatComplex values. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Array-i.cc --- a/liboctave/array/Array-i.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Array-i.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "oct-inttypes.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Array-idx-vec.cc --- a/liboctave/array/Array-idx-vec.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Array-idx-vec.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // Instantiate Arrays of integer values. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Array-s.cc --- a/liboctave/array/Array-s.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Array-s.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // Instantiate Arrays of short int values. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Array-str.cc --- a/liboctave/array/Array-str.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Array-str.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Array-util.cc --- a/liboctave/array/Array-util.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Array-util.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "Array-util.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Array-voidp.cc --- a/liboctave/array/Array-voidp.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Array-voidp.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Array.cc --- a/liboctave/array/Array.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Array.cc Sat Feb 06 06:40:13 2016 -0800 @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/CColVector.cc --- a/liboctave/array/CColVector.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/CColVector.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/CDiagMatrix.cc --- a/liboctave/array/CDiagMatrix.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/CDiagMatrix.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/CMatrix.cc --- a/liboctave/array/CMatrix.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/CMatrix.cc Sat Feb 06 06:40:13 2016 -0800 @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/CNDArray.cc --- a/liboctave/array/CNDArray.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/CNDArray.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/CRowVector.cc --- a/liboctave/array/CRowVector.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/CRowVector.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/CSparse.cc --- a/liboctave/array/CSparse.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/CSparse.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -67,7 +67,7 @@ // Mendelsohn factorization to seperate the problem into under-determined, // well-determined and over-determined parts and solves them seperately #ifndef USE_QRSOLVE -#include "sparse-dmsolve.cc" +# include "sparse-dmsolve.cc" #endif // Fortran functions we call. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/CSparse.h --- a/liboctave/array/CSparse.h Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/CSparse.h Sat Feb 06 06:40:13 2016 -0800 @@ -550,9 +550,9 @@ SPARSE_FORWARD_DEFS (MSparse, SparseComplexMatrix, ComplexMatrix, Complex) #if defined (ENABLE_64) -#define UMFPACK_ZNAME(name) umfpack_zl_ ## name +# define UMFPACK_ZNAME(name) umfpack_zl_ ## name #else -#define UMFPACK_ZNAME(name) umfpack_zi_ ## name +# define UMFPACK_ZNAME(name) umfpack_zi_ ## name #endif #endif diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/DiagArray2.cc --- a/liboctave/array/DiagArray2.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/DiagArray2.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/MArray-C.cc --- a/liboctave/array/MArray-C.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/MArray-C.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // Instantiate MArrays of Complex values. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/MArray-d.cc --- a/liboctave/array/MArray-d.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/MArray-d.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // Instantiate MArrays of double values. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/MArray-f.cc --- a/liboctave/array/MArray-f.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/MArray-f.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // Instantiate MArrays of float values. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/MArray-fC.cc --- a/liboctave/array/MArray-fC.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/MArray-fC.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // Instantiate MArrays of FloatComplex values. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/MArray-i.cc --- a/liboctave/array/MArray-i.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/MArray-i.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "oct-inttypes.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/MArray-s.cc --- a/liboctave/array/MArray-s.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/MArray-s.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // Instantiate MArrays of short int values. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/MArray.cc --- a/liboctave/array/MArray.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/MArray.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "MArray.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/MDiagArray2.cc --- a/liboctave/array/MDiagArray2.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/MDiagArray2.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "MDiagArray2.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/MSparse-C.cc --- a/liboctave/array/MSparse-C.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/MSparse-C.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "oct-cmplx.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/MSparse-d.cc --- a/liboctave/array/MSparse-d.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/MSparse-d.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "MSparse.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/MSparse.h --- a/liboctave/array/MSparse.h Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/MSparse.h Sat Feb 06 06:40:13 2016 -0800 @@ -25,7 +25,7 @@ #define octave_MSparse_h 1 #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/MatrixType.cc --- a/liboctave/array/MatrixType.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/MatrixType.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/PermMatrix.cc --- a/liboctave/array/PermMatrix.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/PermMatrix.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "PermMatrix.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Range.cc --- a/liboctave/array/Range.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Range.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Sparse-C.cc --- a/liboctave/array/Sparse-C.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Sparse-C.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // Instantiate Sparse matrix of complex values. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Sparse-b.cc --- a/liboctave/array/Sparse-b.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Sparse-b.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // Instantiate Sparse matrix of double values. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Sparse-d.cc --- a/liboctave/array/Sparse-d.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Sparse-d.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif // Instantiate Sparse matrix of double values. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/Sparse.cc --- a/liboctave/array/Sparse.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/Sparse.cc Sat Feb 06 06:40:13 2016 -0800 @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/boolMatrix.cc --- a/liboctave/array/boolMatrix.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/boolMatrix.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/boolNDArray.cc --- a/liboctave/array/boolNDArray.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/boolNDArray.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "Array-util.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/boolSparse.cc --- a/liboctave/array/boolSparse.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/boolSparse.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/chMatrix.cc --- a/liboctave/array/chMatrix.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/chMatrix.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/chNDArray.cc --- a/liboctave/array/chNDArray.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/chNDArray.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/dColVector.cc --- a/liboctave/array/dColVector.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/dColVector.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/dDiagMatrix.cc --- a/liboctave/array/dDiagMatrix.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/dDiagMatrix.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/dMatrix.cc --- a/liboctave/array/dMatrix.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/dMatrix.cc Sat Feb 06 06:40:13 2016 -0800 @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/dNDArray.cc --- a/liboctave/array/dNDArray.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/dNDArray.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/dRowVector.cc --- a/liboctave/array/dRowVector.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/dRowVector.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/dSparse.cc --- a/liboctave/array/dSparse.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/dSparse.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -62,7 +62,7 @@ // Mendelsohn factorization to seperate the problem into under-determined, // well-determined and over-determined parts and solves them seperately #ifndef USE_QRSOLVE -#include "sparse-dmsolve.cc" +# include "sparse-dmsolve.cc" #endif // Fortran functions we call. diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/dSparse.h --- a/liboctave/array/dSparse.h Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/dSparse.h Sat Feb 06 06:40:13 2016 -0800 @@ -507,9 +507,9 @@ SPARSE_FORWARD_DEFS (MSparse, SparseMatrix, Matrix, double) #if defined (ENABLE_64) -#define UMFPACK_DNAME(name) umfpack_dl_ ## name +# define UMFPACK_DNAME(name) umfpack_dl_ ## name #else -#define UMFPACK_DNAME(name) umfpack_di_ ## name +# define UMFPACK_DNAME(name) umfpack_di_ ## name #endif #endif diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/dim-vector.cc --- a/liboctave/array/dim-vector.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/dim-vector.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/fCColVector.cc --- a/liboctave/array/fCColVector.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/fCColVector.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/fCDiagMatrix.cc --- a/liboctave/array/fCDiagMatrix.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/fCDiagMatrix.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/fCMatrix.cc --- a/liboctave/array/fCMatrix.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/fCMatrix.cc Sat Feb 06 06:40:13 2016 -0800 @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/fCNDArray.cc --- a/liboctave/array/fCNDArray.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/fCNDArray.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/fCRowVector.cc --- a/liboctave/array/fCRowVector.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/fCRowVector.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/fColVector.cc --- a/liboctave/array/fColVector.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/fColVector.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/fDiagMatrix.cc --- a/liboctave/array/fDiagMatrix.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/fDiagMatrix.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/fMatrix.cc --- a/liboctave/array/fMatrix.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/fMatrix.cc Sat Feb 06 06:40:13 2016 -0800 @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/fNDArray.cc --- a/liboctave/array/fNDArray.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/fNDArray.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/fRowVector.cc --- a/liboctave/array/fRowVector.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/fRowVector.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/idx-vector.cc --- a/liboctave/array/idx-vector.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/idx-vector.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/int16NDArray.cc --- a/liboctave/array/int16NDArray.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/int16NDArray.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "int16NDArray.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/int32NDArray.cc --- a/liboctave/array/int32NDArray.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/int32NDArray.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "int32NDArray.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/int64NDArray.cc --- a/liboctave/array/int64NDArray.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/int64NDArray.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "int64NDArray.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/int8NDArray.cc --- a/liboctave/array/int8NDArray.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/int8NDArray.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "int8NDArray.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/intNDArray.cc --- a/liboctave/array/intNDArray.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/intNDArray.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "Array-util.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/uint16NDArray.cc --- a/liboctave/array/uint16NDArray.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/uint16NDArray.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "uint16NDArray.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/uint32NDArray.cc --- a/liboctave/array/uint32NDArray.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/uint32NDArray.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "uint32NDArray.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/uint64NDArray.cc --- a/liboctave/array/uint64NDArray.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/uint64NDArray.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "uint64NDArray.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/array/uint8NDArray.cc --- a/liboctave/array/uint8NDArray.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/array/uint8NDArray.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "uint8NDArray.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/cruft/misc/blaswrap.c --- a/liboctave/cruft/misc/blaswrap.c Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/cruft/misc/blaswrap.c Sat Feb 06 06:40:13 2016 -0800 @@ -39,7 +39,7 @@ */ #ifdef HAVE_CONFIG_H -#include /* USE_BLASWRAP ? */ +# include /* USE_BLASWRAP ? */ #endif #ifdef USE_BLASWRAP @@ -53,7 +53,7 @@ * same name. */ #ifndef VECLIB_FILE -#define VECLIB_FILE "/System/Library/Frameworks/vecLib.framework/Versions/A/vecLib" +# define VECLIB_FILE "/System/Library/Frameworks/vecLib.framework/Versions/A/vecLib" #endif /* diff -r 88b41a4711e2 -r f7121e111991 liboctave/cruft/misc/cquit.c --- a/liboctave/cruft/misc/cquit.c Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/cruft/misc/cquit.c Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/cruft/misc/f77-extern.cc --- a/liboctave/cruft/misc/f77-extern.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/cruft/misc/f77-extern.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "f77-fcn.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/cruft/misc/f77-fcn.c --- a/liboctave/cruft/misc/f77-fcn.c Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/cruft/misc/f77-fcn.c Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/cruft/misc/f77-fcn.h --- a/liboctave/cruft/misc/f77-fcn.h Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/cruft/misc/f77-fcn.h Sat Feb 06 06:40:13 2016 -0800 @@ -166,9 +166,9 @@ tagged with a "noreturn" attribute. */ #define F77_RETURN(retval) return retval; #if defined (HAVE_ATTR_NORETURN) -#define F77_NORETURN(retval) +# define F77_NORETURN(retval) #else -#define F77_NORETURN(retval) return retval; +# define F77_NORETURN(retval) return retval; #endif /* FIXME: These should work for SV1 or Y-MP systems but will @@ -189,9 +189,9 @@ typedef void *octave_cray_ftn_ch_dsc; #ifdef __cplusplus -#define OCTAVE_F77_FCN_INLINE inline +# define OCTAVE_F77_FCN_INLINE inline #else -#define OCTAVE_F77_FCN_INLINE +# define OCTAVE_F77_FCN_INLINE #endif static OCTAVE_F77_FCN_INLINE octave_cray_ftn_ch_dsc @@ -213,7 +213,7 @@ } #ifdef __cplusplus -#undef OCTAVE_F77_FCN_INLINE +# undef OCTAVE_F77_FCN_INLINE #endif #elif defined (F77_USES_VISUAL_FORTRAN_CALLING_CONVENTION) @@ -264,9 +264,9 @@ #define F77_RETURN(retval) return retval; #if defined (HAVE_ATTR_NORETURN) -#define F77_NORETURN(retval) +# define F77_NORETURN(retval) #else -#define F77_NORETURN(retval) return retval; +# define F77_NORETURN(retval) return retval; #endif #endif diff -r 88b41a4711e2 -r f7121e111991 liboctave/cruft/misc/lo-error.c --- a/liboctave/cruft/misc/lo-error.c Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/cruft/misc/lo-error.c Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/cruft/misc/quit.cc --- a/liboctave/cruft/misc/quit.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/cruft/misc/quit.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/cruft/misc/quit.h --- a/liboctave/cruft/misc/quit.h Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/cruft/misc/quit.h Sat Feb 06 06:40:13 2016 -0800 @@ -29,8 +29,8 @@ #include #ifdef __cplusplus -#include -#include +# include +# include extern "C" { #endif diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/CmplxAEPBAL.cc --- a/liboctave/numeric/CmplxAEPBAL.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/CmplxAEPBAL.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/CmplxCHOL.cc --- a/liboctave/numeric/CmplxCHOL.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/CmplxCHOL.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -35,7 +35,7 @@ #include "oct-locbuf.h" #include "oct-norm.h" #ifndef HAVE_QRUPDATE -#include "dbleQR.h" +# include "dbleQR.h" #endif extern "C" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/CmplxGEPBAL.cc --- a/liboctave/numeric/CmplxGEPBAL.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/CmplxGEPBAL.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/CmplxHESS.cc --- a/liboctave/numeric/CmplxHESS.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/CmplxHESS.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "CmplxHESS.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/CmplxLU.cc --- a/liboctave/numeric/CmplxLU.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/CmplxLU.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "CmplxLU.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/CmplxQR.cc --- a/liboctave/numeric/CmplxQR.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/CmplxQR.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "CmplxQR.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/CmplxQRP.cc --- a/liboctave/numeric/CmplxQRP.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/CmplxQRP.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/CmplxSCHUR.cc --- a/liboctave/numeric/CmplxSCHUR.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/CmplxSCHUR.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "CmplxSCHUR.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/CmplxSVD.cc --- a/liboctave/numeric/CmplxSVD.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/CmplxSVD.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "CmplxSVD.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/CollocWt.cc --- a/liboctave/numeric/CollocWt.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/CollocWt.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/DASPK.cc --- a/liboctave/numeric/DASPK.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/DASPK.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/DASRT.cc --- a/liboctave/numeric/DASRT.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/DASRT.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/DASSL.cc --- a/liboctave/numeric/DASSL.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/DASSL.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/EIG.cc --- a/liboctave/numeric/EIG.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/EIG.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "EIG.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/LSODE.cc --- a/liboctave/numeric/LSODE.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/LSODE.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/ODES.cc --- a/liboctave/numeric/ODES.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/ODES.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "ODES.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/Quad.cc --- a/liboctave/numeric/Quad.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/Quad.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "Quad.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/base-lu.cc --- a/liboctave/numeric/base-lu.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/base-lu.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "base-lu.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/base-qr.cc --- a/liboctave/numeric/base-qr.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/base-qr.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "base-qr.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/dbleAEPBAL.cc --- a/liboctave/numeric/dbleAEPBAL.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/dbleAEPBAL.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/dbleCHOL.cc --- a/liboctave/numeric/dbleCHOL.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/dbleCHOL.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -34,7 +34,7 @@ #include "oct-locbuf.h" #include "oct-norm.h" #ifndef HAVE_QRUPDATE -#include "dbleQR.h" +# include "dbleQR.h" #endif extern "C" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/dbleGEPBAL.cc --- a/liboctave/numeric/dbleGEPBAL.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/dbleGEPBAL.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/dbleHESS.cc --- a/liboctave/numeric/dbleHESS.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/dbleHESS.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "dbleHESS.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/dbleLU.cc --- a/liboctave/numeric/dbleLU.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/dbleLU.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "dbleLU.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/dbleQR.cc --- a/liboctave/numeric/dbleQR.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/dbleQR.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "dbleQR.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/dbleQRP.cc --- a/liboctave/numeric/dbleQRP.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/dbleQRP.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/dbleSCHUR.cc --- a/liboctave/numeric/dbleSCHUR.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/dbleSCHUR.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/dbleSVD.cc --- a/liboctave/numeric/dbleSVD.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/dbleSVD.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/eigs-base.cc --- a/liboctave/numeric/eigs-base.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/eigs-base.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/fCmplxAEPBAL.cc --- a/liboctave/numeric/fCmplxAEPBAL.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/fCmplxAEPBAL.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/fCmplxCHOL.cc --- a/liboctave/numeric/fCmplxCHOL.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/fCmplxCHOL.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -35,7 +35,7 @@ #include "oct-locbuf.h" #include "oct-norm.h" #ifndef HAVE_QRUPDATE -#include "dbleQR.h" +# include "dbleQR.h" #endif extern "C" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/fCmplxGEPBAL.cc --- a/liboctave/numeric/fCmplxGEPBAL.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/fCmplxGEPBAL.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/fCmplxHESS.cc --- a/liboctave/numeric/fCmplxHESS.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/fCmplxHESS.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "fCmplxHESS.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/fCmplxLU.cc --- a/liboctave/numeric/fCmplxLU.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/fCmplxLU.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "fCmplxLU.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/fCmplxQR.cc --- a/liboctave/numeric/fCmplxQR.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/fCmplxQR.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "fCmplxQR.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/fCmplxQRP.cc --- a/liboctave/numeric/fCmplxQRP.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/fCmplxQRP.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/fCmplxSCHUR.cc --- a/liboctave/numeric/fCmplxSCHUR.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/fCmplxSCHUR.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "fCmplxSCHUR.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/fCmplxSVD.cc --- a/liboctave/numeric/fCmplxSVD.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/fCmplxSVD.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "fCmplxSVD.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/fEIG.cc --- a/liboctave/numeric/fEIG.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/fEIG.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "fEIG.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/floatAEPBAL.cc --- a/liboctave/numeric/floatAEPBAL.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/floatAEPBAL.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/floatCHOL.cc --- a/liboctave/numeric/floatCHOL.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/floatCHOL.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -34,7 +34,7 @@ #include "oct-locbuf.h" #include "oct-norm.h" #ifndef HAVE_QRUPDATE -#include "dbleQR.h" +# include "dbleQR.h" #endif extern "C" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/floatGEPBAL.cc --- a/liboctave/numeric/floatGEPBAL.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/floatGEPBAL.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/floatHESS.cc --- a/liboctave/numeric/floatHESS.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/floatHESS.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "floatHESS.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/floatLU.cc --- a/liboctave/numeric/floatLU.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/floatLU.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "floatLU.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/floatQR.cc --- a/liboctave/numeric/floatQR.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/floatQR.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "floatQR.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/floatQRP.cc --- a/liboctave/numeric/floatQRP.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/floatQRP.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/floatSCHUR.cc --- a/liboctave/numeric/floatSCHUR.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/floatSCHUR.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/floatSVD.cc --- a/liboctave/numeric/floatSVD.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/floatSVD.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/lo-mappers.cc --- a/liboctave/numeric/lo-mappers.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/lo-mappers.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -113,7 +113,7 @@ #if defined (HAVE_EXP2) return exp2 (x); #else -#if defined (M_LN2) +# if defined (M_LN2) static double ln2 = M_LN2; #else static double ln2 = gnulib::log (2); @@ -350,7 +350,7 @@ #elif defined (HAVE_EXP2) return exp2 (x); #else -#if defined (M_LN2) +# if defined (M_LN2) static float ln2 = M_LN2; #else static float ln2 = log2 (2); diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/lo-specfun.cc --- a/liboctave/numeric/lo-specfun.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/lo-specfun.cc Sat Feb 06 06:40:13 2016 -0800 @@ -25,7 +25,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "Range.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/oct-convn.cc --- a/liboctave/numeric/oct-convn.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/oct-convn.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/oct-fftw.cc --- a/liboctave/numeric/oct-fftw.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/oct-fftw.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #if defined (HAVE_FFTW) @@ -36,7 +36,7 @@ #include "singleton-cleanup.h" #if defined (HAVE_FFTW3_THREADS) -#include "nproc.h" +# include "nproc.h" #endif octave_fftw_planner *octave_fftw_planner::instance = 0; diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/oct-fftw.h --- a/liboctave/numeric/oct-fftw.h Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/oct-fftw.h Sat Feb 06 06:40:13 2016 -0800 @@ -26,7 +26,7 @@ #include #if defined (HAVE_FFTW3_H) -#include +# include #endif #include "oct-cmplx.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/oct-norm.cc --- a/liboctave/numeric/oct-norm.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/oct-norm.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ // author: Jaroslav Hajek #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/oct-rand.cc --- a/liboctave/numeric/oct-rand.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/oct-rand.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/oct-spparms.cc --- a/liboctave/numeric/oct-spparms.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/oct-spparms.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "lo-error.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/randgamma.c --- a/liboctave/numeric/randgamma.c Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/randgamma.c Sat Feb 06 06:40:13 2016 -0800 @@ -78,7 +78,7 @@ */ #if defined (HAVE_CONFIG_H) -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/randmtzig.c --- a/liboctave/numeric/randmtzig.c Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/randmtzig.c Sat Feb 06 06:40:13 2016 -0800 @@ -153,14 +153,14 @@ */ #if defined (HAVE_CONFIG_H) -#include +# include #endif #include #include #ifdef HAVE_GETTIMEOFDAY -#include +# include #endif #include "lo-math.h" @@ -168,11 +168,11 @@ /* FIXME: may want to suppress X86 if sizeof(long) > 4 */ #if ! defined (USE_X86_32) -# if defined (i386) || defined (HAVE_X86_32) -# define USE_X86_32 1 -# else -# define USE_X86_32 0 -# endif +# if defined (i386) || defined (HAVE_X86_32) +# define USE_X86_32 1 +# else +# define USE_X86_32 0 +# endif #endif /* ===== Mersenne Twister 32-bit generator ===== */ diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/randpoisson.c --- a/liboctave/numeric/randpoisson.c Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/randpoisson.c Sat Feb 06 06:40:13 2016 -0800 @@ -32,7 +32,7 @@ */ #if defined (HAVE_CONFIG_H) -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/sparse-chol.cc --- a/liboctave/numeric/sparse-chol.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/sparse-chol.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "sparse-chol.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/sparse-dmsolve.cc --- a/liboctave/numeric/sparse-dmsolve.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/sparse-dmsolve.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/sparse-lu.cc --- a/liboctave/numeric/sparse-lu.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/sparse-lu.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "CSparse.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/numeric/sparse-qr.cc --- a/liboctave/numeric/sparse-qr.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/numeric/sparse-qr.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "lo-error.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/operators/mx-defs.h --- a/liboctave/operators/mx-defs.h Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/operators/mx-defs.h Sat Feb 06 06:40:13 2016 -0800 @@ -109,7 +109,7 @@ #include "oct-cmplx.h" #ifndef MAPPER_FCN_TYPEDEFS -#define MAPPER_FCN_TYPEDEFS 1 +# define MAPPER_FCN_TYPEDEFS 1 typedef bool (*b_d_Mapper)(double); typedef bool (*b_c_Mapper)(const Complex&); @@ -138,7 +138,6 @@ return static_cast (transt); } +# endif #endif - -#endif diff -r 88b41a4711e2 -r f7121e111991 liboctave/system/dir-ops.cc --- a/liboctave/system/dir-ops.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/system/dir-ops.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/system/file-ops.cc --- a/liboctave/system/file-ops.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/system/file-ops.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -55,7 +55,7 @@ #include "str-vec.h" #if (defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM)) -#include +# include #endif file_ops *file_ops::instance = 0; diff -r 88b41a4711e2 -r f7121e111991 liboctave/system/file-stat.cc --- a/liboctave/system/file-stat.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/system/file-stat.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/system/lo-sysdep.cc --- a/liboctave/system/lo-sysdep.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/system/lo-sysdep.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -34,8 +34,8 @@ #include #if defined (__WIN32__) && ! defined (__CYGWIN__) -#define WIN32_LEAN_AND_MEAN -#include +# define WIN32_LEAN_AND_MEAN +# include #endif #include "file-ops.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/system/mach-info.cc --- a/liboctave/system/mach-info.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/system/mach-info.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "f77-fcn.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/system/oct-env.cc --- a/liboctave/system/oct-env.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/system/oct-env.cc Sat Feb 06 06:40:13 2016 -0800 @@ -37,7 +37,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/system/oct-group.cc --- a/liboctave/system/oct-group.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/system/oct-group.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,13 +21,13 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include #ifdef HAVE_GRP_H -#include +# include #endif #include "lo-error.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/system/oct-openmp.h --- a/liboctave/system/oct-openmp.h Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/system/oct-openmp.h Sat Feb 06 06:40:13 2016 -0800 @@ -25,10 +25,10 @@ /* A macro to make using OpenMP easier, and easier to disable */ #ifdef HAVE_OPENMP -#include -#define OCTAVE_OMP_PRAGMA(x) _Pragma (#x) +# include +# define OCTAVE_OMP_PRAGMA(x) _Pragma (#x) #else -#define OCTAVE_OMP_PRAGMA(x) +# define OCTAVE_OMP_PRAGMA(x) #endif #endif diff -r 88b41a4711e2 -r f7121e111991 liboctave/system/oct-passwd.cc --- a/liboctave/system/oct-passwd.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/system/oct-passwd.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,13 +21,13 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include #ifdef HAVE_PWD_H -#include +# include #endif #include "lo-error.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/system/oct-syscalls.cc --- a/liboctave/system/oct-syscalls.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/system/oct-syscalls.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -127,7 +127,7 @@ pid_t status = -1; #if defined (HAVE_VFORK) || defined (HAVE_FORK) -#if defined (HAVE_VFORK) +# if defined (HAVE_VFORK) status = ::vfork (); #else status = ::fork (); diff -r 88b41a4711e2 -r f7121e111991 liboctave/system/oct-time.cc --- a/liboctave/system/oct-time.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/system/oct-time.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -137,7 +137,7 @@ } #if ! defined STRFTIME_BUF_INITIAL_SIZE -#define STRFTIME_BUF_INITIAL_SIZE 128 +# define STRFTIME_BUF_INITIAL_SIZE 128 #endif std::string diff -r 88b41a4711e2 -r f7121e111991 liboctave/system/oct-uname.cc --- a/liboctave/system/oct-uname.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/system/oct-uname.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/system/pathlen.h --- a/liboctave/system/pathlen.h Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/system/pathlen.h Sat Feb 06 06:40:13 2016 -0800 @@ -24,11 +24,11 @@ #define octave_pathlen_h 1 #ifdef HAVE_SYS_PARAM_H -#include +# include #endif #ifndef MAXPATHLEN -#define MAXPATHLEN 1024 +# define MAXPATHLEN 1024 #endif #endif diff -r 88b41a4711e2 -r f7121e111991 liboctave/system/sysdir.h --- a/liboctave/system/sysdir.h Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/system/sysdir.h Sat Feb 06 06:40:13 2016 -0800 @@ -31,20 +31,20 @@ #include #if defined (HAVE_DIRENT_H) || defined (_POSIX_VERSION) -#include -#define NLENGTH(dirent) (strlen((dirent)->d_name)) +# include +# define NLENGTH(dirent) (strlen((dirent)->d_name)) #else -#define dirent direct -#define NLENGTH(dirent) ((dirent)->d_namlen) -#if defined (HAVE_SYS_NDIR_H) -#include -#endif -#if defined (HAVE_SYS_DIR_H) -#include -#endif -#if defined (HAVE_NDIR_H) -#include -#endif +# define dirent direct +# define NLENGTH(dirent) ((dirent)->d_namlen) +# if defined (HAVE_SYS_NDIR_H) +# include +# endif +# if defined (HAVE_SYS_DIR_H) +# include +# endif +# if defined (HAVE_NDIR_H) +# include +# endif #endif #endif diff -r 88b41a4711e2 -r f7121e111991 liboctave/system/syswait.h --- a/liboctave/system/syswait.h Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/system/syswait.h Sat Feb 06 06:40:13 2016 -0800 @@ -32,30 +32,30 @@ #include #if defined HAVE_SYS_WAIT_H -#include +# include #endif #ifndef WIFEXITED -#define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif #ifndef WEXITSTATUS -#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) #endif #ifndef WIFSIGNALLED -#define WIFSIGNALLED(stat_val) \ - (((stat_val) & 0177) != 0177 && ((stat_val) & 0177) != 0) +# define WIFSIGNALLED(stat_val) \ + (((stat_val) & 0177) != 0177 && ((stat_val) & 0177) != 0) #endif #if defined (__MINGW32__) || defined (_MSC_VER) -#define HAVE_WAITPID 1 -#include -#define WAITPID(a, b, c) _cwait (b, a, c) +# define HAVE_WAITPID 1 +# include +# define WAITPID(a, b, c) _cwait (b, a, c) /* Action argument is ignored for _cwait, so arbitrary definition. */ -#define WNOHANG 0 +# define WNOHANG 0 #else -#define WAITPID(a, b, c) waitpid (a, b, c) +# define WAITPID(a, b, c) waitpid (a, b, c) #endif #ifdef __cplusplus diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/cmd-edit.cc --- a/liboctave/util/cmd-edit.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/cmd-edit.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/cmd-hist.cc --- a/liboctave/util/cmd-hist.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/cmd-hist.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/data-conv.cc --- a/liboctave/util/data-conv.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/data-conv.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -38,43 +38,43 @@ #include "oct-locbuf.h" #if defined HAVE_LONG_LONG_INT -#define FIND_SIZED_INT_TYPE(VAL, BITS, TQ, Q) \ - do \ - { \ - int sz = BITS / std::numeric_limits::digits; \ - if (sizeof (TQ char) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## char; \ - else if (sizeof (TQ short) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## short; \ - else if (sizeof (TQ int) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## int; \ - else if (sizeof (TQ long) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## long; \ - else if (sizeof (TQ long long) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## longlong; \ - else \ - VAL = oct_data_conv::dt_unknown; \ - } \ - while (0) +# define FIND_SIZED_INT_TYPE(VAL, BITS, TQ, Q) \ + do \ + { \ + int sz = BITS / std::numeric_limits::digits; \ + if (sizeof (TQ char) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## char; \ + else if (sizeof (TQ short) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## short; \ + else if (sizeof (TQ int) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## int; \ + else if (sizeof (TQ long) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## long; \ + else if (sizeof (TQ long long) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## longlong; \ + else \ + VAL = oct_data_conv::dt_unknown; \ + } \ + while (0) #else -#define FIND_SIZED_INT_TYPE(VAL, BITS, TQ, Q) \ - do \ - { \ - int sz = BITS / std::numeric_limits::digits; \ - if (sizeof (TQ char) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## char; \ - else if (sizeof (TQ short) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## short; \ - else if (sizeof (TQ int) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## int; \ - else if (sizeof (TQ long) == sz) \ - VAL = oct_data_conv::dt_ ## Q ## long; \ - else \ - VAL = oct_data_conv::dt_unknown; \ - } \ - while (0) +# define FIND_SIZED_INT_TYPE(VAL, BITS, TQ, Q) \ + do \ + { \ + int sz = BITS / std::numeric_limits::digits; \ + if (sizeof (TQ char) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## char; \ + else if (sizeof (TQ short) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## short; \ + else if (sizeof (TQ int) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## int; \ + else if (sizeof (TQ long) == sz) \ + VAL = oct_data_conv::dt_ ## Q ## long; \ + else \ + VAL = oct_data_conv::dt_unknown; \ + } \ + while (0) #endif - + #define FIND_SIZED_FLOAT_TYPE(VAL, BITS) \ do \ { \ diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/f2c-main.c --- a/liboctave/util/f2c-main.c Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/f2c-main.c Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/glob-match.cc --- a/liboctave/util/glob-match.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/glob-match.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/lo-array-errwarn.cc --- a/liboctave/util/lo-array-errwarn.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/lo-array-errwarn.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/lo-array-gripes.cc --- a/liboctave/util/lo-array-gripes.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/lo-array-gripes.cc Sat Feb 06 06:40:13 2016 -0800 @@ -24,7 +24,7 @@ // FIXME: All gripe_XXX functions deprecated in 4.2. Remove file in 4.6 #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -149,14 +149,14 @@ buf << n + 1; #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_invalid_index (buf.str (), nd, dim, var); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif } @@ -168,14 +168,14 @@ buf << n + 1; #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_invalid_index (buf.str (), nd, dim, var); #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) -#pragma GCC diagnostic pop +# pragma GCC diagnostic pop #endif } diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/lo-cutils.c --- a/liboctave/util/lo-cutils.c Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/lo-cutils.c Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "lo-error.h" @@ -63,7 +63,7 @@ } #ifdef HAVE_LOADLIBRARY_API -#include +# include /* Need this since in C++ can't cast from int(*)() to void* */ OCTAVE_API void * diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/lo-cutils.h --- a/liboctave/util/lo-cutils.h Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/lo-cutils.h Sat Feb 06 06:40:13 2016 -0800 @@ -26,8 +26,8 @@ #include #ifdef HAVE_LOADLIBRARY_API -#define WIN32_LEAN_AND_MEAN -#include +# define WIN32_LEAN_AND_MEAN +# include #endif #ifdef __cplusplus diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/lo-ieee.cc --- a/liboctave/util/lo-ieee.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/lo-ieee.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/lo-math.h --- a/liboctave/util/lo-math.h Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/lo-math.h Sat Feb 06 06:40:13 2016 -0800 @@ -24,17 +24,17 @@ #define octave_lo_math_h 1 #if defined (__cplusplus) -#include +# include // if #undef log2 is missing in cmath, undef it here -#if defined (log2) -#undef log2 -#endif +# if defined (log2) +# undef log2 +# endif #else -#include +# include #endif #if defined (HAVE_SUNMATH_H) -#include +# include #endif #endif diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/lo-regexp.cc --- a/liboctave/util/lo-regexp.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/lo-regexp.cc Sat Feb 06 06:40:13 2016 -0800 @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -32,9 +32,9 @@ #include #if defined (HAVE_PCRE_H) -#include +# include #elif defined (HAVE_PCRE_PCRE_H) -#include +# include #endif #include "Matrix.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/lo-utils.cc --- a/liboctave/util/lo-utils.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/lo-utils.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/oct-base64.cc --- a/liboctave/util/oct-base64.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/oct-base64.cc Sat Feb 06 06:40:13 2016 -0800 @@ -20,16 +20,16 @@ */ -#ifdef HAVE_CONFIG_H -#include -#endif + #ifdef HAVE_CONFIG_H +# include +# endif -#include +# include -#include +# include -#include "Array.h" -#include "oct-base64.h" +# include "Array.h" +# include "oct-base64.h" bool octave_base64_encode (const char *inc, const size_t inlen, char **out) diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/oct-glob.cc --- a/liboctave/util/oct-glob.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/oct-glob.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -80,7 +80,7 @@ glob_t glob_info; #if defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) \ - && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM) + && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM) std::replace_if (xpat.begin (), xpat.end (), std::bind2nd (std::equal_to (), '\\'), '/'); diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/oct-inttypes.cc --- a/liboctave/util/oct-inttypes.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/oct-inttypes.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/oct-inttypes.h --- a/liboctave/util/oct-inttypes.h Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/oct-inttypes.h Sat Feb 06 06:40:13 2016 -0800 @@ -177,74 +177,74 @@ { return xop::op (x, static_cast (y)); } #ifdef OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED -#define DECLARE_EXTERNAL_LONG_DOUBLE_CMP_OPS(T) \ - template static OCTAVE_API bool \ - external_mop (double, T); \ - template static OCTAVE_API bool \ - external_mop (T, double) +# define DECLARE_EXTERNAL_LONG_DOUBLE_CMP_OPS(T) \ + template static OCTAVE_API bool \ + external_mop (double, T); \ + template static OCTAVE_API bool \ + external_mop (T, double) - DECLARE_EXTERNAL_LONG_DOUBLE_CMP_OPS (int64_t); - DECLARE_EXTERNAL_LONG_DOUBLE_CMP_OPS (uint64_t); + DECLARE_EXTERNAL_LONG_DOUBLE_CMP_OPS (int64_t); + DECLARE_EXTERNAL_LONG_DOUBLE_CMP_OPS (uint64_t); #endif // Typecasting to doubles won't work properly for 64-bit integers -- // they lose precision. // If we have long doubles, use them... #ifdef OCTAVE_INT_USE_LONG_DOUBLE -#ifdef OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED -#define DEFINE_LONG_DOUBLE_CMP_OP(T) \ - template \ - static bool \ - mop (double x, T y) \ - { \ - return external_mop (x, y); \ - } \ - template \ - static bool \ - mop (T x, double y) \ - { \ - return external_mop (x, y); \ - } -#else -#define DEFINE_LONG_DOUBLE_CMP_OP(T) \ - template \ - static bool \ - mop (double x, T y) \ - { \ - return xop::op (static_cast (x), \ - static_cast (y)); \ - } \ - template \ - static bool \ - mop (T x, double y) \ - { \ - return xop::op (static_cast (x), \ - static_cast (y)); \ - } -#endif +# ifdef OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED +# define DEFINE_LONG_DOUBLE_CMP_OP(T) \ + template \ + static bool \ + mop (double x, T y) \ + { \ + return external_mop (x, y); \ + } \ + template \ + static bool \ + mop (T x, double y) \ + { \ + return external_mop (x, y); \ + } +# else +# define DEFINE_LONG_DOUBLE_CMP_OP(T) \ + template \ + static bool \ + mop (double x, T y) \ + { \ + return xop::op (static_cast (x), \ + static_cast (y)); \ + } \ + template \ + static bool \ + mop (T x, double y) \ + { \ + return xop::op (static_cast (x), \ + static_cast (y)); \ + } +# endif #else // ... otherwise, use external handlers // FIXME: We could declare directly the mop methods as external, // but we can't do this because bugs in gcc (<= 4.3) prevent // explicit instantiations later in that case. -#define DEFINE_LONG_DOUBLE_CMP_OP(T) \ - template static OCTAVE_API bool \ - emulate_mop (double, T); \ - template \ - static bool \ - mop (double x, T y) \ - { \ - return emulate_mop (x, y); \ - } \ - template static OCTAVE_API bool \ - emulate_mop (T, double); \ - template \ - static bool \ - mop (T x, double y) \ - { \ - return emulate_mop (x, y); \ - } +# define DEFINE_LONG_DOUBLE_CMP_OP(T) \ + template static OCTAVE_API bool \ + emulate_mop (double, T); \ + template \ + static bool \ + mop (double x, T y) \ + { \ + return emulate_mop (x, y); \ + } \ + template static OCTAVE_API bool \ + emulate_mop (T, double); \ + template \ + static bool \ + mop (T x, double y) \ + { \ + return emulate_mop (x, y); \ + } #endif DEFINE_LONG_DOUBLE_CMP_OP(int64_t) @@ -1149,7 +1149,7 @@ #ifdef OCTAVE_INT_USE_LONG_DOUBLE // Handle mixed op using long double #ifdef OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED -#define OCTAVE_INT_DOUBLE_BIN_OP(OP, NAME) \ +# define OCTAVE_INT_DOUBLE_BIN_OP(OP, NAME) \ OCTAVE_INT_DOUBLE_BIN_OP0(OP) \ template <> \ inline octave_int64 \ @@ -1176,7 +1176,7 @@ return external_octave_uint64_double_ ## NAME (x, y); \ } #else -#define OCTAVE_INT_DOUBLE_BIN_OP(OP, NAME) \ +# define OCTAVE_INT_DOUBLE_BIN_OP(OP, NAME) \ OCTAVE_INT_DOUBLE_BIN_OP0(OP) \ template <> \ inline octave_int64 \ diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/oct-locbuf.cc --- a/liboctave/util/oct-locbuf.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/oct-locbuf.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -32,7 +32,7 @@ // FIXME: Maybe we should querying for available physical memory? #ifndef OCTAVE_LOCBUF_CHUNKSIZE_MB -#define OCTAVE_LOCBUF_CHUNKSIZE_MB 32 +# define OCTAVE_LOCBUF_CHUNKSIZE_MB 32 #endif // Each chunk will be at least this big. diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/oct-mutex.cc --- a/liboctave/util/oct-mutex.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/oct-mutex.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,16 +21,16 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "oct-mutex.h" #include "lo-error.h" #if defined (__WIN32__) && ! defined (__CYGWIN__) -#include +# include #elif defined (HAVE_PTHREAD_H) -#include +# include #endif void diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/oct-refcount.h --- a/liboctave/util/oct-refcount.h Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/oct-refcount.h Sat Feb 06 06:40:13 2016 -0800 @@ -24,28 +24,28 @@ #define octave_oct_refcount_h 1 #ifndef OCTAVE_CONFIG_INCLUDED -# error "The file must be included before oct-refcount.h." +# error "The file must be included before oct-refcount.h." #endif #if defined (ENABLE_ATOMIC_REFCOUNT) && (defined (_MSC_VER) || defined (__GNUC__)) -# if defined (_MSC_VER) -# include -# define OCTREFCOUNT_ATOMIC_INCREMENT(x) _InterlockedIncrement((long*)x) -# define OCTREFCOUNT_ATOMIC_DECREMENT(x) _InterlockedDecrement((long*)x) -# define OCTREFCOUNT_ATOMIC_INCREMENT_POST(x) _InterlockedExchangeAdd((long*)x, 1) -# define OCTREFCOUNT_ATOMIC_DECREMENT_POST(x) _InterlockedExchangeAdd((long*)x, -1) -# elif defined (__GNUC__) -# define OCTREFCOUNT_ATOMIC_INCREMENT(x) __sync_add_and_fetch(x, 1) -# define OCTREFCOUNT_ATOMIC_DECREMENT(x) __sync_add_and_fetch(x, -1) -# define OCTREFCOUNT_ATOMIC_INCREMENT_POST(x) __sync_fetch_and_add(x, 1) -# define OCTREFCOUNT_ATOMIC_DECREMENT_POST(x) __sync_fetch_and_add(x, -1) -# endif +# if defined (_MSC_VER) +# include +# define OCTREFCOUNT_ATOMIC_INCREMENT(x) _InterlockedIncrement((long*)x) +# define OCTREFCOUNT_ATOMIC_DECREMENT(x) _InterlockedDecrement((long*)x) +# define OCTREFCOUNT_ATOMIC_INCREMENT_POST(x) _InterlockedExchangeAdd((long*)x, 1) +# define OCTREFCOUNT_ATOMIC_DECREMENT_POST(x) _InterlockedExchangeAdd((long*)x, -1) +# elif defined (__GNUC__) +# define OCTREFCOUNT_ATOMIC_INCREMENT(x) __sync_add_and_fetch(x, 1) +# define OCTREFCOUNT_ATOMIC_DECREMENT(x) __sync_add_and_fetch(x, -1) +# define OCTREFCOUNT_ATOMIC_INCREMENT_POST(x) __sync_fetch_and_add(x, 1) +# define OCTREFCOUNT_ATOMIC_DECREMENT_POST(x) __sync_fetch_and_add(x, -1) +# endif #else // Generic non-locking versions -# define OCTREFCOUNT_ATOMIC_INCREMENT(x) ++(*(x)) -# define OCTREFCOUNT_ATOMIC_DECREMENT(x) --(*(x)) -# define OCTREFCOUNT_ATOMIC_INCREMENT_POST(x) (*(x))++ -# define OCTREFCOUNT_ATOMIC_DECREMENT_POST(x) (*(x))-- +# define OCTREFCOUNT_ATOMIC_INCREMENT(x) ++(*(x)) +# define OCTREFCOUNT_ATOMIC_DECREMENT(x) --(*(x)) +# define OCTREFCOUNT_ATOMIC_INCREMENT_POST(x) (*(x))++ +# define OCTREFCOUNT_ATOMIC_DECREMENT_POST(x) (*(x))-- #endif // Encapsulates a reference counter. diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/oct-rl-edit.c --- a/liboctave/util/oct-rl-edit.c Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/oct-rl-edit.c Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #if defined (USE_READLINE) diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/oct-rl-hist.c --- a/liboctave/util/oct-rl-hist.c Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/oct-rl-hist.c Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "oct-rl-hist.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/oct-shlib.cc --- a/liboctave/util/oct-shlib.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/oct-shlib.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,36 +22,36 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include #if defined (HAVE_SHL_LOAD_API) -#include -#include +# include +# include #endif #if defined (HAVE_DYLD_API) -#include +# include #endif extern "C" { #if defined (HAVE_DLOPEN_API) -#if defined (HAVE_DLFCN_H) -#include -#else +# if defined (HAVE_DLFCN_H) +# include +# else extern void *dlopen (const char *, int); extern const char *dlerror (void); extern void *dlsym (void *, const char *); extern int dlclose (void *); -#endif +# endif #elif defined (HAVE_SHL_LOAD_API) -#include +# include #elif defined (HAVE_LOADLIBRARY_API) -#define WIN32_LEAN_AND_MEAN -#include +# define WIN32_LEAN_AND_MEAN +# include #endif } @@ -191,15 +191,15 @@ // By using this option, dlopen will detect errors and Octave // won't exit if there are unresolved symbols in the file we are // loading, and we may even get a useful diagnostic. -#if defined (RTLD_NOW) +# if defined (RTLD_NOW) flags |= RTLD_NOW; -#endif +# endif // Use RTLD_GLOBAL to export symbols from loaded objects so they are // available to other subsequently loaded libraries. -#if defined (RTLD_GLOBAL) +# if defined (RTLD_GLOBAL) flags |= RTLD_GLOBAL; -#endif +# endif library = dlopen (file.c_str (), flags); diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/oct-sort.cc --- a/liboctave/util/oct-sort.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/oct-sort.cc Sat Feb 06 06:40:13 2016 -0800 @@ -102,7 +102,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/pathsearch.cc --- a/liboctave/util/pathsearch.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/pathsearch.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/singleton-cleanup.cc --- a/liboctave/util/singleton-cleanup.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/singleton-cleanup.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/sparse-sort.cc --- a/liboctave/util/sparse-sort.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/sparse-sort.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/sparse-util.cc --- a/liboctave/util/sparse-util.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/sparse-util.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/statdefs.h --- a/liboctave/util/statdefs.h Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/statdefs.h Sat Feb 06 06:40:13 2016 -0800 @@ -26,13 +26,13 @@ #include #ifdef HAVE_SYS_STAT_H -#include +# include #endif #ifndef S_ISREG -#ifndef mode_t -#define mode_t unsigned short -#endif +# ifndef mode_t +# define mode_t unsigned short +# endif #endif #if ! defined (S_ISBLK) && defined (S_IFBLK) #define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK) @@ -64,7 +64,7 @@ #endif #ifndef S_ISLNK -#undef HAVE_LSTAT +# undef HAVE_LSTAT #endif #endif diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/str-vec.cc --- a/liboctave/util/str-vec.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/str-vec.cc Sat Feb 06 06:40:13 2016 -0800 @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/unwind-prot.cc --- a/liboctave/util/unwind-prot.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/unwind-prot.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "lo-error.h" diff -r 88b41a4711e2 -r f7121e111991 liboctave/util/url-transfer.cc --- a/liboctave/util/url-transfer.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/url-transfer.cc Sat Feb 06 06:40:13 2016 -0800 @@ -26,7 +26,7 @@ // Author: jwe #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -40,9 +40,9 @@ #include "url-transfer.h" #ifdef HAVE_CURL -#include -#include -#include +# include +# include +# include #endif void @@ -770,9 +770,9 @@ #endif #if defined (HAVE_CURL) -# define REP_CLASS curl_transfer +# define REP_CLASS curl_transfer #else -# define REP_CLASS base_url_transfer +# define REP_CLASS base_url_transfer #endif url_transfer::url_transfer (void) : rep (new REP_CLASS ()) diff -r 88b41a4711e2 -r f7121e111991 src/display-available.h --- a/src/display-available.h Fri Feb 05 17:58:24 2016 -0800 +++ b/src/display-available.h Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef __cplusplus -#include +# include extern "C" { #endif diff -r 88b41a4711e2 -r f7121e111991 src/main-cli.cc --- a/src/main-cli.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/src/main-cli.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defaults.h" diff -r 88b41a4711e2 -r f7121e111991 src/main-gui.cc --- a/src/main-gui.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/src/main-gui.cc Sat Feb 06 06:40:13 2016 -0800 @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +# include #endif #include "defaults.h" diff -r 88b41a4711e2 -r f7121e111991 src/main.in.cc --- a/src/main.in.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/src/main.in.cc Sat Feb 06 06:40:13 2016 -0800 @@ -29,7 +29,7 @@ // liboctave or libinterp. #ifdef HAVE_CONFIG_H -#include +# include #endif #include @@ -43,19 +43,19 @@ #include #ifndef OCTAVE_VERSION -#define OCTAVE_VERSION %OCTAVE_VERSION% +# define OCTAVE_VERSION %OCTAVE_VERSION% #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_PREFIX -#define OCTAVE_PREFIX %OCTAVE_PREFIX% +# define OCTAVE_PREFIX %OCTAVE_PREFIX% #endif #include "display-available.h" diff -r 88b41a4711e2 -r f7121e111991 src/mkoctfile.in.cc --- a/src/mkoctfile.in.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/src/mkoctfile.in.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #if defined (HAVE_CONFIG_H) -#include +# include #endif #include @@ -42,25 +42,25 @@ #include #if defined HAVE_SYS_WAIT_H -#include +# include #endif #ifndef WIFEXITED -#define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif #ifndef WEXITSTATUS -#define WEXITSTATUS(stat_val) (static_cast (stat_val) >> 8) +# define WEXITSTATUS(stat_val) (static_cast (stat_val) >> 8) #endif static std::map vars; #ifndef OCTAVE_VERSION -#define OCTAVE_VERSION %OCTAVE_CONF_VERSION% +# define OCTAVE_VERSION %OCTAVE_CONF_VERSION% #endif #ifndef OCTAVE_PREFIX -#define OCTAVE_PREFIX %OCTAVE_CONF_PREFIX% +# define OCTAVE_PREFIX %OCTAVE_CONF_PREFIX% #endif #include "shared-fcns.h" diff -r 88b41a4711e2 -r f7121e111991 src/octave-config.in.cc --- a/src/octave-config.in.cc Fri Feb 05 17:58:24 2016 -0800 +++ b/src/octave-config.in.cc Sat Feb 06 06:40:13 2016 -0800 @@ -22,7 +22,7 @@ */ #if defined (HAVE_CONFIG_H) -#include +# include #endif #include @@ -32,7 +32,7 @@ #include #ifndef OCTAVE_PREFIX -#define OCTAVE_PREFIX %OCTAVE_PREFIX% +# define OCTAVE_PREFIX %OCTAVE_PREFIX% #endif #include "shared-fcns.h" diff -r 88b41a4711e2 -r f7121e111991 src/shared-fcns.h --- a/src/shared-fcns.h Fri Feb 05 17:58:24 2016 -0800 +++ b/src/shared-fcns.h Sat Feb 06 06:40:13 2016 -0800 @@ -26,8 +26,8 @@ #include #ifdef _MSC_VER -#define popen _popen -#define pclose _pclose +# define popen _popen +# define pclose _pclose #endif static std::string