# HG changeset patch
# User Rik <rik@octave.org>
# Date 1449167018 28800
# Node ID f7084eae3318ddfd669099adc8e57b7ae3482cee
# Parent  c2d9556d51d067599694c1e39cd42c4b8a0df65b
maint: Use Octave coding conventions for #if statements.

* mk-opts.pl, dialog.h, find-files-dialog.h, find-files-model.h,
file-editor-tab.h, octave-qscintilla.h, octave-txt-lexer.h, main-window.h,
octave-cmd.h, octave-dock-widget.h, octave-gui.h, thread-manager.h,
workspace-model.h, workspace-view.h, builtins.h, Cell.h, bitfcns.cc,
c-file-ptr-stream.h, cdisplay.h, comment-list.h, cutils.h, data.h, debug.h,
defaults.in.h, defun-dld.h, defun-int.h, defun.h, dirfns.h, display.h,
dynamic-ld.h, error.h, event-queue.h, file-io.h, filter.cc, getrusage.cc,
gl-render.h, gl2ps-renderer.h, graphics.in.h, gripes.h, help.h, hook-fcn.h,
input.h, jit-ir.h, jit-typeinfo.h, jit-util.h, load-path.h, load-save.h,
ls-ascii-helper.h, ls-hdf5.h, ls-mat-ascii.h, ls-mat4.h, ls-mat5.h,
ls-oct-binary.h, ls-oct-text.h, ls-utils.h, oct-errno.h, oct-fstrm.h,
oct-handle.h, oct-hdf5-types.h, oct-hdf5.h, oct-hist.h, oct-iostrm.h,
oct-lvalue.h, oct-map.h, oct-obj.h, oct-prcstrm.h, oct-procbuf.h,
oct-stdstrm.h, oct-stream.h, oct-strstrm.h, oct.h, octave-link.h, pager.h,
pr-output.h, procstream.h, profiler.h, pt-jit.h, sighandlers.cc, sighandlers.h,
siglist.h, sparse-xdiv.h, sparse-xpow.h, symtab.h, syscalls.cc, sysdep.h,
toplev.cc, toplev.h, utils.h, variables.h, workspace-element.h, xdiv.h,
xnorm.h, xpow.h, dmperm.cc, oct-qhull.h, mkbuiltins, oct-conf.in.h,
ov-base-diag.h, ov-base-int.h, ov-base-mat.h, ov-base-scalar.h,
ov-base-sparse.h, ov-base.h, ov-bool-mat.h, ov-bool-sparse.h, ov-bool.h,
ov-builtin.h, ov-cell.h, ov-ch-mat.h, ov-class.h, ov-classdef.h, ov-colon.h,
ov-complex.h, ov-cs-list.h, ov-cx-diag.h, ov-cx-mat.h, ov-cx-sparse.h,
ov-dld-fcn.h, ov-fcn-handle.h, ov-fcn-inline.h, ov-fcn.h, ov-float.h,
ov-flt-complex.h, ov-flt-cx-diag.h, ov-flt-cx-mat.h, ov-flt-re-diag.h,
ov-flt-re-mat.h, ov-int-traits.h, ov-int16.h, ov-int32.h, ov-int64.h,
ov-int8.h, ov-java.h, ov-lazy-idx.h, ov-mex-fcn.h, ov-null-mat.h, ov-perm.h,
ov-range.h, ov-re-diag.h, ov-re-mat.h, ov-re-sparse.h, ov-scalar.h,
ov-str-mat.h, ov-struct.h, ov-type-conv.h, ov-typeinfo.h, ov-uint16.h,
ov-uint32.h, ov-uint64.h, ov-uint8.h, ov-usr-fcn.h, ov.h, octave.h, ops.h,
options-usage.h, lex.h, parse.h, pt-all.h, pt-arg-list.h, pt-array-list.h,
pt-assign.h, pt-binop.h, pt-bp.h, pt-cbinop.h, pt-cell.h, pt-check.h,
pt-classdef.h, pt-cmd.h, pt-colon.h, pt-const.h, pt-decl.h, pt-eval.h,
pt-except.h, pt-exp.h, pt-fcn-handle.h, pt-funcall.h, pt-id.h, pt-idx.h,
pt-jump.h, pt-loop.h, pt-mat.h, pt-misc.h, pt-pr-code.h, pt-select.h,
pt-stmt.h, pt-unop.h, pt-walk.h, pt.h, token.h, version.in.h, Array-util.h,
Array.h, CColVector.h, CDiagMatrix.h, CMatrix.h, CNDArray.h, CRowVector.h,
CSparse.h, DiagArray2.h, MArray-decl.h, MArray-defs.h, MArray.h, MDiagArray2.h,
MSparse.h, Matrix.h, MatrixType.h, PermMatrix.h, Range.h, Sparse.h,
boolMatrix.h, boolNDArray.h, boolSparse.h, chMatrix.h, chNDArray.h,
dColVector.h, dDiagMatrix.h, dMatrix.h, dNDArray.h, dRowVector.h, dSparse.h,
dim-vector.h, fCColVector.h, fCDiagMatrix.h, fCMatrix.h, fCNDArray.h,
fCRowVector.h, fColVector.h, fDiagMatrix.h, fMatrix.h, fNDArray.h,
fRowVector.h, idx-vector.h, int16NDArray.h, int32NDArray.h, int64NDArray.h,
int8NDArray.h, intNDArray.h, uint16NDArray.h, uint32NDArray.h, uint64NDArray.h,
uint8NDArray.h, f77-fcn.h, lo-error.h, quit.h, CmplxAEPBAL.h, CmplxCHOL.h,
CmplxGEPBAL.h, CmplxHESS.h, CmplxLU.h, CmplxQR.h, CmplxQRP.h, CmplxSCHUR.h,
CmplxSVD.h, CollocWt.h, DAE.h, DAEFunc.h, DAERT.h, DAERTFunc.h, DASPK.h,
DASRT.h, DASSL.h, DET.h, EIG.h, LSODE.h, ODE.h, ODEFunc.h, ODES.h, ODESFunc.h,
Quad.h, SparseCmplxCHOL.h, SparseCmplxLU.h, SparseCmplxQR.cc, SparseCmplxQR.h,
SparseQR.h, SparsedbleCHOL.h, SparsedbleLU.h, base-aepbal.h, base-dae.h,
base-de.h, base-lu.h, base-min.h, base-qr.h, bsxfun-decl.h, bsxfun-defs.cc,
bsxfun.h, dbleAEPBAL.h, dbleCHOL.h, dbleGEPBAL.h, dbleHESS.h, dbleLU.h,
dbleQR.h, dbleQRP.h, dbleSCHUR.h, dbleSVD.h, eigs-base.cc, fCmplxAEPBAL.h,
fCmplxCHOL.h, fCmplxGEPBAL.h, fCmplxHESS.h, fCmplxLU.h, fCmplxQR.h,
fCmplxQRP.h, fCmplxSCHUR.h, fCmplxSVD.h, fEIG.h, floatAEPBAL.h, floatCHOL.h,
floatGEPBAL.h, floatHESS.h, floatLU.h, floatQR.h, floatQRP.h, floatSCHUR.h,
floatSVD.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h,
oct-convn.h, oct-fftw.h, oct-norm.h, oct-rand.h, oct-spparms.h, randmtzig.c,
sparse-base-chol.h, sparse-base-lu.h, sparse-dmsolve.cc, Sparse-diag-op-defs.h,
Sparse-op-decls.h, Sparse-op-defs.h, Sparse-perm-op-defs.h, mk-ops.awk,
mx-base.h, mx-defs.h, mx-ext.h, mx-inlines.cc, mx-op-decl.h, mx-op-defs.h,
sparse-mk-ops.awk, dir-ops.h, file-ops.h, file-stat.h, lo-sysdep.h,
mach-info.h, oct-env.h, oct-group.h, oct-openmp.h, oct-passwd.h,
oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.h, pathlen.h, sysdir.h,
syswait.h, action-container.h, base-list.h, byte-swap.h, caseless-str.h,
cmd-edit.h, cmd-hist.h, data-conv.h, functor.h, glob-match.h, kpse.cc,
lo-array-gripes.h, lo-cutils.h, lo-ieee.h, lo-macros.h, lo-math.h, lo-regexp.h,
lo-traits.h, lo-utils.h, oct-alloc.h, oct-base64.h, oct-binmap.h, oct-cmplx.h,
oct-glob.h, oct-inttypes.h, oct-locbuf.h, oct-mutex.h, oct-refcount.h,
oct-rl-edit.h, oct-rl-hist.h, oct-shlib.h, oct-sort.h, oct-sparse.h,
pathsearch.h, singleton-cleanup.h, sparse-sort.h, sparse-util.h, statdefs.h,
str-vec.h, sun-utils.h, unwind-prot.h, url-transfer.h:
Use Octave coding conventions for #if statements.

diff -r c2d9556d51d0 -r f7084eae3318 build-aux/mk-opts.pl
--- a/build-aux/mk-opts.pl	Thu Dec 03 12:15:38 2015 -0500
+++ b/build-aux/mk-opts.pl	Thu Dec 03 10:23:38 2015 -0800
@@ -372,7 +372,7 @@
 // DO NOT EDIT!
 // Generated automatically from $DEFN_FILE.
 
-#if !defined (octave_${CLASS_NAME}_h)
+#if ! defined (octave_${CLASS_NAME}_h)
 #define octave_${CLASS_NAME}_h 1
 
 #include <cfloat>
diff -r c2d9556d51d0 -r f7084eae3318 libgui/src/dialog.h
--- a/libgui/src/dialog.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libgui/src/dialog.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_dialog_h)
+#if ! defined (octave_dialog_h)
 #define octave_dialog_h 1
 
 #include <QMutex>
diff -r c2d9556d51d0 -r f7084eae3318 libgui/src/find-files-dialog.h
--- a/libgui/src/find-files-dialog.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libgui/src/find-files-dialog.h	Thu Dec 03 10:23:38 2015 -0800
@@ -19,7 +19,7 @@
 <http://www.gnu.org/licenses/>.
 
 */
-#if !defined (octave_find_files_dialog_h)
+#if ! defined (octave_find_files_dialog_h)
 #define octave_find_files_dialog_h
 
 #include <QDialog>
diff -r c2d9556d51d0 -r f7084eae3318 libgui/src/find-files-model.h
--- a/libgui/src/find-files-model.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libgui/src/find-files-model.h	Thu Dec 03 10:23:38 2015 -0800
@@ -19,7 +19,7 @@
 <http://www.gnu.org/licenses/>.
 
 */
-#if !defined (octave_find_files_model_h)
+#if ! defined (octave_find_files_model_h)
 #define octave_find_files_model_h
 
 #include <QAbstractListModel>
diff -r c2d9556d51d0 -r f7084eae3318 libgui/src/m-editor/file-editor-tab.h
--- a/libgui/src/m-editor/file-editor-tab.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libgui/src/m-editor/file-editor-tab.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_file_editor_tab_h)
+#if ! defined (octave_file_editor_tab_h)
 #define octave_file_editor_tab_h 1
 
 #include <QWidget>
diff -r c2d9556d51d0 -r f7084eae3318 libgui/src/m-editor/octave-qscintilla.h
--- a/libgui/src/m-editor/octave-qscintilla.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libgui/src/m-editor/octave-qscintilla.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 // Author: Torsten <ttl@justmail.de>
 
-#if !defined (octave_octave_qscintilla_h)
+#if ! defined (octave_octave_qscintilla_h)
 #define octave_octave_qscintilla_h 1
 
 #include <Qsci/qsciscintilla.h>
diff -r c2d9556d51d0 -r f7084eae3318 libgui/src/m-editor/octave-txt-lexer.h
--- a/libgui/src/m-editor/octave-txt-lexer.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libgui/src/m-editor/octave-txt-lexer.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 // Author: Torsten <ttl@justmail.de>
 
-#if !defined (octave_txt_lexer_h)
+#if ! defined (octave_txt_lexer_h)
 #define octave_txt_lexer_h 1
 
 #include <Qsci/qsciscintilla.h>
diff -r c2d9556d51d0 -r f7084eae3318 libgui/src/main-window.h
--- a/libgui/src/main-window.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libgui/src/main-window.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_main_window_h)
+#if ! defined (octave_main_window_h)
 #define octave_main_window_h 1
 
 // Qt includes
diff -r c2d9556d51d0 -r f7084eae3318 libgui/src/octave-cmd.h
--- a/libgui/src/octave-cmd.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libgui/src/octave-cmd.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 // Author: Torsten <ttl@justmail.de>
 
-#if !defined (octave_cmd_h)
+#if ! defined (octave_cmd_h)
 #define octave_cmd_h 1
 
 #include <QString>
diff -r c2d9556d51d0 -r f7084eae3318 libgui/src/octave-dock-widget.h
--- a/libgui/src/octave-dock-widget.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libgui/src/octave-dock-widget.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_octave_dock_widget_h)
+#if ! defined (octave_octave_dock_widget_h)
 #define octave_octave_dock_widget_h 1
 
 #include <QDockWidget>
diff -r c2d9556d51d0 -r f7084eae3318 libgui/src/octave-gui.h
--- a/libgui/src/octave-gui.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libgui/src/octave-gui.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_octave_gui_h)
+#if ! defined (octave_octave_gui_h)
 #define octave_octave_gui_h 1
 
 extern OCTGUI_API int octave_start_gui (int argc, char **argv,
diff -r c2d9556d51d0 -r f7084eae3318 libgui/src/thread-manager.h
--- a/libgui/src/thread-manager.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libgui/src/thread-manager.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_thread_manager_h)
+#if ! defined (octave_thread_manager_h)
 #define octave_thread_manager_h 1
 
 class octave_base_thread_manager
diff -r c2d9556d51d0 -r f7084eae3318 libgui/src/workspace-model.h
--- a/libgui/src/workspace-model.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libgui/src/workspace-model.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_workspace_model_h)
+#if ! defined (octave_workspace_model_h)
 #define octave_workspace_model_h 1
 
 #include <QAbstractTableModel>
diff -r c2d9556d51d0 -r f7084eae3318 libgui/src/workspace-view.h
--- a/libgui/src/workspace-view.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libgui/src/workspace-view.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_workspace_view_h)
+#if ! defined (octave_workspace_view_h)
 #define octave_workspace_view_h 1
 
 #include <QItemDelegate>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/builtins.h
--- a/libinterp/builtins.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/builtins.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,10 +20,10 @@
 
 */
 
-#if !defined (octave_builtins_h)
+#if ! defined (octave_builtins_h)
 #define octave_builtins_h 1
 
-#if !defined (MAKE_BUILTINS)
+#if ! defined (MAKE_BUILTINS)
 #include "builtin-defun-decls.h"
 #endif
 
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/Cell.h
--- a/libinterp/corefcn/Cell.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/Cell.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_Cell_h)
+#if ! defined (octave_Cell_h)
 #define octave_Cell_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/bitfcns.cc
--- a/libinterp/corefcn/bitfcns.cc	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/bitfcns.cc	Thu Dec 03 10:23:38 2015 -0800
@@ -47,7 +47,7 @@
 
 #include <functional>
 
-#if !defined (HAVE_CXX_BITWISE_OP_TEMPLATES)
+#if ! defined (HAVE_CXX_BITWISE_OP_TEMPLATES)
 namespace std
 {
   template <typename T>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/c-file-ptr-stream.h
--- a/libinterp/corefcn/c-file-ptr-stream.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/c-file-ptr-stream.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_c_file_ptr_stream_h)
+#if ! defined (octave_c_file_ptr_stream_h)
 #define octave_c_file_ptr_stream_h 1
 
 #include <cstdio>
