Mercurial > octave
changeset 21724:aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
* configure.ac, Doxyfile.in, make_int.cc, Backend.cc, BaseControl.cc,
ButtonControl.cc, Canvas.cc, CheckBoxControl.cc, Container.cc,
ContextMenu.cc, EditControl.cc, Figure.cc, FigureWindow.cc,
GLCanvas.cc, KeyMap.cc, ListBoxControl.cc, Logger.cc, Menu.cc,
MouseModeActionGroup.cc, Object.cc, ObjectFactory.cc,
ObjectProxy.cc, Panel.cc, PopupMenuControl.cc, PushButtonControl.cc,
PushTool.cc, QtHandlesUtils.cc, RadioButtonControl.cc,
SliderControl.cc, TextControl.cc, TextEdit.cc,
ToggleButtonControl.cc, ToggleTool.cc, ToolBar.cc, __init_qt__.cc,
annotation-dialog.cc, gl-select.cc, module.mk, color-picker.cc,
dialog.cc, documentation-dock-widget.cc, files-dock-widget.cc,
find-files-dialog.cc, find-files-model.cc, history-dock-widget.cc,
liboctgui-build-info.in.cc, file-editor-tab.cc, file-editor.cc,
find-dialog.cc, marker.cc, marker.h, octave-qscintilla.cc,
octave-txt-lexer.cc, main-window.cc, octave-cmd.cc,
octave-dock-widget.cc, octave-gui.cc, octave-interpreter.cc,
octave-qt-link.cc, parser.cc, webinfo.cc, resource-manager.cc,
settings-dialog.cc, shortcut-manager.cc, terminal-dock-widget.cc,
thread-manager.cc, welcome-wizard.cc, workspace-model.cc,
workspace-view.cc, build-env.in.cc, Cell.cc, __contourc__.cc,
__dispatch__.cc, __dsearchn__.cc, __ichol__.cc, __ilu__.cc,
__lin_interpn__.cc, __luinc__.cc, __magick_read__.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,
cdisplay.c, cdisplay.h, cellfun.cc, coct-hdf5-types.c, colloc.cc,
comment-list.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
debug.cc, defaults.cc, defaults.in.h, defun.cc, 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, ft-text-renderer.cc, gammainc.cc,
gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc,
gl-render.cc, gl2ps-print.cc, graphics.cc, gripes.cc, hash.cc,
help.cc, hess.cc, hex2num.cc, input.cc, inv.cc, jit-ir.cc, jit-ir.h,
jit-typeinfo.cc, jit-typeinfo.h, 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,
lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex.cc, mex.h,
mexproto.h, mgorth.cc, nproc.cc, oct-errno.in.cc, oct-fstrm.cc,
oct-hdf5-types.cc, oct-hdf5-types.h, oct-hist.cc, oct-iostrm.cc,
oct-lvalue.cc, oct-map.cc, oct-prcstrm.cc, oct-procbuf.cc,
oct-stdstrm.h, oct-stream.cc, oct-strstrm.cc, oct-tex-lexer.in.ll,
oct-tex-parser.in.yy, octave-link.cc, ordschur.cc, pager.cc,
pinv.cc, pr-output.cc, procstream.cc, profiler.cc, psi.cc,
pt-jit.cc, pt-jit.h, quad.cc, quadcc.cc, qz.cc, rand.cc, rcond.cc,
regexp.cc, schur.cc, sighandlers.cc, sighandlers.h, siglist.c,
siglist.h, 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, text-renderer.cc,
time.cc, toplev.cc, tril.cc, tsearch.cc, txt-eng.cc, typecast.cc,
urlwrite.cc, utils.cc, variables.cc, xdiv.cc, xgl2ps.c, xnorm.cc,
xpow.cc, zfstream.cc, zfstream.h, __delaunayn__.cc, __eigs__.cc,
__fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc,
__init_gnuplot__.cc, __osmesa_print__.cc, __voronoi__.cc, amd.cc,
audiodevinfo.cc, audioread.cc, ccolamd.cc, chol.cc, colamd.cc,
convhulln.cc, dmperm.cc, fftw.cc, qr.cc, symbfact.cc, symrcm.cc,
liboctinterp-build-info.in.cc, mkbuiltins, mkops, 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-usr-fcn.h, ov.cc, ovl.cc, octave.cc, octave.h,
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-cdm-cm.cc, op-cdm-dm.cc,
op-cdm-m.cc, op-cell.cc, op-chm.cc, op-class.cc, op-cm-cdm.cc,
op-cm-cm.cc, op-cm-cs.cc, op-cm-dm.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-cdm.cc, op-dm-cm.cc,
op-dm-dm.cc, op-dm-m.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-fcm.cc, op-fcdm-fdm.cc, op-fcdm-fm.cc,
op-fcm-fcdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fdm.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-fcdm.cc, op-fdm-fcm.cc,
op-fdm-fdm.cc, op-fdm-fm.cc, op-float-conv.cc, op-fm-fcdm.cc,
op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fdm.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-cdm.cc, op-m-cm.cc, op-m-cs.cc, op-m-dm.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,
lex.ll, oct-parse.in.yy, 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-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-loop.h, 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-tc.cc,
version.cc, 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, MArray-C.cc, MArray-d.cc, MArray-f.cc,
MArray-fC.cc, MArray-i.cc, MArray-s.cc, MSparse-C.cc, MSparse-d.cc,
MatrixType.cc, PermMatrix.cc, Range.cc, Sparse-C.cc, Sparse-b.cc,
Sparse-d.cc, boolMatrix.cc, boolNDArray.cc, boolSparse.cc,
chMatrix.cc, chNDArray.cc, dColVector.cc, dDiagMatrix.cc,
dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, dim-vector.cc,
dim-vector.h, 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,
uint16NDArray.cc, uint32NDArray.cc, uint64NDArray.cc,
uint8NDArray.cc, Faddeeva.cc, blaswrap.c, cquit.c, f77-extern.cc,
f77-fcn.c, f77-fcn.h, lo-error.c, lo-error.h, quit.cc, quit.h,
liboctave-build-info.in.cc, CollocWt.cc, DASPK.cc, DASRT.cc,
DASSL.cc, EIG.cc, LSODE.cc, ODES.cc, Quad.cc, aepbalance.cc,
chol.cc, eigs-base.cc, fEIG.cc, gepbalance.cc, hess.cc,
lo-mappers.cc, lo-specfun.cc, lu.cc, oct-convn.cc, oct-fftw.cc,
oct-norm.cc, oct-rand.cc, oct-spparms.cc, qr.cc, qrp.cc,
randmtzig.cc, randpoisson.cc, schur.cc, sparse-chol.cc,
sparse-dmsolve.cc, sparse-lu.cc, sparse-qr.cc, svd.cc, mk-ops.awk,
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-passwd.cc,
oct-syscalls.cc, oct-time.cc, oct-uname.cc, pathlen.h, syswait.h,
cmd-edit.cc, cmd-hist.cc, data-conv.cc, f2c-main.c, glob-match.cc,
kpse.cc, lo-array-errwarn.cc, lo-array-gripes.cc, lo-cutils.c,
lo-cutils.h, lo-ieee.cc, lo-ieee.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-rl-edit.c, oct-rl-edit.h,
oct-rl-hist.c, oct-rl-hist.h, 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,
acinclude.m4, display-available.c, display-available.h, main-cli.cc,
main-gui.cc, main.in.cc, mkoctfile.in.cc, octave-build-info.in.cc,
octave-config.in.cc, shared-fcns.h:
Use "#if ..." consistently instead of "#ifdef" and "#ifndef".
line wrap: on
line diff
--- a/configure.ac Tue May 17 11:32:53 2016 -0400 +++ b/configure.ac Tue May 17 12:09:30 2016 -0400 @@ -391,7 +391,7 @@ mingw*) AC_MSG_CHECKING([for MSVC compiler]) AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ - #ifndef _MSC_VER + #if ! defined (_MSC_VER) #error "Not MSVC compiler" #endif ]])],
--- a/doc/doxyhtml/Doxyfile.in Tue May 17 11:32:53 2016 -0400 +++ b/doc/doxyhtml/Doxyfile.in Tue May 17 12:09:30 2016 -0400 @@ -206,7 +206,8 @@ @abs_top_srcdir@/liboctave/util \ @abs_top_srcdir@/src -# So that features that are behind #ifdef HAVE_FOO macros get processed by Doxygen +# So that features that are behind #if defined (HAVE_FOO) macros +# get processed by Doxygen PREDEFINED = HAVE_ARPACK=1 \ HAVE_CCOLAMD=1 \
--- a/examples/code/make_int.cc Tue May 17 11:32:53 2016 -0400 +++ b/examples/code/make_int.cc Tue May 17 12:09:30 2016 -0400 @@ -119,7 +119,7 @@ newline (os); } -#ifdef DEFUNOP_OP +#if defined (DEFUNOP_OP) #undef DEFUNOP_OP #endif @@ -139,7 +139,7 @@ DEFNCUNOP_METHOD (incr, integer, increment) DEFNCUNOP_METHOD (decr, integer, decrement) -#ifdef DEFBINOP_OP +#if defined (DEFBINOP_OP) #undef DEFBINOP_OP #endif
--- a/libgui/graphics/Backend.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/Backend.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/BaseControl.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/BaseControl.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/ButtonControl.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/ButtonControl.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/Canvas.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/Canvas.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/CheckBoxControl.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/CheckBoxControl.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/Container.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/Container.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/ContextMenu.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/ContextMenu.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/EditControl.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/EditControl.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/Figure.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/Figure.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/FigureWindow.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/FigureWindow.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/GLCanvas.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/GLCanvas.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/KeyMap.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/KeyMap.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/ListBoxControl.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/ListBoxControl.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/Logger.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/Logger.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/Menu.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/Menu.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/MouseModeActionGroup.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/MouseModeActionGroup.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/Object.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/Object.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/ObjectFactory.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/ObjectFactory.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/ObjectProxy.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/ObjectProxy.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/Panel.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/Panel.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/PopupMenuControl.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/PopupMenuControl.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/PushButtonControl.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/PushButtonControl.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/PushTool.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/PushTool.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/QtHandlesUtils.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/QtHandlesUtils.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -362,14 +362,14 @@ if (mods & Qt::ShiftModifier) modList.push_back ("shift"); if (mods & Qt::ControlModifier) -#ifdef Q_OS_MAC +#if defined (Q_OS_MAC) modList.push_back ("command"); #else modList.push_back ("control"); #endif if (mods & Qt::AltModifier) modList.push_back ("alt"); -#ifdef Q_OS_MAC +#if defined (Q_OS_MAC) if (mods & Qt::MetaModifier) modList.push_back ("control"); #endif
--- a/libgui/graphics/RadioButtonControl.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/RadioButtonControl.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/SliderControl.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/SliderControl.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/TextControl.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/TextControl.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/TextEdit.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/TextEdit.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/ToggleButtonControl.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/ToggleButtonControl.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/ToggleTool.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/ToggleTool.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/ToolBar.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/ToolBar.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/__init_qt__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/__init_qt__.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/annotation-dialog.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/annotation-dialog.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/graphics/gl-select.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/graphics/gl-select.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/module.mk Tue May 17 11:32:53 2016 -0400 +++ b/libgui/module.mk Tue May 17 12:09:30 2016 -0400 @@ -78,7 +78,7 @@ define moc-command rm -f $@-t $@ && \ - ( echo "#ifdef HAVE_CONFIG_H"; \ + ( echo "#if defined (HAVE_CONFIG_H)"; \ echo '#include "config.h"'; \ echo "#endif"; \ $(MOC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MOC_OCTAVE_CPPFLAGS) $(MOC_CPPFLAGS) $(libgui_liboctgui_la_CPPFLAGS) $< ) > $@-t && \ @@ -87,7 +87,7 @@ define rcc-command rm -f $@-t $@ && \ - ( echo "#ifdef HAVE_CONFIG_H"; \ + ( echo "#if defined (HAVE_CONFIG_H)"; \ echo '#include "config.h"'; \ echo "#endif"; \ echo "// Ignore unused variable warnings in generated code."; \
--- a/libgui/src/color-picker.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/color-picker.cc Tue May 17 12:09:30 2016 -0400 @@ -24,7 +24,7 @@ // Author: Torsten <ttl@justmail.de> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/dialog.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/dialog.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/documentation-dock-widget.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/documentation-dock-widget.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/files-dock-widget.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/files-dock-widget.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/find-files-dialog.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/find-files-dialog.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/find-files-model.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/find-files-model.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/history-dock-widget.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/history-dock-widget.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/liboctgui-build-info.in.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/liboctgui-build-info.in.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/m-editor/file-editor-tab.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/m-editor/file-editor-tab.cc Tue May 17 12:09:30 2016 -0400 @@ -26,11 +26,11 @@ This interfaces QSciScintilla with the rest of Octave. */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) #if defined (HAVE_QSCI_QSCILEXEROCTAVE_H) # define HAVE_LEXER_OCTAVE 1
--- a/libgui/src/m-editor/file-editor.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/m-editor/file-editor.cc Tue May 17 12:09:30 2016 -0400 @@ -20,11 +20,11 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) #include "file-editor.h" #include "resource-manager.h" @@ -1538,7 +1538,7 @@ _tool_bar->setMovable (true); _tab_widget = new tab_widget (editor_widget); _tab_widget->setTabsClosable (true); -#ifdef HAVE_QTABWIDGET_SETMOVABLE +#if defined (HAVE_QTABWIDGET_SETMOVABLE) _tab_widget->setMovable (true); #endif @@ -2343,14 +2343,14 @@ void file_editor::move_tab_left () { -#ifdef HAVE_QTABWIDGET_SETMOVABLE +#if defined (HAVE_QTABWIDGET_SETMOVABLE) switch_tab (-1, true); #endif } void file_editor::move_tab_right () { -#ifdef HAVE_QTABWIDGET_SETMOVABLE +#if defined (HAVE_QTABWIDGET_SETMOVABLE) switch_tab (1, true); #endif } @@ -2370,7 +2370,7 @@ if (movetab) { -#ifdef HAVE_QTABWIDGET_SETMOVABLE +#if defined (HAVE_QTABWIDGET_SETMOVABLE) _tab_widget->tabBar ()->moveTab (old_pos, new_pos); _tab_widget->setCurrentIndex (old_pos); _tab_widget->setCurrentIndex (new_pos);
--- a/libgui/src/m-editor/find-dialog.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/m-editor/find-dialog.cc Tue May 17 12:09:30 2016 -0400 @@ -59,11 +59,11 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) #include <QtGui> #include <QIcon> @@ -108,7 +108,7 @@ _regex_check_box = new QCheckBox (tr ("Regular E&xpressions")); _backward_check_box = new QCheckBox (tr ("Search &backward")); _search_selection_check_box = new QCheckBox (tr ("Search se&lection")); -#ifdef HAVE_QSCI_FINDSELECTION +#if defined (HAVE_QSCI_FINDSELECTION) _search_selection_check_box->setCheckable (true); _search_selection_check_box->setEnabled (edit_area->hasSelectedText ()); #else @@ -134,7 +134,7 @@ connect (_search_line_edit, SIGNAL (textChanged (QString)), this, SLOT (handle_search_text_changed (QString))); -#ifdef HAVE_QSCI_FINDSELECTION +#if defined (HAVE_QSCI_FINDSELECTION) connect (_edit_area, SIGNAL (copyAvailable (bool)), this, SLOT (handle_selection_changed (bool))); connect (_search_selection_check_box, SIGNAL (stateChanged (int)), @@ -204,7 +204,7 @@ _find_result_available = false; } -#ifdef HAVE_QSCI_FINDSELECTION +#if defined (HAVE_QSCI_FINDSELECTION) void find_dialog::handle_sel_search_changed (int selected) { @@ -216,7 +216,7 @@ find_dialog::handle_sel_search_changed (int /* selected */) { } #endif -#ifdef HAVE_QSCI_FINDSELECTION +#if defined (HAVE_QSCI_FINDSELECTION) void find_dialog::handle_selection_changed (bool has_selected) { @@ -326,7 +326,7 @@ if (_edit_area->hasSelectedText () && _search_selection_check_box->isChecked ()) { -#ifdef HAVE_QSCI_FINDSELECTION +#if defined (HAVE_QSCI_FINDSELECTION) if (_find_result_available) _find_result_available = _edit_area->findNext (); else @@ -338,7 +338,7 @@ _whole_words_check_box->isChecked (), do_forward, true -#ifdef HAVE_QSCI_VERSION_2_6_0 +#if defined (HAVE_QSCI_VERSION_2_6_0) , true #endif ); @@ -355,7 +355,7 @@ do_forward, line,col, true -#ifdef HAVE_QSCI_VERSION_2_6_0 +#if defined (HAVE_QSCI_VERSION_2_6_0) , true #endif );
--- a/libgui/src/m-editor/marker.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/m-editor/marker.cc Tue May 17 12:09:30 2016 -0400 @@ -20,11 +20,11 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) #include "config.h" #endif -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) #include <stdio.h>
--- a/libgui/src/m-editor/marker.h Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/m-editor/marker.h Tue May 17 12:09:30 2016 -0400 @@ -19,7 +19,7 @@ */ -#ifndef MARKER_H +#if ! defined (MARKER_H) #define MARKER_H #include <Qsci/qsciscintilla.h>
--- a/libgui/src/m-editor/octave-qscintilla.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/m-editor/octave-qscintilla.cc Tue May 17 12:09:30 2016 -0400 @@ -22,11 +22,11 @@ // Author: Torsten <ttl@justmail.de> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) #include <Qsci/qscilexer.h> #include <Qsci/qscicommandset.h> @@ -45,7 +45,7 @@ // clear scintilla edit shortcuts that are handled by the editor QsciCommandSet *cmd_set = standardCommands (); -#ifdef HAVE_QSCI_VERSION_2_6_0 +#if defined (HAVE_QSCI_VERSION_2_6_0) // find () was added in QScintilla 2.6 cmd_set->find (QsciCommand::SelectionCopy)->setKey (0); cmd_set->find (QsciCommand::SelectionCut)->setKey (0); @@ -190,7 +190,7 @@ void octave_qscintilla::contextMenuEvent (QContextMenuEvent *e) { -#ifdef HAVE_QSCI_VERSION_2_6_0 +#if defined (HAVE_QSCI_VERSION_2_6_0) QPoint global_pos, local_pos; // the menu's position QMenu *context_menu = createStandardContextMenu (); // standard menu @@ -216,7 +216,7 @@ global_pos = editor_rect.topLeft (); // yes, take top left corner } -#ifdef HAVE_QSCI_VERSION_2_6_0 +#if defined (HAVE_QSCI_VERSION_2_6_0) if (! in_left_margin) #endif { @@ -244,7 +244,7 @@ } } } -#ifdef HAVE_QSCI_VERSION_2_6_0 +#if defined (HAVE_QSCI_VERSION_2_6_0) else { // remove all standard actions from scintilla @@ -309,7 +309,7 @@ void octave_qscintilla::contextmenu_break_condition (bool) { -#ifdef HAVE_QSCI_VERSION_2_6_0 +#if defined (HAVE_QSCI_VERSION_2_6_0) QAction *action = qobject_cast<QAction *>(sender()); QPoint local_pos = action->data ().value<QPoint> (); @@ -324,7 +324,7 @@ void octave_qscintilla::contextmenu_break_once (const QPoint& local_pos) { -#ifdef HAVE_QSCI_VERSION_2_6_0 +#if defined (HAVE_QSCI_VERSION_2_6_0) emit context_menu_break_once (lineAt (local_pos)); #endif }
--- a/libgui/src/m-editor/octave-txt-lexer.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/m-editor/octave-txt-lexer.cc Tue May 17 12:09:30 2016 -0400 @@ -22,11 +22,11 @@ // Author: Torsten <ttl@justmail.de> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) #include <Qsci/qscilexer.h>
--- a/libgui/src/main-window.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/main-window.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -47,7 +47,7 @@ #include <utility> -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) # include "file-editor.h" #endif #include "main-window.h" @@ -67,7 +67,7 @@ static file_editor_interface * create_default_editor (QWidget *p) { -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) return new file_editor (p); #else return 0; @@ -174,7 +174,7 @@ if (dock) break; // it is a QDockWidget ==> exit loop -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) if (qobject_cast<octave_qscintilla *> (w_new)) { dock = static_cast<octave_dock_widget *> (editor_window); @@ -798,7 +798,7 @@ closenow = false; } -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) if (closenow) closenow = editor_window->check_closing (); #endif @@ -919,7 +919,7 @@ _debug_step_out->setEnabled (true); _debug_quit->setEnabled (true); -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) editor_window->handle_enter_debug_mode (); #endif } @@ -935,7 +935,7 @@ _debug_step_out->setEnabled (false); _debug_quit->setEnabled (false); -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) editor_window->handle_exit_debug_mode (); #endif } @@ -1145,7 +1145,7 @@ foreach (octave_dock_widget *widget, dock_widget_list ()) widget->connect_visibility_changed (); -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) editor_window->enable_menu_shortcuts (false); #endif } @@ -1383,7 +1383,7 @@ addDockWidget (Qt::RightDockWidgetArea, doc_browser_window); tabifyDockWidget (command_window, doc_browser_window); -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) addDockWidget (Qt::RightDockWidgetArea, editor_window); tabifyDockWidget (command_window, editor_window); #endif @@ -1405,7 +1405,7 @@ setStatusBar (status_bar); -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) connect (this, SIGNAL (insert_debugger_pointer_signal (const QString&, int)), editor_window, @@ -1467,7 +1467,7 @@ if (editor_window) { -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) // Octave ready, determine whether to create an empty script. // This can not be done when the editor is created because all functions // must be known for the lexer's auto completion informations @@ -1545,7 +1545,7 @@ SIGNAL (show_preferences_signal (void)), this, SLOT (process_settings_dialog_request ())); -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) connect (_octave_qt_link, SIGNAL (edit_file_signal (const QString&)), editor_window, @@ -1615,7 +1615,7 @@ construct_news_menu (menu_bar); -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) // call the editor to add actions which should also be available in the // editor's menu and tool bar QList<QAction*> shared_actions; @@ -1692,7 +1692,7 @@ _open_action->setShortcutContext (Qt::ApplicationShortcut); _open_action->setToolTip (tr ("Open an existing file in editor")); -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) file_menu->addMenu (editor_window->get_mru_menu ()); #endif @@ -1709,7 +1709,7 @@ _exit_action = file_menu->addAction (tr ("Exit")); _exit_action->setShortcutContext (Qt::ApplicationShortcut); -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) connect (_open_action, SIGNAL (triggered ()), editor_window, SLOT (request_open_file ())); #endif @@ -1741,7 +1741,7 @@ _new_figure_action = new_menu->addAction (tr ("New Figure")); _new_figure_action->setEnabled (true); -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) connect (_new_script_action, SIGNAL (triggered ()), editor_window, SLOT (request_new_script ())); @@ -1837,7 +1837,7 @@ action->setEnabled (false); -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) editor_window->debug_menu ()->addAction (action); editor_window->toolbar ()->addAction (action); #endif @@ -1867,7 +1867,7 @@ SLOT (debug_continue ())); _debug_menu->addSeparator (); -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) editor_window->debug_menu ()->addSeparator (); #endif @@ -2320,7 +2320,7 @@ list.append (static_cast<octave_dock_widget *> (history_window)); list.append (static_cast<octave_dock_widget *> (file_browser_window)); list.append (static_cast<octave_dock_widget *> (doc_browser_window)); -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) list.append (static_cast<octave_dock_widget *> (editor_window)); #endif list.append (static_cast<octave_dock_widget *> (workspace_window));
--- a/libgui/src/octave-cmd.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/octave-cmd.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ // Author: Torsten <ttl@justmail.de> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/octave-dock-widget.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/octave-dock-widget.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/octave-gui.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/octave-gui.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/octave-interpreter.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/octave-interpreter.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/octave-qt-link.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/octave-qt-link.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/qtinfo/parser.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/qtinfo/parser.cc Tue May 17 12:09:30 2016 -0400 @@ -24,7 +24,7 @@ // Author: P. L. Lucas // Author: Jacob Dawid <jacob.dawid@cybercatalyst.com> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/qtinfo/webinfo.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/qtinfo/webinfo.cc Tue May 17 12:09:30 2016 -0400 @@ -24,7 +24,7 @@ // Author: P. L. Lucas // Author: Jacob Dawid <jacob.dawid@cybercatalyst.com> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -58,7 +58,7 @@ _tab_bar->setSizePolicy (QSizePolicy::Preferred,QSizePolicy::Preferred); _tab_bar->setExpanding (false); _tab_bar->setTabsClosable (true); -#ifdef HAVE_QTABWIDGET_SETMOVABLE +#if defined (HAVE_QTABWIDGET_SETMOVABLE) _tab_bar->setMovable (true); #endif hbox_layout->addWidget (_tab_bar); @@ -78,7 +78,7 @@ vbox_layout->addLayout (hbox_layout); _search_line_edit = new QLineEdit(this); -#ifdef HAVE_SETPLACEHOLDERTEXT +#if defined (HAVE_SETPLACEHOLDERTEXT) _search_line_edit->setPlaceholderText ( tr ("Type here and press \'Return\' to search")); #endif
--- a/libgui/src/resource-manager.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/resource-manager.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/settings-dialog.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/settings-dialog.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -36,7 +36,7 @@ #include <QHash> #include <QTextCodec> -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) # include "octave-qscintilla.h" # include "octave-txt-lexer.h" # include <QScrollArea> @@ -56,7 +56,7 @@ # include <Qsci/qscilexerdiff.h> #endif -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) static const int MaxLexerStyles = 64; static const int MaxStyleNumber = 128; @@ -429,7 +429,7 @@ ui->cb_show_hscrollbar->setChecked ( settings->value ("editor/show_hscroll_bar",true).toBool ()); -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) # if defined (Q_OS_WIN32) int eol_mode = QsciScintilla::EolWindows; #elif defined (Q_OS_MAC) @@ -563,7 +563,7 @@ this, SLOT (default_shortcut_set ())); -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) // editor styles: create lexer, read settings, and create dialog elements QsciLexer *lexer; #if defined (HAVE_LEXER_OCTAVE) @@ -877,7 +877,7 @@ } settings->setValue ("terminal/cursorType", cursorType); -#ifdef HAVE_QSCINTILLA +#if defined (HAVE_QSCINTILLA) // editor styles: create lexer, get dialog contents, and write settings QsciLexer *lexer; #if defined (HAVE_LEXER_OCTAVE)
--- a/libgui/src/shortcut-manager.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/shortcut-manager.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/terminal-dock-widget.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/terminal-dock-widget.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/thread-manager.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/thread-manager.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/welcome-wizard.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/welcome-wizard.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -30,7 +30,7 @@ #include <QHBoxLayout> #include <QVBoxLayout> -#ifdef __WIN32__ +#if defined (__WIN32__) #define WIN32_LEAN_AND_MEAN #include <windows.h> #endif @@ -289,7 +289,7 @@ show_page (); -#ifdef __WIN32__ +#if defined (__WIN32__) // HACK to forceshow of dialog if started minimized ShowWindow((HWND)winId(), SW_SHOWNORMAL); #endif
--- a/libgui/src/workspace-model.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/workspace-model.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libgui/src/workspace-view.cc Tue May 17 11:32:53 2016 -0400 +++ b/libgui/src/workspace-view.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/build-env.in.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/build-env.in.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/Cell.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/Cell.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/__contourc__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/__contourc__.cc Tue May 17 12:09:30 2016 -0400 @@ -32,7 +32,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/__dispatch__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/__dispatch__.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/__dsearchn__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/__dsearchn__.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/__ichol__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/__ichol__.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/__ilu__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/__ilu__.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/__lin_interpn__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/__lin_interpn__.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -56,7 +56,7 @@ if (y > x[n-1] || y < x[0]) return -1; -#ifdef EXHAUSTIF +#if defined (EXHAUSTIF) for (j = 0; j < n - 1; j++) { if (x[j] <= y && y <= x[j+1]) @@ -91,7 +91,7 @@ if (y > x[0] || y < x[n-1]) return -1; -#ifdef EXHAUSTIF +#if defined (EXHAUSTIF) for (j = 0; j < n - 1; j++) { if (x[j+1] <= y && y <= x[j])
--- a/libinterp/corefcn/__luinc__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/__luinc__.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/__magick_read__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/__magick_read__.cc Tue May 17 12:09:30 2016 -0400 @@ -23,7 +23,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -37,7 +37,7 @@ #include "errwarn.h" -#ifdef HAVE_MAGICK +#if defined (HAVE_MAGICK) #include <Magick++.h> #include <clocale> @@ -754,7 +754,7 @@ @seealso{imfinfo, imformats, imread, imwrite}\n\ @end deftypefn") { -#ifdef HAVE_MAGICK +#if defined (HAVE_MAGICK) if (args.length () != 2 || ! args(0).is_string ()) print_usage (); @@ -865,7 +865,7 @@ %!assert (1) */ -#ifdef HAVE_MAGICK +#if defined (HAVE_MAGICK) template <typename T> static uint32NDArray @@ -1397,7 +1397,7 @@ @seealso{imfinfo, imformats, imread, imwrite}\n\ @end deftypefn") { -#ifdef HAVE_MAGICK +#if defined (HAVE_MAGICK) if (args.length () != 5 || ! args(0).is_string () || ! args(1).is_string ()) print_usage (); @@ -1575,7 +1575,7 @@ @seealso{imfinfo}\n\ @end deftypefn") { -#ifdef HAVE_MAGICK +#if defined (HAVE_MAGICK) if (args.length () < 1 || ! args(0).is_string ()) print_usage (); @@ -1623,7 +1623,7 @@ #endif } -#ifdef HAVE_MAGICK +#if defined (HAVE_MAGICK) static octave_value magick_to_octave_value (const Magick::CompressionType& magick) @@ -1801,7 +1801,7 @@ @seealso{imfinfo, imformats, imread, imwrite}\n\ @end deftypefn") { -#ifdef HAVE_MAGICK +#if defined (HAVE_MAGICK) if (args.length () < 1 || ! args(0).is_string ()) print_usage (); @@ -2254,7 +2254,7 @@ octave_map formats = args(0).map_value (); -#ifdef HAVE_MAGICK +#if defined (HAVE_MAGICK) maybe_initialize_magick ();
--- a/libinterp/corefcn/__pchip_deriv__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/__pchip_deriv__.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/__qp__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/__qp__.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/balance.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/balance.cc Tue May 17 12:09:30 2016 -0400 @@ -23,7 +23,7 @@ // Author: A. S. Hodel <scotte@eng.auburn.edu> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/besselj.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/besselj.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/betainc.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/betainc.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/bitfcns.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/bitfcns.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/bsxfun.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/bsxfun.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/c-file-ptr-stream.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/c-file-ptr-stream.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -28,15 +28,15 @@ #include "c-file-ptr-stream.h" -#ifndef SEEK_SET +#if ! defined (SEEK_SET) # define SEEK_SET 0 #endif -#ifndef SEEK_CUR +#if ! defined (SEEK_CUR) # define SEEK_CUR 1 #endif -#ifndef SEEK_END +#if ! defined (SEEK_END) # define SEEK_END 2 #endif @@ -182,7 +182,7 @@ return gnulib::fclose (f); } -#ifdef HAVE_ZLIB +#if defined (HAVE_ZLIB) c_zfile_ptr_buf::~c_zfile_ptr_buf (void) {
--- a/libinterp/corefcn/c-file-ptr-stream.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/c-file-ptr-stream.h Tue May 17 12:09:30 2016 -0400 @@ -139,9 +139,9 @@ typedef c_file_ptr_stream<std::iostream, FILE *, c_file_ptr_buf> io_c_file_ptr_stream; -#ifdef HAVE_ZLIB +#if defined (HAVE_ZLIB) -#ifdef HAVE_ZLIB_H +#if defined (HAVE_ZLIB_H) # include <zlib.h> #endif
--- a/libinterp/corefcn/cdisplay.c Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/cdisplay.c Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/cdisplay.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/cdisplay.h Tue May 17 12:09:30 2016 -0400 @@ -25,7 +25,7 @@ #include "octave-config.h" -#ifdef __cplusplus +#if defined (__cplusplus) extern "C" { #endif @@ -33,7 +33,7 @@ octave_get_display_info (int *ht, int *wd, int *dp, double *rx, double *ry, int *dpy_avail); -#ifdef __cplusplus +#if defined (__cplusplus) } #endif
--- a/libinterp/corefcn/cellfun.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/cellfun.cc Tue May 17 12:09:30 2016 -0400 @@ -23,7 +23,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/coct-hdf5-types.c Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/coct-hdf5-types.c Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) #include "config.h" #endif
--- a/libinterp/corefcn/colloc.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/colloc.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/comment-list.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/comment-list.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/conv2.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/conv2.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/daspk.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/daspk.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/dasrt.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/dasrt.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/dassl.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/dassl.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/data.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/data.cc Tue May 17 12:09:30 2016 -0400 @@ -23,14 +23,14 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif #include <sys/types.h> #include <sys/times.h> -#ifdef HAVE_SYS_RESOURCE_H +#if defined (HAVE_SYS_RESOURCE_H) # include <sys/resource.h> #endif
--- a/libinterp/corefcn/debug.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/debug.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -208,7 +208,7 @@ return dbg_fcn; } -#ifdef DBSTOP_NANINF +#if defined (DBSTOP_NANINF) # include "sigfpe.cc" #endif @@ -378,7 +378,7 @@ Vdebug_on_interrupt = on_off; } else if (condition == "naninf") -#ifdef DBSTOP_NANINF +#if defined (DBSTOP_NANINF) { Vdebug_on_naninf = on_off; enable_fpe (on_off);
--- a/libinterp/corefcn/defaults.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/defaults.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/defaults.in.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/defaults.in.h Tue May 17 12:09:30 2016 -0400 @@ -30,163 +30,163 @@ #include "pathsearch.h" -#ifndef OCTAVE_CANONICAL_HOST_TYPE +#if ! defined (OCTAVE_CANONICAL_HOST_TYPE) # define OCTAVE_CANONICAL_HOST_TYPE %OCTAVE_CANONICAL_HOST_TYPE% #endif -#ifndef OCTAVE_DEFAULT_PAGER +#if ! defined (OCTAVE_DEFAULT_PAGER) # define OCTAVE_DEFAULT_PAGER %OCTAVE_DEFAULT_PAGER% #endif -#ifndef OCTAVE_ARCHLIBDIR +#if ! defined (OCTAVE_ARCHLIBDIR) # define OCTAVE_ARCHLIBDIR %OCTAVE_ARCHLIBDIR% #endif -#ifndef OCTAVE_BINDIR +#if ! defined (OCTAVE_BINDIR) # define OCTAVE_BINDIR %OCTAVE_BINDIR% #endif -#ifndef OCTAVE_DATADIR +#if ! defined (OCTAVE_DATADIR) # define OCTAVE_DATADIR %OCTAVE_DATADIR% #endif -#ifndef OCTAVE_DATAROOTDIR +#if ! defined (OCTAVE_DATAROOTDIR) # define OCTAVE_DATAROOTDIR %OCTAVE_DATAROOTDIR% #endif -#ifndef OCTAVE_DOC_CACHE_FILE +#if ! defined (OCTAVE_DOC_CACHE_FILE) # define OCTAVE_DOC_CACHE_FILE %OCTAVE_DOC_CACHE_FILE% #endif -#ifndef OCTAVE_TEXI_MACROS_FILE +#if ! defined (OCTAVE_TEXI_MACROS_FILE) # define OCTAVE_TEXI_MACROS_FILE %OCTAVE_TEXI_MACROS_FILE% #endif -#ifndef OCTAVE_EXEC_PREFIX +#if ! defined (OCTAVE_EXEC_PREFIX) # define OCTAVE_EXEC_PREFIX %OCTAVE_EXEC_PREFIX% #endif -#ifndef OCTAVE_FCNFILEDIR +#if ! defined (OCTAVE_FCNFILEDIR) # define OCTAVE_FCNFILEDIR %OCTAVE_FCNFILEDIR% #endif -#ifndef OCTAVE_IMAGEDIR +#if ! defined (OCTAVE_IMAGEDIR) # define OCTAVE_IMAGEDIR %OCTAVE_IMAGEDIR% #endif -#ifndef OCTAVE_INCLUDEDIR +#if ! defined (OCTAVE_INCLUDEDIR) # define OCTAVE_INCLUDEDIR %OCTAVE_INCLUDEDIR% #endif -#ifndef OCTAVE_INFODIR +#if ! defined (OCTAVE_INFODIR) # define OCTAVE_INFODIR %OCTAVE_INFODIR% #endif -#ifndef OCTAVE_INFOFILE +#if ! defined (OCTAVE_INFOFILE) # define OCTAVE_INFOFILE %OCTAVE_INFOFILE% #endif -#ifndef OCTAVE_LIBDIR +#if ! defined (OCTAVE_LIBDIR) # define OCTAVE_LIBDIR %OCTAVE_LIBDIR% #endif -#ifndef OCTAVE_LIBEXECDIR +#if ! defined (OCTAVE_LIBEXECDIR) # define OCTAVE_LIBEXECDIR %OCTAVE_LIBEXECDIR% #endif -#ifndef OCTAVE_LIBEXECDIR +#if ! defined (OCTAVE_LIBEXECDIR) # define OCTAVE_LIBEXECDIR %OCTAVE_LIBEXECDIR% #endif -#ifndef OCTAVE_LOCALAPIFCNFILEDIR +#if ! defined (OCTAVE_LOCALAPIFCNFILEDIR) # define OCTAVE_LOCALAPIFCNFILEDIR %OCTAVE_LOCALAPIFCNFILEDIR% #endif -#ifndef OCTAVE_LOCALAPIOCTFILEDIR +#if ! defined (OCTAVE_LOCALAPIOCTFILEDIR) # define OCTAVE_LOCALAPIOCTFILEDIR %OCTAVE_LOCALAPIOCTFILEDIR% #endif -#ifndef OCTAVE_LOCALARCHLIBDIR +#if ! defined (OCTAVE_LOCALARCHLIBDIR) # define OCTAVE_LOCALARCHLIBDIR %OCTAVE_LOCALARCHLIBDIR% #endif -#ifndef OCTAVE_LOCALFCNFILEDIR +#if ! defined (OCTAVE_LOCALFCNFILEDIR) # define OCTAVE_LOCALFCNFILEDIR %OCTAVE_LOCALFCNFILEDIR% #endif -#ifndef OCTAVE_LOCALOCTFILEDIR +#if ! defined (OCTAVE_LOCALOCTFILEDIR) # define OCTAVE_LOCALOCTFILEDIR %OCTAVE_LOCALOCTFILEDIR% #endif -#ifndef OCTAVE_LOCALSTARTUPFILEDIR +#if ! defined (OCTAVE_LOCALSTARTUPFILEDIR) # define OCTAVE_LOCALSTARTUPFILEDIR %OCTAVE_LOCALSTARTUPFILEDIR% #endif -#ifndef OCTAVE_LOCALAPIARCHLIBDIR +#if ! defined (OCTAVE_LOCALAPIARCHLIBDIR) # define OCTAVE_LOCALAPIARCHLIBDIR %OCTAVE_LOCALAPIARCHLIBDIR% #endif -#ifndef OCTAVE_LOCALVERARCHLIBDIR +#if ! defined (OCTAVE_LOCALVERARCHLIBDIR) # define OCTAVE_LOCALVERARCHLIBDIR %OCTAVE_LOCALVERARCHLIBDIR% #endif -#ifndef OCTAVE_LOCALVERFCNFILEDIR +#if ! defined (OCTAVE_LOCALVERFCNFILEDIR) # define OCTAVE_LOCALVERFCNFILEDIR %OCTAVE_LOCALVERFCNFILEDIR% #endif -#ifndef OCTAVE_LOCALVEROCTFILEDIR +#if ! defined (OCTAVE_LOCALVEROCTFILEDIR) # define OCTAVE_LOCALVEROCTFILEDIR %OCTAVE_LOCALVEROCTFILEDIR% #endif -#ifndef OCTAVE_MAN1DIR +#if ! defined (OCTAVE_MAN1DIR) # define OCTAVE_MAN1DIR %OCTAVE_MAN1DIR% #endif -#ifndef OCTAVE_MAN1EXT +#if ! defined (OCTAVE_MAN1EXT) # define OCTAVE_MAN1EXT %OCTAVE_MAN1EXT% #endif -#ifndef OCTAVE_MANDIR +#if ! defined (OCTAVE_MANDIR) # define OCTAVE_MANDIR %OCTAVE_MANDIR% #endif -#ifndef OCTAVE_OCTDATADIR +#if ! defined (OCTAVE_OCTDATADIR) # define OCTAVE_OCTDATADIR %OCTAVE_OCTDATADIR% #endif -#ifndef OCTAVE_OCTFILEDIR +#if ! defined (OCTAVE_OCTFILEDIR) # define OCTAVE_OCTFILEDIR %OCTAVE_OCTFILEDIR% #endif -#ifndef OCTAVE_OCTETCDIR +#if ! defined (OCTAVE_OCTETCDIR) # define OCTAVE_OCTETCDIR %OCTAVE_OCTETCDIR% #endif -#ifndef OCTAVE_OCTLOCALEDIR +#if ! defined (OCTAVE_OCTLOCALEDIR) # define OCTAVE_OCTLOCALEDIR %OCTAVE_OCTLOCALEDIR% #endif -#ifndef OCTAVE_OCTINCLUDEDIR +#if ! defined (OCTAVE_OCTINCLUDEDIR) # define OCTAVE_OCTINCLUDEDIR %OCTAVE_OCTINCLUDEDIR% #endif -#ifndef OCTAVE_OCTLIBDIR +#if ! defined (OCTAVE_OCTLIBDIR) # define OCTAVE_OCTLIBDIR %OCTAVE_OCTLIBDIR% #endif -#ifndef OCTAVE_OCTTESTSDIR +#if ! defined (OCTAVE_OCTTESTSDIR) # define OCTAVE_OCTTESTSDIR %OCTAVE_OCTTESTSDIR% #endif -#ifndef OCTAVE_PREFIX +#if ! defined (OCTAVE_PREFIX) # define OCTAVE_PREFIX %OCTAVE_PREFIX% #endif -#ifndef OCTAVE_STARTUPFILEDIR +#if ! defined (OCTAVE_STARTUPFILEDIR) # define OCTAVE_STARTUPFILEDIR %OCTAVE_STARTUPFILEDIR% #endif -#ifndef OCTAVE_RELEASE +#if ! defined (OCTAVE_RELEASE) # define OCTAVE_RELEASE %OCTAVE_RELEASE% #endif
--- a/libinterp/corefcn/defun.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/defun.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/det.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/det.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/dirfns.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/dirfns.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/display.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/display.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/dlmread.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/dlmread.cc Tue May 17 12:09:30 2016 -0400 @@ -24,7 +24,7 @@ // Adapted from previous version of dlmread.occ as authored by Kai // Habel, but core code has been completely re-written. -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/dot.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/dot.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/dynamic-ld.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/dynamic-ld.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/eig.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/eig.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/ellipj.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/ellipj.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/error.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/error.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/errwarn.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/errwarn.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/event-queue.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/event-queue.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/fft.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/fft.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/fft2.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/fft2.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/fftn.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/fftn.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/file-io.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/file-io.cc Tue May 17 12:09:30 2016 -0400 @@ -34,7 +34,7 @@ // Extensively revised by John W. Eaton <jwe@octave.org>, // April 1996. -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -51,7 +51,7 @@ #include <sys/types.h> #include <unistd.h> -#ifdef HAVE_ZLIB_H +#if defined (HAVE_ZLIB_H) # include <zlib.h> #endif
--- a/libinterp/corefcn/filter.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/filter.cc Tue May 17 12:09:30 2016 -0400 @@ -28,7 +28,7 @@ // Rewritten to use templates to handle both real and complex cases by // jwe, Wed Nov 1 19:15:29 1995. -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/find.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/find.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/ft-text-renderer.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/ft-text-renderer.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/gammainc.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/gammainc.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/gcd.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/gcd.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/getgrent.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/getgrent.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/getpwent.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/getpwent.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/getrusage.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/getrusage.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -28,7 +28,7 @@ #include <sys/times.h> #include <sys/types.h> -#ifdef HAVE_SYS_RESOURCE_H +#if defined (HAVE_SYS_RESOURCE_H) # include <sys/resource.h> #endif @@ -53,7 +53,7 @@ # endif #endif -#ifndef RUSAGE_SELF +#if ! defined (RUSAGE_SELF) # define RUSAGE_SELF 0 #endif
--- a/libinterp/corefcn/givens.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/givens.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ // Originally written by A. S. Hodel <scotte@eng.auburn.edu> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/gl-render.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/gl-render.cc Tue May 17 12:09:30 2016 -0400 @@ -20,13 +20,13 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif #include <iostream> -#ifdef HAVE_WINDOWS_H +#if defined (HAVE_WINDOWS_H) # define WIN32_LEAN_AND_MEAN # include <windows.h> #endif @@ -72,7 +72,7 @@ // Win32 API requires the CALLBACK attributes for // GLU callback functions. Define it to empty on // other platforms. -#ifndef CALLBACK +#if ! defined (CALLBACK) # define CALLBACK #endif
--- a/libinterp/corefcn/gl2ps-print.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/gl2ps-print.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -28,7 +28,7 @@ #include "errwarn.h" #include "gl2ps-print.h" -#ifdef HAVE_GL2PS_H +#if defined (HAVE_GL2PS_H) #include <cstdio> #include <limits>
--- a/libinterp/corefcn/graphics.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/graphics.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/gripes.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/gripes.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ // FIXME: All gripe_XXX functions deprecated in 4.2. Remove file in 4.6 -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/hash.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/hash.cc Tue May 17 12:09:30 2016 -0400 @@ -34,7 +34,7 @@ for now. */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/help.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/help.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/hess.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/hess.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/hex2num.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/hex2num.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/input.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/input.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ // Get command input interactively or from files. -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/inv.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/inv.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/jit-ir.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/jit-ir.cc Tue May 17 12:09:30 2016 -0400 @@ -26,15 +26,15 @@ #define __STDC_LIMIT_MACROS #define __STDC_CONSTANT_MACROS -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) #include "jit-ir.h" -#ifdef HAVE_LLVM_IR_FUNCTION_H +#if defined (HAVE_LLVM_IR_FUNCTION_H) # include <llvm/IR/BasicBlock.h> # include <llvm/IR/Instructions.h> #else
--- a/libinterp/corefcn/jit-ir.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/jit-ir.h Tue May 17 12:09:30 2016 -0400 @@ -27,7 +27,7 @@ #include "octave-config.h" -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) #include <list> #include <stack>
--- a/libinterp/corefcn/jit-typeinfo.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/jit-typeinfo.cc Tue May 17 12:09:30 2016 -0400 @@ -26,15 +26,15 @@ #define __STDC_LIMIT_MACROS #define __STDC_CONSTANT_MACROS -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) #include "jit-typeinfo.h" -#ifdef HAVE_LLVM_IR_VERIFIER_H +#if defined (HAVE_LLVM_IR_VERIFIER_H) # include <llvm/IR/Verifier.h> #else # include <llvm/Analysis/Verifier.h> @@ -42,7 +42,7 @@ #include <llvm/ExecutionEngine/ExecutionEngine.h> -#ifdef HAVE_LLVM_IR_FUNCTION_H +#if defined (HAVE_LLVM_IR_FUNCTION_H) # include <llvm/IR/GlobalVariable.h> # include <llvm/IR/LLVMContext.h> # include <llvm/IR/Function.h> @@ -56,7 +56,7 @@ # include <llvm/Intrinsics.h> #endif -#ifdef HAVE_LLVM_SUPPORT_IRBUILDER_H +#if defined (HAVE_LLVM_SUPPORT_IRBUILDER_H) # include <llvm/Support/IRBuilder.h> # elif defined(HAVE_LLVM_IR_IRBUILDER_H) # include <llvm/IR/IRBuilder.h> @@ -568,7 +568,7 @@ if (sret ()) { -#ifdef FUNCTION_ADDATTRIBUTE_ARG_IS_ATTRIBUTES +#if defined (FUNCTION_ADDATTRIBUTE_ARG_IS_ATTRIBUTES) llvm::AttrBuilder attr_builder; attr_builder.addAttribute (llvm::Attributes::StructRet); llvm::Attributes attrs = llvm::Attributes::get(context, attr_builder); @@ -579,7 +579,7 @@ } if (call_conv == jit_convention::internal) -#ifdef FUNCTION_ADDFNATTR_ARG_IS_ATTRIBUTES +#if defined (FUNCTION_ADDFNATTR_ARG_IS_ATTRIBUTES) llvm_function->addFnAttr (llvm::Attributes::AlwaysInline); #else llvm_function->addFnAttr (llvm::Attribute::AlwaysInline); @@ -686,7 +686,7 @@ if (sret ()) { -#ifdef CALLINST_ADDATTRIBUTE_ARG_IS_ATTRIBUTES +#if defined (CALLINST_ADDATTRIBUTE_ARG_IS_ATTRIBUTES) llvm::AttrBuilder attr_builder; attr_builder.addAttribute(llvm::Attributes::StructRet); llvm::Attributes attrs = llvm::Attributes::get(context, attr_builder);
--- a/libinterp/corefcn/jit-typeinfo.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/jit-typeinfo.h Tue May 17 12:09:30 2016 -0400 @@ -27,7 +27,7 @@ #include "octave-config.h" -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) #include <map> #include <vector>
--- a/libinterp/corefcn/jit-util.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/jit-util.cc Tue May 17 12:09:30 2016 -0400 @@ -26,13 +26,13 @@ #define __STDC_LIMIT_MACROS #define __STDC_CONSTANT_MACROS -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) -#ifdef HAVE_LLVM_IR_FUNCTION_H +#if defined (HAVE_LLVM_IR_FUNCTION_H) # include <llvm/IR/Value.h> #else # include <llvm/Value.h>
--- a/libinterp/corefcn/jit-util.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/jit-util.h Tue May 17 12:09:30 2016 -0400 @@ -29,7 +29,7 @@ #include "octave-config.h" -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) #include <stdexcept> @@ -44,7 +44,7 @@ { class Value; class Module; -#ifdef LEGACY_PASSMANAGER +#if defined (LEGACY_PASSMANAGER) namespace legacy { class FunctionPassManager; class PassManager;
--- a/libinterp/corefcn/kron.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/kron.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ // Author: Paul Kienzle <pkienzle@users.sf.net> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/load-path.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/load-path.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/load-save.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/load-save.cc Tue May 17 12:09:30 2016 -0400 @@ -24,7 +24,7 @@ // HDF5 support by Steven G. Johnson <stevenj@alum.mit.edu> // Matlab v5 support by James R. Van Zandt <jrv@vanzandt.mv.com> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -81,14 +81,14 @@ #include "ls-oct-binary.h" // Remove gnulib definitions, if any. -#ifdef close +#if defined (close) # undef close #endif -#ifdef open +#if defined (open) # undef open #endif -#ifdef HAVE_ZLIB +#if defined (HAVE_ZLIB) # include "zfstream.h" #endif @@ -210,7 +210,7 @@ return 0; } -#ifdef HAVE_ZLIB +#if defined (HAVE_ZLIB) static bool check_gzip_magic (const std::string& fname) { @@ -300,13 +300,13 @@ { load_save_format retval = LS_UNKNOWN; -#ifdef HAVE_HDF5 +#if defined (HAVE_HDF5) // check this before we open the file if (H5Fis_hdf5 (fname.c_str ()) > 0) return LS_HDF5; #endif -#ifdef HAVE_ZLIB +#if defined (HAVE_ZLIB) use_zlib = check_gzip_magic (fname); #else use_zlib = false; @@ -323,7 +323,7 @@ else if (! quiet) err_file_open ("load", orig_fname); } -#ifdef HAVE_ZLIB +#if defined (HAVE_ZLIB) else { gzifstream gzfile (fname.c_str ()); @@ -382,7 +382,7 @@ name = read_mat_binary_data (stream, orig_fname, tc); break; -#ifdef HAVE_HDF5 +#if defined (HAVE_HDF5) case LS_HDF5: name = read_hdf5_data (stream, orig_fname, global, tc, doc, argv, argv_idx, argc); @@ -692,7 +692,7 @@ } else if (argv[i] == "-hdf5" || argv[i] == "-h") { -#ifdef HAVE_HDF5 +#if defined (HAVE_HDF5) format = LS_HDF5; #else err_disabled_feature ("load", "HDF5"); @@ -728,7 +728,7 @@ { i++; -#ifdef HAVE_HDF5 +#if defined (HAVE_HDF5) if (format == LS_HDF5) error ("load: cannot read HDF5 format from stdin"); else @@ -758,7 +758,7 @@ if (format == LS_UNKNOWN) format = get_file_format (fname, orig_fname, use_zlib); -#ifdef HAVE_HDF5 +#if defined (HAVE_HDF5) if (format == LS_HDF5) { i++; @@ -786,7 +786,7 @@ // line-endings explicitly. std::ios::openmode mode = std::ios::in | std::ios::binary; -#ifdef HAVE_ZLIB +#if defined (HAVE_ZLIB) if (use_zlib) { gzifstream file (fname.c_str (), mode); @@ -928,7 +928,7 @@ save_mat_binary_data (os, tc, name); break; -#ifdef HAVE_HDF5 +#if defined (HAVE_HDF5) case LS_HDF5: save_hdf5_data (os, tc, name, help, global, save_as_floats); break; @@ -1061,7 +1061,7 @@ } else if (argv[i] == "-hdf5" || argv[i] == "-h") { -#ifdef HAVE_HDF5 +#if defined (HAVE_HDF5) format = LS_HDF5; #else err_disabled_feature ("save", "HDF5"); @@ -1073,7 +1073,7 @@ { format = LS_MAT5_BINARY; } -#ifdef HAVE_ZLIB +#if defined (HAVE_ZLIB) else if (argv[i] == "-mat7-binary" || argv[i] == "-7" || argv[i] == "-v7" || argv[i] == "-V7") { @@ -1092,14 +1092,14 @@ } else if (argv[i] == "-float-hdf5") { -#ifdef HAVE_HDF5 +#if defined (HAVE_HDF5) format = LS_HDF5; save_as_floats = true; #else err_disabled_feature ("save", "HDF5"); #endif } -#ifdef HAVE_ZLIB +#if defined (HAVE_ZLIB) else if (argv[i] == "-zip" || argv[i] == "-z") { use_zlib = true; @@ -1207,7 +1207,7 @@ break; -#ifdef HAVE_HDF5 +#if defined (HAVE_HDF5) case LS_HDF5: #endif case LS_TEXT: @@ -1218,7 +1218,7 @@ if (! comment_string.empty ()) { -#ifdef HAVE_HDF5 +#if defined (HAVE_HDF5) if (format == LS_HDF5) { hdf5_ofstream& hs = dynamic_cast<hdf5_ofstream&> (os); @@ -1239,7 +1239,7 @@ void octave_prepare_hdf5 (void) { -#ifdef HAVE_HDF5 +#if defined (HAVE_HDF5) H5dont_atexit (); #endif } @@ -1247,7 +1247,7 @@ void octave_finalize_hdf5 (void) { -#ifdef HAVE_HDF5 +#if defined (HAVE_HDF5) H5close (); #endif } @@ -1380,7 +1380,7 @@ use_zlib = false; if (format == LS_BINARY -#ifdef HAVE_HDF5 +#if defined (HAVE_HDF5) || format == LS_HDF5 #endif || format == LS_MAT_BINARY @@ -1390,7 +1390,7 @@ mode |= append ? std::ios::ate : std::ios::trunc; -#ifdef HAVE_HDF5 +#if defined (HAVE_HDF5) if (format == LS_HDF5) { hdf5_ofstream file (fname, mode); @@ -1410,7 +1410,7 @@ // don't insert any commands here! The open brace below must // go with the else above! { -#ifdef HAVE_ZLIB +#if defined (HAVE_ZLIB) if (use_zlib) { gzofstream file (fname, mode); @@ -1606,7 +1606,7 @@ { i++; -#ifdef HAVE_HDF5 +#if defined (HAVE_HDF5) if (format == LS_HDF5) error ("save: cannot write HDF5 format to stdout"); else @@ -1646,7 +1646,7 @@ = append ? (std::ios::app | std::ios::ate) : std::ios::out; if (format == LS_BINARY -#ifdef HAVE_HDF5 +#if defined (HAVE_HDF5) || format == LS_HDF5 #endif || format == LS_MAT_BINARY @@ -1654,7 +1654,7 @@ || format == LS_MAT7_BINARY) mode |= std::ios::binary; -#ifdef HAVE_HDF5 +#if defined (HAVE_HDF5) if (format == LS_HDF5) { // FIXME: It should be possible to append to HDF5 files. @@ -1679,7 +1679,7 @@ // don't insert any statements here! The brace below must go // with the "else" above! { -#ifdef HAVE_ZLIB +#if defined (HAVE_ZLIB) if (use_zlib) { gzofstream file (fname.c_str (), mode);
--- a/libinterp/corefcn/lookup.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/lookup.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ // Author: Jaroslav Hajek <highegg@gmail.com> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/ls-ascii-helper.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/ls-ascii-helper.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/ls-hdf5.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/ls-hdf5.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ // Author: Steven G. Johnson <stevenj@alum.mit.edu> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -492,7 +492,7 @@ { // What integer type do we really have.. std::string int_typ; -#ifdef HAVE_H5T_GET_NATIVE_TYPE +#if defined (HAVE_H5T_GET_NATIVE_TYPE) // FIXME: test this code and activated with an autoconf // test!! It is also incorrect for 64-bit indexing!!
--- a/libinterp/corefcn/ls-mat-ascii.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/ls-mat-ascii.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/ls-mat4.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/ls-mat4.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/ls-mat5.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/ls-mat5.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ // Author: James R. Van Zandt <jrv@vanzandt.mv.com> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -77,7 +77,7 @@ #include "parse.h" #include "defaults.h" -#ifdef HAVE_ZLIB +#if defined (HAVE_ZLIB) # include <zlib.h> #endif @@ -510,7 +510,7 @@ if (type == miCOMPRESSED) { -#ifdef HAVE_ZLIB +#if defined (HAVE_ZLIB) // If C++ allowed us direct access to the file descriptor of an // ifstream in a uniform way, the code below could be vastly // simplified, and additional copies of the data in memory @@ -2286,7 +2286,7 @@ return true; // skip to next } -#ifdef HAVE_ZLIB +#if defined (HAVE_ZLIB) if (mat7_format && ! compressing) {
--- a/libinterp/corefcn/ls-oct-binary.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/ls-oct-binary.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/ls-oct-text.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/ls-oct-text.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ // Author: John W. Eaton. -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/ls-oct-text.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/ls-oct-text.h Tue May 17 12:09:30 2016 -0400 @@ -39,7 +39,7 @@ // Used when converting Inf to something that gnuplot can read. -#ifndef OCT_RBV +#if ! defined (OCT_RBV) # define OCT_RBV (std::numeric_limits<double>::max () / 100.0) #endif
--- a/libinterp/corefcn/ls-utils.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/ls-utils.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/lsode.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/lsode.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/lu.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/lu.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/mappers.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/mappers.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/matrix_type.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/matrix_type.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/max.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/max.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/mex.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/mex.cc Tue May 17 12:09:30 2016 -0400 @@ -2131,7 +2131,7 @@ if (p != foreign_memlist.end ()) foreign_memlist.erase (p); -#ifdef DEBUG +#if defined (DEBUG) else warning ("mxFree: skipping memory not allocated by mxMalloc, mxCalloc, or mxRealloc"); #endif @@ -2142,7 +2142,7 @@ // Mark a pointer to be freed on exit. void mark (void *ptr) { -#ifdef DEBUG +#if defined (DEBUG) if (memlist.find (ptr) != memlist.end ()) warning ("%s: double registration ignored", function_name ()); #endif @@ -2158,7 +2158,7 @@ if (p != memlist.end ()) memlist.erase (p); -#ifdef DEBUG +#if defined (DEBUG) else warning ("%s: value not marked", function_name ()); #endif @@ -2181,7 +2181,7 @@ // Mark a pointer as one we allocated. void mark_foreign (void *ptr) { -#ifdef DEBUG +#if defined (DEBUG) if (foreign_memlist.find (ptr) != foreign_memlist.end ()) warning ("%s: double registration ignored", function_name ()); #endif @@ -2196,7 +2196,7 @@ if (p != foreign_memlist.end ()) foreign_memlist.erase (p); -#ifdef DEBUG +#if defined (DEBUG) else warning ("%s: value not marked", function_name ()); #endif @@ -2223,7 +2223,7 @@ arraylist.erase (p); delete ptr; } -#ifdef DEBUG +#if defined (DEBUG) else warning ("mex::free_value: skipping memory not allocated by mex::make_value"); #endif @@ -2263,7 +2263,7 @@ // Mark a pointer as one we allocated. void global_mark (void *ptr) { -#ifdef DEBUG +#if defined (DEBUG) if (global_memlist.find (ptr) != global_memlist.end ()) warning ("%s: double registration ignored", function_name ()); #endif @@ -2278,7 +2278,7 @@ if (p != global_memlist.end ()) global_memlist.erase (p); -#ifdef DEBUG +#if defined (DEBUG) else warning ("%s: value not marked", function_name ()); #endif
--- a/libinterp/corefcn/mex.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/mex.h Tue May 17 12:09:30 2016 -0400 @@ -108,67 +108,67 @@ /* Apparently these are also defined. */ -#ifndef UINT64_T +#if ! defined (UINT64_T) # define UINT64_T uint64_t #endif -#ifndef uint64_T +#if ! defined (uint64_T) # define uint64_T uint64_t #endif -#ifndef INT64_T +#if ! defined (INT64_T) # define INT64_T int64_t #endif -#ifndef int64_T +#if ! defined (int64_T) # define int64_T int64_t #endif -#ifndef UINT32_T +#if ! defined (UINT32_T) # define UINT32_T uint32_t #endif -#ifndef uint32_T +#if ! defined (uint32_T) # define uint32_T uint32_t #endif -#ifndef INT32_T +#if ! defined (INT32_T) # define INT32_T int32_t #endif -#ifndef int32_T +#if ! defined (int32_T) # define int32_T int32_t #endif -#ifndef UINT16_T +#if ! defined (UINT16_T) # define UINT16_T uint16_t #endif -#ifndef uint16_T +#if ! defined (uint16_T) # define uint16_T uint16_t #endif -#ifndef INT16_T +#if ! defined (INT16_T) # define INT16_T int16_t #endif -#ifndef int16_T +#if ! defined (int16_T) # define int16_T int16_t #endif -#ifndef UINT8_T +#if ! defined (UINT8_T) # define UINT8_T uint8_t #endif -#ifndef uint8_T +#if ! defined (uint8_T) # define uint8_T uint8_t #endif -#ifndef INT8_T +#if ! defined (INT8_T) # define INT8_T int8_t #endif -#ifndef int8_T +#if ! defined (int8_T) # define int8_T int8_t #endif
--- a/libinterp/corefcn/mexproto.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/mexproto.h Tue May 17 12:09:30 2016 -0400 @@ -275,7 +275,7 @@ extern OCTINTERP_API char *mxArrayToString (const mxArray *ptr); /* Miscellaneous. */ -#ifdef NDEBUG +#if defined (NDEBUG) # define mxAssert(expr, msg) \ do \ { \
--- a/libinterp/corefcn/mgorth.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/mgorth.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/nproc.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/nproc.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/oct-errno.in.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/oct-errno.in.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/oct-fstrm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/oct-fstrm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/oct-hdf5-types.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/oct-hdf5-types.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/oct-hdf5-types.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/oct-hdf5-types.h Tue May 17 12:09:30 2016 -0400 @@ -25,7 +25,7 @@ #include "octave-config.h" -#ifdef __cplusplus +#if defined (__cplusplus) // This function only needs to be defined for C++. extern bool check_hdf5_types (bool warn = true); #endif @@ -35,7 +35,7 @@ typedef int octave_hdf5_id; typedef int octave_hdf5_err; -#ifdef __cplusplus +#if defined (__cplusplus) extern "C" { #endif @@ -46,7 +46,7 @@ extern const octave_hdf5_id octave_H5P_DEFAULT; extern const octave_hdf5_id octave_H5S_ALL; -#ifdef __cplusplus +#if defined (__cplusplus) } #endif
--- a/libinterp/corefcn/oct-hist.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/oct-hist.cc Tue May 17 12:09:30 2016 -0400 @@ -31,7 +31,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/oct-iostrm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/oct-iostrm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/oct-lvalue.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/oct-lvalue.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/oct-map.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/oct-map.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/oct-prcstrm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/oct-prcstrm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/oct-procbuf.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/oct-procbuf.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -42,7 +42,7 @@ #include "errwarn.h" #include "utils.h" -#ifndef SHELL_PATH +#if ! defined (SHELL_PATH) # define SHELL_PATH "/bin/sh" #endif @@ -51,7 +51,7 @@ static octave_procbuf *octave_procbuf_list = 0; -#ifndef BUFSIZ +#if ! defined (BUFSIZ) # define BUFSIZ 1024 #endif
--- a/libinterp/corefcn/oct-stdstrm.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/oct-stdstrm.h Tue May 17 12:09:30 2016 -0400 @@ -135,7 +135,7 @@ octave_stdiostream& operator = (const octave_stdiostream&); }; -#ifdef HAVE_ZLIB +#if defined (HAVE_ZLIB) class octave_zstdiostream
--- a/libinterp/corefcn/oct-stream.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/oct-stream.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/oct-strstrm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/oct-strstrm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/oct-tex-lexer.in.ll Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/oct-tex-lexer.in.ll Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ %top { -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) #include "config.h" #endif @@ -39,7 +39,7 @@ // Define away the deprecated register storage class specifier to avoid // potential warnings about it. #if ! defined (register) -#define register +# define register #endif } @@ -76,20 +76,20 @@ // of YYSTYPE in the generated oct-parse.h file. #if defined (OCTAVE_TEX_STYPE_IS_DECLARED) && ! defined YYSTYPE -#define YYSTYPE OCTAVE_TEX_STYPE +# define YYSTYPE OCTAVE_TEX_STYPE #endif #if defined (GNULIB_NAMESPACE) // Calls to the following functions appear in the generated output // from flex without the namespace tag. Redefine them so we will use // them via the gnulib namespace. -#define fprintf GNULIB_NAMESPACE::fprintf -#define fread GNULIB_NAMESPACE::fread -#define fwrite GNULIB_NAMESPACE::fwrite -#define getc GNULIB_NAMESPACE::getc -#define isatty GNULIB_NAMESPACE::isatty -#define malloc GNULIB_NAMESPACE::malloc -#define realloc GNULIB_NAMESPACE::realloc +# define fprintf GNULIB_NAMESPACE::fprintf +# define fread GNULIB_NAMESPACE::fread +# define fwrite GNULIB_NAMESPACE::fwrite +# define getc GNULIB_NAMESPACE::getc +# define isatty GNULIB_NAMESPACE::isatty +# define malloc GNULIB_NAMESPACE::malloc +# define realloc GNULIB_NAMESPACE::realloc #endif %}
--- a/libinterp/corefcn/oct-tex-parser.in.yy Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/oct-tex-parser.in.yy Tue May 17 12:09:30 2016 -0400 @@ -24,7 +24,7 @@ #define YYDEBUG 1 -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) #include "config.h" #endif @@ -38,9 +38,9 @@ // Calls to the following functions appear in the generated output // from Bison without the namespace tag. Redefine them so we will use // them via the gnulib namespace. -#define fclose GNULIB_NAMESPACE::fclose -#define fprintf GNULIB_NAMESPACE::fprintf -#define malloc GNULIB_NAMESPACE::malloc +# define fclose GNULIB_NAMESPACE::fclose +# define fprintf GNULIB_NAMESPACE::fprintf +# define malloc GNULIB_NAMESPACE::malloc #endif #define scanner parser.get_scanner ()
--- a/libinterp/corefcn/octave-link.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/octave-link.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/ordschur.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/ordschur.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/pager.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/pager.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -62,7 +62,7 @@ { std::string pager_binary = octave_env::getenv ("PAGER"); -#ifdef OCTAVE_DEFAULT_PAGER +#if defined (OCTAVE_DEFAULT_PAGER) if (pager_binary.empty ()) pager_binary = OCTAVE_DEFAULT_PAGER; #endif
--- a/libinterp/corefcn/pinv.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/pinv.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/pr-output.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/pr-output.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/procstream.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/procstream.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/profiler.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/profiler.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/psi.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/psi.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/pt-jit.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/pt-jit.cc Tue May 17 12:09:30 2016 -0400 @@ -25,7 +25,7 @@ #define __STDC_LIMIT_MACROS #define __STDC_CONSTANT_MACROS -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -39,7 +39,7 @@ #include "symtab.h" #include "variables.h" -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) static bool Vdebug_jit = false; @@ -52,7 +52,7 @@ #include <llvm/Analysis/CallGraph.h> #include <llvm/Analysis/Passes.h> -#ifdef HAVE_LLVM_IR_VERIFIER_H +#if defined (HAVE_LLVM_IR_VERIFIER_H) # include <llvm/IR/Verifier.h> #else # include <llvm/Analysis/Verifier.h> @@ -62,13 +62,13 @@ #include <llvm/ExecutionEngine/ExecutionEngine.h> #include <llvm/ExecutionEngine/JIT.h> -#ifdef LEGACY_PASSMANAGER +#if defined (LEGACY_PASSMANAGER) # include <llvm/IR/LegacyPassManager.h> #else # include <llvm/PassManager.h> #endif -#ifdef HAVE_LLVM_IR_FUNCTION_H +#if defined (HAVE_LLVM_IR_FUNCTION_H) # include <llvm/IR/LLVMContext.h> # include <llvm/IR/Module.h> #else @@ -76,7 +76,7 @@ # include <llvm/Module.h> #endif -#ifdef HAVE_LLVM_SUPPORT_IRBUILDER_H +#if defined (HAVE_LLVM_SUPPORT_IRBUILDER_H) # include <llvm/Support/IRBuilder.h> #elif defined(HAVE_LLVM_IR_IRBUILDER_H) # include <llvm/IR/IRBuilder.h> @@ -87,7 +87,7 @@ #include <llvm/Support/raw_os_ostream.h> #include <llvm/Support/TargetSelect.h> -#ifdef HAVE_LLVM_IR_DATALAYOUT_H +#if defined (HAVE_LLVM_IR_DATALAYOUT_H) # include <llvm/IR/DataLayout.h> #elif defined(HAVE_LLVM_DATALAYOUT_H) # include <llvm/DataLayout.h> @@ -2068,7 +2068,7 @@ if (! engine) return false; -#ifdef LEGACY_PASSMANAGER +#if defined (LEGACY_PASSMANAGER) module_pass_manager = new llvm::legacy::PassManager (); pass_manager = new llvm::legacy::FunctionPassManager (module); #else @@ -2077,7 +2077,7 @@ #endif module_pass_manager->add (llvm::createAlwaysInlinerPass ()); -#ifdef HAVE_LLVM_DATALAYOUT +#if defined (HAVE_LLVM_DATALAYOUT) pass_manager->add (new llvm::DataLayout (*engine->getDataLayout ())); #else pass_manager->add (new llvm::TargetData (*engine->getTargetData ())); @@ -2191,7 +2191,7 @@ if (Vdebug_jit) { std::string error; -#ifdef RAW_FD_OSTREAM_ARG_IS_LLVM_SYS_FS +#if defined (RAW_FD_OSTREAM_ARG_IS_LLVM_SYS_FS) llvm::raw_fd_ostream fout ("test.bc", error, llvm::sys::fs::F_Binary); #else
--- a/libinterp/corefcn/pt-jit.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/pt-jit.h Tue May 17 12:09:30 2016 -0400 @@ -27,7 +27,7 @@ #include "octave-config.h" -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) #include "jit-ir.h" #include "pt-walk.h" @@ -388,7 +388,7 @@ size_t trip_count (const octave_value& bounds) const; llvm::Module *module; -#ifdef LEGACY_PASSMANAGER +#if defined (LEGACY_PASSMANAGER) llvm::legacy::PassManager *module_pass_manager; llvm::legacy::FunctionPassManager *pass_manager; #else
--- a/libinterp/corefcn/quad.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/quad.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/quadcc.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/quadcc.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/qz.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/qz.cc Tue May 17 12:09:30 2016 -0400 @@ -28,7 +28,7 @@ #undef DEBUG_SORT #undef DEBUG_EIG -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -259,7 +259,7 @@ else retval = (fabs (p) < 1 ? 1 : -1); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: fin: retval=" << retval << std::endl; #endif @@ -374,7 +374,7 @@ { int nargin = args.length (); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: nargin = " << nargin << ", nargout = " << nargout << std::endl; #endif @@ -385,7 +385,7 @@ if (nargin == 3 && (nargout < 3 || nargout > 4)) error ("qz: invalid number of output arguments for form [3] call"); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: determine ordering option" << std::endl; #endif @@ -413,7 +413,7 @@ safmin F77_CHAR_ARG_LEN (1)); -#ifdef DEBUG_EIG +#if defined (DEBUG_EIG) std::cout << "qz: initial value of safmin=" << setiosflags (std::ios::scientific) << safmin << std::endl; @@ -423,7 +423,7 @@ // for these, use eps instead to avoid problems in dlag2. if (safmin == 0) { -#ifdef DEBUG_EIG +#if defined (DEBUG_EIG) std::cout << "qz: DANGER WILL ROBINSON: safmin is 0!" << std::endl; #endif @@ -431,7 +431,7 @@ safmin F77_CHAR_ARG_LEN (1)); -#ifdef DEBUG_EIG +#if defined (DEBUG_EIG) std::cout << "qz: safmin set to " << setiosflags (std::ios::scientific) << safmin << std::endl; @@ -439,14 +439,14 @@ } } -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: check argument 1" << std::endl; #endif // Argument 1: check if it's o.k. dimensioned. octave_idx_type nn = args(0).rows (); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "argument 1 dimensions: (" << nn << "," << args(0).columns () << ")" << std::endl; @@ -478,7 +478,7 @@ else aa = args(0).matrix_value (); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: check argument 2" << std::endl; #endif @@ -528,7 +528,7 @@ if (complex_case) { -#ifdef DEBUG +#if defined (DEBUG) if (compq == 'V') std::cout << "qz: performing balancing; CQ=" << std::endl << CQ << std::endl; @@ -554,7 +554,7 @@ } else { -#ifdef DEBUG +#if defined (DEBUG) if (compq == 'V') std::cout << "qz: performing balancing; QQ=" << std::endl << QQ << std::endl; @@ -582,7 +582,7 @@ F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); -#ifdef DEBUG +#if defined (DEBUG) if (compq == 'V') std::cout << "qz: balancing done; QQ=" << std::endl << QQ << std::endl; #endif @@ -599,7 +599,7 @@ F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); -#ifdef DEBUG +#if defined (DEBUG) if (compz == 'V') std::cout << "qz: balancing done; ZZ=" << std::endl << ZZ << std::endl; #endif @@ -674,27 +674,27 @@ } else { -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: peforming qr decomposition of bb" << std::endl; #endif // Compute the QR factorization of bb. qr<Matrix> bqr (bb); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: qr (bb) done; now peforming qz decomposition" << std::endl; #endif bb = bqr.R (); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: extracted bb" << std::endl; #endif aa = (bqr.Q ()).transpose () * aa; -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: updated aa " << std::endl; std::cout << "bqr.Q () = " << std::endl << bqr.Q () << std::endl; @@ -705,11 +705,11 @@ if (compq == 'V') QQ = QQ * bqr.Q (); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: precursors done..." << std::endl; #endif -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: compq = " << compq << ", compz = " << compz << std::endl; #endif @@ -750,7 +750,7 @@ F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); -#ifdef DEBUG +#if defined (DEBUG) if (compq == 'V') std::cout << "qz: balancing done; QQ=" << std::endl << QQ << std::endl; @@ -768,7 +768,7 @@ F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); -#ifdef DEBUG +#if defined (DEBUG) if (compz == 'V') std::cout << "qz: balancing done; ZZ=" << std::endl << ZZ << std::endl; @@ -784,7 +784,7 @@ // Probably not needed, but better be safe. error ("qz: cannot re-order complex qz decomposition"); -#ifdef DEBUG_SORT +#if defined (DEBUG_SORT) std::cout << "qz: ordering eigenvalues: ord_job = " << ord_job << std::endl; #endif @@ -830,7 +830,7 @@ double eps = std::numeric_limits<double>::epsilon () * inf_norm * nn; -#ifdef DEBUG_SORT +#if defined (DEBUG_SORT) std::cout << "qz: calling dsubsp: aa=" << std::endl; octave_print_internal (std::cout, aa, 0); std::cout << std::endl << "bb=" << std::endl; @@ -857,7 +857,7 @@ ZZ.fortran_vec (), sort_test, eps, ndim, fail, ind.fortran_vec ())); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: back from dsubsp: aa=" << std::endl; octave_print_internal (std::cout, aa, 0); std::cout << std::endl << "bb=" << std::endl; @@ -876,7 +876,7 @@ jj = 0; while (jj < nn) { -#ifdef DEBUG_EIG +#if defined (DEBUG_EIG) std::cout << "computing gen eig #" << jj << std::endl; #endif @@ -892,7 +892,7 @@ if (zcnt == 1) { // Real zero. -#ifdef DEBUG_EIG +#if defined (DEBUG_EIG) std::cout << " single gen eig:" << std::endl; std::cout << " alphar(" << jj << ") = " << aa(jj,jj) << std::endl; @@ -908,7 +908,7 @@ else { // Complex conjugate pair. -#ifdef DEBUG_EIG +#if defined (DEBUG_EIG) std::cout << "qz: calling dlag2:" << std::endl; std::cout << "safmin=" << setiosflags (std::ios::scientific) @@ -936,7 +936,7 @@ (aa_ptr, nn, bb_ptr, nn, safmin, scale1, scale2, wr1, wr2, wi)); -#ifdef DEBUG_EIG +#if defined (DEBUG_EIG) std::cout << "dlag2 returns: scale1=" << scale1 << "\tscale2=" << scale2 << std::endl << "\twr1=" << wr1 << "\twr2=" << wr2 @@ -965,7 +965,7 @@ jj += zcnt; } -#ifdef DEBUG_SORT +#if defined (DEBUG_SORT) std::cout << "qz: back from dsubsp: aa=" << std::endl; octave_print_internal (std::cout, aa, 0); std::cout << std::endl << "bb=" << std::endl; @@ -1010,7 +1010,7 @@ } else { -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: computing generalized eigenvalues" << std::endl; #endif @@ -1061,7 +1061,7 @@ } else { -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: computing generalized eigenvectors" << std::endl; #endif @@ -1146,7 +1146,7 @@ case 4: if (nargin == 3) { -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: sort: retval(3) = gev = " << std::endl; octave_print_internal (std::cout, gev); std::cout << std::endl; @@ -1181,7 +1181,7 @@ { if (complex_case) { -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: retval(1) = cbb = " << std::endl; octave_print_internal (std::cout, cbb, 0); std::cout << std::endl << "qz: retval(0) = caa = " <<std::endl; @@ -1193,7 +1193,7 @@ } else { -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: retval(1) = bb = " << std::endl; octave_print_internal (std::cout, bb, 0); std::cout << std::endl << "qz: retval(0) = aa = " <<std::endl; @@ -1208,7 +1208,7 @@ case 1: case 0: -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: retval(0) = gev = " << gev << std::endl; #endif retval(0) = gev; @@ -1219,7 +1219,7 @@ break; } -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: exiting (at long last)" << std::endl; #endif
--- a/libinterp/corefcn/rand.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/rand.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -1078,7 +1078,7 @@ @seealso{perms}\n\ @end deftypefn") { -#ifdef USE_UNORDERED_MAP_WITH_TR1 +#if defined (USE_UNORDERED_MAP_WITH_TR1) using std::tr1::unordered_map; #else using std::unordered_map;
--- a/libinterp/corefcn/rcond.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/rcond.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/regexp.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/regexp.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/schur.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/schur.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/sighandlers.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/sighandlers.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -126,7 +126,7 @@ static void octave_jump_to_enclosing_context_sync (void) { -#ifdef _MSC_VER +#if defined (_MSC_VER) _fpreset (); #endif ::octave_jump_to_enclosing_context (); @@ -226,7 +226,7 @@ #endif // Signal handler return type. -#ifndef BADSIG +#if ! defined (BADSIG) # define BADSIG (void (*)(int))-1 #endif @@ -276,7 +276,7 @@ switch (i) { -#ifdef SIGCHLD +#if defined (SIGCHLD) case SIGCHLD: { volatile octave_interrupt_handler saved_interrupt_handler @@ -301,7 +301,7 @@ std::cerr << "warning: floating point exception" << std::endl; break; -#ifdef SIGPIPE +#if defined (SIGPIPE) case SIGPIPE: std::cerr << "warning: broken pipe" << std::endl; break; @@ -395,7 +395,7 @@ // Handle SIGCHLD. -#ifdef SIGCHLD +#if defined (SIGCHLD) static void sigchld_handler (int /* sig */) { @@ -539,7 +539,7 @@ #endif } -#ifdef SIGPIPE +#if defined (SIGPIPE) static void sigpipe_handler (int /* sig */) { @@ -563,11 +563,11 @@ w32_interrupt_manager::init (); #endif -#ifdef SIGINT +#if defined (SIGINT) retval.int_handler = octave_set_signal_handler (SIGINT, sigint_handler); #endif -#ifdef SIGBREAK +#if defined (SIGBREAK) retval.brk_handler = octave_set_signal_handler (SIGBREAK, sigint_handler); #endif @@ -583,11 +583,11 @@ w32_interrupt_manager::init (); #endif -#ifdef SIGINT +#if defined (SIGINT) retval.int_handler = octave_set_signal_handler (SIGINT, SIG_IGN); #endif -#ifdef SIGBREAK +#if defined (SIGBREAK) retval.brk_handler = octave_set_signal_handler (SIGBREAK, SIG_IGN); #endif @@ -604,12 +604,12 @@ w32_interrupt_manager::init (); #endif -#ifdef SIGINT +#if defined (SIGINT) retval.int_handler = octave_set_signal_handler (SIGINT, h.int_handler, restart_syscalls); #endif -#ifdef SIGBREAK +#if defined (SIGBREAK) retval.brk_handler = octave_set_signal_handler (SIGBREAK, h.brk_handler, restart_syscalls); #endif @@ -627,30 +627,30 @@ octave_catch_interrupts (); -#ifdef SIGABRT +#if defined (SIGABRT) octave_set_signal_handler (SIGABRT, generic_sig_handler); #endif -#ifdef SIGALRM +#if defined (SIGALRM) octave_set_signal_handler (SIGALRM, generic_sig_handler); #endif -#ifdef SIGBUS +#if defined (SIGBUS) octave_set_signal_handler (SIGBUS, generic_sig_handler); #endif -#ifdef SIGCHLD +#if defined (SIGCHLD) octave_set_signal_handler (SIGCHLD, sigchld_handler); #endif // SIGCLD // SIGCONT -#ifdef SIGEMT +#if defined (SIGEMT) octave_set_signal_handler (SIGEMT, generic_sig_handler); #endif -#ifdef SIGFPE +#if defined (SIGFPE) # if defined (__alpha__) octave_set_signal_handler (SIGFPE, sigfpe_handler); # else @@ -658,55 +658,55 @@ # endif #endif -#ifdef SIGHUP +#if defined (SIGHUP) octave_set_signal_handler (SIGHUP, sig_hup_or_term_handler); #endif -#ifdef SIGILL +#if defined (SIGILL) octave_set_signal_handler (SIGILL, generic_sig_handler); #endif // SIGINFO // SIGINT -#ifdef SIGIOT +#if defined (SIGIOT) octave_set_signal_handler (SIGIOT, generic_sig_handler); #endif -#ifdef SIGLOST +#if defined (SIGLOST) octave_set_signal_handler (SIGLOST, generic_sig_handler); #endif -#ifdef SIGPIPE +#if defined (SIGPIPE) octave_set_signal_handler (SIGPIPE, sigpipe_handler); #endif -#ifdef SIGPOLL +#if defined (SIGPOLL) octave_set_signal_handler (SIGPOLL, SIG_IGN); #endif // SIGPROF // SIGPWR -#ifdef SIGQUIT +#if defined (SIGQUIT) octave_set_signal_handler (SIGQUIT, generic_sig_handler); #endif -#ifdef SIGSEGV +#if defined (SIGSEGV) octave_set_signal_handler (SIGSEGV, generic_sig_handler); #endif // SIGSTOP -#ifdef SIGSYS +#if defined (SIGSYS) octave_set_signal_handler (SIGSYS, generic_sig_handler); #endif -#ifdef SIGTERM +#if defined (SIGTERM) octave_set_signal_handler (SIGTERM, sig_hup_or_term_handler); #endif -#ifdef SIGTRAP +#if defined (SIGTRAP) octave_set_signal_handler (SIGTRAP, generic_sig_handler); #endif @@ -715,33 +715,33 @@ // SIGTTOU // SIGURG -#ifdef SIGUSR1 +#if defined (SIGUSR1) octave_set_signal_handler (SIGUSR1, generic_sig_handler); #endif -#ifdef SIGUSR2 +#if defined (SIGUSR2) octave_set_signal_handler (SIGUSR2, generic_sig_handler); #endif -#ifdef SIGVTALRM +#if defined (SIGVTALRM) octave_set_signal_handler (SIGVTALRM, generic_sig_handler); #endif -#ifdef SIGIO +#if defined (SIGIO) octave_set_signal_handler (SIGIO, SIG_IGN); #endif #if 0 -# ifdef SIGWINCH +# if defined (SIGWINCH) octave_set_signal_handler (SIGWINCH, sigwinch_handler); #endif #endif -#ifdef SIGXCPU +#if defined (SIGXCPU) octave_set_signal_handler (SIGXCPU, generic_sig_handler); #endif -#ifdef SIGXFSZ +#if defined (SIGXFSZ) octave_set_signal_handler (SIGXFSZ, generic_sig_handler); #endif @@ -752,155 +752,155 @@ { octave_scalar_map m; -#ifdef SIGABRT +#if defined (SIGABRT) m.assign ("ABRT", SIGABRT); #endif -#ifdef SIGALRM +#if defined (SIGALRM) m.assign ("ALRM", SIGALRM); #endif -#ifdef SIGBUS +#if defined (SIGBUS) m.assign ("BUS", SIGBUS); #endif -#ifdef SIGCHLD +#if defined (SIGCHLD) m.assign ("CHLD", SIGCHLD); #endif -#ifdef SIGCLD +#if defined (SIGCLD) m.assign ("CLD", SIGCLD); #endif -#ifdef SIGCONT +#if defined (SIGCONT) m.assign ("CONT", SIGCONT); #endif -#ifdef SIGEMT +#if defined (SIGEMT) m.assign ("EMT", SIGEMT); #endif -#ifdef SIGFPE +#if defined (SIGFPE) m.assign ("FPE", SIGFPE); #endif -#ifdef SIGHUP +#if defined (SIGHUP) m.assign ("HUP", SIGHUP); #endif -#ifdef SIGILL +#if defined (SIGILL) m.assign ("ILL", SIGILL); #endif -#ifdef SIGINFO +#if defined (SIGINFO) m.assign ("INFO", SIGINFO); #endif -#ifdef SIGINT +#if defined (SIGINT) m.assign ("INT", SIGINT); #endif -#ifdef SIGIO +#if defined (SIGIO) m.assign ("IO", SIGIO); #endif -#ifdef SIGIOT +#if defined (SIGIOT) m.assign ("IOT", SIGIOT); #endif -#ifdef SIGKILL +#if defined (SIGKILL) m.assign ("KILL", SIGKILL); #endif -#ifdef SIGLOST +#if defined (SIGLOST) m.assign ("LOST", SIGLOST); #endif -#ifdef SIGPIPE +#if defined (SIGPIPE) m.assign ("PIPE", SIGPIPE); #endif -#ifdef SIGPOLL +#if defined (SIGPOLL) m.assign ("POLL", SIGPOLL); #endif -#ifdef SIGPROF +#if defined (SIGPROF) m.assign ("PROF", SIGPROF); #endif -#ifdef SIGPWR +#if defined (SIGPWR) m.assign ("PWR", SIGPWR); #endif -#ifdef SIGQUIT +#if defined (SIGQUIT) m.assign ("QUIT", SIGQUIT); #endif -#ifdef SIGSEGV +#if defined (SIGSEGV) m.assign ("SEGV", SIGSEGV); #endif -#ifdef SIGSTKFLT +#if defined (SIGSTKFLT) m.assign ("STKFLT", SIGSTKFLT); #endif -#ifdef SIGSTOP +#if defined (SIGSTOP) m.assign ("STOP", SIGSTOP); #endif -#ifdef SIGSYS +#if defined (SIGSYS) m.assign ("SYS", SIGSYS); #endif -#ifdef SIGTERM +#if defined (SIGTERM) m.assign ("TERM", SIGTERM); #endif -#ifdef SIGTRAP +#if defined (SIGTRAP) m.assign ("TRAP", SIGTRAP); #endif -#ifdef SIGTSTP +#if defined (SIGTSTP) m.assign ("TSTP", SIGTSTP); #endif -#ifdef SIGTTIN +#if defined (SIGTTIN) m.assign ("TTIN", SIGTTIN); #endif -#ifdef SIGTTOU +#if defined (SIGTTOU) m.assign ("TTOU", SIGTTOU); #endif -#ifdef SIGUNUSED +#if defined (SIGUNUSED) m.assign ("UNUSED", SIGUNUSED); #endif -#ifdef SIGURG +#if defined (SIGURG) m.assign ("URG", SIGURG); #endif -#ifdef SIGUSR1 +#if defined (SIGUSR1) m.assign ("USR1", SIGUSR1); #endif -#ifdef SIGUSR2 +#if defined (SIGUSR2) m.assign ("USR2", SIGUSR2); #endif -#ifdef SIGVTALRM +#if defined (SIGVTALRM) m.assign ("VTALRM", SIGVTALRM); #endif -#ifdef SIGWINCH +#if defined (SIGWINCH) m.assign ("WINCH", SIGWINCH); #endif -#ifdef SIGXCPU +#if defined (SIGXCPU) m.assign ("XCPU", SIGXCPU); #endif -#ifdef SIGXFSZ +#if defined (SIGXFSZ) m.assign ("XFSZ", SIGXFSZ); #endif
--- a/libinterp/corefcn/sighandlers.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/sighandlers.h Tue May 17 12:09:30 2016 -0400 @@ -50,11 +50,11 @@ struct octave_interrupt_handler { -#ifdef SIGINT +#if defined (SIGINT) sig_handler *int_handler; #endif -#ifdef SIGBREAK +#if defined (SIGBREAK) sig_handler *brk_handler; #endif };
--- a/libinterp/corefcn/siglist.c Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/siglist.c Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) #include "config.h" #endif @@ -34,7 +34,7 @@ static char *my_sys_siglist[NSIG]; -#ifdef sys_siglist +#if defined (sys_siglist) #undef sys_siglist #endif #define sys_siglist my_sys_siglist @@ -52,166 +52,166 @@ { initialized = 1; -# ifdef SIGABRT +# if defined (SIGABRT) sys_siglist[SIGABRT] = "Aborted"; # endif -# ifdef SIGAIO +# if defined (SIGAIO) sys_siglist[SIGAIO] = "LAN I/O interrupt"; # endif -# ifdef SIGALRM +# if defined (SIGALRM) sys_siglist[SIGALRM] = "Alarm clock"; # endif -# ifdef SIGBUS +# if defined (SIGBUS) sys_siglist[SIGBUS] = "Bus error"; # endif -# ifdef SIGCLD +# if defined (SIGCLD) sys_siglist[SIGCLD] = "Child status changed"; # endif -# ifdef SIGCHLD +# if defined (SIGCHLD) sys_siglist[SIGCHLD] = "Child status changed"; # endif -# ifdef SIGCONT +# if defined (SIGCONT) sys_siglist[SIGCONT] = "Continued"; # endif -# ifdef SIGDANGER +# if defined (SIGDANGER) sys_siglist[SIGDANGER] = "Swap space dangerously low"; # endif -# ifdef SIGDGNOTIFY +# if defined (SIGDGNOTIFY) sys_siglist[SIGDGNOTIFY] = "Notification message in queue"; # endif -# ifdef SIGEMT +# if defined (SIGEMT) sys_siglist[SIGEMT] = "Emulation trap"; # endif -# ifdef SIGFPE +# if defined (SIGFPE) sys_siglist[SIGFPE] = "Arithmetic exception"; # endif -# ifdef SIGFREEZE +# if defined (SIGFREEZE) sys_siglist[SIGFREEZE] = "SIGFREEZE"; # endif -# ifdef SIGGRANT +# if defined (SIGGRANT) sys_siglist[SIGGRANT] = "Monitor mode granted"; # endif -# ifdef SIGHUP +# if defined (SIGHUP) sys_siglist[SIGHUP] = "Hangup"; # endif -# ifdef SIGILL +# if defined (SIGILL) sys_siglist[SIGILL] = "Illegal instruction"; # endif -# ifdef SIGINT +# if defined (SIGINT) sys_siglist[SIGINT] = "Interrupt"; # endif -# ifdef SIGIO +# if defined (SIGIO) sys_siglist[SIGIO] = "I/O possible"; # endif -# ifdef SIGIOINT +# if defined (SIGIOINT) sys_siglist[SIGIOINT] = "I/O intervention required"; # endif -# ifdef SIGIOT +# if defined (SIGIOT) sys_siglist[SIGIOT] = "IOT trap"; # endif -# ifdef SIGKILL +# if defined (SIGKILL) sys_siglist[SIGKILL] = "Killed"; # endif -# ifdef SIGLOST +# if defined (SIGLOST) sys_siglist[SIGLOST] = "Resource lost"; # endif -# ifdef SIGLWP +# if defined (SIGLWP) sys_siglist[SIGLWP] = "SIGLWP"; # endif -# ifdef SIGMSG +# if defined (SIGMSG) sys_siglist[SIGMSG] = "Monitor mode data available"; # endif -# ifdef SIGPHONE +# if defined (SIGPHONE) sys_siglist[SIGPHONE] = "SIGPHONE"; # endif -# ifdef SIGPIPE +# if defined (SIGPIPE) sys_siglist[SIGPIPE] = "Broken pipe"; # endif -# ifdef SIGPOLL +# if defined (SIGPOLL) sys_siglist[SIGPOLL] = "Pollable event occurred"; # endif -# ifdef SIGPROF +# if defined (SIGPROF) sys_siglist[SIGPROF] = "Profiling timer expired"; # endif -# ifdef SIGPTY +# if defined (SIGPTY) sys_siglist[SIGPTY] = "PTY I/O interrupt"; # endif -# ifdef SIGPWR +# if defined (SIGPWR) sys_siglist[SIGPWR] = "Power-fail restart"; # endif -# ifdef SIGQUIT +# if defined (SIGQUIT) sys_siglist[SIGQUIT] = "Quit"; # endif -# ifdef SIGRETRACT +# if defined (SIGRETRACT) sys_siglist[SIGRETRACT] = "Need to relinguish monitor mode"; # endif -# ifdef SIGSAK +# if defined (SIGSAK) sys_siglist[SIGSAK] = "Secure attention"; # endif -# ifdef SIGSEGV +# if defined (SIGSEGV) sys_siglist[SIGSEGV] = "Segmentation violation"; # endif -# ifdef SIGSOUND +# if defined (SIGSOUND) sys_siglist[SIGSOUND] = "Sound completed"; # endif -# ifdef SIGSTKFLT +# if defined (SIGSTKFLT) sys_siglist[SIGSTKFLT] = "Stack fault"; # endif -# ifdef SIGSTOP +# if defined (SIGSTOP) sys_siglist[SIGSTOP] = "Stopped (signal)"; # endif -# ifdef SIGSTP +# if defined (SIGSTP) sys_siglist[SIGSTP] = "Stopped (user)"; # endif -# ifdef SIGSYS +# if defined (SIGSYS) sys_siglist[SIGSYS] = "Bad argument to system call"; # endif -# ifdef SIGTERM +# if defined (SIGTERM) sys_siglist[SIGTERM] = "Terminated"; # endif -# ifdef SIGTHAW +# if defined (SIGTHAW) sys_siglist[SIGTHAW] = "SIGTHAW"; # endif -# ifdef SIGTRAP +# if defined (SIGTRAP) sys_siglist[SIGTRAP] = "Trace/breakpoint trap"; # endif -# ifdef SIGTSTP +# if defined (SIGTSTP) sys_siglist[SIGTSTP] = "Stopped (user)"; # endif -# ifdef SIGTTIN +# if defined (SIGTTIN) sys_siglist[SIGTTIN] = "Stopped (tty input)"; # endif -# ifdef SIGTTOU +# if defined (SIGTTOU) sys_siglist[SIGTTOU] = "Stopped (tty output)"; # endif -# ifdef SIGUNUSED +# if defined (SIGUNUSED) sys_siglist[SIGUNUSED] = "SIGUNUSED"; # endif -# ifdef SIGURG +# if defined (SIGURG) sys_siglist[SIGURG] = "Urgent I/O condition"; # endif -# ifdef SIGUSR1 +# if defined (SIGUSR1) sys_siglist[SIGUSR1] = "User defined signal 1"; # endif -# ifdef SIGUSR2 +# if defined (SIGUSR2) sys_siglist[SIGUSR2] = "User defined signal 2"; # endif -# ifdef SIGVTALRM +# if defined (SIGVTALRM) sys_siglist[SIGVTALRM] = "Virtual timer expired"; # endif -# ifdef SIGWAITING +# if defined (SIGWAITING) sys_siglist[SIGWAITING] = "Process's LWPs are blocked"; # endif -# ifdef SIGWINCH +# if defined (SIGWINCH) sys_siglist[SIGWINCH] = "Window size changed"; # endif -# ifdef SIGWIND +# if defined (SIGWIND) sys_siglist[SIGWIND] = "SIGWIND"; # endif -# ifdef SIGXCPU +# if defined (SIGXCPU) sys_siglist[SIGXCPU] = "CPU time limit exceeded"; # endif -# ifdef SIGXFSZ +# if defined (SIGXFSZ) sys_siglist[SIGXFSZ] = "File size limit exceeded"; # endif }
--- a/libinterp/corefcn/siglist.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/siglist.h Tue May 17 12:09:30 2016 -0400 @@ -25,7 +25,7 @@ #include "octave-config.h" -#ifdef __cplusplus +#if defined (__cplusplus) extern "C" { #endif @@ -42,7 +42,7 @@ extern char *strsignal (int); #endif -#ifdef __cplusplus +#if defined (__cplusplus) } #endif
--- a/libinterp/corefcn/sparse-xdiv.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/sparse-xdiv.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/sparse-xpow.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/sparse-xpow.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/sparse.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/sparse.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/spparms.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/spparms.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/sqrtm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/sqrtm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/str2double.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/str2double.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/strfind.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/strfind.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/strfns.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/strfns.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/sub2ind.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/sub2ind.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/svd.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/svd.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/sylvester.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/sylvester.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ // Author: A. S. Hodel <scotte@eng.auburn.edu> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/symtab.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/symtab.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/syscalls.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/syscalls.cc Tue May 17 12:09:30 2016 -0400 @@ -26,7 +26,7 @@ // // mkfifo unlink waitpid -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/sysdep.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/sysdep.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -89,7 +89,7 @@ #include "utils.h" #include "file-stat.h" -#ifndef STDIN_FILENO +#if ! defined (STDIN_FILENO) # define STDIN_FILENO 1 #endif @@ -99,7 +99,7 @@ { # if defined (HAVE_FLOATINGPOINT_H) // Disable trapping on common exceptions. -# ifndef FP_X_DNML +# if ! defined (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)); @@ -119,7 +119,7 @@ std::string bin_dir; HANDLE h = CreateToolhelp32Snapshot (TH32CS_SNAPMODULE -#ifdef TH32CS_SNAPMODULE32 +#if defined (TH32CS_SNAPMODULE32) | TH32CS_SNAPMODULE32 #endif , 0); @@ -250,7 +250,7 @@ bool same_file_internal (const std::string& file1, const std::string& file2) { -#ifdef OCTAVE_USE_WINDOWS_API +#if defined (OCTAVE_USE_WINDOWS_API) bool retval = false;
--- a/libinterp/corefcn/text-renderer.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/text-renderer.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) #include "config.h" #endif
--- a/libinterp/corefcn/time.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/time.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/toplev.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/toplev.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -82,7 +82,7 @@ #include "variables.h" #include "version.h" -#ifndef SHELL_PATH +#if ! defined (SHELL_PATH) # define SHELL_PATH "/bin/sh" #endif @@ -777,7 +777,7 @@ << std::endl; } -#ifdef DBSTOP_NANINF +#if defined (DBSTOP_NANINF) if (Vdebug_on_naninf) { if (setjump (naninf_jump) != 0) @@ -1171,7 +1171,7 @@ if (type == et_async) { // FIXME: maybe this should go in sysdep.cc? -#ifdef HAVE_FORK +#if defined (HAVE_FORK) pid_t pid = fork (); if (pid < 0)
--- a/libinterp/corefcn/tril.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/tril.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/tsearch.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/tsearch.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ // Author: Andreas Stahel <Andreas.Stahel@hta-bi.bfh.ch> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/txt-eng.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/txt-eng.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/typecast.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/typecast.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/urlwrite.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/urlwrite.cc Tue May 17 12:09:30 2016 -0400 @@ -25,7 +25,7 @@ // Author: Alexander Barth <abarth@marine.usf.edu> // Adapted-By: jwe -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/utils.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/utils.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/variables.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/variables.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/xdiv.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/xdiv.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/xgl2ps.c Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/xgl2ps.c Tue May 17 12:09:30 2016 -0400 @@ -23,7 +23,7 @@ /* Wrapper for "imported" file gl2ps.c so that config.h will be included before any other system or gnulib headers. */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) #include "config.h" #endif
--- a/libinterp/corefcn/xnorm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/xnorm.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ // author: Jaroslav Hajek <highegg@gmail.com> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/xpow.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/xpow.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/corefcn/zfstream.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/zfstream.cc Tue May 17 12:09:30 2016 -0400 @@ -31,7 +31,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -39,7 +39,7 @@ #include "zfstream.h" -#ifdef HAVE_ZLIB +#if defined (HAVE_ZLIB) // For strcpy, strcat, strlen (mode strings). #include <cstring>
--- a/libinterp/corefcn/zfstream.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/zfstream.h Tue May 17 12:09:30 2016 -0400 @@ -35,7 +35,7 @@ #include "octave-config.h" -#ifdef HAVE_ZLIB +#if defined (HAVE_ZLIB) #include <iosfwd>
--- a/libinterp/dldfcn/__delaunayn__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/__delaunayn__.cc Tue May 17 12:09:30 2016 -0400 @@ -38,7 +38,7 @@ * change the default options (for compatibility with matlab) */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/dldfcn/__eigs__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/__eigs__.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -149,7 +149,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifdef HAVE_ARPACK +#if defined (HAVE_ARPACK) int nargin = args.length ();
--- a/libinterp/dldfcn/__fltk_uigetfile__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/__fltk_uigetfile__.cc Tue May 17 12:09:30 2016 -0400 @@ -20,13 +20,13 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif -#ifdef HAVE_FLTK +#if defined (HAVE_FLTK) -#ifdef WIN32 +#if defined (WIN32) # define WIN32_LEAN_AND_MEAN #endif @@ -51,7 +51,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifdef HAVE_FLTK +#if defined (HAVE_FLTK) // Expected argument list: //
--- a/libinterp/dldfcn/__glpk__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/__glpk__.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/dldfcn/__init_fltk__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/__init_fltk__.cc Tue May 17 12:09:30 2016 -0400 @@ -32,7 +32,7 @@ // PKG_ADD: if (__have_feature__ ("FLTK") && __have_feature__ ("OPENGL") && have_window_system ()) register_graphics_toolkit ("fltk"); endif -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -43,7 +43,7 @@ #include "oct-opengl.h" #include "ov-fcn-handle.h" -#ifdef HAVE_FLTK +#if defined (HAVE_FLTK) #if defined (HAVE_X_WINDOWS) # include <X11/Xlib.h> @@ -2396,7 +2396,7 @@ Undocumented internal function. Calls Fl::check ()\n\ @end deftypefn") { -#ifdef HAVE_FLTK +#if defined (HAVE_FLTK) Fl::check (); if (Vdrawnow_requested) @@ -2416,7 +2416,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifdef HAVE_FLTK +#if defined (HAVE_FLTK) if (! display_info::display_available ()) error ("__init_fltk__: no graphics DISPLAY available"); else if (! toolkit_loaded)
--- a/libinterp/dldfcn/__init_gnuplot__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/__init_gnuplot__.cc Tue May 17 12:09:30 2016 -0400 @@ -29,7 +29,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/dldfcn/__osmesa_print__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/__osmesa_print__.cc Tue May 17 12:09:30 2016 -0400 @@ -23,7 +23,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/dldfcn/__voronoi__.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/__voronoi__.cc Tue May 17 12:09:30 2016 -0400 @@ -30,7 +30,7 @@ qhull command */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/dldfcn/amd.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/amd.cc Tue May 17 12:09:30 2016 -0400 @@ -23,7 +23,7 @@ // This is the octave interface to amd, which bore the copyright given // in the help of the functions. -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -85,7 +85,7 @@ @seealso{symamd, colamd}\n\ @end deftypefn") { -#ifdef HAVE_AMD +#if defined (HAVE_AMD) int nargin = args.length ();
--- a/libinterp/dldfcn/audiodevinfo.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/audiodevinfo.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -101,7 +101,7 @@ recording using those parameters.\n\ @end deftypefn") { -#ifdef HAVE_PORTAUDIO +#if defined (HAVE_PORTAUDIO) int nargin = args.length (); @@ -449,7 +449,7 @@ %! endfor */ -#ifdef HAVE_PORTAUDIO +#if defined (HAVE_PORTAUDIO) enum audio_type { TYPE_INT8, TYPE_UINT8, TYPE_UINT16, TYPE_DOUBLE }; @@ -1812,7 +1812,7 @@ { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_audiorecorder__", @@ -1852,7 +1852,7 @@ return retval; } -#ifdef HAVE_PORTAUDIO +#if defined (HAVE_PORTAUDIO) static audiorecorder * get_recorder (const octave_value& ov) @@ -1877,7 +1877,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_getaudiodata__", @@ -1895,7 +1895,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_get_channels__", @@ -1913,7 +1913,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_get_fs__", @@ -1931,7 +1931,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_get_id__", @@ -1949,7 +1949,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_get_nbits__", @@ -1967,7 +1967,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_get_sample_number__", @@ -1985,7 +1985,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_get_tag__", @@ -2003,7 +2003,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_get_total_samples__", @@ -2021,7 +2021,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_get_userdata__", @@ -2039,7 +2039,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_isrecording__", @@ -2056,7 +2056,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_pause__", @@ -2073,7 +2073,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_recordblocking__", @@ -2092,7 +2092,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_record__", @@ -2114,7 +2114,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_resume__", @@ -2132,7 +2132,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_set_fs__", @@ -2150,7 +2150,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_set_tag__", @@ -2168,7 +2168,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_set_userdata__", @@ -2186,7 +2186,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__recorder_stop__", @@ -2207,7 +2207,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_audioplayer__", @@ -2252,7 +2252,7 @@ return retval; } -#ifdef HAVE_PORTAUDIO +#if defined (HAVE_PORTAUDIO) static audioplayer * get_player (const octave_value& ov) @@ -2277,7 +2277,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_get_channels__", @@ -2296,7 +2296,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_get_fs__", @@ -2315,7 +2315,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_get_id__", @@ -2334,7 +2334,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_get_nbits__", @@ -2353,7 +2353,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_get_sample_number__", @@ -2372,7 +2372,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_get_tag__", @@ -2391,7 +2391,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_get_total_samples__", @@ -2410,7 +2410,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_get_userdata__", @@ -2429,7 +2429,7 @@ @end deftypefn") { octave_value retval; -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_isplaying__", @@ -2447,7 +2447,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_pause__", @@ -2467,7 +2467,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_playblocking__", @@ -2521,7 +2521,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_play__", @@ -2573,7 +2573,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_resume__", @@ -2591,7 +2591,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_set_fs__", @@ -2609,7 +2609,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_set_tag__", @@ -2627,7 +2627,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_set_userdata__", @@ -2645,7 +2645,7 @@ Undocumented internal function.\n\ @end deftypefn") { -#ifndef HAVE_PORTAUDIO +#if ! defined (HAVE_PORTAUDIO) octave_unused_parameter (args); err_disabled_feature ("__player_stop__",
--- a/libinterp/dldfcn/audioread.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/audioread.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -40,11 +40,11 @@ #include "pager.h" -#ifdef HAVE_SNDFILE +#if defined (HAVE_SNDFILE) # include <sndfile.h> #endif -#ifdef HAVE_SNDFILE +#if defined (HAVE_SNDFILE) static void safe_close (SNDFILE *file) @@ -75,7 +75,7 @@ is stored in the audio file.\n\ @end deftypefn") { -#ifdef HAVE_SNDFILE +#if defined (HAVE_SNDFILE) int nargin = args.length (); @@ -186,7 +186,7 @@ #endif } -#ifdef HAVE_SNDFILE +#if defined (HAVE_SNDFILE) static int extension_to_format (const std::string& ext) @@ -267,7 +267,7 @@ @end table\n\ @end deftypefn") { -#ifdef HAVE_SNDFILE +#if defined (HAVE_SNDFILE) int nargin = args.length (); @@ -448,7 +448,7 @@ Return information about an audio file specified by @var{filename}.\n\ @end deftypefn") { -#ifdef HAVE_SNDFILE +#if defined (HAVE_SNDFILE) if (args.length () != 1) print_usage (); @@ -519,7 +519,7 @@ #endif } -#ifdef HAVE_SNDFILE +#if defined (HAVE_SNDFILE) static void audio_sub_formats (int format) @@ -555,7 +555,7 @@ with names that start with @var{format}.\n\ @end deftypefn") { -#ifdef HAVE_SNDFILE +#if defined (HAVE_SNDFILE) if (args.length () > 1) print_usage ();
--- a/libinterp/dldfcn/ccolamd.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/ccolamd.cc Tue May 17 12:09:30 2016 -0400 @@ -23,7 +23,7 @@ // This is the octave interface to ccolamd, which bore the copyright given // in the help of the functions. -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -144,7 +144,7 @@ @seealso{colamd, csymamd}\n\ @end deftypefn") { -#ifdef HAVE_CCOLAMD +#if defined (HAVE_CCOLAMD) int nargin = args.length ();
--- a/libinterp/dldfcn/chol.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/chol.cc Tue May 17 12:09:30 2016 -0400 @@ -23,7 +23,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/dldfcn/colamd.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/colamd.cc Tue May 17 12:09:30 2016 -0400 @@ -24,7 +24,7 @@ // This is the octave interface to colamd, which bore the copyright given // in the help of the functions. -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -278,7 +278,7 @@ @seealso{colperm, symamd, ccolamd}\n\ @end deftypefn") { -#ifdef HAVE_COLAMD +#if defined (HAVE_COLAMD) int nargin = args.length (); @@ -516,7 +516,7 @@ @seealso{colperm, colamd}\n\ @end deftypefn") { -#ifdef HAVE_COLAMD +#if defined (HAVE_COLAMD) int nargin = args.length ();
--- a/libinterp/dldfcn/convhulln.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/convhulln.cc Tue May 17 12:09:30 2016 -0400 @@ -29,7 +29,7 @@ * guaranteed to be simplicial. */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/dldfcn/dmperm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/dmperm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/dldfcn/fftw.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/fftw.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/dldfcn/qr.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/qr.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/dldfcn/symbfact.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/symbfact.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -102,7 +102,7 @@ @seealso{chol, etree, treelayout}\n\ @end deftypefn") { -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) int nargin = args.length ();
--- a/libinterp/dldfcn/symrcm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/dldfcn/symrcm.cc Tue May 17 12:09:30 2016 -0400 @@ -50,7 +50,7 @@ <weitzel@@ldknet.org> */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/liboctinterp-build-info.in.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/liboctinterp-build-info.in.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/mkbuiltins Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/mkbuiltins Tue May 17 12:09:30 2016 -0400 @@ -75,7 +75,7 @@ cat << \EOF // DO NOT EDIT! Generated automatically by mkbuiltins. -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) #include "config.h" #endif @@ -86,22 +86,22 @@ #include "builtins.h" #if defined (quad) -#undef quad +# undef quad #endif #if defined (ENABLE_DYNAMIC_LINKING) -#define XDEFUN_DLD_INTERNAL(name, args_name, nargout_name, doc) +# define XDEFUN_DLD_INTERNAL(name, args_name, nargout_name, doc) -#define XDEFUNX_DLD_INTERNAL(name, fname, args_name, nargout_name, doc) +# define XDEFUNX_DLD_INTERNAL(name, fname, args_name, nargout_name, doc) #else -#define XDEFUN_DLD_INTERNAL(name, args_name, nargout_name, doc) \ - XDEFUN_INTERNAL(name, args_name, nargout_name, doc) +# define XDEFUN_DLD_INTERNAL(name, args_name, nargout_name, doc) \ + XDEFUN_INTERNAL(name, args_name, nargout_name, doc) -#define XDEFUNX_DLD_INTERNAL(name, fname, args_name, nargout_name, doc) \ - XDEFUNX_INTERNAL(name, fname, args_name, nargout_name, doc) +# define XDEFUNX_DLD_INTERNAL(name, fname, args_name, nargout_name, doc) \ + XDEFUNX_INTERNAL(name, fname, args_name, nargout_name, doc) #endif
--- a/libinterp/mkops Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/mkops Tue May 17 12:09:30 2016 -0400 @@ -23,7 +23,7 @@ cat << \EOF // DO NOT EDIT! Generated automatically by mkops. -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) #include "config.h" #endif
--- a/libinterp/octave-value/ov-base.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-base.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-bool-mat.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-bool-mat.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-bool-sparse.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-bool-sparse.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-bool.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-bool.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-builtin.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-builtin.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-cell.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-cell.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-ch-mat.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-ch-mat.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -183,7 +183,7 @@ // functions are int (*) (int), even in C++. Wicked! static inline int xisascii (int c) { -#ifdef HAVE_ISASCII +#if defined (HAVE_ISASCII) return isascii (c); #else return (c >= 0x00 && c <= 0x7f); @@ -192,7 +192,7 @@ static inline int xtoascii (int c) { -#ifdef HAVE_TOASCII +#if defined (HAVE_TOASCII) return toascii (c); #else return (c & 0x7F);
--- a/libinterp/octave-value/ov-class.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-class.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-classdef.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-classdef.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-colon.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-colon.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-complex.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-complex.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-cs-list.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-cs-list.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-cx-diag.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-cx-diag.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-cx-mat.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-cx-mat.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-cx-sparse.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-cx-sparse.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-dld-fcn.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-dld-fcn.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-fcn-handle.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-fcn-handle.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-fcn-inline.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-fcn-inline.cc Tue May 17 12:09:30 2016 -0400 @@ -24,7 +24,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-fcn.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-fcn.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-float.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-float.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-flt-complex.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-flt-complex.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-flt-cx-diag.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-flt-cx-diag.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-flt-cx-mat.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-flt-cx-mat.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-flt-re-diag.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-flt-re-diag.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-flt-re-mat.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-flt-re-mat.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-int16.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-int16.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-int32.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-int32.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-int64.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-int64.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-int8.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-int8.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-java.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-java.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -280,7 +280,7 @@ std::list<std::string> java_opts; }; -#ifdef __WIN32__ +#if defined (__WIN32__) static std::string read_registry_string (const std::string& key, const std::string& value) @@ -508,7 +508,7 @@ return retval; } -#ifndef _FPU_DEFAULT +#if ! defined (_FPU_DEFAULT) # if defined __i386__ || defined __x86_64__ # define _FPU_DEFAULT 0x037f # else
--- a/libinterp/octave-value/ov-lazy-idx.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-lazy-idx.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-mex-fcn.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-mex-fcn.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-null-mat.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-null-mat.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-oncleanup.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-oncleanup.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-perm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-perm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-range.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-range.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-re-diag.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-re-diag.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-re-mat.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-re-mat.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-re-sparse.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-re-sparse.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-scalar.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-scalar.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-str-mat.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-str-mat.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-struct.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-struct.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-typeinfo.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-typeinfo.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-uint16.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-uint16.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-uint32.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-uint32.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-uint64.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-uint64.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-uint8.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-uint8.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ov-usr-fcn.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-usr-fcn.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -192,7 +192,7 @@ class_constructor (none), class_method (false), parent_scope (-1), local_scope (sid), curr_unwind_protect_frame (0) -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) , jit_info (0) #endif { @@ -214,7 +214,7 @@ delete lead_comm; delete trail_comm; -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) delete jit_info; #endif @@ -485,7 +485,7 @@ panic_impossible (); } -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) if (is_special_expr () && tree_jit::execute (*this, args, retval)) return retval;
--- a/libinterp/octave-value/ov-usr-fcn.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov-usr-fcn.h Tue May 17 12:09:30 2016 -0400 @@ -46,7 +46,7 @@ class tree_expression; class tree_walker; -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) class jit_function_info; #endif @@ -405,7 +405,7 @@ return false; } -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) jit_function_info *get_info (void) { return jit_info; } void stash_info (jit_function_info *info) { jit_info = info; } @@ -500,7 +500,7 @@ // pointer to the current unwind_protect frame of this function. unwind_protect *curr_unwind_protect_frame; -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) jit_function_info *jit_info; #endif
--- a/libinterp/octave-value/ov.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ov.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave-value/ovl.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave-value/ovl.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ // Born February 20, 1992. -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/octave.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/octave.h Tue May 17 12:09:30 2016 -0400 @@ -25,7 +25,7 @@ #include "octave-config.h" -#ifdef __cplusplus +#if defined (__cplusplus) extern "C" { #endif @@ -45,7 +45,7 @@ extern OCTINTERP_API int octave_starting_gui (void); extern OCTINTERP_API int octave_fork_gui (void); -#ifdef __cplusplus +#if defined (__cplusplus) } #endif
--- a/libinterp/operators/op-b-b.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-b-b.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-b-bm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-b-bm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-b-sbm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-b-sbm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-bm-b.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-bm-b.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-bm-bm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-bm-bm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-bm-sbm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-bm-sbm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cdm-cdm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cdm-cdm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cdm-cm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cdm-cm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cdm-dm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cdm-dm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cdm-m.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cdm-m.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cell.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cell.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-chm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-chm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-class.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-class.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cm-cdm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cm-cdm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cm-cm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cm-cm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cm-cs.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cm-cs.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cm-dm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cm-dm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cm-m.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cm-m.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cm-s.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cm-s.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cm-scm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cm-scm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cm-sm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cm-sm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cs-cm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cs-cm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cs-cs.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cs-cs.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cs-m.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cs-m.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cs-s.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cs-s.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cs-scm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cs-scm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-cs-sm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-cs-sm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-dm-cdm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-dm-cdm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-dm-cm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-dm-cm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-dm-dm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-dm-dm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-dm-m.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-dm-m.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-dm-scm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-dm-scm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-dm-sm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-dm-sm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-dm-template.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-dm-template.cc Tue May 17 12:09:30 2016 -0400 @@ -32,7 +32,7 @@ #include "xdiv.h" #include LINCLUDE #include RINCLUDE -#ifdef DEFINENULLASSIGNCONV +#if defined (DEFINENULLASSIGNCONV) # include "ov-null-mat.h" #endif @@ -42,11 +42,11 @@ DEFBINOP_OP (sub, LMATRIX, RMATRIX, -) DEFBINOP_OP (mul, LMATRIX, RMATRIX, *) -#ifndef LDMATRIX +#if ! defined (LDMATRIX) # define LDMATRIX LMATRIX #endif -#ifndef RDMATRIX +#if ! defined (RDMATRIX) # define RDMATRIX RMATRIX #endif @@ -58,7 +58,7 @@ #define LDMATRIX_VALUE CONCAT2(LDMATRIX, _value) #define RDMATRIX_VALUE CONCAT2(RDMATRIX, _value) -#ifdef DEFINEDIV +#if defined (DEFINEDIV) DEFBINOP (div, LMATRIX, RMATRIX) { const OCTAVE_LMATRIX& v1 = dynamic_cast<const OCTAVE_LMATRIX&> (a1); @@ -68,7 +68,7 @@ } #endif -#ifdef DEFINELDIV +#if defined (DEFINELDIV) DEFBINOP (ldiv, LMATRIX, RMATRIX) { const OCTAVE_LMATRIX& v1 = dynamic_cast<const OCTAVE_LMATRIX&> (a1); @@ -87,13 +87,13 @@ INSTALL_BINOP (op_add, OCTAVE_LMATRIX, OCTAVE_RMATRIX, add); INSTALL_BINOP (op_sub, OCTAVE_LMATRIX, OCTAVE_RMATRIX, sub); INSTALL_BINOP (op_mul, OCTAVE_LMATRIX, OCTAVE_RMATRIX, mul); -#ifdef DEFINEDIV +#if defined (DEFINEDIV) INSTALL_BINOP (op_div, OCTAVE_LMATRIX, OCTAVE_RMATRIX, div); #endif -#ifdef DEFINELDIV +#if defined (DEFINELDIV) INSTALL_BINOP (op_ldiv, OCTAVE_LMATRIX, OCTAVE_RMATRIX, ldiv); #endif -#ifdef DEFINENULLASSIGNCONV +#if defined (DEFINENULLASSIGNCONV) INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_matrix, OCTAVE_LDMATRIX); INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_str, OCTAVE_LDMATRIX); INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_sq_str, OCTAVE_LDMATRIX);
--- a/libinterp/operators/op-dms-template.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-dms-template.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -32,11 +32,11 @@ // matrix by diag matrix ops. -#ifndef SCALARV +#if ! defined (SCALARV) # define SCALARV SCALAR #endif -#ifndef MATRIXV +#if ! defined (MATRIXV) # define MATRIXV MATRIX #endif
--- a/libinterp/operators/op-double-conv.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-double-conv.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fcdm-fcdm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fcdm-fcdm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fcdm-fcm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fcdm-fcm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fcdm-fdm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fcdm-fdm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fcdm-fm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fcdm-fm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fcm-fcdm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fcm-fcdm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fcm-fcm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fcm-fcm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fcm-fcs.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fcm-fcs.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fcm-fdm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fcm-fdm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fcm-fm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fcm-fm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fcm-fs.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fcm-fs.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fcn.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fcn.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fcs-fcm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fcs-fcm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fcs-fcs.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fcs-fcs.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fcs-fm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fcs-fm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fcs-fs.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fcs-fs.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fdm-fcdm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fdm-fcdm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fdm-fcm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fdm-fcm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fdm-fdm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fdm-fdm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fdm-fm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fdm-fm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-float-conv.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-float-conv.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fm-fcdm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fm-fcdm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fm-fcm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fm-fcm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fm-fcs.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fm-fcs.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fm-fdm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fm-fdm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fm-fm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fm-fm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fm-fs.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fm-fs.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fs-fcm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fs-fcm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fs-fcs.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fs-fcs.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fs-fm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fs-fm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-fs-fs.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-fs-fs.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-i16-i16.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-i16-i16.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-i32-i32.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-i32-i32.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-i64-i64.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-i64-i64.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-i8-i8.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-i8-i8.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-int-concat.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-int-concat.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-int-conv.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-int-conv.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-m-cdm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-m-cdm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-m-cm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-m-cm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-m-cs.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-m-cs.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-m-dm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-m-dm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-m-m.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-m-m.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-m-s.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-m-s.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-m-scm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-m-scm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-m-sm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-m-sm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-pm-pm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-pm-pm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-pm-scm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-pm-scm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-pm-sm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-pm-sm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-pm-template.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-pm-template.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -31,18 +31,18 @@ #include "ov-perm.h" #include MINCLUDE #include "ops.h" -#ifdef DEFINENULLASSIGNCONV +#if defined (DEFINENULLASSIGNCONV) # include "ov-null-mat.h" #endif -#ifndef LDMATRIX +#if ! defined (LDMATRIX) # define LDMATRIX LMATRIX #endif #define OCTAVE_LMATRIX CONCAT2(octave_, LMATRIX) #define OCTAVE_LDMATRIX CONCAT2(octave_, LDMATRIX) #define OCTAVE_RMATRIX CONCAT2(octave_, RMATRIX) -#ifdef LEFT +#if defined (LEFT) # define LMATRIX_VALUE perm_matrix_value # define RMATRIX_VALUE CONCAT2(RMATRIX, _value) #else @@ -58,7 +58,7 @@ return v1.LMATRIX_VALUE () * v2.RMATRIX_VALUE (); } -#ifdef LEFT +#if defined (LEFT) DEFBINOP (ldiv, LMATRIX, RMATRIX) { const OCTAVE_LMATRIX& v1 = dynamic_cast<const OCTAVE_LMATRIX&> (a1); @@ -84,12 +84,12 @@ INST_NAME (void) { INSTALL_BINOP (op_mul, OCTAVE_LMATRIX, OCTAVE_RMATRIX, mul); -#ifdef LEFT +#if defined (LEFT) INSTALL_BINOP (op_ldiv, OCTAVE_LMATRIX, OCTAVE_RMATRIX, ldiv); #else INSTALL_BINOP (op_div, OCTAVE_LMATRIX, OCTAVE_RMATRIX, div); #endif -#ifdef DEFINENULLASSIGNCONV +#if defined (DEFINENULLASSIGNCONV) INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_matrix, OCTAVE_LDMATRIX); INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_str, OCTAVE_LDMATRIX); INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_sq_str, OCTAVE_LDMATRIX);
--- a/libinterp/operators/op-range.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-range.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-s-cm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-s-cm.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-s-cs.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-s-cs.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-s-m.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-s-m.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-s-s.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-s-s.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-s-scm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-s-scm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-s-sm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-s-sm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-sbm-b.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-sbm-b.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-sbm-bm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-sbm-bm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-sbm-sbm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-sbm-sbm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-scm-cm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-scm-cm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-scm-cs.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-scm-cs.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-scm-m.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-scm-m.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-scm-s.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-scm-s.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-scm-scm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-scm-scm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-scm-sm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-scm-sm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-sm-cm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-sm-cm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-sm-cs.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-sm-cs.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-sm-m.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-sm-m.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-sm-s.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-sm-s.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-sm-scm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-sm-scm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-sm-sm.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-sm-sm.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-str-m.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-str-m.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-str-s.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-str-s.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-str-str.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-str-str.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-struct.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-struct.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-ui16-ui16.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-ui16-ui16.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-ui32-ui32.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-ui32-ui32.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-ui64-ui64.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-ui64-ui64.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/operators/op-ui8-ui8.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/operators/op-ui8-ui8.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/lex.ll Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/lex.ll Tue May 17 12:09:30 2016 -0400 @@ -32,7 +32,7 @@ */ %top { -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) #include "config.h" #endif @@ -50,7 +50,7 @@ // Define away the deprecated register storage class specifier to avoid // potential warnings about it. #if ! defined (register) -#define register +# define register #endif } @@ -128,18 +128,18 @@ // in the generated oct-parse.h file. #if defined (OCTAVE_STYPE_IS_DECLARED) && ! defined YYSTYPE -#define YYSTYPE OCTAVE_STYPE +# define YYSTYPE OCTAVE_STYPE #endif #if defined (GNULIB_NAMESPACE) // Calls to the following functions appear in the generated output from // flex without the namespace tag. Redefine them so we will use them // via the gnulib namespace. -#define fprintf GNULIB_NAMESPACE::fprintf -#define fwrite GNULIB_NAMESPACE::fwrite -#define isatty GNULIB_NAMESPACE::isatty -#define malloc GNULIB_NAMESPACE::malloc -#define realloc GNULIB_NAMESPACE::realloc +# define fprintf GNULIB_NAMESPACE::fprintf +# define fwrite GNULIB_NAMESPACE::fwrite +# define isatty GNULIB_NAMESPACE::isatty +# define malloc GNULIB_NAMESPACE::malloc +# define realloc GNULIB_NAMESPACE::realloc #endif #if ! (defined (FLEX_SCANNER) \ @@ -153,16 +153,16 @@ // Arrange to get input via readline. -#ifdef YY_INPUT -#undef YY_INPUT +#if defined (YY_INPUT) +# undef YY_INPUT #endif #define YY_INPUT(buf, result, max_size) \ result = curr_lexer->fill_flex_buffer (buf, max_size) // Try to avoid crashing out completely on fatal scanner errors. -#ifdef YY_FATAL_ERROR -#undef YY_FATAL_ERROR +#if defined (YY_FATAL_ERROR) +# undef YY_FATAL_ERROR #endif #define YY_FATAL_ERROR(msg) \ (yyget_extra (yyscanner))->fatal_error (msg)
--- a/libinterp/parse-tree/oct-parse.in.yy Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/oct-parse.in.yy Tue May 17 12:09:30 2016 -0400 @@ -31,7 +31,7 @@ #define YYDEBUG 1 -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) #include "config.h" #endif @@ -93,9 +93,9 @@ // Calls to the following functions appear in the generated output from // Bison without the namespace tag. Redefine them so we will use them // via the gnulib namespace. -#define fclose GNULIB_NAMESPACE::fclose -#define fprintf GNULIB_NAMESPACE::fprintf -#define malloc GNULIB_NAMESPACE::malloc +# define fclose GNULIB_NAMESPACE::fclose +# define fprintf GNULIB_NAMESPACE::fprintf +# define malloc GNULIB_NAMESPACE::malloc #endif // TRUE means we printed messages about reading startup files.
--- a/libinterp/parse-tree/pt-arg-list.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-arg-list.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-array-list.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-array-list.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-assign.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-assign.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-binop.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-binop.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-bp.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-bp.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-cbinop.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-cbinop.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-cell.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-cell.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-check.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-check.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-classdef.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-classdef.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-cmd.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-cmd.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-colon.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-colon.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-const.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-const.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-decl.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-decl.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-eval.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-eval.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-except.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-except.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-exp.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-exp.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-fcn-handle.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-fcn-handle.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-funcall.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-funcall.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-id.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-id.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-idx.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-idx.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-jump.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-jump.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-loop.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-loop.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -50,7 +50,7 @@ delete list; delete lead_comm; delete trail_comm; -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) delete compiled; #endif } @@ -101,7 +101,7 @@ delete list; delete lead_comm; delete trail_comm; -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) delete compiled; #endif }
--- a/libinterp/parse-tree/pt-loop.h Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-loop.h Tue May 17 12:09:30 2016 -0400 @@ -50,7 +50,7 @@ tree_while_command (int l = -1, int c = -1) : tree_command (l, c), expr (0), list (0), lead_comm (0), trail_comm (0) -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) , compiled (0) #endif { } @@ -61,7 +61,7 @@ int l = -1, int c = -1) : tree_command (l, c), expr (e), list (0), lead_comm (lc), trail_comm (tc) -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) , compiled (0) #endif { } @@ -72,7 +72,7 @@ int l = -1, int c = -1) : tree_command (l, c), expr (e), list (lst), lead_comm (lc), trail_comm (tc) -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) , compiled (0) #endif { } @@ -92,7 +92,7 @@ void accept (tree_walker& tw); -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) // some functions use by tree_jit jit_info *get_info (void) const { @@ -121,7 +121,7 @@ private: -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) // compiled version of the loop jit_info *compiled; #endif @@ -181,7 +181,7 @@ tree_simple_for_command (int l = -1, int c = -1) : tree_command (l, c), parallel (false), lhs (0), expr (0), maxproc (0), list (0), lead_comm (0), trail_comm (0) -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) , compiled (0) #endif { } @@ -196,7 +196,7 @@ : tree_command (l, c), parallel (parallel_arg), lhs (le), expr (re), maxproc (maxproc_arg), list (lst), lead_comm (lc), trail_comm (tc) -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) , compiled (0) #endif { } @@ -222,7 +222,7 @@ void accept (tree_walker& tw); -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) // some functions use by tree_jit jit_info *get_info (void) const {
--- a/libinterp/parse-tree/pt-mat.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-mat.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-misc.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-misc.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-pr-code.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-pr-code.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-select.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-select.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-stmt.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-stmt.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt-unop.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt-unop.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/pt.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/pt.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/parse-tree/token.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/parse-tree/token.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/template-inst/Array-jit.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/template-inst/Array-jit.cc Tue May 17 12:09:30 2016 -0400 @@ -22,11 +22,11 @@ // Author: Max Brister <max@2bass.com> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif -#ifdef HAVE_LLVM +#if defined (HAVE_LLVM) #include "Array.h" #include "Array.cc" @@ -43,7 +43,7 @@ INSTANTIATE_ARRAY (jit_function, OCTINTERP_API); -#ifdef Cell_h +#if defined (Cell_h) # error Must not include Cell.h in Array-jit.h # error This causes problems on MSVC #endif
--- a/libinterp/template-inst/Array-tc.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/template-inst/Array-tc.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ // Instantiate Arrays of octave_values. -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/libinterp/version.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/version.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/Array-C.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/Array-C.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/Array-b.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/Array-b.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/Array-ch.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/Array-ch.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/Array-d.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/Array-d.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/Array-f.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/Array-f.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/Array-fC.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/Array-fC.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/Array-i.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/Array-i.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/Array-idx-vec.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/Array-idx-vec.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/Array-s.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/Array-s.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/Array-str.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/Array-str.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/Array-util.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/Array-util.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/Array-voidp.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/Array-voidp.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/Array.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/Array.cc Tue May 17 12:09:30 2016 -0400 @@ -266,7 +266,7 @@ Array<T>::column (octave_idx_type k) const { octave_idx_type r = dimensions(0); -#ifdef OCTAVE_ENABLE_BOUNDS_CHECK +#if defined (OCTAVE_ENABLE_BOUNDS_CHECK) if (k < 0 || k > dimensions.numel (1)) err_index_out_of_range (2, 2, k+1, dimensions.numel (1), dimensions); #endif @@ -281,7 +281,7 @@ octave_idx_type r = dimensions(0); octave_idx_type c = dimensions(1); octave_idx_type p = r*c; -#ifdef OCTAVE_ENABLE_BOUNDS_CHECK +#if defined (OCTAVE_ENABLE_BOUNDS_CHECK) if (k < 0 || k > dimensions.numel (2)) err_index_out_of_range (3, 3, k+1, dimensions.numel (2), dimensions); #endif @@ -293,7 +293,7 @@ Array<T> Array<T>::linear_slice (octave_idx_type lo, octave_idx_type up) const { -#ifdef OCTAVE_ENABLE_BOUNDS_CHECK +#if defined (OCTAVE_ENABLE_BOUNDS_CHECK) if (lo < 0) err_index_out_of_range (1, 1, lo+1, numel (), dimensions); if (up > numel ())
--- a/liboctave/array/CColVector.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/CColVector.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/CDiagMatrix.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/CDiagMatrix.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/CMatrix.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/CMatrix.cc Tue May 17 12:09:30 2016 -0400 @@ -23,7 +23,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/CNDArray.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/CNDArray.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/CRowVector.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/CRowVector.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/CSparse.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/CSparse.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -1142,7 +1142,7 @@ { ComplexDET retval; -#ifdef HAVE_UMFPACK +#if defined (HAVE_UMFPACK) octave_idx_type nr = rows (); octave_idx_type nc = cols (); @@ -5437,7 +5437,7 @@ void *Numeric = 0; err = 0; -#ifdef HAVE_UMFPACK +#if defined (HAVE_UMFPACK) // Setup the control parameters Control = Matrix (UMFPACK_CONTROL, 1); @@ -5579,7 +5579,7 @@ if (typ == MatrixType::Hermitian) { -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) cholmod_common Common; cholmod_common *cm = &Common; @@ -5714,7 +5714,7 @@ if (typ == MatrixType::Full) { -#ifdef HAVE_UMFPACK +#if defined (HAVE_UMFPACK) Matrix Control, Info; void *Numeric = factorize (err, rcond, Control, Info, sing_handler, calc_cond); @@ -5729,7 +5729,7 @@ const octave_idx_type *Ap = cidx (); const octave_idx_type *Ai = ridx (); const Complex *Ax = data (); -#ifdef UMFPACK_SEPARATE_SPLIT +#if defined (UMFPACK_SEPARATE_SPLIT) const double *Bx = b.fortran_vec (); OCTAVE_LOCAL_BUFFER (double, Bz, b_nr); for (octave_idx_type i = 0; i < b_nr; i++) @@ -5742,7 +5742,7 @@ for (octave_idx_type j = 0, iidx = 0; j < b_nc; j++, iidx += b_nr) { -#ifdef UMFPACK_SEPARATE_SPLIT +#if defined (UMFPACK_SEPARATE_SPLIT) status = UMFPACK_ZNAME (solve) (UMFPACK_A, Ap, Ai, reinterpret_cast<const double *> (Ax), @@ -5829,7 +5829,7 @@ if (typ == MatrixType::Hermitian) { -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) cholmod_common Common; cholmod_common *cm = &Common; @@ -5980,7 +5980,7 @@ if (typ == MatrixType::Full) { -#ifdef HAVE_UMFPACK +#if defined (HAVE_UMFPACK) Matrix Control, Info; void *Numeric = factorize (err, rcond, Control, Info, sing_handler, calc_cond); @@ -5996,7 +5996,7 @@ const octave_idx_type *Ai = ridx (); const Complex *Ax = data (); -#ifdef UMFPACK_SEPARATE_SPLIT +#if defined (UMFPACK_SEPARATE_SPLIT) OCTAVE_LOCAL_BUFFER (double, Bx, b_nr); OCTAVE_LOCAL_BUFFER (double, Bz, b_nr); for (octave_idx_type i = 0; i < b_nr; i++) @@ -6017,7 +6017,7 @@ for (octave_idx_type j = 0; j < b_nc; j++) { -#ifdef UMFPACK_SEPARATE_SPLIT +#if defined (UMFPACK_SEPARATE_SPLIT) for (octave_idx_type i = 0; i < b_nr; i++) Bx[i] = b.elem (i, j); @@ -6127,7 +6127,7 @@ if (typ == MatrixType::Hermitian) { -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) cholmod_common Common; cholmod_common *cm = &Common; @@ -6262,7 +6262,7 @@ if (typ == MatrixType::Full) { -#ifdef HAVE_UMFPACK +#if defined (HAVE_UMFPACK) Matrix Control, Info; void *Numeric = factorize (err, rcond, Control, Info, sing_handler, calc_cond); @@ -6356,7 +6356,7 @@ if (typ == MatrixType::Hermitian) { -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) cholmod_common Common; cholmod_common *cm = &Common; @@ -6507,7 +6507,7 @@ if (typ == MatrixType::Full) { -#ifdef HAVE_UMFPACK +#if defined (HAVE_UMFPACK) Matrix Control, Info; void *Numeric = factorize (err, rcond, Control, Info, sing_handler, calc_cond); @@ -6674,7 +6674,7 @@ if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; -#ifdef USE_QRSOLVE +#if defined (USE_QRSOLVE) retval = qrsolve (*this, b, err); #else retval = dmsolve<ComplexMatrix, SparseComplexMatrix, Matrix> @@ -6739,7 +6739,7 @@ if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; -#ifdef USE_QRSOLVE +#if defined (USE_QRSOLVE) retval = qrsolve (*this, b, err); #else retval = dmsolve<SparseComplexMatrix, SparseComplexMatrix, SparseMatrix> @@ -6804,7 +6804,7 @@ if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; -#ifdef USE_QRSOLVE +#if defined (USE_QRSOLVE) retval = qrsolve (*this, b, err); #else retval = dmsolve<ComplexMatrix, SparseComplexMatrix, ComplexMatrix> @@ -6870,7 +6870,7 @@ if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; -#ifdef USE_QRSOLVE +#if defined (USE_QRSOLVE) retval = qrsolve (*this, b, err); #else retval = dmsolve<SparseComplexMatrix, SparseComplexMatrix,
--- a/liboctave/array/MArray-C.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/MArray-C.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/MArray-d.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/MArray-d.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/MArray-f.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/MArray-f.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/MArray-fC.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/MArray-fC.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/MArray-i.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/MArray-i.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/MArray-s.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/MArray-s.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/MSparse-C.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/MSparse-C.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/MSparse-d.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/MSparse-d.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/MatrixType.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/MatrixType.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/PermMatrix.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/PermMatrix.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/Range.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/Range.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/Sparse-C.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/Sparse-C.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/Sparse-b.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/Sparse-b.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/Sparse-d.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/Sparse-d.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/boolMatrix.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/boolMatrix.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/boolNDArray.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/boolNDArray.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/boolSparse.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/boolSparse.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/chMatrix.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/chMatrix.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/chNDArray.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/chNDArray.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/dColVector.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/dColVector.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/dDiagMatrix.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/dDiagMatrix.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/dMatrix.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/dMatrix.cc Tue May 17 12:09:30 2016 -0400 @@ -23,7 +23,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/dNDArray.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/dNDArray.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/dRowVector.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/dRowVector.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/dSparse.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/dSparse.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -1228,7 +1228,7 @@ { DET retval; -#ifdef HAVE_UMFPACK +#if defined (HAVE_UMFPACK) octave_idx_type nr = rows (); octave_idx_type nc = cols (); @@ -5632,7 +5632,7 @@ void *Numeric = 0; err = 0; -#ifdef HAVE_UMFPACK +#if defined (HAVE_UMFPACK) // Setup the control parameters Control = Matrix (UMFPACK_CONTROL, 1); @@ -5771,7 +5771,7 @@ if (typ == MatrixType::Hermitian) { -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) cholmod_common Common; cholmod_common *cm = &Common; @@ -5907,7 +5907,7 @@ if (typ == MatrixType::Full) { -#ifdef HAVE_UMFPACK +#if defined (HAVE_UMFPACK) Matrix Control, Info; void *Numeric = factorize (err, rcond, Control, Info, sing_handler, calc_cond); @@ -5995,7 +5995,7 @@ if (typ == MatrixType::Hermitian) { -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) cholmod_common Common; cholmod_common *cm = &Common; @@ -6145,7 +6145,7 @@ if (typ == MatrixType::Full) { -#ifdef HAVE_UMFPACK +#if defined (HAVE_UMFPACK) Matrix Control, Info; void *Numeric = factorize (err, rcond, Control, Info, sing_handler, calc_cond); @@ -6264,7 +6264,7 @@ if (typ == MatrixType::Hermitian) { -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) cholmod_common Common; cholmod_common *cm = &Common; @@ -6399,7 +6399,7 @@ if (typ == MatrixType::Full) { -#ifdef HAVE_UMFPACK +#if defined (HAVE_UMFPACK) Matrix Control, Info; void *Numeric = factorize (err, rcond, Control, Info, sing_handler, calc_cond); @@ -6505,7 +6505,7 @@ if (typ == MatrixType::Hermitian) { -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) cholmod_common Common; cholmod_common *cm = &Common; @@ -6656,7 +6656,7 @@ if (typ == MatrixType::Full) { -#ifdef HAVE_UMFPACK +#if defined (HAVE_UMFPACK) Matrix Control, Info; void *Numeric = factorize (err, rcond, Control, Info, sing_handler, calc_cond); @@ -6813,7 +6813,7 @@ if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; -#ifdef USE_QRSOLVE +#if defined (USE_QRSOLVE) retval = qrsolve (*this, b, err); #else retval = dmsolve<Matrix, SparseMatrix, Matrix> (*this, b, err); @@ -6877,7 +6877,7 @@ if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; -#ifdef USE_QRSOLVE +#if defined (USE_QRSOLVE) retval = qrsolve (*this, b, err); #else retval = dmsolve<SparseMatrix, SparseMatrix, SparseMatrix> @@ -6942,7 +6942,7 @@ if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; -#ifdef USE_QRSOLVE +#if defined (USE_QRSOLVE) retval = qrsolve (*this, b, err); #else retval = dmsolve<ComplexMatrix, SparseMatrix, ComplexMatrix> @@ -7007,7 +7007,7 @@ if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; -#ifdef USE_QRSOLVE +#if defined (USE_QRSOLVE) retval = qrsolve (*this, b, err); #else retval = dmsolve<SparseComplexMatrix, SparseMatrix, SparseComplexMatrix>
--- a/liboctave/array/dim-vector.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/dim-vector.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/dim-vector.h Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/dim-vector.h Tue May 17 12:09:30 2016 -0400 @@ -238,7 +238,7 @@ octave_idx_type& elem (int i) { -#ifdef OCTAVE_ENABLE_BOUNDS_CHECK +#if defined (OCTAVE_ENABLE_BOUNDS_CHECK) assert (i >= 0 && i < ndims ()); #endif make_unique (); @@ -247,7 +247,7 @@ octave_idx_type elem (int i) const { -#ifdef OCTAVE_ENABLE_BOUNDS_CHECK +#if defined (OCTAVE_ENABLE_BOUNDS_CHECK) assert (i >= 0 && i < ndims ()); #endif return rep[i];
--- a/liboctave/array/fCColVector.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/fCColVector.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/fCDiagMatrix.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/fCDiagMatrix.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/fCMatrix.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/fCMatrix.cc Tue May 17 12:09:30 2016 -0400 @@ -23,7 +23,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/fCNDArray.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/fCNDArray.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/fCRowVector.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/fCRowVector.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/fColVector.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/fColVector.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/fDiagMatrix.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/fDiagMatrix.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/fMatrix.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/fMatrix.cc Tue May 17 12:09:30 2016 -0400 @@ -23,7 +23,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/fNDArray.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/fNDArray.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/fRowVector.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/fRowVector.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/idx-vector.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/idx-vector.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/int16NDArray.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/int16NDArray.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/int32NDArray.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/int32NDArray.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/int64NDArray.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/int64NDArray.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/int8NDArray.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/int8NDArray.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/uint16NDArray.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/uint16NDArray.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/uint32NDArray.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/uint32NDArray.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/uint64NDArray.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/uint64NDArray.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/array/uint8NDArray.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/array/uint8NDArray.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/cruft/Faddeeva/Faddeeva.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/cruft/Faddeeva/Faddeeva.cc Tue May 17 12:09:30 2016 -0400 @@ -148,14 +148,14 @@ (with various "HAVE_*" #defines to indicate features) if HAVE_CONFIG_H is #defined (in GNU autotools style). */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif ///////////////////////////////////////////////////////////////////////// // macros to allow us to use either C++ or C (with C99 features) -#ifdef __cplusplus +#if defined (__cplusplus) # include "lo-ieee.h" @@ -213,7 +213,7 @@ // gnulib::floor and the system ::floor (and only on ancient OSF systems) // has to do with floor(-0), which doesn't occur in the usage below, but // the Octave developers prefer that we silence the warning. -# ifdef GNULIB_NAMESPACE +# if defined (GNULIB_NAMESPACE) # define floor GNULIB_NAMESPACE::floor # define log GNULIB_NAMESPACE::log # endif @@ -247,10 +247,10 @@ # define CMPLX(a,b) __builtin_complex((double) (a), (double) (b)) # endif -# ifdef CMPLX // C11 +# if defined (CMPLX) // C11 # define C(a,b) CMPLX(a,b) # define Inf INFINITY // C99 infinity -# ifdef NAN // GNU libc extension +# if defined (NAN) // GNU libc extension # define NaN NAN # else # define NaN (0./0.) // NaN @@ -1894,9 +1894,9 @@ ///////////////////////////////////////////////////////////////////////// // Compile with -DTEST_FADDEEVA to compile a little test program -#ifdef TEST_FADDEEVA +#if defined (TEST_FADDEEVA) -#ifdef __cplusplus +#if defined (__cplusplus) # include <cstdio> #else # include <stdio.h>
--- a/liboctave/cruft/misc/blaswrap.c Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/cruft/misc/blaswrap.c Tue May 17 12:09:30 2016 -0400 @@ -38,11 +38,11 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" /* USE_BLASWRAP ? */ #endif -#ifdef USE_BLASWRAP +#if defined (USE_BLASWRAP) /* * vecLib is an Apple framework (collection of libraries) containing @@ -52,7 +52,7 @@ * get the Apple versions, rather than some other blas/lapack with the * same name. */ -#ifndef VECLIB_FILE +#if ! defined (VECLIB_FILE) # define VECLIB_FILE "/System/Library/Frameworks/vecLib.framework/Versions/A/vecLib" #endif
--- a/liboctave/cruft/misc/cquit.c Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/cruft/misc/cquit.c Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/cruft/misc/f77-extern.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/cruft/misc/f77-extern.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/cruft/misc/f77-fcn.c Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/cruft/misc/f77-fcn.c Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/cruft/misc/f77-fcn.h Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/cruft/misc/f77-fcn.h Tue May 17 12:09:30 2016 -0400 @@ -27,7 +27,7 @@ #include "quit.h" -#ifdef __cplusplus +#if defined (__cplusplus) extern "C" { #endif @@ -190,7 +190,7 @@ typedef void *octave_cray_ftn_ch_dsc; -#ifdef __cplusplus +#if defined (__cplusplus) # define OCTAVE_F77_FCN_INLINE inline #else # define OCTAVE_F77_FCN_INLINE @@ -214,7 +214,7 @@ return *((octave_cray_ftn_ch_dsc *) &desc); } -#ifdef __cplusplus +#if defined (__cplusplus) # undef OCTAVE_F77_FCN_INLINE #endif @@ -290,7 +290,7 @@ F77_FUNC (xstopx, XSTOPX) (F77_CONST_CHAR_ARG_DECL F77_CHAR_ARG_LEN_DECL); -#ifdef __cplusplus +#if defined (__cplusplus) } #endif
--- a/liboctave/cruft/misc/lo-error.c Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/cruft/misc/lo-error.c Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/cruft/misc/lo-error.h Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/cruft/misc/lo-error.h Tue May 17 12:09:30 2016 -0400 @@ -25,7 +25,7 @@ #include "octave-config.h" -#ifdef __cplusplus +#if defined (__cplusplus) extern "C" { #endif @@ -71,7 +71,7 @@ OCTAVE_API extern void set_liboctave_warning_with_id_handler (liboctave_warning_with_id_handler f); -#ifdef __cplusplus +#if defined (__cplusplus) } #endif
--- a/liboctave/cruft/misc/quit.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/cruft/misc/quit.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/cruft/misc/quit.h Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/cruft/misc/quit.h Tue May 17 12:09:30 2016 -0400 @@ -30,7 +30,7 @@ #include <signal.h> #include <setjmp.h> -#ifdef __cplusplus +#if defined (__cplusplus) # include <new> # include <string> extern "C" { @@ -74,7 +74,7 @@ OCTAVE_API extern void octave_restore_signal_mask (void); -#ifdef __cplusplus +#if defined (__cplusplus) class octave_execution_exception { @@ -151,7 +151,7 @@ OCTAVE_API extern void octave_rethrow_exception (void); -#ifdef __cplusplus +#if defined (__cplusplus) inline void octave_quit (void) { if (octave_signal_caught) @@ -222,7 +222,7 @@ } \ while (0) -#ifdef __cplusplus +#if defined (__cplusplus) #define BEGIN_INTERRUPT_WITH_EXCEPTIONS \ sig_atomic_t saved_octave_interrupt_immediately = octave_interrupt_immediately; \ @@ -254,7 +254,7 @@ octave_interrupt_immediately = saved_octave_interrupt_immediately #endif -#ifdef __cplusplus +#if defined (__cplusplus) } /* These should only be declared for C++ code, and should also be
--- a/liboctave/liboctave-build-info.in.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/liboctave-build-info.in.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/CollocWt.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/CollocWt.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/DASPK.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/DASPK.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/DASRT.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/DASRT.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/DASSL.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/DASSL.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/EIG.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/EIG.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/LSODE.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/LSODE.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/ODES.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/ODES.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/Quad.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/Quad.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/aepbalance.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/aepbalance.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/chol.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/chol.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -70,7 +70,7 @@ double&, double*, octave_idx_type*, octave_idx_type& F77_CHAR_ARG_LEN_DECL); -#ifdef HAVE_QRUPDATE +#if defined (HAVE_QRUPDATE) F77_RET_T F77_FUNC (dch1up, DCH1UP) (const octave_idx_type&, double*, @@ -116,7 +116,7 @@ float&, float*, octave_idx_type*, octave_idx_type& F77_CHAR_ARG_LEN_DECL); -#ifdef HAVE_QRUPDATE +#if defined (HAVE_QRUPDATE) F77_RET_T F77_FUNC (sch1up, SCH1UP) (const octave_idx_type&, float*, @@ -160,7 +160,7 @@ const octave_idx_type&, const double&, double&, Complex*, double*, octave_idx_type& F77_CHAR_ARG_LEN_DECL); -#ifdef HAVE_QRUPDATE +#if defined (HAVE_QRUPDATE) F77_RET_T F77_FUNC (zch1up, ZCH1UP) (const octave_idx_type&, Complex*, @@ -204,7 +204,7 @@ const octave_idx_type&, const float&, float&, FloatComplex*, float*, octave_idx_type& F77_CHAR_ARG_LEN_DECL); -#ifdef HAVE_QRUPDATE +#if defined (HAVE_QRUPDATE) F77_RET_T F77_FUNC (cch1up, CCH1UP) (const octave_idx_type&, FloatComplex*, @@ -835,7 +835,7 @@ return info; } -#ifdef HAVE_QRUPDATE +#if defined (HAVE_QRUPDATE) template <> void @@ -1003,7 +1003,7 @@ return info; } -#ifdef HAVE_QRUPDATE +#if defined (HAVE_QRUPDATE) template <> void @@ -1174,7 +1174,7 @@ return info; } -#ifdef HAVE_QRUPDATE +#if defined (HAVE_QRUPDATE) template <> void
--- a/liboctave/numeric/eigs-base.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/eigs-base.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -43,7 +43,7 @@ #include "sparse-chol.h" #include "sparse-lu.h" -#ifdef HAVE_ARPACK +#if defined (HAVE_ARPACK) // Arpack and blas fortran functions we call. extern "C"
--- a/liboctave/numeric/fEIG.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/fEIG.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/gepbalance.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/gepbalance.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/hess.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/hess.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/lo-mappers.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/lo-mappers.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/lo-specfun.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/lo-specfun.cc Tue May 17 12:09:30 2016 -0400 @@ -24,7 +24,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/lu.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/lu.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -45,7 +45,7 @@ double*, const octave_idx_type&, octave_idx_type*, octave_idx_type&); -#ifdef HAVE_QRUPDATE_LUU +#if defined (HAVE_QRUPDATE_LUU) F77_RET_T F77_FUNC (dlu1up, DLU1UP) (const octave_idx_type&, const octave_idx_type&, double *, const octave_idx_type&, @@ -65,7 +65,7 @@ float*, const octave_idx_type&, octave_idx_type*, octave_idx_type&); -#ifdef HAVE_QRUPDATE_LUU +#if defined (HAVE_QRUPDATE_LUU) F77_RET_T F77_FUNC (slu1up, SLU1UP) (const octave_idx_type&, const octave_idx_type&, float *, const octave_idx_type&, @@ -85,7 +85,7 @@ Complex*, const octave_idx_type&, octave_idx_type*, octave_idx_type&); -#ifdef HAVE_QRUPDATE_LUU +#if defined (HAVE_QRUPDATE_LUU) F77_RET_T F77_FUNC (zlu1up, ZLU1UP) (const octave_idx_type&, const octave_idx_type&, Complex *, const octave_idx_type&, @@ -105,7 +105,7 @@ FloatComplex*, const octave_idx_type&, octave_idx_type*, octave_idx_type&); -#ifdef HAVE_QRUPDATE_LUU +#if defined (HAVE_QRUPDATE_LUU) F77_RET_T F77_FUNC (clu1up, CLU1UP) (const octave_idx_type&, const octave_idx_type&, FloatComplex *, const octave_idx_type&, @@ -348,7 +348,7 @@ pipvt[i] -= 1; } -#ifdef HAVE_QRUPDATE_LUU +#if defined (HAVE_QRUPDATE_LUU) template <> void @@ -482,7 +482,7 @@ pipvt[i] -= 1; } -#ifdef HAVE_QRUPDATE_LUU +#if defined (HAVE_QRUPDATE_LUU) template <> void @@ -618,7 +618,7 @@ pipvt[i] -= 1; } -#ifdef HAVE_QRUPDATE_LUU +#if defined (HAVE_QRUPDATE_LUU) template <> void @@ -754,7 +754,7 @@ pipvt[i] -= 1; } -#ifdef HAVE_QRUPDATE_LUU +#if defined (HAVE_QRUPDATE_LUU) template <> void
--- a/liboctave/numeric/oct-convn.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/oct-convn.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/oct-fftw.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/oct-fftw.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/oct-norm.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/oct-norm.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ // author: Jaroslav Hajek <highegg@gmail.com> -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/oct-rand.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/oct-rand.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/oct-spparms.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/oct-spparms.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/qr.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/qr.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -225,7 +225,7 @@ FloatComplex*, const octave_idx_type&, octave_idx_type&); -#ifdef HAVE_QRUPDATE +#if defined (HAVE_QRUPDATE) F77_RET_T F77_FUNC (cqr1up, CQR1UP) (const octave_idx_type&, const octave_idx_type&, @@ -1051,7 +1051,7 @@ form (n, afact, tau, qr_type); } -#ifdef HAVE_QRUPDATE +#if defined (HAVE_QRUPDATE) template <> void @@ -1777,7 +1777,7 @@ form (n, afact, tau, qr_type); } -#ifdef HAVE_QRUPDATE +#if defined (HAVE_QRUPDATE) template <> void
--- a/liboctave/numeric/qrp.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/qrp.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/randmtzig.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/randmtzig.cc Tue May 17 12:09:30 2016 -0400 @@ -159,7 +159,7 @@ #include <cstdio> #include <ctime> -#ifdef HAVE_GETTIMEOFDAY +#if defined (HAVE_GETTIMEOFDAY) # include <sys/time.h> #endif @@ -279,7 +279,7 @@ entropy[n++] = time (0); /* Current time in seconds */ if (n < MT_N) entropy[n++] = clock (); /* CPU time used (usec) */ -#ifdef HAVE_GETTIMEOFDAY +#if defined (HAVE_GETTIMEOFDAY) if (n < MT_N) { struct timeval tv; @@ -362,7 +362,7 @@ { const uint32_t lo = randi32 (); const uint32_t hi = randi32 () & 0x1FFFFF; -#ifdef HAVE_X86_32 +#if defined (HAVE_X86_32) uint64_t u; uint32_t *p = (uint32_t *)&u; p[0] = lo; @@ -378,7 +378,7 @@ { const uint32_t lo = randi32 (); const uint32_t hi = randi32 () & 0x3FFFFF; -#ifdef HAVE_X86_32 +#if defined (HAVE_X86_32) uint64_t u; uint32_t *p = static_cast<uint32_t *> (&u); p[0] = lo; @@ -577,7 +577,7 @@ * Of course, different compilers and operating systems may * have something to do with this. */ -# ifdef HAVE_X86_32 +# if defined (HAVE_X86_32) /* 53-bit mantissa, 1-bit sign, x86 32-bit architecture */ double x; int si,idx;
--- a/liboctave/numeric/randpoisson.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/randpoisson.cc Tue May 17 12:09:30 2016 -0400 @@ -55,7 +55,7 @@ xlgamma (double x) { double result; -#ifdef HAVE_LGAMMA +#if defined (HAVE_LGAMMA) result = lgamma (x); #else double sgngam;
--- a/liboctave/numeric/schur.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/schur.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/sparse-chol.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/sparse-chol.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -41,14 +41,14 @@ sparse_chol_rep (void) : count (1), is_pd (false), minor_p (0), perms (), cond (0) -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) , Lsparse (0), Common () #endif { } sparse_chol_rep (const chol_type& a, bool natural, bool force) : count (1), is_pd (false), minor_p (0), perms (), cond (0) -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) , Lsparse (0), Common () #endif { @@ -58,7 +58,7 @@ sparse_chol_rep (const chol_type& a, octave_idx_type& info, bool natural, bool force) : count (1), is_pd (false), minor_p (0), perms (), cond (0) -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) , Lsparse (0), Common () #endif { @@ -67,7 +67,7 @@ ~sparse_chol_rep (void) { -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) if (Lsparse) CHOLMOD_NAME (free_sparse) (&Lsparse, &Common); @@ -75,7 +75,7 @@ #endif } -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) cholmod_sparse *L (void) const { return Lsparse; @@ -84,7 +84,7 @@ octave_idx_type P (void) const { -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) return (minor_p == static_cast<octave_idx_type>(Lsparse->ncol) ? 0 : minor_p + 1); #else @@ -112,7 +112,7 @@ double cond; -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) cholmod_sparse *Lsparse; cholmod_common Common; @@ -129,7 +129,7 @@ sparse_chol_rep& operator = (const sparse_chol_rep&); }; -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) // Can't use CHOLMOD_NAME(drop)(0.0, S, cm) because it doesn't treat // complex matrices. @@ -202,7 +202,7 @@ { volatile octave_idx_type info = 0; -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) octave_idx_type a_nr = a.rows (); octave_idx_type a_nc = a.cols (); @@ -350,7 +350,7 @@ SparseMatrix sparse_chol<chol_type>::sparse_chol_rep::Q (void) const { -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) octave_idx_type n = Lsparse->nrow; SparseMatrix p (n, n, n); @@ -439,7 +439,7 @@ chol_type sparse_chol<chol_type>::L (void) const { -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) cholmod_sparse *m = rep->L (); @@ -507,7 +507,7 @@ { chol_type retval; -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) cholmod_sparse *m = rep->L (); octave_idx_type n = m->ncol;
--- a/liboctave/numeric/sparse-dmsolve.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/sparse-dmsolve.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -344,7 +344,7 @@ } } -#ifdef HAVE_CXSPARSE +#if defined (HAVE_CXSPARSE) static void solve_singularity_warning (double) @@ -361,7 +361,7 @@ { RT retval; -#ifdef HAVE_CXSPARSE +#if defined (HAVE_CXSPARSE) octave_idx_type nr = a.rows (); octave_idx_type nc = a.cols ();
--- a/liboctave/numeric/sparse-lu.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/sparse-lu.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -378,7 +378,7 @@ bool scale) : Lfact (), Ufact (), Rfact (), cond (0), P (), Q () { -#ifdef HAVE_UMFPACK +#if defined (HAVE_UMFPACK) octave_idx_type nr = a.rows (); octave_idx_type nc = a.cols (); @@ -571,7 +571,7 @@ bool milu, bool udiag) : Lfact (), Ufact (), Rfact (), cond (0), P (), Q () { -#ifdef HAVE_UMFPACK +#if defined (HAVE_UMFPACK) if (milu) (*current_liboctave_error_handler)
--- a/liboctave/numeric/sparse-qr.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/sparse-qr.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/numeric/svd.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/numeric/svd.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/operators/mk-ops.awk Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/operators/mk-ops.awk Tue May 17 12:09:30 2016 -0400 @@ -293,7 +293,7 @@ { print "// DO NOT EDIT -- generated by mk-ops.awk"; - print "#ifdef HAVE_CONFIG_H"; + print "#if defined (HAVE_CONFIG_H)"; print "# include \"config.h\""; print "#endif";
--- a/liboctave/operators/mx-defs.h Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/operators/mx-defs.h Tue May 17 12:09:30 2016 -0400 @@ -83,7 +83,7 @@ #include "oct-cmplx.h" -#ifndef MAPPER_FCN_TYPEDEFS +#if ! defined (MAPPER_FCN_TYPEDEFS) # define MAPPER_FCN_TYPEDEFS 1 typedef bool (*b_d_Mapper)(double);
--- a/liboctave/system/dir-ops.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/system/dir-ops.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/system/file-ops.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/system/file-ops.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/system/file-stat.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/system/file-stat.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -85,7 +85,7 @@ bool base_file_stat::is_blk (mode_t mode) { -#ifdef S_ISBLK +#if defined (S_ISBLK) return S_ISBLK (mode); #else return false; @@ -95,7 +95,7 @@ bool base_file_stat::is_chr (mode_t mode) { -#ifdef S_ISCHR +#if defined (S_ISCHR) return S_ISCHR (mode); #else return false; @@ -105,7 +105,7 @@ bool base_file_stat::is_dir (mode_t mode) { -#ifdef S_ISDIR +#if defined (S_ISDIR) return S_ISDIR (mode); #else return false; @@ -115,7 +115,7 @@ bool base_file_stat::is_fifo (mode_t mode) { -#ifdef S_ISFIFO +#if defined (S_ISFIFO) return S_ISFIFO (mode); #else return false; @@ -125,7 +125,7 @@ bool base_file_stat::is_lnk (mode_t mode) { -#ifdef S_ISLNK +#if defined (S_ISLNK) return S_ISLNK (mode); #else return false; @@ -135,7 +135,7 @@ bool base_file_stat::is_reg (mode_t mode) { -#ifdef S_ISREG +#if defined (S_ISREG) return S_ISREG (mode); #else return false; @@ -145,7 +145,7 @@ bool base_file_stat::is_sock (mode_t mode) { -#ifdef S_ISSOCK +#if defined (S_ISSOCK) return S_ISSOCK (mode); #else return false;
--- a/liboctave/system/lo-sysdep.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/system/lo-sysdep.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/system/mach-info.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/system/mach-info.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/system/oct-env.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/system/oct-env.cc Tue May 17 12:09:30 2016 -0400 @@ -36,7 +36,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/system/oct-group.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/system/oct-group.cc Tue May 17 12:09:30 2016 -0400 @@ -20,13 +20,13 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif #include <sys/types.h> -#ifdef HAVE_GRP_H +#if defined (HAVE_GRP_H) # include <grp.h> #endif
--- a/liboctave/system/oct-passwd.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/system/oct-passwd.cc Tue May 17 12:09:30 2016 -0400 @@ -20,13 +20,13 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif #include <sys/types.h> -#ifdef HAVE_PWD_H +#if defined (HAVE_PWD_H) # include <pwd.h> #endif
--- a/liboctave/system/oct-syscalls.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/system/oct-syscalls.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/system/oct-time.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/system/oct-time.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/system/oct-uname.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/system/oct-uname.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/system/pathlen.h Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/system/pathlen.h Tue May 17 12:09:30 2016 -0400 @@ -25,11 +25,11 @@ #include "octave-config.h" -#ifdef HAVE_SYS_PARAM_H +#if defined (HAVE_SYS_PARAM_H) # include <sys/param.h> #endif -#ifndef MAXPATHLEN +#if ! defined (MAXPATHLEN) # define MAXPATHLEN 1024 #endif
--- a/liboctave/system/syswait.h Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/system/syswait.h Tue May 17 12:09:30 2016 -0400 @@ -25,7 +25,7 @@ #include "octave-config.h" -#ifdef __cplusplus +#if defined (__cplusplus) extern "C" { #endif @@ -37,15 +37,15 @@ # include <sys/wait.h> #endif -#ifndef WIFEXITED +#if ! defined (WIFEXITED) # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif -#ifndef WEXITSTATUS +#if ! defined (WEXITSTATUS) # define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) #endif -#ifndef WIFSIGNALLED +#if ! defined (WIFSIGNALLED) # define WIFSIGNALLED(stat_val) \ (((stat_val) & 0177) != 0177 && ((stat_val) & 0177) != 0) #endif @@ -60,7 +60,7 @@ # define WAITPID(a, b, c) waitpid (a, b, c) #endif -#ifdef __cplusplus +#if defined (__cplusplus) } #endif
--- a/liboctave/util/cmd-edit.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/cmd-edit.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/cmd-hist.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/cmd-hist.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/data-conv.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/data-conv.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/f2c-main.c Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/f2c-main.c Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -31,8 +31,8 @@ Fortran libraries. See the AC_F77_DUMMY_MAIN macro documentation. This function should never be called. */ -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus +#if defined (F77_DUMMY_MAIN) +# if defined (__cplusplus) extern "C" # endif int F77_DUMMY_MAIN () { assert (0); return 1; }
--- a/liboctave/util/glob-match.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/glob-match.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/kpse.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/kpse.cc Tue May 17 12:09:30 2016 -0400 @@ -53,13 +53,13 @@ #include <fcntl.h> #include <dirent.h> #elif defined (WIN32) -#ifndef _MSC_VER +#if ! defined (_MSC_VER) #define __STDC__ 1 #include "win32lib.h" #endif #endif /* not WIN32 */ -#ifdef __DJGPP__ +#if defined (__DJGPP__) #include <fcntl.h> /* for long filenames' stuff */ #include <dir.h> /* for 'getdisk' */ #include <io.h> /* for 'setmode' */ @@ -67,7 +67,7 @@ } /* Some drivers have partially integrated kpathsea changes. */ -#ifndef KPATHSEA +#if ! defined (KPATHSEA) #define KPATHSEA 32 #endif @@ -85,7 +85,7 @@ #define ST_NLINK_TRICK #endif /* either not DOSISH or __DJGPP__ */ -#ifdef OS2 +#if defined (OS2) #define access ln_access #define fopen ln_fopen #define rename ln_rename @@ -96,8 +96,8 @@ filenames and environment variable paths. */ /* What separates filename components? */ -#ifndef DIR_SEP -#ifdef DOSISH +#if ! defined (DIR_SEP) +#if defined (DOSISH) /* Either \'s or 's work. Wayne Sullivan's web2pc prefers /, so we'll go with that. */ #define DIR_SEP '/' @@ -112,13 +112,14 @@ #endif /* not DOSISH */ #endif /* not DIR_SEP */ -#ifndef IS_DIR_SEP +#if ! defined (IS_DIR_SEP) #define IS_DIR_SEP(ch) ((ch) == DIR_SEP) #endif -#ifndef IS_DEVICE_SEP /* No 'devices' on, e.g., Unix. */ +#if ! defined (IS_DEVICE_SEP) +/* No 'devices' on, e.g., Unix. */ #define IS_DEVICE_SEP(ch) 0 #endif -#ifndef NAME_BEGINS_WITH_DEVICE +#if ! defined (NAME_BEGINS_WITH_DEVICE) #define NAME_BEGINS_WITH_DEVICE(name) 0 #endif @@ -148,18 +149,18 @@ /* Most likely the system will truncate filenames if it is not POSIX, and so we can use the BSD value here. */ -#ifndef _POSIX_NAME_MAX +#if ! defined (_POSIX_NAME_MAX) #define _POSIX_NAME_MAX 255 #endif -#ifndef NAME_MAX +#if ! defined (NAME_MAX) #define NAME_MAX _POSIX_NAME_MAX #endif #include <cctype> /* What separates elements in environment variable path lists? */ -#ifndef ENV_SEP +#if ! defined (ENV_SEP) #if defined (SEPCHAR) && defined (SEPCHAR_STR) #define ENV_SEP SEPCHAR #define ENV_SEP_STRING SEPCHAR_STR @@ -172,7 +173,7 @@ #endif /* not DOS */ #endif /* not ENV_SEP */ -#ifndef IS_ENV_SEP +#if ! defined (IS_ENV_SEP) #define IS_ENV_SEP(ch) ((ch) == ENV_SEP) #endif @@ -183,12 +184,12 @@ /* Cheat and define this as a manifest constant no matter what, instead of using pathconf. I forget why we want to do this. */ -#ifndef _POSIX_PATH_MAX +#if ! defined (_POSIX_PATH_MAX) #define _POSIX_PATH_MAX 255 #endif -#ifndef PATH_MAX -#ifdef MAXPATHLEN +#if ! defined (PATH_MAX) +#if defined (MAXPATHLEN) #define PATH_MAX MAXPATHLEN #else #define PATH_MAX _POSIX_PATH_MAX @@ -196,7 +197,7 @@ #endif /* not PATH_MAX */ /* If NO_DEBUG is defined (not recommended), skip all this. */ -#ifndef NO_DEBUG +#if ! defined (NO_DEBUG) /* OK, we'll have tracing support. */ #define KPSE_DEBUG @@ -230,7 +231,7 @@ #endif /* not NO_DEBUG */ -#ifdef KPSE_DEBUG +#if defined (KPSE_DEBUG) static unsigned int kpathsea_debug = 0; #endif @@ -243,11 +244,11 @@ * Define all the symbols that apply correctly. */ -#ifndef DOSISH +#if ! defined (DOSISH) #define DOSISH #endif -#ifndef MAXPATHLEN +#if ! defined (MAXPATHLEN) #define MAXPATHLEN _MAX_PATH #endif @@ -300,7 +301,7 @@ } \ while (0) -#ifndef WIN32 +#if ! defined (WIN32) static void xclosedir (DIR *d); #endif @@ -419,7 +420,7 @@ if (key == p->key) ret.append (p->value); -#ifdef KPSE_DEBUG +#if defined (KPSE_DEBUG) if (KPSE_DEBUG_P (KPSE_DEBUG_HASH)) { DEBUGF1 ("hash_lookup (%s) =>", key.c_str ()); @@ -520,7 +521,7 @@ if (! tmp.empty ()) ret = kpse_var_expand (tmp); -#ifdef KPSE_DEBUG +#if defined (KPSE_DEBUG) if (KPSE_DEBUG_P (KPSE_DEBUG_VARS)) DEBUGF2 ("variable: %s = %s\n", var.c_str (), tmp.empty () ? "(nil)" : tmp.c_str ()); @@ -570,7 +571,7 @@ regular file, as it is potentially useful to read fifo's or some kinds of devices. */ -#ifdef WIN32 +#if defined (WIN32) static inline bool READABLE (const std::string& fn, struct stat&) { @@ -604,7 +605,7 @@ { ret = name; -#ifdef ENAMETOOLONG +#if defined (ENAMETOOLONG) } else if (errno == ENAMETOOLONG) { @@ -645,11 +646,11 @@ size_t len = filename.length (); int absolute = (len > 0 && IS_DIR_SEP (filename[0])) -#ifdef DOSISH +#if defined (DOSISH) /* Novell allows non-alphanumeric drive letters. */ || (len > 0 && IS_DEVICE_SEP (filename[1])) #endif /* DOSISH */ -#ifdef WIN32 +#if defined (WIN32) /* UNC names */ || (len > 1 && filename[0] == '\\' && filename[1] == '\\') #endif @@ -1231,7 +1232,7 @@ OS/2 doesn't have this concept. */ } else -#ifdef HAVE_PWD_H +#if defined (HAVE_PWD_H) { unsigned c = 2; @@ -1920,7 +1921,7 @@ std::string db_file = db_dirs[j] + atry; bool matched = match (db_file, path_elt); -#ifdef KPSE_DEBUG +#if defined (KPSE_DEBUG) if (KPSE_DEBUG_P (KPSE_DEBUG_SEARCH)) DEBUGF3 ("db:match (%s,%s) = %d\n", db_file.c_str (), path_elt.c_str (), matched); @@ -2056,7 +2057,7 @@ static bool dir_p (const std::string& fn) { -#ifdef WIN32 +#if defined (WIN32) unsigned int fa = GetFileAttributes (fn.c_str ()); return (fa != 0xFFFFFFFF && (fa & FILE_ATTRIBUTE_DIRECTORY)); #else @@ -2146,7 +2147,7 @@ subdirectories of ELT (up to ELT_LENGTH, which must be a /) to STR_LIST_PTR. */ -#ifdef WIN32 +#if defined (WIN32) /* Shared across recursive calls, it acts like a stack. */ static std::string dirname; @@ -2175,7 +2176,7 @@ link_table[fn] = ret; -#ifdef KPSE_DEBUG +#if defined (KPSE_DEBUG) if (KPSE_DEBUG_P (KPSE_DEBUG_STAT)) DEBUGF2 ("dir_links (%s) => %ld\n", fn.c_str (), ret); #endif @@ -2190,7 +2191,7 @@ do_subdir (str_llist_type *str_list_ptr, const std::string& elt, unsigned elt_length, const std::string& post) { -#ifdef WIN32 +#if defined (WIN32) WIN32_FIND_DATA find_file_data; HANDLE hnd; int proceed; @@ -2300,16 +2301,16 @@ the only alternative I know of is to stat every entry in the directory, and that is unacceptably slow. - The #ifdef here makes all this configurable at + The #if here makes all this configurable at compile-time, so that if we're using VMS directories or some such, we can still find subdirectories, even if it is much slower. */ -#ifdef ST_NLINK_TRICK +#if defined (ST_NLINK_TRICK) if (links != 2) #endif /* not ST_NLINK_TRICK */ /* All criteria are met; find subdirectories. */ do_subdir (str_list_ptr, name, potential_len, post); -#ifdef ST_NLINK_TRICK +#if defined (ST_NLINK_TRICK) else if (post.empty ()) /* Nothing to match, no recursive subdirectories to look for: we're done with this branch. Add it. */ @@ -2407,7 +2408,7 @@ made with the same ELT. */ cache (elt, ret); -#ifdef KPSE_DEBUG +#if defined (KPSE_DEBUG) if (KPSE_DEBUG_P (KPSE_DEBUG_EXPAND)) { DEBUGF1 ("path element %s =>", elt.c_str ()); @@ -2425,7 +2426,7 @@ return ret; } -#ifndef WIN32 +#if ! defined (WIN32) void xclosedir (DIR *d) { @@ -2566,16 +2567,19 @@ /* Can't think of when it would be useful to change these (and the diagnostic messages assume them), but ... */ -#ifndef IS_VAR_START /* starts all variable references */ +#if ! defined (IS_VAR_START) +/* starts all variable references */ #define IS_VAR_START(c) ((c) == '$') #endif -#ifndef IS_VAR_CHAR /* variable name constituent */ +#if ! defined (IS_VAR_CHAR) +/* variable name constituent */ #define IS_VAR_CHAR(c) (isalnum (c) || (c) == '_') #endif -#ifndef IS_VAR_BEGIN_DELIMITER /* start delimited variable name (after $) */ +#if ! defined (IS_VAR_BEGIN_DELIMITER) +/* start delimited variable name (after $) */ #define IS_VAR_BEGIN_DELIMITER(c) ((c) == '{') #endif -#ifndef IS_VAR_END_DELIMITER +#if ! defined (IS_VAR_END_DELIMITER) #define IS_VAR_END_DELIMITER(c) ((c) == '}') #endif
--- a/liboctave/util/lo-array-errwarn.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/lo-array-errwarn.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/lo-array-gripes.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/lo-array-gripes.cc Tue May 17 12:09:30 2016 -0400 @@ -23,7 +23,7 @@ // FIXME: All gripe_XXX functions deprecated in 4.2. Remove file in 4.6 -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/lo-cutils.c Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/lo-cutils.c Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/lo-cutils.h Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/lo-cutils.h Tue May 17 12:09:30 2016 -0400 @@ -27,7 +27,7 @@ #include <sys/types.h> -#ifdef __cplusplus +#if defined (__cplusplus) extern "C" { #endif @@ -53,7 +53,7 @@ OCTAVE_API int octave_wstopsig (int status); OCTAVE_API int octave_wifcontinued (int status); -#ifdef __cplusplus +#if defined (__cplusplus) } #endif
--- a/liboctave/util/lo-ieee.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/lo-ieee.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/lo-ieee.h Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/lo-ieee.h Tue May 17 12:09:30 2016 -0400 @@ -25,7 +25,7 @@ #include "octave-config.h" -#ifdef __cplusplus +#if defined (__cplusplus) extern "C" { #endif @@ -96,7 +96,7 @@ extern OCTAVE_API int __lo_ieee_float_signbit (float); -#ifdef __cplusplus +#if defined (__cplusplus) } #endif @@ -115,7 +115,7 @@ #define lo_ieee_signbit(x) (sizeof (x) == sizeof (float) ? \ __lo_ieee_float_signbit (x) : __lo_ieee_signbit (x)) -#ifdef __cplusplus +#if defined (__cplusplus) namespace octave
--- a/liboctave/util/lo-regexp.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/lo-regexp.cc Tue May 17 12:09:30 2016 -0400 @@ -22,7 +22,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/lo-utils.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/lo-utils.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/oct-base64.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/oct-base64.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/oct-glob.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/oct-glob.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/oct-inttypes.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/oct-inttypes.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -103,9 +103,9 @@ INSTANTIATE_CONVERT_REAL (long double); #endif -#ifdef OCTAVE_INT_USE_LONG_DOUBLE +#if defined (OCTAVE_INT_USE_LONG_DOUBLE) -#ifdef OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED +#if defined (OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED) #define DEFINE_OCTAVE_LONG_DOUBLE_CMP_OP_TEMPLATES(T) \ template <typename xop> \
--- a/liboctave/util/oct-inttypes.h Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/oct-inttypes.h Tue May 17 12:09:30 2016 -0400 @@ -35,7 +35,7 @@ #include "lo-math.h" #include "lo-mappers.h" -#ifdef OCTAVE_INT_USE_LONG_DOUBLE +#if defined (OCTAVE_INT_USE_LONG_DOUBLE) inline long double xround (long double x) { return roundl (x); } inline long double xisnan (long double x) { return xisnan (static_cast<double> (x)); } @@ -178,7 +178,7 @@ mop (double x, T y) { return xop::op (x, static_cast<double> (y)); } -#ifdef OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED +#if defined (OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED) # define DECLARE_EXTERNAL_LONG_DOUBLE_CMP_OPS(T) \ template <typename xop> static OCTAVE_API bool \ external_mop (double, T); \ @@ -192,8 +192,8 @@ // 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 +#if defined (OCTAVE_INT_USE_LONG_DOUBLE) +# if defined (OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED) # define DEFINE_LONG_DOUBLE_CMP_OP(T) \ template <typename xop> \ static bool \ @@ -429,11 +429,11 @@ } }; -#ifdef OCTAVE_INT_USE_LONG_DOUBLE +#if defined (OCTAVE_INT_USE_LONG_DOUBLE) // Handle 64-bit multiply using long double -#ifdef OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED +#if defined (OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED) extern OCTAVE_API uint64_t octave_external_uint64_uint64_mul (uint64_t, uint64_t); @@ -460,7 +460,7 @@ inline uint64_t octave_int_arith_base<uint64_t, false>::mul (uint64_t x, uint64_t y) { -#ifdef OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED +#if defined (OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED) return octave_external_uint64_uint64_mul (x, y); #else return mul_internal (x, y); @@ -753,11 +753,11 @@ } }; -#ifdef OCTAVE_INT_USE_LONG_DOUBLE +#if defined (OCTAVE_INT_USE_LONG_DOUBLE) // Handle 64-bit multiply using long double -#ifdef OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED +#if defined (OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED) extern OCTAVE_API int64_t octave_external_int64_int64_mul (int64_t, int64_t); @@ -789,7 +789,7 @@ inline int64_t octave_int_arith_base<int64_t, true>::mul (int64_t x, int64_t y) { -#ifdef OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED +#if defined (OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED) return octave_external_int64_int64_mul (x, y); #else return mul_internal (x, y); @@ -833,7 +833,7 @@ octave_int (float d) : ival (octave_int_base<T>::convert_real (d)) { } -#ifdef OCTAVE_INT_USE_LONG_DOUBLE +#if defined (OCTAVE_INT_USE_LONG_DOUBLE) octave_int (long double d) : ival (octave_int_base<T>::convert_real (d)) { } #endif @@ -1104,7 +1104,7 @@ typedef octave_int<uint32_t> octave_uint32; typedef octave_int<uint64_t> octave_uint64; -#ifdef OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED +#if defined (OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED) #define DECLARE_EXTERNAL_LONG_DOUBLE_OP(T, OP) \ extern OCTAVE_API T \ @@ -1133,9 +1133,9 @@ operator OP (const double& x, const octave_int<T>& y) \ { return octave_int<T> (x OP static_cast<double> (y)); } -#ifdef OCTAVE_INT_USE_LONG_DOUBLE +#if defined (OCTAVE_INT_USE_LONG_DOUBLE) // Handle mixed op using long double -#ifdef OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED +#if defined (OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED) # define OCTAVE_INT_DOUBLE_BIN_OP(OP, NAME) \ OCTAVE_INT_DOUBLE_BIN_OP0(OP) \ template <> \
--- a/liboctave/util/oct-locbuf.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/oct-locbuf.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -31,7 +31,7 @@ // FIXME: Maybe we should querying for available physical memory? -#ifndef OCTAVE_LOCBUF_CHUNKSIZE_MB +#if ! defined (OCTAVE_LOCBUF_CHUNKSIZE_MB) # define OCTAVE_LOCBUF_CHUNKSIZE_MB 32 #endif
--- a/liboctave/util/oct-mutex.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/oct-mutex.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/oct-rl-edit.c Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/oct-rl-edit.c Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/oct-rl-edit.h Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/oct-rl-edit.h Tue May 17 12:09:30 2016 -0400 @@ -45,7 +45,7 @@ typedef int (*rl_command_fcn_ptr) (int, int); -#ifdef __cplusplus +#if defined (__cplusplus) extern "C" { #endif @@ -170,7 +170,7 @@ extern int octave_rl_meta (char); -#ifdef __cplusplus +#if defined (__cplusplus) } #endif
--- a/liboctave/util/oct-rl-hist.c Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/oct-rl-hist.c Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/oct-rl-hist.h Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/oct-rl-hist.h Tue May 17 12:09:30 2016 -0400 @@ -25,7 +25,7 @@ #include "octave-config.h" -#ifdef __cplusplus +#if defined (__cplusplus) extern "C" { #endif @@ -78,7 +78,7 @@ extern void octave_replace_history_entry (int, const char *); -#ifdef __cplusplus +#if defined (__cplusplus) } #endif
--- a/liboctave/util/oct-shlib.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/oct-shlib.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/oct-sort.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/oct-sort.cc Tue May 17 12:09:30 2016 -0400 @@ -1507,12 +1507,12 @@ void octave_sort<T>::sort (T *data, octave_idx_type nel) { -#ifdef INLINE_ASCENDING_SORT +#if defined (INLINE_ASCENDING_SORT) if (compare == ascending_compare) sort (data, nel, std::less<T> ()); else #endif -#ifdef INLINE_DESCENDING_SORT +#if defined (INLINE_DESCENDING_SORT) if (compare == descending_compare) sort (data, nel, std::greater<T> ()); else @@ -1525,12 +1525,12 @@ void octave_sort<T>::sort (T *data, octave_idx_type *idx, octave_idx_type nel) { -#ifdef INLINE_ASCENDING_SORT +#if defined (INLINE_ASCENDING_SORT) if (compare == ascending_compare) sort (data, idx, nel, std::less<T> ()); else #endif -#ifdef INLINE_DESCENDING_SORT +#if defined (INLINE_DESCENDING_SORT) if (compare == descending_compare) sort (data, idx, nel, std::greater<T> ()); else @@ -1565,12 +1565,12 @@ octave_sort<T>::is_sorted (const T *data, octave_idx_type nel) { bool retval = false; -#ifdef INLINE_ASCENDING_SORT +#if defined (INLINE_ASCENDING_SORT) if (compare == ascending_compare) retval = is_sorted (data, nel, std::less<T> ()); else #endif -#ifdef INLINE_DESCENDING_SORT +#if defined (INLINE_DESCENDING_SORT) if (compare == descending_compare) retval = is_sorted (data, nel, std::greater<T> ()); else @@ -1654,12 +1654,12 @@ octave_sort<T>::sort_rows (const T *data, octave_idx_type *idx, octave_idx_type rows, octave_idx_type cols) { -#ifdef INLINE_ASCENDING_SORT +#if defined (INLINE_ASCENDING_SORT) if (compare == ascending_compare) sort_rows (data, idx, rows, cols, std::less<T> ()); else #endif -#ifdef INLINE_DESCENDING_SORT +#if defined (INLINE_DESCENDING_SORT) if (compare == descending_compare) sort_rows (data, idx, rows, cols, std::greater<T> ()); else @@ -1733,12 +1733,12 @@ { bool retval = false; -#ifdef INLINE_ASCENDING_SORT +#if defined (INLINE_ASCENDING_SORT) if (compare == ascending_compare) retval = is_sorted_rows (data, rows, cols, std::less<T> ()); else #endif -#ifdef INLINE_DESCENDING_SORT +#if defined (INLINE_DESCENDING_SORT) if (compare == descending_compare) retval = is_sorted_rows (data, rows, cols, std::greater<T> ()); else @@ -1779,12 +1779,12 @@ { octave_idx_type retval = 0; -#ifdef INLINE_ASCENDING_SORT +#if defined (INLINE_ASCENDING_SORT) if (compare == ascending_compare) retval = lookup (data, nel, value, std::less<T> ()); else #endif -#ifdef INLINE_DESCENDING_SORT +#if defined (INLINE_DESCENDING_SORT) if (compare == descending_compare) retval = lookup (data, nel, value, std::greater<T> ()); else @@ -1815,12 +1815,12 @@ const T* values, octave_idx_type nvalues, octave_idx_type *idx) { -#ifdef INLINE_ASCENDING_SORT +#if defined (INLINE_ASCENDING_SORT) if (compare == ascending_compare) lookup (data, nel, values, nvalues, idx, std::less<T> ()); else #endif -#ifdef INLINE_DESCENDING_SORT +#if defined (INLINE_DESCENDING_SORT) if (compare == descending_compare) lookup (data, nel, values, nvalues, idx, std::greater<T> ()); else @@ -1890,12 +1890,12 @@ const T* values, octave_idx_type nvalues, octave_idx_type *idx, bool rev) { -#ifdef INLINE_ASCENDING_SORT +#if defined (INLINE_ASCENDING_SORT) if (compare == ascending_compare) lookup_sorted (data, nel, values, nvalues, idx, rev, std::less<T> ()); else #endif -#ifdef INLINE_DESCENDING_SORT +#if defined (INLINE_DESCENDING_SORT) if (compare == descending_compare) lookup_sorted (data, nel, values, nvalues, idx, rev, std::greater<T> ()); else @@ -1939,12 +1939,12 @@ { if (up < 0) up = lo + 1; -#ifdef INLINE_ASCENDING_SORT +#if defined (INLINE_ASCENDING_SORT) if (compare == ascending_compare) nth_element (data, nel, lo, up, std::less<T> ()); else #endif -#ifdef INLINE_DESCENDING_SORT +#if defined (INLINE_DESCENDING_SORT) if (compare == descending_compare) nth_element (data, nel, lo, up, std::greater<T> ()); else
--- a/liboctave/util/pathsearch.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/pathsearch.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/singleton-cleanup.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/singleton-cleanup.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/sparse-sort.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/sparse-sort.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/sparse-util.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/sparse-util.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -35,7 +35,7 @@ sparse_chol_error_internal (int status, const char *file, int line, const char *message) { -#ifdef HAVE_CHOLMOD +#if defined (HAVE_CHOLMOD) // Ignore CHOLMOD_NOT_POSDEF, since we handle that in Fchol as an // error or exit status.
--- a/liboctave/util/statdefs.h Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/statdefs.h Tue May 17 12:09:30 2016 -0400 @@ -27,12 +27,12 @@ #include <sys/types.h> -#ifdef HAVE_SYS_STAT_H +#if defined (HAVE_SYS_STAT_H) # include <sys/stat.h> #endif -#ifndef S_ISREG -# ifndef mode_t +#if ! defined (S_ISREG) +# if ! defined (mode_t) # define mode_t unsigned short # endif #endif @@ -65,7 +65,7 @@ # define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK) #endif -#ifndef S_ISLNK +#if ! defined (S_ISLNK) # undef HAVE_LSTAT #endif
--- a/liboctave/util/str-vec.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/str-vec.cc Tue May 17 12:09:30 2016 -0400 @@ -28,7 +28,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/unwind-prot.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/unwind-prot.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/liboctave/util/url-transfer.cc Tue May 17 11:32:53 2016 -0400 +++ b/liboctave/util/url-transfer.cc Tue May 17 12:09:30 2016 -0400 @@ -25,7 +25,7 @@ // Author: Alexander Barth <abarth@marine.usf.edu> // Author: jwe -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -39,7 +39,7 @@ #include "unwind-prot.h" #include "url-transfer.h" -#ifdef HAVE_CURL +#if defined (HAVE_CURL) # include <curl/curl.h> # include <curl/curlver.h> # include <curl/easy.h>
--- a/m4/acinclude.m4 Tue May 17 11:32:53 2016 -0400 +++ b/m4/acinclude.m4 Tue May 17 12:09:30 2016 -0400 @@ -379,7 +379,7 @@ [octave_cv_func_glutesscallback_threedots], [AC_LANG_PUSH(C++) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #ifdef HAVE_GL_GLU_H + #if defined (HAVE_GL_GLU_H) # include <GL/glu.h> #elif defined HAVE_OPENGL_GLU_H || defined HAVE_FRAMEWORK_OPENGL # include <OpenGL/glu.h> @@ -986,20 +986,20 @@ AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h], [AC_CHECK_HEADERS([GL/glu.h OpenGL/glu.h], [have_opengl_incs=yes; break], [], [ -#ifdef HAVE_WINDOWS_H +#if defined (HAVE_WINDOWS_H) #include <windows.h> #endif ]) break ], [], [ -#ifdef HAVE_WINDOWS_H +#if defined (HAVE_WINDOWS_H) # include <windows.h> #endif ]) if test $have_opengl_incs = yes; then AC_CHECK_HEADERS([GL/glext.h OpenGL/glext.h], [], [], [ -#ifdef HAVE_WINDOWS_H +#if defined (HAVE_WINDOWS_H) # include <windows.h> #endif #if defined (HAVE_GL_GL_H) @@ -1080,7 +1080,7 @@ # include <poly.h> # include <io.h> #endif - #ifdef NEED_QHULL_VERSION + #if defined (NEED_QHULL_VERSION) char *qh_version = "version"; #endif ]], [[ @@ -1218,7 +1218,7 @@ #elif defined (HAVE_OPENGL_GL_H) # include <OpenGL/gl.h> #endif - #ifdef HAVE_GL_GLU_H + #if defined (HAVE_GL_GLU_H) # include <GL/glu.h> #elif defined HAVE_OPENGL_GLU_H || defined HAVE_FRAMEWORK_OPENGL # include <OpenGL/glu.h> @@ -1273,7 +1273,7 @@ #include <assert.h> #include <stdint.h> ]], [[ - #ifdef OCTAVE_ENABLE_64 + #if defined (OCTAVE_ENABLE_64) typedef int64_t octave_idx_type; #else typedef int octave_idx_type; @@ -1693,7 +1693,7 @@ [AC_LANG_PUSH(C++) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[ -#ifdef HAVE_LLVM_IR_FUNCTION_H +#if defined (HAVE_LLVM_IR_FUNCTION_H) #include <llvm/IR/Instructions.h> #include <llvm/IR/Attributes.h> #else @@ -1725,7 +1725,7 @@ [AC_LANG_PUSH(C++) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[ -#ifdef HAVE_LLVM_IR_FUNCTION_H +#if defined (HAVE_LLVM_IR_FUNCTION_H) #include <llvm/IR/Function.h> #include <llvm/IR/Attributes.h> #include <llvm/IR/LLVMContext.h> @@ -1759,7 +1759,7 @@ [AC_LANG_PUSH(C++) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[ -#ifdef HAVE_LLVM_IR_FUNCTION_H +#if defined (HAVE_LLVM_IR_FUNCTION_H) #include <llvm/IR/Function.h> #include <llvm/IR/Attributes.h> #else @@ -2343,7 +2343,7 @@ #elif defined (HAVE_UMFPACK_H) # include <umfpack.h> #endif - #ifdef OCTAVE_ENABLE_64 + #if defined (OCTAVE_ENABLE_64) typedef uint64_t idx_type; #define UMFPACK_NAME(name) umfpack_zl_ ## name #else
--- a/src/display-available.c Tue May 17 11:32:53 2016 -0400 +++ b/src/display-available.c Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) #include "config.h" #endif
--- a/src/display-available.h Tue May 17 11:32:53 2016 -0400 +++ b/src/display-available.h Tue May 17 12:09:30 2016 -0400 @@ -23,14 +23,14 @@ #if ! defined (octave_display_available_h) #define octave_display_available_h 1 -#ifdef __cplusplus +#if defined (__cplusplus) # include <new> extern "C" { #endif extern const char *display_available (int *dpy_avail); -#ifdef __cplusplus +#if defined (__cplusplus) } #endif
--- a/src/main-cli.cc Tue May 17 11:32:53 2016 -0400 +++ b/src/main-cli.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/src/main-gui.cc Tue May 17 11:32:53 2016 -0400 +++ b/src/main-gui.cc Tue May 17 12:09:30 2016 -0400 @@ -20,7 +20,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/src/main.in.cc Tue May 17 11:32:53 2016 -0400 +++ b/src/main.in.cc Tue May 17 12:09:30 2016 -0400 @@ -28,7 +28,7 @@ // that it remains small, it should NOT depend on or be linked with // liboctave or libinterp. -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -42,19 +42,19 @@ #include <sys/types.h> #include <unistd.h> -#ifndef OCTAVE_VERSION +#if ! defined (OCTAVE_VERSION) # define OCTAVE_VERSION %OCTAVE_VERSION% #endif -#ifndef OCTAVE_ARCHLIBDIR +#if ! defined (OCTAVE_ARCHLIBDIR) # define OCTAVE_ARCHLIBDIR %OCTAVE_ARCHLIBDIR% #endif -#ifndef OCTAVE_BINDIR +#if ! defined (OCTAVE_BINDIR) # define OCTAVE_BINDIR %OCTAVE_BINDIR% #endif -#ifndef OCTAVE_PREFIX +#if ! defined (OCTAVE_PREFIX) # define OCTAVE_PREFIX %OCTAVE_PREFIX% #endif @@ -108,23 +108,23 @@ install_signal_handlers (void) { -#ifdef SIGINT +#if defined (SIGINT) octave_set_signal_handler (SIGINT, gui_driver_sig_handler); #endif -#ifdef SIGBREAK +#if defined (SIGBREAK) octave_set_signal_handler (SIGBREAK, gui_driver_sig_handler); #endif -#ifdef SIGABRT +#if defined (SIGABRT) octave_set_signal_handler (SIGABRT, gui_driver_sig_handler); #endif -#ifdef SIGALRM +#if defined (SIGALRM) octave_set_signal_handler (SIGALRM, gui_driver_sig_handler); #endif -#ifdef SIGBUS +#if defined (SIGBUS) octave_set_signal_handler (SIGBUS, gui_driver_sig_handler); #endif @@ -132,63 +132,63 @@ // SIGCLD // SIGCONT -#ifdef SIGEMT +#if defined (SIGEMT) octave_set_signal_handler (SIGEMT, gui_driver_sig_handler); #endif -#ifdef SIGFPE +#if defined (SIGFPE) octave_set_signal_handler (SIGFPE, gui_driver_sig_handler); #endif -#ifdef SIGHUP +#if defined (SIGHUP) octave_set_signal_handler (SIGHUP, gui_driver_sig_handler); #endif -#ifdef SIGILL +#if defined (SIGILL) octave_set_signal_handler (SIGILL, gui_driver_sig_handler); #endif // SIGINFO // SIGINT -#ifdef SIGIOT +#if defined (SIGIOT) octave_set_signal_handler (SIGIOT, gui_driver_sig_handler); #endif -#ifdef SIGLOST +#if defined (SIGLOST) octave_set_signal_handler (SIGLOST, gui_driver_sig_handler); #endif -#ifdef SIGPIPE +#if defined (SIGPIPE) octave_set_signal_handler (SIGPIPE, gui_driver_sig_handler); #endif -#ifdef SIGPOLL +#if defined (SIGPOLL) octave_set_signal_handler (SIGPOLL, gui_driver_sig_handler); #endif // SIGPROF // SIGPWR -#ifdef SIGQUIT +#if defined (SIGQUIT) octave_set_signal_handler (SIGQUIT, gui_driver_sig_handler); #endif -#ifdef SIGSEGV +#if defined (SIGSEGV) octave_set_signal_handler (SIGSEGV, gui_driver_sig_handler); #endif // SIGSTOP -#ifdef SIGSYS +#if defined (SIGSYS) octave_set_signal_handler (SIGSYS, gui_driver_sig_handler); #endif -#ifdef SIGTERM +#if defined (SIGTERM) octave_set_signal_handler (SIGTERM, gui_driver_sig_handler); #endif -#ifdef SIGTRAP +#if defined (SIGTRAP) octave_set_signal_handler (SIGTRAP, gui_driver_sig_handler); #endif @@ -197,29 +197,29 @@ // SIGTTOU // SIGURG -#ifdef SIGUSR1 +#if defined (SIGUSR1) octave_set_signal_handler (SIGUSR1, gui_driver_sig_handler); #endif -#ifdef SIGUSR2 +#if defined (SIGUSR2) octave_set_signal_handler (SIGUSR2, gui_driver_sig_handler); #endif -#ifdef SIGVTALRM +#if defined (SIGVTALRM) octave_set_signal_handler (SIGVTALRM, gui_driver_sig_handler); #endif -#ifdef SIGIO +#if defined (SIGIO) octave_set_signal_handler (SIGIO, gui_driver_sig_handler); #endif // SIGWINCH -#ifdef SIGXCPU +#if defined (SIGXCPU) octave_set_signal_handler (SIGXCPU, gui_driver_sig_handler); #endif -#ifdef SIGXFSZ +#if defined (SIGXFSZ) octave_set_signal_handler (SIGXFSZ, gui_driver_sig_handler); #endif
--- a/src/mkoctfile.in.cc Tue May 17 11:32:53 2016 -0400 +++ b/src/mkoctfile.in.cc Tue May 17 12:09:30 2016 -0400 @@ -45,21 +45,21 @@ # include <sys/wait.h> #endif -#ifndef WIFEXITED +#if ! defined (WIFEXITED) # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif -#ifndef WEXITSTATUS +#if ! defined (WEXITSTATUS) # define WEXITSTATUS(stat_val) (static_cast<unsigned> (stat_val) >> 8) #endif static std::map<std::string, std::string> vars; -#ifndef OCTAVE_VERSION +#if ! defined (OCTAVE_VERSION) # define OCTAVE_VERSION %OCTAVE_CONF_VERSION% #endif -#ifndef OCTAVE_PREFIX +#if ! defined (OCTAVE_PREFIX) # define OCTAVE_PREFIX %OCTAVE_CONF_PREFIX% #endif @@ -314,7 +314,7 @@ " .F90 Fortran source (free form)\n" " .o object file\n" " .a library file\n" -#ifdef _MSC_VER +#if defined (_MSC_VER) " .lib library file\n" #endif "\n"; @@ -541,7 +541,7 @@ else if (arg == "-mex" || arg == "--mex") { incflags += " -I."; -#ifdef _MSC_VER +#if defined (_MSC_VER) ldflags += " -Wl,-export:mexFunction"; #endif output_ext = ".mex";
--- a/src/octave-build-info.in.cc Tue May 17 11:32:53 2016 -0400 +++ b/src/octave-build-info.in.cc Tue May 17 12:09:30 2016 -0400 @@ -21,7 +21,7 @@ */ -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif
--- a/src/octave-config.in.cc Tue May 17 11:32:53 2016 -0400 +++ b/src/octave-config.in.cc Tue May 17 12:09:30 2016 -0400 @@ -31,7 +31,7 @@ #include <algorithm> #include <cstdlib> -#ifndef OCTAVE_PREFIX +#if ! defined (OCTAVE_PREFIX) # define OCTAVE_PREFIX %OCTAVE_PREFIX% #endif
--- a/src/shared-fcns.h Tue May 17 11:32:53 2016 -0400 +++ b/src/shared-fcns.h Tue May 17 12:09:30 2016 -0400 @@ -28,7 +28,7 @@ #include <windows.h> #include <tlhelp32.h> -#ifdef _MSC_VER +#if defined (_MSC_VER) # define popen _popen # define pclose _pclose #endif @@ -41,7 +41,7 @@ std::string bin_dir; HANDLE h = CreateToolhelp32Snapshot (TH32CS_SNAPMODULE -#ifdef TH32CS_SNAPMODULE32 +#if defined (TH32CS_SNAPMODULE32) | TH32CS_SNAPMODULE32 #endif , 0);