@@ -32,7 +32,7 @@
 {
 public:
 
-#if !defined (CXX_ISO_COMPLIANT_LIBRARY)
+#if ! defined (CXX_ISO_COMPLIANT_LIBRARY)
   typedef int int_type;
 #else
   typedef std::streambuf::int_type int_type;
@@ -152,7 +152,7 @@
 {
 public:
 
-#if !defined (CXX_ISO_COMPLIANT_LIBRARY)
+#if ! defined (CXX_ISO_COMPLIANT_LIBRARY)
   typedef int int_type;
 #else
   typedef std::streambuf::int_type int_type;
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/cdisplay.h
--- a/libinterp/corefcn/cdisplay.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/cdisplay.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_cdisplay_h)
+#if ! defined (octave_cdisplay_h)
 #define octave_cdisplay_h 1
 
 #ifdef __cplusplus
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/comment-list.h
--- a/libinterp/corefcn/comment-list.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/comment-list.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_comment_list_h)
+#if ! defined (octave_comment_list_h)
 #define octave_comment_list_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/cutils.h
--- a/libinterp/corefcn/cutils.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/cutils.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_cutils_h)
+#if ! defined (octave_cutils_h)
 #define octave_cutils_h 1
 
 #include <stdarg.h>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/data.h
--- a/libinterp/corefcn/data.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/data.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_data_h)
+#if ! defined (octave_data_h)
 #define octave_data_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/debug.h
--- a/libinterp/corefcn/debug.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/debug.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_debug_h)
+#if ! defined (octave_debug_h)
 #define octave_debug_h 1
 
 #include <map>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/defaults.in.h
--- a/libinterp/corefcn/defaults.in.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/defaults.in.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_defaults_h)
+#if ! defined (octave_defaults_h)
 #define octave_defaults_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/defun-dld.h
--- a/libinterp/corefcn/defun-dld.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/defun-dld.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_defun_dld_h)
+#if ! defined (octave_defun_dld_h)
 #define octave_defun_dld_h 1
 
 #if defined (octave_defun_h)
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/defun-int.h
--- a/libinterp/corefcn/defun-int.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/defun-int.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_defun_int_h)
+#if ! defined (octave_defun_int_h)
 #define octave_defun_int_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/defun.h
--- a/libinterp/corefcn/defun.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/defun.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_defun_h)
+#if ! defined (octave_defun_h)
 #define octave_defun_h 1
 
 #if defined (octave_defun_dld_h)
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/dirfns.h
--- a/libinterp/corefcn/dirfns.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/dirfns.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_dirfns_h)
+#if ! defined (octave_dirfns_h)
 #define octave_dirfns_h 1
 
 #include <ctime>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/display.h
--- a/libinterp/corefcn/display.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/display.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_display_h)
+#if ! defined (octave_display_h)
 #define octave_display_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/dynamic-ld.h
--- a/libinterp/corefcn/dynamic-ld.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/dynamic-ld.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_dynamic_ld_h)
+#if ! defined (octave_dynamic_ld_h)
 #define octave_dynamic_ld_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/error.h
--- a/libinterp/corefcn/error.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/error.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_error_h)
+#if ! defined (octave_error_h)
 #define octave_error_h 1
 
 #include <cstdarg>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/event-queue.h
--- a/libinterp/corefcn/event-queue.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/event-queue.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_event_queue_h)
+#if ! defined (octave_event_queue_h)
 #define octave_event_queue_h 1
 
 #include <queue>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/file-io.h
--- a/libinterp/corefcn/file-io.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/file-io.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 // Written by John C. Campbell <jcc@bevo.che.wisc.edu>
 
-#if !defined (octave_file_io_h)
+#if ! defined (octave_file_io_h)
 #define octave_file_io_h 1
 
 extern OCTINTERP_API void initialize_file_io (void);
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/filter.cc
--- a/libinterp/corefcn/filter.cc	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/filter.cc	Thu Dec 03 10:23:38 2015 -0800
@@ -38,7 +38,7 @@
 #include "error.h"
 #include "oct-obj.h"
 
-#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
+#if ! defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
 extern MArray<double>
 filter (MArray<double>&, MArray<double>&, MArray<double>&, int dim);
 
@@ -235,7 +235,7 @@
   return y;
 }
 
-#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
+#if ! defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
 extern MArray<double>
 filter (MArray<double>&, MArray<double>&, MArray<double>&,
         MArray<double>&, int dim);
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/getrusage.cc
--- a/libinterp/corefcn/getrusage.cc	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/getrusage.cc	Thu Dec 03 10:23:38 2015 -0800
@@ -43,7 +43,7 @@
 #include "oct-obj.h"
 #include "utils.h"
 
-#if !defined (HZ)
+#if ! defined (HZ)
 #if defined (CLK_TCK)
 #define HZ CLK_TCK
 #elif defined (USG)
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/gl-render.h
--- a/libinterp/corefcn/gl-render.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/gl-render.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_gl_render_h)
+#if ! defined (octave_gl_render_h)
 #define octave_gl_render_h 1
 
 #ifdef HAVE_WINDOWS_H
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/gl2ps-renderer.h
--- a/libinterp/corefcn/gl2ps-renderer.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/gl2ps-renderer.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_gl2ps_renderer_h)
+#if ! defined (octave_gl2ps_renderer_h)
 #define octave_gl2ps_renderer_h 1
 
 #include "graphics.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/graphics.in.h
--- a/libinterp/corefcn/graphics.in.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/graphics.in.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_graphics_h)
+#if ! defined (octave_graphics_h)
 #define octave_graphics_h 1
 
 #ifdef HAVE_CONFIG_H
@@ -49,7 +49,7 @@
 // FIXME: maybe this should be a configure option?
 // Matlab defaults to "Helvetica", but that causes problems for many
 // gnuplot users.
-#if !defined (OCTAVE_DEFAULT_FONTNAME)
+#if ! defined (OCTAVE_DEFAULT_FONTNAME)
 #define OCTAVE_DEFAULT_FONTNAME "*"
 #endif
 
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/gripes.h
--- a/libinterp/corefcn/gripes.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/gripes.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_gripes_h)
+#if ! defined (octave_gripes_h)
 #define octave_gripes_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/help.h
--- a/libinterp/corefcn/help.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/help.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_help_h)
+#if ! defined (octave_help_h)
 #define octave_help_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/hook-fcn.h
--- a/libinterp/corefcn/hook-fcn.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/hook-fcn.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_hook_fcn_h)
+#if ! defined (octave_hook_fcn_h)
 #define octave_hook_fcn_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/input.h
--- a/libinterp/corefcn/input.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/input.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 // Use the GNU readline library for command line editing and hisory.
 
-#if !defined (octave_input_h)
+#if ! defined (octave_input_h)
 #define octave_input_h 1
 
 #include <cstdio>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/jit-ir.h
--- a/libinterp/corefcn/jit-ir.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/jit-ir.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 // Author: Max Brister <max@2bass.com>
 
-#if !defined (octave_jit_ir_h)
+#if ! defined (octave_jit_ir_h)
 #define octave_jit_ir_h 1
 
 #ifdef HAVE_LLVM
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/jit-typeinfo.h
--- a/libinterp/corefcn/jit-typeinfo.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/jit-typeinfo.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 // Author: Max Brister <max@2bass.com>
 
-#if !defined (octave_jit_typeinfo_h)
+#if ! defined (octave_jit_typeinfo_h)
 #define octave_jit_typeinfo_h 1
 
 #ifdef HAVE_LLVM
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/jit-util.h
--- a/libinterp/corefcn/jit-util.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/jit-util.h	Thu Dec 03 10:23:38 2015 -0800
@@ -24,14 +24,14 @@
 
 // Some utility classes and functions used throughout jit
 
-#if !defined (octave_jit_util_h)
+#if ! defined (octave_jit_util_h)
 #define octave_jit_util_h 1
 
 #ifdef HAVE_LLVM
 
 #include <stdexcept>
 
-#if defined(HAVE_LLVM_IR_DATALAYOUT_H) || defined(HAVE_LLVM_DATALAYOUT_H)
+#if defined (HAVE_LLVM_IR_DATALAYOUT_H) || defined (HAVE_LLVM_DATALAYOUT_H)
 #define HAVE_LLVM_DATALAYOUT
 #endif
 
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/load-path.h
--- a/libinterp/corefcn/load-path.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/load-path.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_load_path_h)
+#if ! defined (octave_load_path_h)
 #define octave_load_path_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/load-save.h
--- a/libinterp/corefcn/load-save.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/load-save.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_load_save_h)
+#if ! defined (octave_load_save_h)
 #define octave_load_save_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/ls-ascii-helper.h
--- a/libinterp/corefcn/ls-ascii-helper.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/ls-ascii-helper.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ls_ascii_helper_h)
+#if ! defined (octave_ls_ascii_helper_h)
 #define octave_ls_ascii_helper_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/ls-hdf5.h
--- a/libinterp/corefcn/ls-hdf5.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/ls-hdf5.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ls_hdf5_h)
+#if ! defined (octave_ls_hdf5_h)
 #define octave_ls_hdf5_h 1
 
 #if defined (HAVE_HDF5)
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/ls-mat-ascii.h
--- a/libinterp/corefcn/ls-mat-ascii.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/ls-mat-ascii.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ls_mat_ascii_h)
+#if ! defined (octave_ls_mat_ascii_h)
 #define octave_ls_mat_ascii_h 1
 
 extern std::string
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/ls-mat4.h
--- a/libinterp/corefcn/ls-mat4.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/ls-mat4.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ls_mat4_h)
+#if ! defined (octave_ls_mat4_h)
 #define octave_ls_mat4_h 1
 
 extern oct_mach_info::float_format
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/ls-mat5.h
--- a/libinterp/corefcn/ls-mat5.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/ls-mat5.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ls_mat5_h)
+#if ! defined (octave_ls_mat5_h)
 #define octave_ls_mat5_h 1
 
 enum mat5_data_type
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/ls-oct-binary.h
--- a/libinterp/corefcn/ls-oct-binary.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/ls-oct-binary.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ls_oct_binary_h)
+#if ! defined (octave_ls_oct_binary_h)
 #define octave_ls_oct_binary_h 1
 
 extern OCTINTERP_API bool
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/ls-oct-text.h
--- a/libinterp/corefcn/ls-oct-text.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/ls-oct-text.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ls_oct_text_h)
+#if ! defined (octave_ls_oct_text_h)
 #define octave_ls_oct_text_h 1
 
 #include <cfloat>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/ls-utils.h
--- a/libinterp/corefcn/ls-utils.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/ls-utils.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ls_utils_h)
+#if ! defined (octave_ls_utils_h)
 #define octave_ls_utils 1
 
 extern save_type
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/oct-errno.h
--- a/libinterp/corefcn/oct-errno.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/oct-errno.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_oct_errno_h)
+#if ! defined (octave_oct_errno_h)
 #define octave_oct_errno_h 1
 
 #include <cerrno>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/oct-fstrm.h
--- a/libinterp/corefcn/oct-fstrm.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/oct-fstrm.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_fstrm_h)
+#if ! defined (octave_oct_fstrm_h)
 #define octave_oct_fstrm_h 1
 
 #include <fstream>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/oct-handle.h
--- a/libinterp/corefcn/oct-handle.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/oct-handle.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_handle_h)
+#if ! defined (octave_oct_handle_h)
 #define octave_oct_handle_h 1
 
 #include "dMatrix.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/oct-hdf5-types.h
--- a/libinterp/corefcn/oct-hdf5-types.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/oct-hdf5-types.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_hdf5_types_h)
+#if ! defined (octave_oct_hdf5_types_h)
 #define octave_oct_hdf5_types_h 1
 
 typedef int octave_hdf5_id;
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/oct-hdf5.h
--- a/libinterp/corefcn/oct-hdf5.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/oct-hdf5.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_hdf5_h)
+#if ! defined (octave_oct_hdf5_h)
 #define octave_hdf5_h 1
 
 #if defined (HAVE_HDF5_H)
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/oct-hist.h
--- a/libinterp/corefcn/oct-hist.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/oct-hist.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_hist_h)
+#if ! defined (octave_oct_hist_h)
 #define octave_oct_hist_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/oct-iostrm.h
--- a/libinterp/corefcn/oct-iostrm.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/oct-iostrm.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_iostrm_h)
+#if ! defined (octave_oct_iostrm_h)
 #define octave_oct_iostrm_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/oct-lvalue.h
--- a/libinterp/corefcn/oct-lvalue.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/oct-lvalue.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_lvalue_h)
+#if ! defined (octave_oct_lvalue_h)
 #define octave_oct_lvalue_h 1
 
 class octave_value;
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/oct-map.h
--- a/libinterp/corefcn/oct-map.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/oct-map.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_oct_map_h)
+#if ! defined (octave_oct_map_h)
 #define octave_oct_map_h 1
 
 #include <algorithm>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/oct-obj.h
--- a/libinterp/corefcn/oct-obj.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/oct-obj.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_oct_obj_h)
+#if ! defined (octave_oct_obj_h)
 #define octave_oct_obj_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/oct-prcstrm.h
--- a/libinterp/corefcn/oct-prcstrm.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/oct-prcstrm.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_prcstrm_h)
+#if ! defined (octave_oct_prcstrm_h)
 #define octave_oct_prcstrm_h 1
 
 #include "oct-stdstrm.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/oct-procbuf.h
--- a/libinterp/corefcn/oct-procbuf.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/oct-procbuf.h	Thu Dec 03 10:23:38 2015 -0800
@@ -23,7 +23,7 @@
 // This class is based on the procbuf class from libg++, written by
 // Per Bothner, Copyright (C) 1993 Free Software Foundation.
 
-#if !defined (octave_oct_procbuf_h)
+#if ! defined (octave_oct_procbuf_h)
 #define octave_oct_procbuf_h 1
 
 #include <sys/types.h>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/oct-stdstrm.h
--- a/libinterp/corefcn/oct-stdstrm.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/oct-stdstrm.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_stdstrm_h)
+#if ! defined (octave_oct_stdstrm_h)
 #define octave_oct_stdstrm_h 1
 
 #include "oct-stream.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/oct-stream.h
--- a/libinterp/corefcn/oct-stream.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/oct-stream.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_stream_h)
+#if ! defined (octave_oct_stream_h)
 #define octave_oct_stream_h 1
 
 class Matrix;
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/oct-strstrm.h
--- a/libinterp/corefcn/oct-strstrm.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/oct-strstrm.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_strstrm_h)
+#if ! defined (octave_oct_strstrm_h)
 #define octave_oct_strstrm_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/oct.h
--- a/libinterp/corefcn/oct.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/oct.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_h)
+#if ! defined (octave_oct_h)
 #define octave_oct_h 1
 
 // Things that are often included to create .oct files.
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/octave-link.h
--- a/libinterp/corefcn/octave-link.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/octave-link.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 */
 
-#if !defined (octave_octave_link_h)
+#if ! defined (octave_octave_link_h)
 #define octave_octave_link_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/pager.h
--- a/libinterp/corefcn/pager.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/pager.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pager_h)
+#if ! defined (octave_pager_h)
 #define octave_pager_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/pr-output.h
--- a/libinterp/corefcn/pr-output.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/pr-output.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pr_output_h)
+#if ! defined (octave_pr_output_h)
 #define octave_pr_output_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/procstream.h
--- a/libinterp/corefcn/procstream.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/procstream.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_procstream_h)
+#if ! defined (octave_procstream_h)
 #define octave_procstream_h 1
 
 #include <istream>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/profiler.h
--- a/libinterp/corefcn/profiler.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/profiler.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_profiler_h)
+#if ! defined (octave_profiler_h)
 #define octave_profiler_h 1
 
 #include <cstddef>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/pt-jit.h
--- a/libinterp/corefcn/pt-jit.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/pt-jit.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 // Author: Max Brister <max@2bass.com>
 
-#if !defined (octave_pt_jit_h)
+#if ! defined (octave_pt_jit_h)
 #define octave_pt_jit_h 1
 
 #ifdef HAVE_LLVM
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/sighandlers.cc
--- a/libinterp/corefcn/sighandlers.cc	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/sighandlers.cc	Thu Dec 03 10:23:38 2015 -0800
@@ -255,7 +255,7 @@
     } \
   while (0)
 
-#if !defined (SIGCHLD) && defined (SIGCLD)
+#if ! defined (SIGCHLD) && defined (SIGCLD)
 #define SIGCHLD SIGCLD
 #endif
 
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/sighandlers.h
--- a/libinterp/corefcn/sighandlers.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/sighandlers.h	Thu Dec 03 10:23:38 2015 -0800
@@ -30,7 +30,7 @@
 
 // This file should always be included after config.h!
 
-#if !defined (octave_sighandlers_h)
+#if ! defined (octave_sighandlers_h)
 #define octave_sighandlers_h 1
 
 // Include signal.h, not csignal since the latter might only define
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/siglist.h
--- a/libinterp/corefcn/siglist.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/siglist.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_siglist_h)
+#if ! defined (octave_siglist_h)
 #define octave_siglist_h 1
 
 #ifdef __cplusplus
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/sparse-xdiv.h
--- a/libinterp/corefcn/sparse-xdiv.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/sparse-xdiv.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_sparse_xdiv_h)
+#if ! defined (octave_sparse_xdiv_h)
 #define octave_sparse_xdiv_h 1
 
 #include "oct-cmplx.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/sparse-xpow.h
--- a/libinterp/corefcn/sparse-xpow.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/sparse-xpow.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_sparse_xpow_h)
+#if ! defined (octave_sparse_xpow_h)
 #define octave_sparse_xpow_h 1
 
 #include "oct-cmplx.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/symtab.h
--- a/libinterp/corefcn/symtab.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/symtab.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_symtab_h)
+#if ! defined (octave_symtab_h)
 #define octave_symtab_h 1
 
 #include <deque>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/syscalls.cc
--- a/libinterp/corefcn/syscalls.cc	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/syscalls.cc	Thu Dec 03 10:23:38 2015 -0800
@@ -1607,7 +1607,7 @@
   return retval;
 }
 
-#if !defined (O_NONBLOCK) && defined (O_NDELAY)
+#if ! defined (O_NONBLOCK) && defined (O_NDELAY)
 #define O_NONBLOCK O_NDELAY
 #endif
 
@@ -1856,7 +1856,7 @@
 #endif
 }
 
-#if !defined (WNOHANG)
+#if ! defined (WNOHANG)
 #define WNOHANG 0
 #endif
 
@@ -1872,7 +1872,7 @@
   return const_value (args, WNOHANG);
 }
 
-#if !defined (WUNTRACED)
+#if ! defined (WUNTRACED)
 #define WUNTRACED 0
 #endif
 
@@ -1888,7 +1888,7 @@
   return const_value (args, WUNTRACED);
 }
 
-#if !defined (WCONTINUE)
+#if ! defined (WCONTINUE)
 #define WCONTINUE 0
 #endif
 
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/sysdep.h
--- a/libinterp/corefcn/sysdep.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/sysdep.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_sysdep_h)
+#if ! defined (octave_sysdep_h)
 #define octave_sysdep_h 1
 
 #include <cstdio>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/toplev.cc
--- a/libinterp/corefcn/toplev.cc	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/toplev.cc	Thu Dec 03 10:23:38 2015 -0800
@@ -1503,7 +1503,7 @@
 
 #if defined (WIN32)
       windows_system = true;
-#if !defined (__CYGWIN__)
+#if ! defined (__CYGWIN__)
       unix_system = false;
 #endif
 #endif
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/toplev.h
--- a/libinterp/corefcn/toplev.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/toplev.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_toplev_h)
+#if ! defined (octave_toplev_h)
 #define octave_toplev_h 1
 
 #include <cstdio>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/utils.h
--- a/libinterp/corefcn/utils.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/utils.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_utils_h)
+#if ! defined (octave_utils_h)
 #define octave_utils_h 1
 
 #include <cstdarg>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/variables.h
--- a/libinterp/corefcn/variables.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/variables.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_variables_h)
+#if ! defined (octave_variables_h)
 #define octave_variables_h 1
 
 class octave_function;
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/workspace-element.h
--- a/libinterp/corefcn/workspace-element.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/workspace-element.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_workspace_element_h)
+#if ! defined (octave_workspace_element_h)
 #define octave_workspace_element_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/xdiv.h
--- a/libinterp/corefcn/xdiv.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/xdiv.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_xdiv_h)
+#if ! defined (octave_xdiv_h)
 #define octave_xdiv_h 1
 
 #include "mx-defs.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/xnorm.h
--- a/libinterp/corefcn/xnorm.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/xnorm.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 // author: Jaroslav Hajek <highegg@gmail.com>
 
-#if !defined (octave_xnorm_h)
+#if ! defined (octave_xnorm_h)
 #define octave_xnorm_h 1
 
 #include "oct-norm.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/corefcn/xpow.h
--- a/libinterp/corefcn/xpow.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/corefcn/xpow.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_xpow_h)
+#if ! defined (octave_xpow_h)
 #define octave_xpow_h 1
 
 #include "oct-cmplx.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/dldfcn/dmperm.cc
--- a/libinterp/dldfcn/dmperm.cc	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/dldfcn/dmperm.cc	Thu Dec 03 10:23:38 2015 -0800
@@ -84,7 +84,7 @@
 
   if (nargout <= 1 || rank)
     {
-#if defined(CS_VER) && (CS_VER >= 2)
+#if defined (CS_VER) && (CS_VER >= 2)
       octave_idx_type *jmatch = CXSPARSE_NAME (_maxtrans) (&csm, 0);
 #else
       octave_idx_type *jmatch = CXSPARSE_NAME (_maxtrans) (&csm);
@@ -103,7 +103,7 @@
     }
   else
     {
-#if defined(CS_VER) && (CS_VER >= 2)
+#if defined (CS_VER) && (CS_VER >= 2)
       CXSPARSE_NAME (d) *dm = CXSPARSE_NAME(_dmperm) (&csm, 0);
 #else
       CXSPARSE_NAME (d) *dm = CXSPARSE_NAME(_dmperm) (&csm);
@@ -111,7 +111,7 @@
 
       //retval(5) = put_int (dm->rr, 5);
       //retval(4) = put_int (dm->cc, 5);
-#if defined(CS_VER) && (CS_VER >= 2)
+#if defined (CS_VER) && (CS_VER >= 2)
       retval(3) = put_int (dm->s, dm->nb+1);
       retval(2) = put_int (dm->r, dm->nb+1);
       retval(1) = put_int (dm->q, nc);
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/dldfcn/oct-qhull.h
--- a/libinterp/dldfcn/oct-qhull.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/dldfcn/oct-qhull.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_qhull_h)
+#if ! defined (octave_oct_qhull_h)
 #define octave_oct_qhull_h 1
 
 #include <cstdio>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/mkbuiltins
--- a/libinterp/mkbuiltins	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/mkbuiltins	Thu Dec 03 10:23:38 2015 -0800
@@ -47,7 +47,7 @@
   cat << \EOF
 // DO NOT EDIT!  Generated automatically by mkbuiltins.
 
-#if !defined (octave_builtin_defun_decls_h)
+#if ! defined (octave_builtin_defun_decls_h)
 #define octave_builtin_defun_decls_h 1
 
 #include "oct-obj.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/oct-conf.in.h
--- a/libinterp/oct-conf.in.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/oct-conf.in.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_conf_h)
+#if ! defined (octave_conf_h)
 #define octave_conf_h 1
 
 #ifndef OCTAVE_CONF_ALL_CFLAGS
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-base-diag.h
--- a/libinterp/octave-value/ov-base-diag.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-base-diag.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_base_diag_h)
+#if ! defined (octave_ov_base_diag_h)
 #define octave_ov_base_diag_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-base-int.h
--- a/libinterp/octave-value/ov-base-int.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-base-int.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_base_int_h)
+#if ! defined (octave_ov_base_int_h)
 #define octave_ov_base_int_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-base-mat.h
--- a/libinterp/octave-value/ov-base-mat.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-base-mat.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ov_base_mat_h)
+#if ! defined (octave_ov_base_mat_h)
 #define octave_ov_base_mat_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-base-scalar.h
--- a/libinterp/octave-value/ov-base-scalar.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-base-scalar.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_base_scalar_h)
+#if ! defined (octave_ov_base_scalar_h)
 #define octave_ov_base_scalar_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-base-sparse.h
--- a/libinterp/octave-value/ov-base-sparse.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-base-sparse.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ov_base_sparse_h)
+#if ! defined (octave_ov_base_sparse_h)
 #define octave_ov_base_sparse_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-base.h
--- a/libinterp/octave-value/ov-base.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-base.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ov_base_h)
+#if ! defined (octave_ov_base_h)
 #define octave_ov_base_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-bool-mat.h
--- a/libinterp/octave-value/ov-bool-mat.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-bool-mat.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ov_bool_mat_h)
+#if ! defined (octave_ov_bool_mat_h)
 #define octave_ov_bool_mat_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-bool-sparse.h
--- a/libinterp/octave-value/ov-bool-sparse.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-bool-sparse.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ov_bool_sparse_h)
+#if ! defined (octave_ov_bool_sparse_h)
 #define octave_ov_bool_sparse_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-bool.h
--- a/libinterp/octave-value/ov-bool.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-bool.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_bool_h)
+#if ! defined (octave_ov_bool_h)
 #define octave_ov_bool_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-builtin.h
--- a/libinterp/octave-value/ov-builtin.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-builtin.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_builtin_h)
+#if ! defined (octave_ov_builtin_h)
 #define octave_ov_builtin_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-cell.h
--- a/libinterp/octave-value/ov-cell.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-cell.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ov_cell_h)
+#if ! defined (octave_ov_cell_h)
 #define octave_ov_cell_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-ch-mat.h
--- a/libinterp/octave-value/ov-ch-mat.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-ch-mat.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ov_ch_mat_h)
+#if ! defined (octave_ov_ch_mat_h)
 #define octave_ov_ch_mat_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-class.h
--- a/libinterp/octave-value/ov-class.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-class.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ov_class_h)
+#if ! defined (octave_ov_class_h)
 #define octave_ov_class_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-classdef.h
--- a/libinterp/octave-value/ov-classdef.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-classdef.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_classdef_h)
+#if ! defined (octave_classdef_h)
 #define octave_classdef_h 1
 
 #include <map>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-colon.h
--- a/libinterp/octave-value/ov-colon.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-colon.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_colon_h)
+#if ! defined (octave_ov_colon_h)
 #define octave_ov_colon_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-complex.h
--- a/libinterp/octave-value/ov-complex.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-complex.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_complex_h)
+#if ! defined (octave_ov_complex_h)
 #define octave_ov_complex_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-cs-list.h
--- a/libinterp/octave-value/ov-cs-list.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-cs-list.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_cs_list_h)
+#if ! defined (octave_ov_cs_list_h)
 #define octave_ov_cs_list_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-cx-diag.h
--- a/libinterp/octave-value/ov-cx-diag.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-cx-diag.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_cx_diag_h)
+#if ! defined (octave_ov_cx_diag_h)
 #define octave_ov_cx_diag_h 1
 
 #include "ov-base.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-cx-mat.h
--- a/libinterp/octave-value/ov-cx-mat.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-cx-mat.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ov_cx_mat_h)
+#if ! defined (octave_ov_cx_mat_h)
 #define octave_ov_cx_mat_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-cx-sparse.h
--- a/libinterp/octave-value/ov-cx-sparse.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-cx-sparse.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ov_cx_sparse_h)
+#if ! defined (octave_ov_cx_sparse_h)
 #define octave_ov_cx_sparse_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-dld-fcn.h
--- a/libinterp/octave-value/ov-dld-fcn.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-dld-fcn.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_dld_fcn_h)
+#if ! defined (octave_ov_dld_fcn_h)
 #define octave_ov_dld_fcn_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-fcn-handle.h
--- a/libinterp/octave-value/ov-fcn-handle.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-fcn-handle.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ov_fcn_handle_h)
+#if ! defined (octave_ov_fcn_handle_h)
 #define octave_ov_fcn_handle_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-fcn-inline.h
--- a/libinterp/octave-value/ov-fcn-inline.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-fcn-inline.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_fcn_inline_h)
+#if ! defined (octave_ov_fcn_inline_h)
 #define octave_ov_fcn_inline_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-fcn.h
--- a/libinterp/octave-value/ov-fcn.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-fcn.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_fcn_h)
+#if ! defined (octave_ov_fcn_h)
 #define octave_ov_fcn_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-float.h
--- a/libinterp/octave-value/ov-float.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-float.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_float_h)
+#if ! defined (octave_ov_float_h)
 #define octave_ov_float_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-flt-complex.h
--- a/libinterp/octave-value/ov-flt-complex.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-flt-complex.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_flt_complex_h)
+#if ! defined (octave_ov_flt_complex_h)
 #define octave_ov_flt_complex_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-flt-cx-diag.h
--- a/libinterp/octave-value/ov-flt-cx-diag.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-flt-cx-diag.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_flt_cx_diag_h)
+#if ! defined (octave_ov_flt_cx_diag_h)
 #define octave_ov_flt_cx_diag_h 1
 
 #include "ov-base.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-flt-cx-mat.h
--- a/libinterp/octave-value/ov-flt-cx-mat.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-flt-cx-mat.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ov_flt_cx_mat_h)
+#if ! defined (octave_ov_flt_cx_mat_h)
 #define octave_ov_flt_cx_mat_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-flt-re-diag.h
--- a/libinterp/octave-value/ov-flt-re-diag.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-flt-re-diag.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_flt_re_diag_h)
+#if ! defined (octave_ov_flt_re_diag_h)
 #define octave_ov_flt_re_diag_h 1
 
 #include "ov-base.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-flt-re-mat.h
--- a/libinterp/octave-value/ov-flt-re-mat.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-flt-re-mat.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ov_flt_re_mat_h)
+#if ! defined (octave_ov_flt_re_mat_h)
 #define octave_ov_flt_re_mat_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-int-traits.h
--- a/libinterp/octave-value/ov-int-traits.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-int-traits.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_int_traits_h)
+#if ! defined (octave_ov_int_traits_h)
 #define octave_ov_int_traits_h 1
 
 #include "ov-int8.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-int16.h
--- a/libinterp/octave-value/ov-int16.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-int16.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_int16_h)
+#if ! defined (octave_ov_int16_h)
 #define octave_ov_int16_h 1
 
 #define OCTAVE_INT_T octave_int16
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-int32.h
--- a/libinterp/octave-value/ov-int32.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-int32.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_int32_h)
+#if ! defined (octave_ov_int32_h)
 #define octave_ov_int32_h 1
 
 #define OCTAVE_INT_T octave_int32
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-int64.h
--- a/libinterp/octave-value/ov-int64.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-int64.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_int64_h)
+#if ! defined (octave_ov_int64_h)
 #define octave_ov_int64_h 1
 
 #define OCTAVE_INT_T octave_int64
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-int8.h
--- a/libinterp/octave-value/ov-int8.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-int8.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_int8_h)
+#if ! defined (octave_ov_int8_h)
 #define octave_ov_int8_h 1
 
 #define OCTAVE_INT_T octave_int8
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-java.h
--- a/libinterp/octave-value/ov-java.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-java.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_java_h)
+#if ! defined (octave_ov_java_h)
 #define octave_ov_java_h 1
 
 #include <jni.h>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-lazy-idx.h
--- a/libinterp/octave-value/ov-lazy-idx.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-lazy-idx.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_lazy_idx_h)
+#if ! defined (octave_ov_lazy_idx_h)
 #define octave_ov_lazy_idx_h 1
 
 #include "ov-re-mat.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-mex-fcn.h
--- a/libinterp/octave-value/ov-mex-fcn.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-mex-fcn.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_mex_fcn_h)
+#if ! defined (octave_ov_mex_fcn_h)
 #define octave_ov_mex_fcn_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-null-mat.h
--- a/libinterp/octave-value/ov-null-mat.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-null-mat.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_null_mat_h)
+#if ! defined (octave_ov_null_mat_h)
 #define octave_ov_null_mat_h 1
 
 #include "ov.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-perm.h
--- a/libinterp/octave-value/ov-perm.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-perm.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_perm_h)
+#if ! defined (octave_ov_perm_h)
 #define octave_ov_perm_h 1
 
 #include "mx-base.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-range.h
--- a/libinterp/octave-value/ov-range.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-range.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_range_h)
+#if ! defined (octave_ov_range_h)
 #define octave_ov_range_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-re-diag.h
--- a/libinterp/octave-value/ov-re-diag.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-re-diag.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_re_diag_h)
+#if ! defined (octave_ov_re_diag_h)
 #define octave_ov_re_diag_h 1
 
 #include "ov-base.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-re-mat.h
--- a/libinterp/octave-value/ov-re-mat.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-re-mat.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ov_re_mat_h)
+#if ! defined (octave_ov_re_mat_h)
 #define octave_ov_re_mat_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-re-sparse.h
--- a/libinterp/octave-value/ov-re-sparse.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-re-sparse.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ov_re_sparse_h)
+#if ! defined (octave_ov_re_sparse_h)
 #define octave_ov_re_sparse_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-scalar.h
--- a/libinterp/octave-value/ov-scalar.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-scalar.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_scalar_h)
+#if ! defined (octave_ov_scalar_h)
 #define octave_ov_scalar_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-str-mat.h
--- a/libinterp/octave-value/ov-str-mat.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-str-mat.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ov_str_mat_h)
+#if ! defined (octave_ov_str_mat_h)
 #define octave_ov_str_mat_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-struct.h
--- a/libinterp/octave-value/ov-struct.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-struct.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_struct_h)
+#if ! defined (octave_ov_struct_h)
 #define octave_ov_struct_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-type-conv.h
--- a/libinterp/octave-value/ov-type-conv.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-type-conv.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_type_conv_h)
+#if ! defined (octave_ov_type_conv_h)
 #define octave_ov_type_conv_h 1
 
 static
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-typeinfo.h
--- a/libinterp/octave-value/ov-typeinfo.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-typeinfo.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_typeinfo_h)
+#if ! defined (octave_ov_typeinfo_h)
 #define octave_ov_typeinfo_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-uint16.h
--- a/libinterp/octave-value/ov-uint16.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-uint16.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_uint16_h)
+#if ! defined (octave_ov_uint16_h)
 #define octave_ov_uint16_h 1
 
 #define OCTAVE_INT_T octave_uint16
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-uint32.h
--- a/libinterp/octave-value/ov-uint32.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-uint32.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_uint32_h)
+#if ! defined (octave_ov_uint32_h)
 #define octave_ov_uint32_h 1
 
 #define OCTAVE_INT_T octave_uint32
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-uint64.h
--- a/libinterp/octave-value/ov-uint64.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-uint64.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_uint64_h)
+#if ! defined (octave_ov_uint64_h)
 #define octave_ov_uint64_h 1
 
 #define OCTAVE_INT_T octave_uint64
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-uint8.h
--- a/libinterp/octave-value/ov-uint8.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-uint8.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_uint8_h)
+#if ! defined (octave_ov_uint8_h)
 #define octave_ov_uint8_h 1
 
 #define OCTAVE_INT_T octave_uint8
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov-usr-fcn.h
--- a/libinterp/octave-value/ov-usr-fcn.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov-usr-fcn.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ov_usr_fcn_h)
+#if ! defined (octave_ov_usr_fcn_h)
 #define octave_ov_usr_fcn_h 1
 
 #include <ctime>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave-value/ov.h
--- a/libinterp/octave-value/ov.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave-value/ov.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ov_h)
+#if ! defined (octave_ov_h)
 #define octave_ov_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/octave.h
--- a/libinterp/octave.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/octave.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_octave_h)
+#if ! defined (octave_octave_h)
 #define octave_octave_h 1
 
 #ifdef  __cplusplus
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/operators/ops.h
--- a/libinterp/operators/ops.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/operators/ops.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_ops_h)
+#if ! defined (octave_ops_h)
 #define octave_ops_h 1
 
 #include "Array-util.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/options-usage.h
--- a/libinterp/options-usage.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/options-usage.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_options_usage_h)
+#if ! defined (octave_options_usage_h)
 #define octave_options_usage_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/lex.h
--- a/libinterp/parse-tree/lex.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/lex.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_lex_h)
+#if ! defined (octave_lex_h)
 #define octave_lex_h 1
 
 #include <deque>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/parse.h
--- a/libinterp/parse-tree/parse.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/parse.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_parse_h)
+#if ! defined (octave_parse_h)
 #define octave_parse_h 1
 
 #include <cstdio>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-all.h
--- a/libinterp/parse-tree/pt-all.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-all.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_all_h)
+#if ! defined (octave_pt_all_h)
 #define octave_pt_all_h 1
 
 #include "pt.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-arg-list.h
--- a/libinterp/parse-tree/pt-arg-list.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-arg-list.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_arg_list_h)
+#if ! defined (octave_pt_arg_list_h)
 #define octave_pt_arg_list_h 1
 
 #include <list>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-array-list.h
--- a/libinterp/parse-tree/pt-array-list.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-array-list.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_array_list_h)
+#if ! defined (octave_pt_array_list_h)
 #define octave_pt_array_list_h 1
 
 #include "base-list.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-assign.h
--- a/libinterp/parse-tree/pt-assign.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-assign.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_assign_h)
+#if ! defined (octave_pt_assign_h)
 #define octave_pt_assign_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-binop.h
--- a/libinterp/parse-tree/pt-binop.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-binop.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_binop_h)
+#if ! defined (octave_pt_binop_h)
 #define octave_pt_binop_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-bp.h
--- a/libinterp/parse-tree/pt-bp.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-bp.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_bp_h)
+#if ! defined (octave_pt_bp_h)
 #define octave_pt_bp_h 1
 
 #include "input.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-cbinop.h
--- a/libinterp/parse-tree/pt-cbinop.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-cbinop.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_cbinop_h)
+#if ! defined (octave_pt_cbinop_h)
 #define octave_pt_cbinop_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-cell.h
--- a/libinterp/parse-tree/pt-cell.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-cell.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_cell_h)
+#if ! defined (octave_pt_cell_h)
 #define octave_pt_cell_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-check.h
--- a/libinterp/parse-tree/pt-check.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-check.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_check_h)
+#if ! defined (octave_pt_check_h)
 #define octave_pt_check_h 1
 
 #include "pt-walk.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-classdef.h
--- a/libinterp/parse-tree/pt-classdef.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-classdef.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_tree_classdef_h)
+#if ! defined (octave_tree_classdef_h)
 #define octave_tree_classdef_h 1
 
 class octave_value;
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-cmd.h
--- a/libinterp/parse-tree/pt-cmd.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-cmd.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_cmd_h)
+#if ! defined (octave_pt_cmd_h)
 #define octave_pt_cmd_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-colon.h
--- a/libinterp/parse-tree/pt-colon.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-colon.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_colon_h)
+#if ! defined (octave_pt_colon_h)
 #define octave_tree_colon 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-const.h
--- a/libinterp/parse-tree/pt-const.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-const.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_const_h)
+#if ! defined (octave_pt_const_h)
 #define octave_pt_const_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-decl.h
--- a/libinterp/parse-tree/pt-decl.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-decl.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_decl_h)
+#if ! defined (octave_pt_decl_h)
 #define octave_pt_decl_h 1
 
 class tree_expression;
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-eval.h
--- a/libinterp/parse-tree/pt-eval.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-eval.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_eval_h)
+#if ! defined (octave_pt_eval_h)
 #define octave_pt_eval_h 1
 
 #include <stack>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-except.h
--- a/libinterp/parse-tree/pt-except.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-except.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_except_h)
+#if ! defined (octave_pt_except_h)
 #define octave_pt_except_h 1
 
 class tree_statement_list;
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-exp.h
--- a/libinterp/parse-tree/pt-exp.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-exp.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_exp_h)
+#if ! defined (octave_pt_exp_h)
 #define octave_pt_exp_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-fcn-handle.h
--- a/libinterp/parse-tree/pt-fcn-handle.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-fcn-handle.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_fcn_handle_h)
+#if ! defined (octave_pt_fcn_handle_h)
 #define octave_fcn_handle_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-funcall.h
--- a/libinterp/parse-tree/pt-funcall.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-funcall.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_tree_funcall_h)
+#if ! defined (octave_tree_funcall_h)
 #define octave_tree_funcall_h 1
 
 #include "ov.h"
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-id.h
--- a/libinterp/parse-tree/pt-id.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-id.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_id_h)
+#if ! defined (octave_pt_id_h)
 #define octave_pt_id_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-idx.h
--- a/libinterp/parse-tree/pt-idx.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-idx.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_idx_h)
+#if ! defined (octave_pt_idx_h)
 #define octave_pt_idx_h 1
 
 #include <list>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-jump.h
--- a/libinterp/parse-tree/pt-jump.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-jump.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_jump_h)
+#if ! defined (octave_pt_jump_h)
 #define octave_pt_jump_h 1
 
 class tree_walker;
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-loop.h
--- a/libinterp/parse-tree/pt-loop.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-loop.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_loop_h)
+#if ! defined (octave_pt_loop_h)
 #define octave_pt_loop_h 1
 
 class octave_value;
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-mat.h
--- a/libinterp/parse-tree/pt-mat.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-mat.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_mat_h)
+#if ! defined (octave_pt_mat_h)
 #define octave_pt_mat_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-misc.h
--- a/libinterp/parse-tree/pt-misc.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-misc.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_misc_h)
+#if ! defined (octave_pt_misc_h)
 #define octave_pt_misc_h 1
 
 class Cell;
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-pr-code.h
--- a/libinterp/parse-tree/pt-pr-code.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-pr-code.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_pr_code_h)
+#if ! defined (octave_pt_pr_code_h)
 #define octave_pt_pr_code_h 1
 
 #include <stack>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-select.h
--- a/libinterp/parse-tree/pt-select.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-select.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_select_h)
+#if ! defined (octave_pt_select_h)
 #define octave_pt_select_h 1
 
 class expression;
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-stmt.h
--- a/libinterp/parse-tree/pt-stmt.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-stmt.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_stmt_h)
+#if ! defined (octave_pt_stmt_h)
 #define octave_pt_stmt_h 1
 
 class octave_value_list;
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-unop.h
--- a/libinterp/parse-tree/pt-unop.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-unop.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_unop_h)
+#if ! defined (octave_pt_unop_h)
 #define octave_pt_unop_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt-walk.h
--- a/libinterp/parse-tree/pt-walk.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt-walk.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_walk_h)
+#if ! defined (octave_pt_walk_h)
 #define octave_pt_walk_h 1
 
 class tree_anon_fcn_handle;
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/pt.h
--- a/libinterp/parse-tree/pt.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/pt.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pt_h)
+#if ! defined (octave_pt_h)
 #define octave_pt_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/parse-tree/token.h
--- a/libinterp/parse-tree/token.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/parse-tree/token.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_token_h)
+#if ! defined (octave_token_h)
 #define octave_token_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 libinterp/version.in.h
--- a/libinterp/version.in.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/libinterp/version.in.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_version_h)
+#if ! defined (octave_version_h)
 #define octave_version_h 1
 
 #define OCTAVE_VERSION %OCTAVE_VERSION%
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/Array-util.h
--- a/liboctave/array/Array-util.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/Array-util.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_Array_util_h)
+#if ! defined (octave_Array_util_h)
 #define octave_Array_util_h 1
 
 #include "Array.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/Array.h
--- a/liboctave/array/Array.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/Array.h	Thu Dec 03 10:23:38 2015 -0800
@@ -23,7 +23,7 @@
 
 */
 
-#if !defined (octave_Array_h)
+#if ! defined (octave_Array_h)
 #define octave_Array_h 1
 
 #include <cassert>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/CColVector.h
--- a/liboctave/array/CColVector.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/CColVector.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_CColVector_h)
+#if ! defined (octave_CColVector_h)
 #define octave_CColVector_h 1
 
 #include "MArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/CDiagMatrix.h
--- a/liboctave/array/CDiagMatrix.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/CDiagMatrix.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_CDiagMatrix_h)
+#if ! defined (octave_CDiagMatrix_h)
 #define octave_CDiagMatrix_h 1
 
 #include "MDiagArray2.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/CMatrix.h
--- a/liboctave/array/CMatrix.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/CMatrix.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_CMatrix_h)
+#if ! defined (octave_CMatrix_h)
 #define octave_CMatrix_h 1
 
 #include "MArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/CNDArray.h
--- a/liboctave/array/CNDArray.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/CNDArray.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_CNDArray_h)
+#if ! defined (octave_CNDArray_h)
 #define octave_CNDArray_h 1
 
 #include "MArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/CRowVector.h
--- a/liboctave/array/CRowVector.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/CRowVector.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_CRowVector_h)
+#if ! defined (octave_CRowVector_h)
 #define octave_CRowVector_h 1
 
 #include "MArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/CSparse.h
--- a/liboctave/array/CSparse.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/CSparse.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_CSparse_h)
+#if ! defined (octave_CSparse_h)
 #define octave_CSparse_h 1
 
 #include "dMatrix.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/DiagArray2.h
--- a/liboctave/array/DiagArray2.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/DiagArray2.h	Thu Dec 03 10:23:38 2015 -0800
@@ -23,7 +23,7 @@
 
 */
 
-#if !defined (octave_DiagArray2_h)
+#if ! defined (octave_DiagArray2_h)
 #define octave_DiagArray2_h 1
 
 #include <cassert>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/MArray-decl.h
--- a/liboctave/array/MArray-decl.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/MArray-decl.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_MArray_decl_h)
+#if ! defined (octave_MArray_decl_h)
 #define octave_MArray_decl_h 1
 
 // A macro that can be used to declare and instantiate OP= operators.
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/MArray-defs.h
--- a/liboctave/array/MArray-defs.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/MArray-defs.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_MArray_defs_h)
+#if ! defined (octave_MArray_defs_h)
 #define octave_MArray_defs_h 1
 
 #include "mx-inlines.cc"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/MArray.h
--- a/liboctave/array/MArray.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/MArray.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 */
 
-#if !defined (octave_MArray_h)
+#if ! defined (octave_MArray_h)
 #define octave_MArray_h 1
 
 #include "Array.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/MDiagArray2.h
--- a/liboctave/array/MDiagArray2.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/MDiagArray2.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 */
 
-#if !defined (octave_MDiagArray2_h)
+#if ! defined (octave_MDiagArray2_h)
 #define octave_MDiagArray2_h 1
 
 #include "DiagArray2.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/MSparse.h
--- a/liboctave/array/MSparse.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/MSparse.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_MSparse_h)
+#if ! defined (octave_MSparse_h)
 #define octave_MSparse_h 1
 
 #ifdef HAVE_CONFIG_H
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/Matrix.h
--- a/liboctave/array/Matrix.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/Matrix.h	Thu Dec 03 10:23:38 2015 -0800
@@ -24,7 +24,7 @@
 // Should probably say something here about why these classes are not
 // represented by some sort of inheritance tree...
 
-#if !defined (octave_Matrix_h)
+#if ! defined (octave_Matrix_h)
 #define octave_Matrix_h 1
 
 #include "mx-base.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/MatrixType.h
--- a/liboctave/array/MatrixType.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/MatrixType.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_MatrixType_h)
+#if ! defined (octave_MatrixType_h)
 #define octave_MatrixType_h
 
 class Matrix;
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/PermMatrix.h
--- a/liboctave/array/PermMatrix.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/PermMatrix.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_PermMatrix_h)
+#if ! defined (octave_PermMatrix_h)
 #define octave_PermMatrix_h 1
 
 #include "Array.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/Range.h
--- a/liboctave/array/Range.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/Range.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_Range_h)
+#if ! defined (octave_Range_h)
 #define octave_Range_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/Sparse.h
--- a/liboctave/array/Sparse.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/Sparse.h	Thu Dec 03 10:23:38 2015 -0800
@@ -23,7 +23,7 @@
 
 */
 
-#if !defined (octave_Sparse_h)
+#if ! defined (octave_Sparse_h)
 #define octave_Sparse_h 1
 
 #include <cassert>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/boolMatrix.h
--- a/liboctave/array/boolMatrix.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/boolMatrix.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_boolMatrix_h)
+#if ! defined (octave_boolMatrix_h)
 #define octave_boolMatrix_h 1
 
 #include "Array.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/boolNDArray.h
--- a/liboctave/array/boolNDArray.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/boolNDArray.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_boolNDArray_h)
+#if ! defined (octave_boolNDArray_h)
 #define octave_boolNDArray_h 1
 
 #include "Array.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/boolSparse.h
--- a/liboctave/array/boolSparse.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/boolSparse.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_boolSparse_h)
+#if ! defined (octave_boolSparse_h)
 #define octave_boolSparse_h 1
 
 #include "Sparse.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/chMatrix.h
--- a/liboctave/array/chMatrix.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/chMatrix.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_chMatrix_h)
+#if ! defined (octave_chMatrix_h)
 #define octave_chMatrix_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/chNDArray.h
--- a/liboctave/array/chNDArray.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/chNDArray.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_chNDArray_h)
+#if ! defined (octave_chNDArray_h)
 #define octave_chNDArray_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/dColVector.h
--- a/liboctave/array/dColVector.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/dColVector.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_dColVector_h)
+#if ! defined (octave_dColVector_h)
 #define octave_dColVector_h 1
 
 #include "MArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/dDiagMatrix.h
--- a/liboctave/array/dDiagMatrix.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/dDiagMatrix.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_dDiagMatrix_h)
+#if ! defined (octave_dDiagMatrix_h)
 #define octave_dDiagMatrix_h 1
 
 #include "MDiagArray2.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/dMatrix.h
--- a/liboctave/array/dMatrix.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/dMatrix.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_dMatrix_h)
+#if ! defined (octave_dMatrix_h)
 #define octave_dMatrix_h 1
 
 #include "dNDArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/dNDArray.h
--- a/liboctave/array/dNDArray.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/dNDArray.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_dNDArray_h)
+#if ! defined (octave_dNDArray_h)
 #define octave_dNDArray_h 1
 
 #include "MArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/dRowVector.h
--- a/liboctave/array/dRowVector.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/dRowVector.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_dRowVector_h)
+#if ! defined (octave_dRowVector_h)
 #define octave_dRowVector_h 1
 
 #include "MArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/dSparse.h
--- a/liboctave/array/dSparse.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/dSparse.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_dSparse_h)
+#if ! defined (octave_dSparse_h)
 #define octave_dSparse_h 1
 
 #include "dMatrix.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/dim-vector.h
--- a/liboctave/array/dim-vector.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/dim-vector.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_dim_vector_h)
+#if ! defined (octave_dim_vector_h)
 #define octave_dim_vector_h 1
 
 #include <cassert>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/fCColVector.h
--- a/liboctave/array/fCColVector.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/fCColVector.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_fCColVector_h)
+#if ! defined (octave_fCColVector_h)
 #define octave_fCColVector_h 1
 
 #include "MArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/fCDiagMatrix.h
--- a/liboctave/array/fCDiagMatrix.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/fCDiagMatrix.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_fCDiagMatrix_h)
+#if ! defined (octave_fCDiagMatrix_h)
 #define octave_fCDiagMatrix_h 1
 
 #include "MDiagArray2.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/fCMatrix.h
--- a/liboctave/array/fCMatrix.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/fCMatrix.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_fCMatrix_h)
+#if ! defined (octave_fCMatrix_h)
 #define octave_fCMatrix_h 1
 
 #include "fCNDArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/fCNDArray.h
--- a/liboctave/array/fCNDArray.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/fCNDArray.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_fCNDArray_h)
+#if ! defined (octave_fCNDArray_h)
 #define octave_fCNDArray_h 1
 
 #include "MArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/fCRowVector.h
--- a/liboctave/array/fCRowVector.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/fCRowVector.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_fCRowVector_h)
+#if ! defined (octave_fCRowVector_h)
 #define octave_fCRowVector_h 1
 
 #include "MArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/fColVector.h
--- a/liboctave/array/fColVector.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/fColVector.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_fColVector_h)
+#if ! defined (octave_fColVector_h)
 #define octave_fColVector_h 1
 
 #include "MArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/fDiagMatrix.h
--- a/liboctave/array/fDiagMatrix.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/fDiagMatrix.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_fDiagMatrix_h)
+#if ! defined (octave_fDiagMatrix_h)
 #define octave_fDiagMatrix_h 1
 
 #include "MDiagArray2.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/fMatrix.h
--- a/liboctave/array/fMatrix.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/fMatrix.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_fMatrix_h)
+#if ! defined (octave_fMatrix_h)
 #define octave_fMatrix_h 1
 
 #include "fNDArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/fNDArray.h
--- a/liboctave/array/fNDArray.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/fNDArray.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_fNDArray_h)
+#if ! defined (octave_fNDArray_h)
 #define octave_fNDArray_h 1
 
 #include "MArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/fRowVector.h
--- a/liboctave/array/fRowVector.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/fRowVector.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_fRowVector_h)
+#if ! defined (octave_fRowVector_h)
 #define octave_fRowVector_h 1
 
 #include "MArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/idx-vector.h
--- a/liboctave/array/idx-vector.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/idx-vector.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 */
 
-#if !defined (octave_idx_vector_h)
+#if ! defined (octave_idx_vector_h)
 #define octave_idx_vector_h 1
 
 #include <cassert>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/int16NDArray.h
--- a/liboctave/array/int16NDArray.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/int16NDArray.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_int16NDArray_h)
+#if ! defined (octave_int16NDArray_h)
 #define octave_int16NDArray_h 1
 
 #include "intNDArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/int32NDArray.h
--- a/liboctave/array/int32NDArray.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/int32NDArray.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_int32NDArray_h)
+#if ! defined (octave_int32NDArray_h)
 #define octave_int32NDArray_h 1
 
 #include "intNDArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/int64NDArray.h
--- a/liboctave/array/int64NDArray.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/int64NDArray.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_int64NDArray_h)
+#if ! defined (octave_int64NDArray_h)
 #define octave_int64NDArray_h 1
 
 #include "intNDArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/int8NDArray.h
--- a/liboctave/array/int8NDArray.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/int8NDArray.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_int8NDArray_h)
+#if ! defined (octave_int8NDArray_h)
 #define octave_int8NDArray_h 1
 
 #include "intNDArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/intNDArray.h
--- a/liboctave/array/intNDArray.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/intNDArray.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_intNDArray_h)
+#if ! defined (octave_intNDArray_h)
 #define octave_intNDArray_h 1
 
 #include "MArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/uint16NDArray.h
--- a/liboctave/array/uint16NDArray.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/uint16NDArray.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_uint16NDArray_h)
+#if ! defined (octave_uint16NDArray_h)
 #define octave_uint16NDArray_h 1
 
 #include "intNDArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/uint32NDArray.h
--- a/liboctave/array/uint32NDArray.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/uint32NDArray.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_uint32NDArray_h)
+#if ! defined (octave_uint32NDArray_h)
 #define octave_uint32NDArray_h 1
 
 #include "intNDArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/uint64NDArray.h
--- a/liboctave/array/uint64NDArray.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/uint64NDArray.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_uint64NDArray_h)
+#if ! defined (octave_uint64NDArray_h)
 #define octave_uint64NDArray_h 1
 
 #include "intNDArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/array/uint8NDArray.h
--- a/liboctave/array/uint8NDArray.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/array/uint8NDArray.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_uint8NDArray_h)
+#if ! defined (octave_uint8NDArray_h)
 #define octave_uint8NDArray_h 1
 
 #include "intNDArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/cruft/misc/f77-fcn.h
--- a/liboctave/cruft/misc/f77-fcn.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/cruft/misc/f77-fcn.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_f77_fcn_h)
+#if ! defined (octave_f77_fcn_h)
 #define octave_f77_fcn_h 1
 
 #include "quit.h"
@@ -76,7 +76,7 @@
 /* So we can check to see if an exception has occurred. */
 CRUFT_API extern int f77_exception_encountered;
 
-#if !defined (F77_FCN)
+#if ! defined (F77_FCN)
 #define F77_FCN(f, F) F77_FUNC (f, F)
 #endif
 
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/cruft/misc/lo-error.h
--- a/liboctave/cruft/misc/lo-error.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/cruft/misc/lo-error.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_lo_error_h)
+#if ! defined (octave_lo_error_h)
 #define octave_lo_error_h 1
 
 #ifdef __cplusplus
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/cruft/misc/quit.h
--- a/liboctave/cruft/misc/quit.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/cruft/misc/quit.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_quit_h)
+#if ! defined (octave_quit_h)
 #define octave_quit_h 1
 
 #include <stdio.h>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/CmplxAEPBAL.h
--- a/liboctave/numeric/CmplxAEPBAL.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/CmplxAEPBAL.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_CmplxAEPBAL_h)
+#if ! defined (octave_CmplxAEPBAL_h)
 #define octave_CmplxAEPBAL_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/CmplxCHOL.h
--- a/liboctave/numeric/CmplxCHOL.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/CmplxCHOL.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_CmplxCHOL_h)
+#if ! defined (octave_CmplxCHOL_h)
 #define octave_CmplxCHOL_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/CmplxGEPBAL.h
--- a/liboctave/numeric/CmplxGEPBAL.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/CmplxGEPBAL.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_CmplxGEPBAL_h)
+#if ! defined (octave_CmplxGEPBAL_h)
 #define octave_CmplxGEPBAL_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/CmplxHESS.h
--- a/liboctave/numeric/CmplxHESS.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/CmplxHESS.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_CmplxHESS_h)
+#if ! defined (octave_CmplxHESS_h)
 #define octave_CmplxHESS_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/CmplxLU.h
--- a/liboctave/numeric/CmplxLU.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/CmplxLU.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_CmplxLU_h)
+#if ! defined (octave_CmplxLU_h)
 #define octave_CmplxLU_h 1
 
 #include "base-lu.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/CmplxQR.h
--- a/liboctave/numeric/CmplxQR.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/CmplxQR.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_CmplxQR_h)
+#if ! defined (octave_CmplxQR_h)
 #define octave_CmplxQR_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/CmplxQRP.h
--- a/liboctave/numeric/CmplxQRP.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/CmplxQRP.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_CmplxQRP_h)
+#if ! defined (octave_CmplxQRP_h)
 #define octave_CmplxQRP_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/CmplxSCHUR.h
--- a/liboctave/numeric/CmplxSCHUR.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/CmplxSCHUR.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_CmplxSCHUR_h)
+#if ! defined (octave_CmplxSCHUR_h)
 #define octave_CmplxSCHUR_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/CmplxSVD.h
--- a/liboctave/numeric/CmplxSVD.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/CmplxSVD.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_CmplxSVD_h)
+#if ! defined (octave_CmplxSVD_h)
 #define octave_CmplxSVD_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/CollocWt.h
--- a/liboctave/numeric/CollocWt.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/CollocWt.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_CollocWt_h)
+#if ! defined (octave_CollocWt_h)
 #define octave_CollocWt_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/DAE.h
--- a/liboctave/numeric/DAE.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/DAE.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_DAE_h)
+#if ! defined (octave_DAE_h)
 #define octave_DAE_h 1
 
 #include "DAEFunc.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/DAEFunc.h
--- a/liboctave/numeric/DAEFunc.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/DAEFunc.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_DAEFunc_h)
+#if ! defined (octave_DAEFunc_h)
 #define octave_DAEFunc_h 1
 
 class Matrix;
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/DAERT.h
--- a/liboctave/numeric/DAERT.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/DAERT.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_DAERT_h)
+#if ! defined (octave_DAERT_h)
 #define octave_DAERT_h 1
 
 #include "DAE.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/DAERTFunc.h
--- a/liboctave/numeric/DAERTFunc.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/DAERTFunc.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_DAERTFunc_h)
+#if ! defined (octave_DAERTFunc_h)
 #define octave_DAERTFunc_h 1
 
 #include "dMatrix.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/DASPK.h
--- a/liboctave/numeric/DASPK.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/DASPK.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_DASPK_h)
+#if ! defined (octave_DASPK_h)
 #define octave_DASPK_h 1
 
 #include <cfloat>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/DASRT.h
--- a/liboctave/numeric/DASRT.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/DASRT.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_DASRT_h)
+#if ! defined (octave_DASRT_h)
 #define octave_DASRT_h 1
 
 #include <cfloat>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/DASSL.h
--- a/liboctave/numeric/DASSL.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/DASSL.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_DASSL_h)
+#if ! defined (octave_DASSL_h)
 #define octave_DASSL_h 1
 
 #include <cfloat>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/DET.h
--- a/liboctave/numeric/DET.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/DET.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_DET_h)
+#if ! defined (octave_DET_h)
 #define octave_DET_h 1
 
 #include <cmath>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/EIG.h
--- a/liboctave/numeric/EIG.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/EIG.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_EIG_h)
+#if ! defined (octave_EIG_h)
 #define octave_EIG_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/LSODE.h
--- a/liboctave/numeric/LSODE.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/LSODE.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_LSODE_h)
+#if ! defined (octave_LSODE_h)
 #define octave_LSODE_h 1
 
 #include <cfloat>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/ODE.h
--- a/liboctave/numeric/ODE.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/ODE.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ODE_h)
+#if ! defined (octave_ODE_h)
 #define octave_ODE_h 1
 
 #include "ODEFunc.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/ODEFunc.h
--- a/liboctave/numeric/ODEFunc.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/ODEFunc.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ODEFunc_h)
+#if ! defined (octave_ODEFunc_h)
 #define octave_ODEFunc_h 1
 
 class Matrix;
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/ODES.h
--- a/liboctave/numeric/ODES.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/ODES.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ODES_h)
+#if ! defined (octave_ODES_h)
 #define octave_ODES_h 1
 
 #include "ODESFunc.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/ODESFunc.h
--- a/liboctave/numeric/ODESFunc.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/ODESFunc.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_ODESFunc_h)
+#if ! defined (octave_ODESFunc_h)
 #define octave_ODESFunc_h 1
 
 #include "dMatrix.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/Quad.h
--- a/liboctave/numeric/Quad.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/Quad.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_Quad_h)
+#if ! defined (octave_Quad_h)
 #define octave_Quad_h 1
 
 #include <cfloat>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/SparseCmplxCHOL.h
--- a/liboctave/numeric/SparseCmplxCHOL.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/SparseCmplxCHOL.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_SparseCmplxCHOL_h)
+#if ! defined (octave_SparseCmplxCHOL_h)
 #define octave_SparseCmplxCHOL_h 1
 
 #include "sparse-base-chol.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/SparseCmplxLU.h
--- a/liboctave/numeric/SparseCmplxLU.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/SparseCmplxLU.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_SparseCmplxLU_h)
+#if ! defined (octave_SparseCmplxLU_h)
 #define octave_SparseCmplxLU_h 1
 
 #include "sparse-base-lu.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/SparseCmplxQR.cc
--- a/liboctave/numeric/SparseCmplxQR.cc	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/SparseCmplxQR.cc	Thu Dec 03 10:23:38 2015 -0800
@@ -29,7 +29,7 @@
 #include "SparseCmplxQR.h"
 #include "oct-locbuf.h"
 
-#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER < 2)) || (CS_VER < 2))
+#if defined (CS_VER) && (((CS_VER == 2) && (CS_SUBVER < 2)) || (CS_VER < 2))
 typedef double _Complex cs_complex_t;
 
 // Why did g++ 4.x stl_vector.h make
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/SparseCmplxQR.h
--- a/liboctave/numeric/SparseCmplxQR.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/SparseCmplxQR.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_SparseCmplxQR_h)
+#if ! defined (octave_SparseCmplxQR_h)
 #define octave_SparseCmplxQR_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/SparseQR.h
--- a/liboctave/numeric/SparseQR.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/SparseQR.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_SparseQR_h)
+#if ! defined (octave_SparseQR_h)
 #define octave_SparseQR_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/SparsedbleCHOL.h
--- a/liboctave/numeric/SparsedbleCHOL.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/SparsedbleCHOL.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_SparsedbleCHOL_h)
+#if ! defined (octave_SparsedbleCHOL_h)
 #define octave_SparsedbleCHOL_h 1
 
 #include "sparse-base-chol.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/SparsedbleLU.h
--- a/liboctave/numeric/SparsedbleLU.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/SparsedbleLU.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_SparsedbleLU_h)
+#if ! defined (octave_SparsedbleLU_h)
 #define octave_SparsedbleLU_h 1
 
 #include "sparse-base-lu.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/base-aepbal.h
--- a/liboctave/numeric/base-aepbal.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/base-aepbal.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_base_aepbal_h)
+#if ! defined (octave_base_aepbal_h)
 #define octave_base_aepbal_h 1
 
 template <class MatrixT, class VectorT>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/base-dae.h
--- a/liboctave/numeric/base-dae.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/base-dae.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_base_dae_h)
+#if ! defined (octave_base_dae_h)
 #define octave_base_dae_h 1
 
 #include "base-de.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/base-de.h
--- a/liboctave/numeric/base-de.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/base-de.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_base_de_h)
+#if ! defined (octave_base_de_h)
 #define octave_base_de_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/base-lu.h
--- a/liboctave/numeric/base-lu.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/base-lu.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_base_lu_h)
+#if ! defined (octave_base_lu_h)
 #define octave_base_lu_h 1
 
 #include "MArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/base-min.h
--- a/liboctave/numeric/base-min.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/base-min.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_base_min_h)
+#if ! defined (octave_base_min_h)
 #define octave_base_min_h 1
 
 #include "dColVector.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/base-qr.h
--- a/liboctave/numeric/base-qr.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/base-qr.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_base_qr_h)
+#if ! defined (octave_base_qr_h)
 #define octave_base_qr_h 1
 
 #include "MArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/bsxfun-decl.h
--- a/liboctave/numeric/bsxfun-decl.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/bsxfun-decl.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_bsxfun_decl_h)
+#if ! defined (octave_bsxfun_decl_h)
 #define octave_bsxfun_decl_h 1
 
 #define BSXFUN_OP_DECL(OP, ARRAY, API) \
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/bsxfun-defs.cc
--- a/liboctave/numeric/bsxfun-defs.cc	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/bsxfun-defs.cc	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_bsxfun_defs_h)
+#if ! defined (octave_bsxfun_defs_h)
 #define octave_bsxfun_defs_h 1
 
 #include <algorithm>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/bsxfun.h
--- a/liboctave/numeric/bsxfun.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/bsxfun.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 // Author: Jordi Gutiérrez Hermoso <jordigh@octave.org>
 
-#if !defined (octave_bsxfun_h)
+#if ! defined (octave_bsxfun_h)
 #define octave_bsxfun_h 1
 
 #include <algorithm>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/dbleAEPBAL.h
--- a/liboctave/numeric/dbleAEPBAL.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/dbleAEPBAL.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_dbleAEPBAL_h)
+#if ! defined (octave_dbleAEPBAL_h)
 #define octave_dbleAEPBAL_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/dbleCHOL.h
--- a/liboctave/numeric/dbleCHOL.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/dbleCHOL.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_dbleCHOL_h)
+#if ! defined (octave_dbleCHOL_h)
 #define octave_dbleCHOL_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/dbleGEPBAL.h
--- a/liboctave/numeric/dbleGEPBAL.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/dbleGEPBAL.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_dbleGEPBAL_h)
+#if ! defined (octave_dbleGEPBAL_h)
 #define octave_dbleGEPBAL_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/dbleHESS.h
--- a/liboctave/numeric/dbleHESS.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/dbleHESS.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_dbleHESS_h)
+#if ! defined (octave_dbleHESS_h)
 #define octave_dbleHESS_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/dbleLU.h
--- a/liboctave/numeric/dbleLU.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/dbleLU.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_dbleLU_h)
+#if ! defined (octave_dbleLU_h)
 #define octave_dbleLU_h 1
 
 #include "base-lu.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/dbleQR.h
--- a/liboctave/numeric/dbleQR.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/dbleQR.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_dbleQR_h)
+#if ! defined (octave_dbleQR_h)
 #define octave_dbleQR_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/dbleQRP.h
--- a/liboctave/numeric/dbleQRP.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/dbleQRP.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_dbleQRP_h)
+#if ! defined (octave_dbleQRP_h)
 #define octave_dbleQRP_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/dbleSCHUR.h
--- a/liboctave/numeric/dbleSCHUR.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/dbleSCHUR.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_dbleSCHUR_h)
+#if ! defined (octave_dbleSCHUR_h)
 #define octave_dbleSCHUR_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/dbleSVD.h
--- a/liboctave/numeric/dbleSVD.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/dbleSVD.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_dbleSVD_h)
+#if ! defined (octave_dbleSVD_h)
 #define octave_dbleSVD_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/eigs-base.cc
--- a/liboctave/numeric/eigs-base.cc	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/eigs-base.cc	Thu Dec 03 10:23:38 2015 -0800
@@ -166,7 +166,7 @@
 }
 
 
-#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
+#if ! defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
 static octave_idx_type
 lusolve (const SparseMatrix&, const SparseMatrix&, Matrix&);
 
@@ -3656,7 +3656,7 @@
   return ip(4);
 }
 
-#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
+#if ! defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
 extern octave_idx_type
 EigsRealSymmetricMatrix (const Matrix& m, const std::string typ,
                          octave_idx_type k, octave_idx_type p,
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/fCmplxAEPBAL.h
--- a/liboctave/numeric/fCmplxAEPBAL.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/fCmplxAEPBAL.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_fCmplxAEPBAL_h)
+#if ! defined (octave_fCmplxAEPBAL_h)
 #define octave_fCmplxAEPBAL_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/fCmplxCHOL.h
--- a/liboctave/numeric/fCmplxCHOL.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/fCmplxCHOL.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_fCmplxCHOL_h)
+#if ! defined (octave_fCmplxCHOL_h)
 #define octave_fCmplxCHOL_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/fCmplxGEPBAL.h
--- a/liboctave/numeric/fCmplxGEPBAL.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/fCmplxGEPBAL.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_fCmplxGEPBAL_h)
+#if ! defined (octave_fCmplxGEPBAL_h)
 #define octave_fCmplxGEPBAL_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/fCmplxHESS.h
--- a/liboctave/numeric/fCmplxHESS.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/fCmplxHESS.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_fCmplxHESS_h)
+#if ! defined (octave_fCmplxHESS_h)
 #define octave_fCmplxHESS_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/fCmplxLU.h
--- a/liboctave/numeric/fCmplxLU.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/fCmplxLU.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_fCmplxLU_h)
+#if ! defined (octave_fCmplxLU_h)
 #define octave_fCmplxLU_h 1
 
 #include "base-lu.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/fCmplxQR.h
--- a/liboctave/numeric/fCmplxQR.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/fCmplxQR.h	Thu Dec 03 10:23:38 2015 -0800
@@ -23,7 +23,7 @@
 
 // updating/downdating by Jaroslav Hajek 2008
 
-#if !defined (octave_fCmplxQR_h)
+#if ! defined (octave_fCmplxQR_h)
 #define octave_fCmplxQR_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/fCmplxQRP.h
--- a/liboctave/numeric/fCmplxQRP.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/fCmplxQRP.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_fCmplxQRP_h)
+#if ! defined (octave_fCmplxQRP_h)
 #define octave_fCmplxQRP_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/fCmplxSCHUR.h
--- a/liboctave/numeric/fCmplxSCHUR.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/fCmplxSCHUR.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_fCmplxSCHUR_h)
+#if ! defined (octave_fCmplxSCHUR_h)
 #define octave_fCmplxSCHUR_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/fCmplxSVD.h
--- a/liboctave/numeric/fCmplxSVD.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/fCmplxSVD.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_fCmplxSVD_h)
+#if ! defined (octave_fCmplxSVD_h)
 #define octave_fCmplxSVD_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/fEIG.h
--- a/liboctave/numeric/fEIG.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/fEIG.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_fEIG_h)
+#if ! defined (octave_fEIG_h)
 #define octave_fEIG_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/floatAEPBAL.h
--- a/liboctave/numeric/floatAEPBAL.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/floatAEPBAL.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_floatAEPBAL_h)
+#if ! defined (octave_floatAEPBAL_h)
 #define octave_floatAEPBAL_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/floatCHOL.h
--- a/liboctave/numeric/floatCHOL.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/floatCHOL.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_floatCHOL_h)
+#if ! defined (octave_floatCHOL_h)
 #define octave_floatCHOL_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/floatGEPBAL.h
--- a/liboctave/numeric/floatGEPBAL.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/floatGEPBAL.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_floatGEPBAL_h)
+#if ! defined (octave_floatGEPBAL_h)
 #define octave_floatGEPBAL_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/floatHESS.h
--- a/liboctave/numeric/floatHESS.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/floatHESS.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_floatHESS_h)
+#if ! defined (octave_floatHESS_h)
 #define octave_floatHESS_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/floatLU.h
--- a/liboctave/numeric/floatLU.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/floatLU.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_floatLU_h)
+#if ! defined (octave_floatLU_h)
 #define octave_floatLU_h 1
 
 #include "base-lu.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/floatQR.h
--- a/liboctave/numeric/floatQR.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/floatQR.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_floatQR_h)
+#if ! defined (octave_floatQR_h)
 #define octave_floatQR_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/floatQRP.h
--- a/liboctave/numeric/floatQRP.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/floatQRP.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_floatQRP_h)
+#if ! defined (octave_floatQRP_h)
 #define octave_floatQRP_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/floatSCHUR.h
--- a/liboctave/numeric/floatSCHUR.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/floatSCHUR.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_floatSCHUR_h)
+#if ! defined (octave_floatSCHUR_h)
 #define octave_floatSCHUR_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/floatSVD.h
--- a/liboctave/numeric/floatSVD.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/floatSVD.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_floatSVD_h)
+#if ! defined (octave_floatSVD_h)
 #define octave_floatSVD_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/lo-mappers.cc
--- a/liboctave/numeric/lo-mappers.cc	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/lo-mappers.cc	Thu Dec 03 10:23:38 2015 -0800
@@ -139,7 +139,7 @@
 
 // double -> bool mappers.
 
-#if ! defined(HAVE_CMATH_ISNAN)
+#if ! defined (HAVE_CMATH_ISNAN)
 bool
 xisnan (double x)
 {
@@ -147,7 +147,7 @@
 }
 #endif
 
-#if ! defined(HAVE_CMATH_ISFINITE)
+#if ! defined (HAVE_CMATH_ISFINITE)
 bool
 xfinite (double x)
 {
@@ -155,7 +155,7 @@
 }
 #endif
 
-#if ! defined(HAVE_CMATH_ISINF)
+#if ! defined (HAVE_CMATH_ISINF)
 bool
 xisinf (double x)
 {
@@ -376,7 +376,7 @@
 
 // float -> bool mappers.
 
-#if ! defined(HAVE_CMATH_ISNANF)
+#if ! defined (HAVE_CMATH_ISNANF)
 bool
 xisnan (float x)
 {
@@ -384,7 +384,7 @@
 }
 #endif
 
-#if ! defined(HAVE_CMATH_ISFINITEF)
+#if ! defined (HAVE_CMATH_ISFINITEF)
 bool
 xfinite (float x)
 {
@@ -392,7 +392,7 @@
 }
 #endif
 
-#if ! defined(HAVE_CMATH_ISINFF)
+#if ! defined (HAVE_CMATH_ISINFF)
 bool
 xisinf (float x)
 {
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/lo-mappers.h
--- a/liboctave/numeric/lo-mappers.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/lo-mappers.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_lo_mappers_h)
+#if ! defined (octave_lo_mappers_h)
 #define octave_lo_mappers_h 1
 
 #include <limits>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/lo-specfun.cc
--- a/liboctave/numeric/lo-specfun.cc	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/lo-specfun.cc	Thu Dec 03 10:23:38 2015 -0800
@@ -198,7 +198,7 @@
                              double*, octave_idx_type*, octave_idx_type*);
 }
 
-#if !defined (HAVE_ACOSH)
+#if ! defined (HAVE_ACOSH)
 double
 acosh (double x)
 {
@@ -208,7 +208,7 @@
 }
 #endif
 
-#if !defined (HAVE_ACOSHF)
+#if ! defined (HAVE_ACOSHF)
 float
 acoshf (float x)
 {
@@ -218,7 +218,7 @@
 }
 #endif
 
-#if !defined (HAVE_ASINH)
+#if ! defined (HAVE_ASINH)
 double
 asinh (double x)
 {
@@ -228,7 +228,7 @@
 }
 #endif
 
-#if !defined (HAVE_ASINHF)
+#if ! defined (HAVE_ASINHF)
 float
 asinhf (float x)
 {
@@ -238,7 +238,7 @@
 }
 #endif
 
-#if !defined (HAVE_ATANH)
+#if ! defined (HAVE_ATANH)
 double
 atanh (double x)
 {
@@ -248,7 +248,7 @@
 }
 #endif
 
-#if !defined (HAVE_ATANHF)
+#if ! defined (HAVE_ATANHF)
 float
 atanhf (float x)
 {
@@ -258,7 +258,7 @@
 }
 #endif
 
-#if !defined (HAVE_ERF)
+#if ! defined (HAVE_ERF)
 double
 erf (double x)
 {
@@ -268,7 +268,7 @@
 }
 #endif
 
-#if !defined (HAVE_ERFF)
+#if ! defined (HAVE_ERFF)
 float
 erff (float x)
 {
@@ -278,7 +278,7 @@
 }
 #endif
 
-#if !defined (HAVE_ERFC)
+#if ! defined (HAVE_ERFC)
 double
 erfc (double x)
 {
@@ -288,7 +288,7 @@
 }
 #endif
 
-#if !defined (HAVE_ERFCF)
+#if ! defined (HAVE_ERFCF)
 float
 erfcf (float x)
 {
@@ -518,7 +518,7 @@
     return result;
 }
 
-#if !defined (HAVE_EXPM1)
+#if ! defined (HAVE_EXPM1)
 double
 expm1 (double x)
 {
@@ -573,7 +573,7 @@
   return retval;
 }
 
-#if !defined (HAVE_EXPM1F)
+#if ! defined (HAVE_EXPM1F)
 float
 expm1f (float x)
 {
@@ -628,7 +628,7 @@
   return retval;
 }
 
-#if !defined (HAVE_LOG1P)
+#if ! defined (HAVE_LOG1P)
 double
 log1p (double x)
 {
@@ -671,7 +671,7 @@
   return retval;
 }
 
-#if !defined (HAVE_CBRT)
+#if ! defined (HAVE_CBRT)
 double cbrt (double x)
 {
   static const double one_third = 0.3333333333333333333;
@@ -687,7 +687,7 @@
 }
 #endif
 
-#if !defined (HAVE_LOG1PF)
+#if ! defined (HAVE_LOG1PF)
 float
 log1pf (float x)
 {
@@ -730,7 +730,7 @@
   return retval;
 }
 
-#if !defined (HAVE_CBRTF)
+#if ! defined (HAVE_CBRTF)
 float cbrtf (float x)
 {
   static const float one_third = 0.3333333333333333333f;
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/lo-specfun.h
--- a/liboctave/numeric/lo-specfun.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/lo-specfun.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_lo_specfun_h)
+#if ! defined (octave_lo_specfun_h)
 #define octave_lo_specfun_h 1
 
 #include "oct-cmplx.h"
@@ -41,75 +41,75 @@
 class FloatComplexColumnVector;
 class Range;
 
-#if !defined (HAVE_ACOSH)
+#if ! defined (HAVE_ACOSH)
 extern OCTAVE_API double acosh (double);
 #endif
 
-#if !defined (HAVE_ASINH)
+#if ! defined (HAVE_ASINH)
 extern OCTAVE_API double asinh (double);
 #endif
 
-#if !defined (HAVE_ATANH)
+#if ! defined (HAVE_ATANH)
 extern OCTAVE_API double atanh (double);
 #endif
 
-#if !defined (HAVE_ERF)
+#if ! defined (HAVE_ERF)
 extern OCTAVE_API double erf (double);
 #endif
 extern OCTAVE_API Complex erf (const Complex& x);
 extern OCTAVE_API FloatComplex erf (const FloatComplex& x);
 
-#if !defined (HAVE_ERFC)
+#if ! defined (HAVE_ERFC)
 extern OCTAVE_API double erfc (double);
 #endif
 extern OCTAVE_API Complex erfc (const Complex& x);
 extern OCTAVE_API FloatComplex erfc (const FloatComplex& x);
 
-#if !defined (HAVE_ACOSHF)
+#if ! defined (HAVE_ACOSHF)
 extern OCTAVE_API float acoshf (float);
 #endif
 
-#if !defined (HAVE_ASINHF)
+#if ! defined (HAVE_ASINHF)
 extern OCTAVE_API float asinhf (float);
 #endif
 
-#if !defined (HAVE_ATANHF)
+#if ! defined (HAVE_ATANHF)
 extern OCTAVE_API float atanhf (float);
 #endif
 
-#if !defined (HAVE_ERFF)
+#if ! defined (HAVE_ERFF)
 extern OCTAVE_API float erff (float);
 #endif
 
-#if !defined (HAVE_ERFCF)
+#if ! defined (HAVE_ERFCF)
 extern OCTAVE_API float erfcf (float);
 #endif
 
-#if !defined (HAVE_EXPM1)
+#if ! defined (HAVE_EXPM1)
 extern OCTAVE_API double expm1 (double x);
 #endif
 extern OCTAVE_API Complex expm1 (const Complex& x);
 
-#if !defined (HAVE_EXPM1F)
+#if ! defined (HAVE_EXPM1F)
 extern OCTAVE_API float expm1f (float x);
 #endif
 extern OCTAVE_API FloatComplex expm1 (const FloatComplex& x);
 
-#if !defined (HAVE_LOG1P)
+#if ! defined (HAVE_LOG1P)
 extern OCTAVE_API double log1p (double x);
 #endif
 extern OCTAVE_API Complex log1p (const Complex& x);
 
-#if !defined (HAVE_LOG1PF)
+#if ! defined (HAVE_LOG1PF)
 extern OCTAVE_API float log1pf (float x);
 #endif
 extern OCTAVE_API FloatComplex log1p (const FloatComplex& x);
 
-#if !defined (HAVE_CBRT)
+#if ! defined (HAVE_CBRT)
 extern OCTAVE_API double cbrt (double x);
 #endif
 
-#if !defined (HAVE_CBRTF)
+#if ! defined (HAVE_CBRTF)
 extern OCTAVE_API float cbrtf (float x);
 #endif
 
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/oct-convn.h
--- a/liboctave/numeric/oct-convn.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/oct-convn.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_oct_convn_h)
+#if ! defined (octave_oct_convn_h)
 #define octave_oct_convn_h 1
 
 #include "dMatrix.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/oct-fftw.h
--- a/liboctave/numeric/oct-fftw.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/oct-fftw.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_fftw_h)
+#if ! defined (octave_oct_fftw_h)
 #define octave_oct_fftw_h 1
 
 #include <cstddef>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/oct-norm.h
--- a/liboctave/numeric/oct-norm.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/oct-norm.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 // author: Jaroslav Hajek <highegg@gmail.com>
 
-#if !defined (octave_oct_norm_h)
+#if ! defined (octave_oct_norm_h)
 #define octave_oct_norm_h 1
 
 #include "oct-cmplx.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/oct-rand.h
--- a/liboctave/numeric/oct-rand.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/oct-rand.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_rand_h)
+#if ! defined (octave_oct_rand_h)
 #define octave_oct_rand_h 1
 
 #include <map>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/oct-spparms.h
--- a/liboctave/numeric/oct-spparms.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/oct-spparms.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_oct_spparms_h)
+#if ! defined (octave_oct_spparms_h)
 #define octave_oct_spparms_h 1
 
 #include <cassert>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/randmtzig.c
--- a/liboctave/numeric/randmtzig.c	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/randmtzig.c	Thu Dec 03 10:23:38 2015 -0800
@@ -167,7 +167,7 @@
 #include "randmtzig.h"
 
 /* FIXME may want to suppress X86 if sizeof(long) > 4 */
-#if !defined (USE_X86_32)
+#if ! defined (USE_X86_32)
 # if defined (i386) || defined (HAVE_X86_32)
 #  define USE_X86_32 1
 # else
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/sparse-base-chol.h
--- a/liboctave/numeric/sparse-base-chol.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/sparse-base-chol.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_sparse_base_chol_h)
+#if ! defined (octave_sparse_base_chol_h)
 #define octave_sparse_base_chol_h 1
 
 #include "oct-sparse.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/sparse-base-lu.h
--- a/liboctave/numeric/sparse-base-lu.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/sparse-base-lu.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 */
 
 
-#if !defined (octave_sparse_base_lu_h)
+#if ! defined (octave_sparse_base_lu_h)
 #define octave_sparse_base_lu_h 1
 
 #include "MArray.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/numeric/sparse-dmsolve.cc
--- a/liboctave/numeric/sparse-dmsolve.cc	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/numeric/sparse-dmsolve.cc	Thu Dec 03 10:23:38 2015 -0800
@@ -109,7 +109,7 @@
   return B;
 }
 
-#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
+#if ! defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
 static MSparse<double>
 dmsolve_extract (const MSparse<double> &A, const octave_idx_type *Pinv,
                  const octave_idx_type *Q, octave_idx_type rst,
@@ -149,7 +149,7 @@
   return result;
 }
 
-#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
+#if ! defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
 static MArray<double>
 dmsolve_extract (const MArray<double> &m, const octave_idx_type *,
                  const octave_idx_type *, octave_idx_type r1,
@@ -185,7 +185,7 @@
     }
 }
 
-#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
+#if ! defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
 static void
 dmsolve_insert (MArray<double> &a, const MArray<double> &b,
                 const octave_idx_type *Q, octave_idx_type r, octave_idx_type c);
@@ -272,7 +272,7 @@
     }
 }
 
-#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
+#if ! defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
 static void
 dmsolve_insert (MSparse<double> &a, const SparseMatrix &b,
                 const octave_idx_type *Q, octave_idx_type r, octave_idx_type c);
@@ -302,7 +302,7 @@
     }
 }
 
-#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
+#if ! defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
 static void
 dmsolve_permute (MArray<double> &a, const MArray<double>& b,
                  const octave_idx_type *p);
@@ -348,7 +348,7 @@
     }
 }
 
-#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
+#if ! defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
 static void
 dmsolve_permute (MSparse<double> &a, const MSparse<double>& b,
                  const octave_idx_type *p);
@@ -489,7 +489,7 @@
 #endif
 }
 
-#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
+#if ! defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
 extern Matrix
 dmsolve (const SparseMatrix &a, const Matrix &b,
          octave_idx_type &info);
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/operators/Sparse-diag-op-defs.h
--- a/liboctave/operators/Sparse-diag-op-defs.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/operators/Sparse-diag-op-defs.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_Sparse_diag_op_defs_h)
+#if ! defined (octave_Sparse_diag_op_defs_h)
 #define octave_Sparse_diag_op_defs_h 1
 
 // Matrix multiplication
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/operators/Sparse-op-decls.h
--- a/liboctave/operators/Sparse-op-decls.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/operators/Sparse-op-decls.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 */
 
-#if !defined (octave_Sparse_op_decls_h)
+#if ! defined (octave_Sparse_op_decls_h)
 #define octave_Sparse_op_decls_h 1
 
 class SparseBoolMatrix;
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/operators/Sparse-op-defs.h
--- a/liboctave/operators/Sparse-op-defs.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/operators/Sparse-op-defs.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 */
 
-#if !defined (octave_Sparse_op_defs_h)
+#if ! defined (octave_Sparse_op_defs_h)
 #define octave_Sparse_op_defs_h 1
 
 #include "Array-util.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/operators/Sparse-perm-op-defs.h
--- a/liboctave/operators/Sparse-perm-op-defs.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/operators/Sparse-perm-op-defs.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_Sparse_perm_op_defs_h)
+#if ! defined (octave_Sparse_perm_op_defs_h)
 #define octave_Sparse_perm_op_defs_h 1
 
 // Matrix multiplication
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/operators/mk-ops.awk
--- a/liboctave/operators/mk-ops.awk	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/operators/mk-ops.awk	Thu Dec 03 10:23:38 2015 -0800
@@ -26,7 +26,7 @@
       print "// DO NOT EDIT -- generated by mk-ops";
       tmp = make_inclusive_header;
       gsub (/[\.-]/, "_", tmp);
-      printf ("#if !defined (octave_%s)\n", tmp);
+      printf ("#if ! defined (octave_%s)\n", tmp);
       printf ("#define octave_%s 1\n", tmp);
     }
 }
@@ -135,7 +135,7 @@
 
           print "// DO NOT EDIT -- generated by mk-ops" > h_file;
 
-          printf ("#if !defined (%s)\n", h_guard) >> h_file;
+          printf ("#if ! defined (%s)\n", h_guard) >> h_file;
           printf ("#define %s 1\n", h_guard) >> h_file;
 
           if (result_header)
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/operators/mx-base.h
--- a/liboctave/operators/mx-base.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/operators/mx-base.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_mx_base_h)
+#if ! defined (octave_mx_base_h)
 #define octave_mx_base_h 1
 
 // Matrix Type class
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/operators/mx-defs.h
--- a/liboctave/operators/mx-defs.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/operators/mx-defs.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_mx_defs_h)
+#if ! defined (octave_mx_defs_h)
 #define octave_mx_defs_h 1
 
 // Classes we declare.
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/operators/mx-ext.h
--- a/liboctave/operators/mx-ext.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/operators/mx-ext.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_mx_ext_h)
+#if ! defined (octave_mx_ext_h)
 #define octave_mx_ext_h 1
 
 // Result of a AEP Balance operation.
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/operators/mx-inlines.cc
--- a/liboctave/operators/mx-inlines.cc	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/operators/mx-inlines.cc	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 */
 
-#if !defined (octave_mx_inlines_h)
+#if ! defined (octave_mx_inlines_h)
 #define octave_mx_inlines_h 1
 
 #include <cstddef>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/operators/mx-op-decl.h
--- a/liboctave/operators/mx-op-decl.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/operators/mx-op-decl.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 */
 
-#if !defined (octave_mx_op_decl_h)
+#if ! defined (octave_mx_op_decl_h)
 #define octave_mx_op_decl_h 1
 
 #define BIN_OP_DECL(R, OP, X, Y, API) \
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/operators/mx-op-defs.h
--- a/liboctave/operators/mx-op-defs.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/operators/mx-op-defs.h	Thu Dec 03 10:23:38 2015 -0800
@@ -22,7 +22,7 @@
 
 */
 
-#if !defined (octave_mx_op_defs_h)
+#if ! defined (octave_mx_op_defs_h)
 #define octave_mx_op_defs_h 1
 
 #include "lo-array-gripes.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/operators/sparse-mk-ops.awk
--- a/liboctave/operators/sparse-mk-ops.awk	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/operators/sparse-mk-ops.awk	Thu Dec 03 10:23:38 2015 -0800
@@ -26,7 +26,7 @@
       print "// DO NOT EDIT -- generated by sparse-mk-ops";
       tmp = make_inclusive_header;
       gsub (/[\.-]/, "_", tmp);
-      printf ("#if !defined (octave_%s)\n", tmp);
+      printf ("#if ! defined (octave_%s)\n", tmp);
       printf ("#define octave_%s 1\n", tmp);
     }
 }
@@ -135,7 +135,7 @@
 
           print "// DO NOT EDIT -- generated by sparse-mk-ops" > h_file;
 
-          printf ("#if !defined (%s)\n", h_guard) >> h_file;
+          printf ("#if ! defined (%s)\n", h_guard) >> h_file;
           printf ("#define %s 1\n", h_guard) >> h_file;
 
           if (result_header_1)
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/system/dir-ops.h
--- a/liboctave/system/dir-ops.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/system/dir-ops.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_dir_ops_h)
+#if ! defined (octave_dir_ops_h)
 #define octave_dir_ops_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/system/file-ops.h
--- a/liboctave/system/file-ops.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/system/file-ops.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_file_ops_h)
+#if ! defined (octave_file_ops_h)
 #define octave_file_ops_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/system/file-stat.h
--- a/liboctave/system/file-stat.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/system/file-stat.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_file_stat_h)
+#if ! defined (octave_file_stat_h)
 #define octave_file_stat_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/system/lo-sysdep.h
--- a/liboctave/system/lo-sysdep.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/system/lo-sysdep.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_lo_sysdep_h)
+#if ! defined (octave_lo_sysdep_h)
 #define octave_lo_sysdep_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/system/mach-info.h
--- a/liboctave/system/mach-info.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/system/mach-info.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_mach_info_h)
+#if ! defined (octave_mach_info_h)
 #define octave_mach_info_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/system/oct-env.h
--- a/liboctave/system/oct-env.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/system/oct-env.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_env_h)
+#if ! defined (octave_oct_env_h)
 #define octave_oct_env_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/system/oct-group.h
--- a/liboctave/system/oct-group.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/system/oct-group.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_group_h)
+#if ! defined (octave_oct_group_h)
 #define octave_oct_group_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/system/oct-openmp.h
--- a/liboctave/system/oct-openmp.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/system/oct-openmp.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_openmp_h)
+#if ! defined (octave_oct_openmp_h)
 #define octave_oct_openmp_h 1
 
 /* A macro to make using OpenMP easier, and easier to disable */
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/system/oct-passwd.h
--- a/liboctave/system/oct-passwd.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/system/oct-passwd.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_passwd_h)
+#if ! defined (octave_oct_passwd_h)
 #define octave_oct_passwd_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/system/oct-syscalls.h
--- a/liboctave/system/oct-syscalls.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/system/oct-syscalls.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_syscalls_h)
+#if ! defined (octave_oct_syscalls_h)
 #define octave_oct_syscalls_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/system/oct-time.cc
--- a/liboctave/system/oct-time.cc	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/system/oct-time.cc	Thu Dec 03 10:23:38 2015 -0800
@@ -136,7 +136,7 @@
   return *this;
 }
 
-#if !defined STRFTIME_BUF_INITIAL_SIZE
+#if ! defined STRFTIME_BUF_INITIAL_SIZE
 #define STRFTIME_BUF_INITIAL_SIZE 128
 #endif
 
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/system/oct-time.h
--- a/liboctave/system/oct-time.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/system/oct-time.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_time_h)
+#if ! defined (octave_oct_time_h)
 #define octave_oct_time_h 1
 
 #include <ctime>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/system/oct-uname.h
--- a/liboctave/system/oct-uname.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/system/oct-uname.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_uname_h)
+#if ! defined (octave_oct_uname_h)
 #define octave_uname_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/system/pathlen.h
--- a/liboctave/system/pathlen.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/system/pathlen.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pathlen_h)
+#if ! defined (octave_pathlen_h)
 #define octave_pathlen_h 1
 
 #ifdef HAVE_SYS_PARAM_H
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/system/sysdir.h
--- a/liboctave/system/sysdir.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/system/sysdir.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_sysdir_h)
+#if ! defined (octave_sysdir_h)
 #define octave_sysdir_h 1
 
 // This mess suggested by the autoconf manual.
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/system/syswait.h
--- a/liboctave/system/syswait.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/system/syswait.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_syswait_h)
+#if ! defined (octave_syswait_h)
 #define octave_syswait_h 1
 
 #ifdef __cplusplus
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/action-container.h
--- a/liboctave/util/action-container.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/action-container.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_action_container_h)
+#if ! defined (octave_action_container_h)
 #define octave_action_container_h 1
 
 // This class allows registering actions in a list for later
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/base-list.h
--- a/liboctave/util/base-list.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/base-list.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_base_list_h)
+#if ! defined (octave_base_list_h)
 #define octave_base_list_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/byte-swap.h
--- a/liboctave/util/byte-swap.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/byte-swap.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_byte_swap_h)
+#if ! defined (octave_byte_swap_h)
 #define octave_byte_swap_h 1
 
 static inline void
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/caseless-str.h
--- a/liboctave/util/caseless-str.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/caseless-str.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_caseless_str_h)
+#if ! defined (octave_caseless_str_h)
 #define octave_caseless_str_h 1
 
 #include <cctype>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/cmd-edit.h
--- a/liboctave/util/cmd-edit.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/cmd-edit.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_cmd_edit_h)
+#if ! defined (octave_cmd_edit_h)
 #define octave_cmd_edit_h 1
 
 #include <cstdio>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/cmd-hist.h
--- a/liboctave/util/cmd-hist.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/cmd-hist.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_cmd_hist_h)
+#if ! defined (octave_cmd_hist_h)
 #define octave_cmd_hist_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/data-conv.h
--- a/liboctave/util/data-conv.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/data-conv.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_data_conv_h)
+#if ! defined (octave_data_conv_h)
 #define octave_data_conv_h 1
 
 #include <limits>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/functor.h
--- a/liboctave/util/functor.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/functor.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_functor_h)
+#if ! defined (octave_functor_h)
 #define octave_functor_h 1
 
 template <typename RT, typename PT>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/glob-match.h
--- a/liboctave/util/glob-match.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/glob-match.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_glob_match_h)
+#if ! defined (octave_glob_match_h)
 #define octave_glob_match_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/kpse.cc
--- a/liboctave/util/kpse.cc	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/kpse.cc	Thu Dec 03 10:23:38 2015 -0800
@@ -234,7 +234,7 @@
 static unsigned int kpathsea_debug = 0;
 #endif
 
-#if defined (WIN32) && !defined (__MINGW32__)
+#if defined (WIN32) && ! defined (__MINGW32__)
 
 /* System description file for Windows NT.  */
 
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/lo-array-gripes.h
--- a/liboctave/util/lo-array-gripes.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/lo-array-gripes.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_lo_array_gripes_h)
+#if ! defined (octave_lo_array_gripes_h)
 #define octave_lo_array_gripes_h 1
 
 #include "dim-vector.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/lo-cutils.h
--- a/liboctave/util/lo-cutils.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/lo-cutils.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_lo_cutils_h)
+#if ! defined (octave_lo_cutils_h)
 #define octave_lo_cutils_h 1
 
 #include <sys/types.h>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/lo-ieee.h
--- a/liboctave/util/lo-ieee.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/lo-ieee.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_lo_ieee_h)
+#if ! defined (octave_lo_ieee_h)
 #define octave_lo_ieee_h 1
 
 #ifdef  __cplusplus
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/lo-macros.h
--- a/liboctave/util/lo-macros.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/lo-macros.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_lo_macros_h)
+#if ! defined (octave_lo_macros_h)
 #define octave_lo_macros_h 1
 
 // Core macros. Iteration is supported up to count 10.
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/lo-math.h
--- a/liboctave/util/lo-math.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/lo-math.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_lo_math_h)
+#if ! defined (octave_lo_math_h)
 #define octave_lo_math_h 1
 
 #if defined (__cplusplus)
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/lo-regexp.h
--- a/liboctave/util/lo-regexp.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/lo-regexp.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_lo_regexp_h)
+#if ! defined (octave_lo_regexp_h)
 #define octave_lo_regexp_h 1
 
 #include <list>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/lo-traits.h
--- a/liboctave/util/lo-traits.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/lo-traits.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_lo_traits_h)
+#if ! defined (octave_lo_traits_h)
 #define octave_lo_traits_h 1
 
 // Ideas for these classes taken from C++ Templates, The Complete
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/lo-utils.h
--- a/liboctave/util/lo-utils.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/lo-utils.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_lo_utils_h)
+#if ! defined (octave_lo_utils_h)
 #define octave_lo_utils_h 1
 
 #include <cstdio>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/oct-alloc.h
--- a/liboctave/util/oct-alloc.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/oct-alloc.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_alloc_h)
+#if ! defined (octave_oct_alloc_h)
 #define octave_oct_alloc_h 1
 
 #warning "the octave_allocator class has been deprecated and will be removed in a future release of Octave"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/oct-base64.h
--- a/liboctave/util/oct-base64.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/oct-base64.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_base64_h)
+#if ! defined (octave_oct_base64_h)
 #define octave_oct_base64_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/oct-binmap.h
--- a/liboctave/util/oct-binmap.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/oct-binmap.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_binmap_h)
+#if ! defined (octave_oct_binmap_h)
 #define octave_oct_binmap_h 1
 
 #include "Array.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/oct-cmplx.h
--- a/liboctave/util/oct-cmplx.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/oct-cmplx.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_oct_cmplx_h)
+#if ! defined (octave_oct_cmplx_h)
 #define octave_oct_cmplx_h 1
 
 #include <complex>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/oct-glob.h
--- a/liboctave/util/oct-glob.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/oct-glob.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_glob_h)
+#if ! defined (octave_oct_glob_h)
 #define octave_oct_glob_h 1
 
 #include "str-vec.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/oct-inttypes.h
--- a/liboctave/util/oct-inttypes.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/oct-inttypes.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_oct_inttypes_h)
+#if ! defined (octave_oct_inttypes_h)
 #define octave_oct_inttypes_h 1
 
 #include <cstdlib>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/oct-locbuf.h
--- a/liboctave/util/oct-locbuf.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/oct-locbuf.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_locbuf_h)
+#if ! defined (octave_oct_locbuf_h)
 #define octave_oct_locbuf_h 1
 
 #include <cstddef>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/oct-mutex.h
--- a/liboctave/util/oct-mutex.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/oct-mutex.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_mutex_h)
+#if ! defined (octave_oct_mutex_h)
 #define octave_oct_mutex_h 1
 
 #include "oct-refcount.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/oct-refcount.h
--- a/liboctave/util/oct-refcount.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/oct-refcount.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_refcount_h)
+#if ! defined (octave_oct_refcount_h)
 #define octave_oct_refcount_h 1
 
 #ifndef OCTAVE_CONFIG_INCLUDED
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/oct-rl-edit.h
--- a/liboctave/util/oct-rl-edit.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/oct-rl-edit.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_rl_edit_h)
+#if ! defined (octave_oct_rl_edit_h)
 #define octave_oct_rl_edit_h 1
 
 typedef int (*rl_startup_hook_fcn_ptr) (void);
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/oct-rl-hist.h
--- a/liboctave/util/oct-rl-hist.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/oct-rl-hist.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_rl_hist_h)
+#if ! defined (octave_oct_rl_hist_h)
 #define octave_oct_rl_hist_h 1
 
 #ifdef __cplusplus
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/oct-shlib.h
--- a/liboctave/util/oct-shlib.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/oct-shlib.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_oct_shlib_h)
+#if ! defined (octave_oct_shlib_h)
 #define octave_oct_shlib_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/oct-sort.h
--- a/liboctave/util/oct-sort.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/oct-sort.h	Thu Dec 03 10:23:38 2015 -0800
@@ -80,7 +80,7 @@
   Agreement.
 */
 
-#if !defined (octave_oct_sort_h)
+#if ! defined (octave_oct_sort_h)
 #define octave_oct_sort_h 1
 
 #include "lo-traits.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/oct-sparse.h
--- a/liboctave/util/oct-sparse.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/oct-sparse.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_oct_sparse_h)
+#if ! defined (octave_oct_sparse_h)
 #define octave_oct_sparse_h 1
 
 #if defined (HAVE_SUITESPARSE_AMD_H)
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/pathsearch.h
--- a/liboctave/util/pathsearch.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/pathsearch.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_pathsearch_h)
+#if ! defined (octave_pathsearch_h)
 #define octave_pathsearch_h 1
 
 #include <string>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/singleton-cleanup.h
--- a/liboctave/util/singleton-cleanup.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/singleton-cleanup.h	Thu Dec 03 10:23:38 2015 -0800
@@ -1,4 +1,4 @@
-#if !defined (octave_singleton_cleanup_h)
+#if ! defined (octave_singleton_cleanup_h)
 #define octave_singleton_cleanup_h 1
 
 #include <set>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/sparse-sort.h
--- a/liboctave/util/sparse-sort.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/sparse-sort.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_sparse_sort_h)
+#if ! defined (octave_sparse_sort_h)
 #define octave_sparse_sort_h
 
 #include "oct-sort.h"
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/sparse-util.h
--- a/liboctave/util/sparse-util.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/sparse-util.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_sparse_util_h)
+#if ! defined (octave_sparse_util_h)
 #define octave_sparse_util_h 1
 
 // The next two functions don't do anything unless CHOLMOD is
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/statdefs.h
--- a/liboctave/util/statdefs.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/statdefs.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_statdefs_h)
+#if ! defined (octave_statdefs_h)
 #define octave_statdefs_h 1
 
 #include <sys/types.h>
@@ -34,32 +34,32 @@
 #define mode_t unsigned short
 #endif
 #endif
-#if !defined(S_ISBLK) && defined(S_IFBLK)
+#if ! defined (S_ISBLK) && defined (S_IFBLK)
 #define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
 #endif
-#if !defined(S_ISCHR) && defined(S_IFCHR)
+#if ! defined (S_ISCHR) && defined (S_IFCHR)
 #define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
 #endif
-#if !defined(S_ISDIR) && defined(S_IFDIR)
+#if ! defined (S_ISDIR) && defined (S_IFDIR)
 #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
-#if !defined(S_ISREG) && defined(S_IFREG)
+#if ! defined (S_ISREG) && defined (S_IFREG)
 #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
 #endif
-#if !defined(S_ISFIFO) && defined(S_IFIFO)
+#if ! defined (S_ISFIFO) && defined (S_IFIFO)
 #define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
 #endif
-#if !defined(S_ISLNK) && defined(S_IFLNK)
+#if ! defined (S_ISLNK) && defined (S_IFLNK)
 #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
 #endif
-#if !defined(S_ISSOCK) && defined(S_IFSOCK)
+#if ! defined (S_ISSOCK) && defined (S_IFSOCK)
 #define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
 #endif
-#if !defined(S_ISMPB) && defined(S_IFMPB) /* V7 */
+#if ! defined (S_ISMPB) && defined (S_IFMPB) /* V7 */
 #define S_ISMPB(m) (((m) & S_IFMT) == S_IFMPB)
 #define S_ISMPC(m) (((m) & S_IFMT) == S_IFMPC)
 #endif
-#if !defined(S_ISNWK) && defined(S_IFNWK) /* HP/UX */
+#if ! defined (S_ISNWK) && defined (S_IFNWK) /* HP/UX */
 #define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK)
 #endif
 
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/str-vec.h
--- a/liboctave/util/str-vec.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/str-vec.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_str_vec_h)
+#if ! defined (octave_str_vec_h)
 #define octave_str_vec_h 1
 
 #include <iosfwd>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/sun-utils.h
--- a/liboctave/util/sun-utils.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/sun-utils.h	Thu Dec 03 10:23:38 2015 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (octave_sun_utils_h)
+#if ! defined (octave_sun_utils_h)
 #define octave_sun_utils_h 1
 
 // This is only needed to dereference pointers to doubles if mixing
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/unwind-prot.h
--- a/liboctave/util/unwind-prot.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/unwind-prot.h	Thu Dec 03 10:23:38 2015 -0800
@@ -21,7 +21,7 @@
 
 */
 
-#if !defined (octave_unwind_prot_h)
+#if ! defined (octave_unwind_prot_h)
 #define octave_unwind_prot_h 1
 
 #include <cstddef>
diff -r c2d9556d51d0 -r f7084eae3318 liboctave/util/url-transfer.h
--- a/liboctave/util/url-transfer.h	Thu Dec 03 12:15:38 2015 -0500
+++ b/liboctave/util/url-transfer.h	Thu Dec 03 10:23:38 2015 -0800
@@ -25,7 +25,7 @@
 // Author: Alexander Barth <abarth@marine.usf.edu>
 // Author: jwe
 
-#if !defined (octave_url_transfer_h)
+#if ! defined (octave_url_transfer_h)
 #define octave_url_transfer_h 1
 
 #include <iosfwd>