--- a/libinterp/builtins.h	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/builtins.h	Fri Feb 05 16:29:08 2016 -0800
@@ -24,7 +24,7 @@
 #define octave_builtins_h 1
 
 #if ! defined (MAKE_BUILTINS)
-#include "builtin-defun-decls.h"
+#  include "builtin-defun-decls.h"
 #endif
 
 extern OCTINTERP_API void install_builtins (void);

--- a/libinterp/corefcn/Cell.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/Cell.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "idx-vector.h"

--- a/libinterp/corefcn/__contourc__.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/__contourc__.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -33,7 +33,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cfloat>

--- a/libinterp/corefcn/__dispatch__.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/__dispatch__.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <list>

--- a/libinterp/corefcn/__dsearchn__.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/__dsearchn__.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <iostream>

--- a/libinterp/corefcn/__ichol__.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/__ichol__.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "oct-locbuf.h"

--- a/libinterp/corefcn/__ilu__.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/__ilu__.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "oct-locbuf.h"

--- a/libinterp/corefcn/__lin_interpn__.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/__lin_interpn__.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "lo-ieee.h"

--- a/libinterp/corefcn/__pchip_deriv__.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/__pchip_deriv__.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "defun.h"

--- a/libinterp/corefcn/__qp__.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/__qp__.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cfloat>

--- a/libinterp/corefcn/balance.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/balance.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -24,7 +24,7 @@
 // Author: A. S. Hodel <scotte@eng.auburn.edu>
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <string>

--- a/libinterp/corefcn/besselj.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/besselj.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "lo-specfun.h"

--- a/libinterp/corefcn/betainc.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/betainc.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "lo-specfun.h"

--- a/libinterp/corefcn/bitfcns.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/bitfcns.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <limits>

--- a/libinterp/corefcn/bsxfun.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/bsxfun.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <string>

--- a/libinterp/corefcn/c-file-ptr-stream.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/c-file-ptr-stream.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <iostream>
@@ -29,15 +29,15 @@
 #include "c-file-ptr-stream.h"
 
 #ifndef SEEK_SET
-#define SEEK_SET 0
+#  define SEEK_SET 0
 #endif
 
 #ifndef SEEK_CUR
-#define SEEK_CUR 1
+#  define SEEK_CUR 1
 #endif
 
 #ifndef SEEK_END
-#define SEEK_END 2
+#  define SEEK_END 2
 #endif
 
 c_file_ptr_buf::~c_file_ptr_buf (void)

--- a/libinterp/corefcn/c-file-ptr-stream.h	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/c-file-ptr-stream.h	Fri Feb 05 16:29:08 2016 -0800
@@ -140,7 +140,7 @@
 #ifdef HAVE_ZLIB
 
 #ifdef HAVE_ZLIB_H
-#include <zlib.h>
+#  include <zlib.h>
 #endif
 
 class

--- a/libinterp/corefcn/cellfun.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/cellfun.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -24,7 +24,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <string>

--- a/libinterp/corefcn/colloc.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/colloc.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <string>

--- a/libinterp/corefcn/comment-list.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/comment-list.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "lo-utils.h"

--- a/libinterp/corefcn/conv2.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/conv2.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "oct-convn.h"

--- a/libinterp/corefcn/daspk.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/daspk.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <string>

--- a/libinterp/corefcn/dasrt.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/dasrt.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <iostream>

--- a/libinterp/corefcn/dassl.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/dassl.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <string>

--- a/libinterp/corefcn/data.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/data.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -24,14 +24,14 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <sys/types.h>
 #include <sys/times.h>
 
 #ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
+#  include <sys/resource.h>
 #endif
 
 #include <cfloat>
@@ -70,16 +70,16 @@
 #include "xnorm.h"
 
 #if ! defined (CLOCKS_PER_SEC)
-#if defined (CLK_TCK)
-#define CLOCKS_PER_SEC CLK_TCK
-#else
-#error "no definition for CLOCKS_PER_SEC!"
-#endif
+#  if defined (CLK_TCK)
+#    define CLOCKS_PER_SEC CLK_TCK
+#  else
+#    error "no definition for CLOCKS_PER_SEC!"
+#  endif
 #endif
 
 #if ! defined (HAVE_HYPOTF) && defined (HAVE__HYPOTF)
-#define hypotf _hypotf
-#define HAVE_HYPOTF 1
+#  define hypotf _hypotf
+#  define HAVE_HYPOTF 1
 #endif
 
 static void

--- a/libinterp/corefcn/debug.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/debug.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 
 */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <deque>
@@ -199,7 +199,7 @@
 }
 
 #ifdef DBSTOP_NANINF
-#include "sigfpe.cc"
+#  include "sigfpe.cc"
 #endif
 
 enum

--- a/libinterp/corefcn/defaults.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/defaults.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cstdlib>

--- a/libinterp/corefcn/defaults.in.h	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/defaults.in.h	Fri Feb 05 16:29:08 2016 -0800
@@ -29,163 +29,163 @@
 #include "pathsearch.h"
 
 #ifndef OCTAVE_CANONICAL_HOST_TYPE
-#define OCTAVE_CANONICAL_HOST_TYPE %OCTAVE_CANONICAL_HOST_TYPE%
+#  define OCTAVE_CANONICAL_HOST_TYPE %OCTAVE_CANONICAL_HOST_TYPE%
 #endif
 
 #ifndef OCTAVE_DEFAULT_PAGER
-#define OCTAVE_DEFAULT_PAGER %OCTAVE_DEFAULT_PAGER%
+#  define OCTAVE_DEFAULT_PAGER %OCTAVE_DEFAULT_PAGER%
 #endif
 
 #ifndef OCTAVE_ARCHLIBDIR
-#define OCTAVE_ARCHLIBDIR %OCTAVE_ARCHLIBDIR%
+#  define OCTAVE_ARCHLIBDIR %OCTAVE_ARCHLIBDIR%
 #endif
 
 #ifndef OCTAVE_BINDIR
-#define OCTAVE_BINDIR %OCTAVE_BINDIR%
+#  define OCTAVE_BINDIR %OCTAVE_BINDIR%
 #endif
 
 #ifndef OCTAVE_DATADIR
-#define OCTAVE_DATADIR %OCTAVE_DATADIR%
+#  define OCTAVE_DATADIR %OCTAVE_DATADIR%
 #endif
 
 #ifndef OCTAVE_DATAROOTDIR
-#define OCTAVE_DATAROOTDIR %OCTAVE_DATAROOTDIR%
+#  define OCTAVE_DATAROOTDIR %OCTAVE_DATAROOTDIR%
 #endif
 
 #ifndef OCTAVE_DOC_CACHE_FILE
-#define OCTAVE_DOC_CACHE_FILE %OCTAVE_DOC_CACHE_FILE%
+#  define OCTAVE_DOC_CACHE_FILE %OCTAVE_DOC_CACHE_FILE%
 #endif
 
 #ifndef OCTAVE_TEXI_MACROS_FILE
-#define OCTAVE_TEXI_MACROS_FILE %OCTAVE_TEXI_MACROS_FILE%
+#  define OCTAVE_TEXI_MACROS_FILE %OCTAVE_TEXI_MACROS_FILE%
 #endif
 
 #ifndef OCTAVE_EXEC_PREFIX
-#define OCTAVE_EXEC_PREFIX %OCTAVE_EXEC_PREFIX%
+#  define OCTAVE_EXEC_PREFIX %OCTAVE_EXEC_PREFIX%
 #endif
 
 #ifndef OCTAVE_FCNFILEDIR
-#define OCTAVE_FCNFILEDIR %OCTAVE_FCNFILEDIR%
+#  define OCTAVE_FCNFILEDIR %OCTAVE_FCNFILEDIR%
 #endif
 
 #ifndef OCTAVE_IMAGEDIR
-#define OCTAVE_IMAGEDIR %OCTAVE_IMAGEDIR%
+#  define OCTAVE_IMAGEDIR %OCTAVE_IMAGEDIR%
 #endif
 
 #ifndef OCTAVE_INCLUDEDIR
-#define OCTAVE_INCLUDEDIR %OCTAVE_INCLUDEDIR%
+#  define OCTAVE_INCLUDEDIR %OCTAVE_INCLUDEDIR%
 #endif
 
 #ifndef OCTAVE_INFODIR
-#define OCTAVE_INFODIR %OCTAVE_INFODIR%
+#  define OCTAVE_INFODIR %OCTAVE_INFODIR%
 #endif
 
 #ifndef OCTAVE_INFOFILE
-#define OCTAVE_INFOFILE %OCTAVE_INFOFILE%
+#  define OCTAVE_INFOFILE %OCTAVE_INFOFILE%
 #endif
 
 #ifndef OCTAVE_LIBDIR
-#define OCTAVE_LIBDIR %OCTAVE_LIBDIR%
+#  define OCTAVE_LIBDIR %OCTAVE_LIBDIR%
 #endif
 
 #ifndef OCTAVE_LIBEXECDIR
-#define OCTAVE_LIBEXECDIR %OCTAVE_LIBEXECDIR%
+#  define OCTAVE_LIBEXECDIR %OCTAVE_LIBEXECDIR%
 #endif
 
 #ifndef OCTAVE_LIBEXECDIR
-#define OCTAVE_LIBEXECDIR %OCTAVE_LIBEXECDIR%
+#  define OCTAVE_LIBEXECDIR %OCTAVE_LIBEXECDIR%
 #endif
 
 #ifndef OCTAVE_LOCALAPIFCNFILEDIR
-#define OCTAVE_LOCALAPIFCNFILEDIR %OCTAVE_LOCALAPIFCNFILEDIR%
+#  define OCTAVE_LOCALAPIFCNFILEDIR %OCTAVE_LOCALAPIFCNFILEDIR%
 #endif
 
 #ifndef OCTAVE_LOCALAPIOCTFILEDIR
-#define OCTAVE_LOCALAPIOCTFILEDIR %OCTAVE_LOCALAPIOCTFILEDIR%
+#  define OCTAVE_LOCALAPIOCTFILEDIR %OCTAVE_LOCALAPIOCTFILEDIR%
 #endif
 
 #ifndef OCTAVE_LOCALARCHLIBDIR
-#define OCTAVE_LOCALARCHLIBDIR %OCTAVE_LOCALARCHLIBDIR%
+#  define OCTAVE_LOCALARCHLIBDIR %OCTAVE_LOCALARCHLIBDIR%
 #endif
 
 #ifndef OCTAVE_LOCALFCNFILEDIR
-#define OCTAVE_LOCALFCNFILEDIR %OCTAVE_LOCALFCNFILEDIR%
+#  define OCTAVE_LOCALFCNFILEDIR %OCTAVE_LOCALFCNFILEDIR%
 #endif
 
 #ifndef OCTAVE_LOCALOCTFILEDIR
-#define OCTAVE_LOCALOCTFILEDIR %OCTAVE_LOCALOCTFILEDIR%
+#  define OCTAVE_LOCALOCTFILEDIR %OCTAVE_LOCALOCTFILEDIR%
 #endif
 
 #ifndef OCTAVE_LOCALSTARTUPFILEDIR
-#define OCTAVE_LOCALSTARTUPFILEDIR %OCTAVE_LOCALSTARTUPFILEDIR%
+#  define OCTAVE_LOCALSTARTUPFILEDIR %OCTAVE_LOCALSTARTUPFILEDIR%
 #endif
 
 #ifndef OCTAVE_LOCALAPIARCHLIBDIR
-#define OCTAVE_LOCALAPIARCHLIBDIR %OCTAVE_LOCALAPIARCHLIBDIR%
+#  define OCTAVE_LOCALAPIARCHLIBDIR %OCTAVE_LOCALAPIARCHLIBDIR%
 #endif
 
 #ifndef OCTAVE_LOCALVERARCHLIBDIR
-#define OCTAVE_LOCALVERARCHLIBDIR %OCTAVE_LOCALVERARCHLIBDIR%
+#  define OCTAVE_LOCALVERARCHLIBDIR %OCTAVE_LOCALVERARCHLIBDIR%
 #endif
 
 #ifndef OCTAVE_LOCALVERFCNFILEDIR
-#define OCTAVE_LOCALVERFCNFILEDIR %OCTAVE_LOCALVERFCNFILEDIR%
+#  define OCTAVE_LOCALVERFCNFILEDIR %OCTAVE_LOCALVERFCNFILEDIR%
 #endif
 
 #ifndef OCTAVE_LOCALVEROCTFILEDIR
-#define OCTAVE_LOCALVEROCTFILEDIR %OCTAVE_LOCALVEROCTFILEDIR%
+#  define OCTAVE_LOCALVEROCTFILEDIR %OCTAVE_LOCALVEROCTFILEDIR%
 #endif
 
 #ifndef OCTAVE_MAN1DIR
-#define OCTAVE_MAN1DIR %OCTAVE_MAN1DIR%
+#  define OCTAVE_MAN1DIR %OCTAVE_MAN1DIR%
 #endif
 
 #ifndef OCTAVE_MAN1EXT
-#define OCTAVE_MAN1EXT %OCTAVE_MAN1EXT%
+#  define OCTAVE_MAN1EXT %OCTAVE_MAN1EXT%
 #endif
 
 #ifndef OCTAVE_MANDIR
-#define OCTAVE_MANDIR %OCTAVE_MANDIR%
+#  define OCTAVE_MANDIR %OCTAVE_MANDIR%
 #endif
 
 #ifndef OCTAVE_OCTDATADIR
-#define OCTAVE_OCTDATADIR %OCTAVE_OCTDATADIR%
+#  define OCTAVE_OCTDATADIR %OCTAVE_OCTDATADIR%
 #endif
 
 #ifndef OCTAVE_OCTFILEDIR
-#define OCTAVE_OCTFILEDIR %OCTAVE_OCTFILEDIR%
+#  define OCTAVE_OCTFILEDIR %OCTAVE_OCTFILEDIR%
 #endif
 
 #ifndef OCTAVE_OCTETCDIR
-#define OCTAVE_OCTETCDIR %OCTAVE_OCTETCDIR%
+#  define OCTAVE_OCTETCDIR %OCTAVE_OCTETCDIR%
 #endif
 
 #ifndef OCTAVE_OCTLOCALEDIR
-#define OCTAVE_OCTLOCALEDIR %OCTAVE_OCTLOCALEDIR%
+#  define OCTAVE_OCTLOCALEDIR %OCTAVE_OCTLOCALEDIR%
 #endif
 
 #ifndef OCTAVE_OCTINCLUDEDIR
-#define OCTAVE_OCTINCLUDEDIR %OCTAVE_OCTINCLUDEDIR%
+#  define OCTAVE_OCTINCLUDEDIR %OCTAVE_OCTINCLUDEDIR%
 #endif
 
 #ifndef OCTAVE_OCTLIBDIR
-#define OCTAVE_OCTLIBDIR %OCTAVE_OCTLIBDIR%
+#  define OCTAVE_OCTLIBDIR %OCTAVE_OCTLIBDIR%
 #endif
 
 #ifndef OCTAVE_OCTTESTSDIR
-#define OCTAVE_OCTTESTSDIR %OCTAVE_OCTTESTSDIR%
+#  define OCTAVE_OCTTESTSDIR %OCTAVE_OCTTESTSDIR%
 #endif
 
 #ifndef OCTAVE_PREFIX
-#define OCTAVE_PREFIX %OCTAVE_PREFIX%
+#  define OCTAVE_PREFIX %OCTAVE_PREFIX%
 #endif
 
 #ifndef OCTAVE_STARTUPFILEDIR
-#define OCTAVE_STARTUPFILEDIR %OCTAVE_STARTUPFILEDIR%
+#  define OCTAVE_STARTUPFILEDIR %OCTAVE_STARTUPFILEDIR%
 #endif
 
 #ifndef OCTAVE_RELEASE
-#define OCTAVE_RELEASE %OCTAVE_RELEASE%
+#  define OCTAVE_RELEASE %OCTAVE_RELEASE%
 #endif
 
 extern OCTINTERP_API std::string Voctave_home;

--- a/libinterp/corefcn/defun-dld.h	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/defun-dld.h	Fri Feb 05 16:29:08 2016 -0800
@@ -24,7 +24,7 @@
 #define octave_defun_dld_h 1
 
 #if defined (octave_defun_h)
-#error defun.h and defun-dld.h both included in same file!
+#  error defun.h and defun-dld.h both included in same file!
 #endif
 
 #include "defun-int.h"

--- a/libinterp/corefcn/defun.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/defun.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <sstream>

--- a/libinterp/corefcn/defun.h	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/defun.h	Fri Feb 05 16:29:08 2016 -0800
@@ -24,7 +24,7 @@
 #define octave_defun_h 1
 
 #if defined (octave_defun_dld_h)
-#error defun.h and defun-dld.h both included in same file!
+#  error defun.h and defun-dld.h both included in same file!
 #endif
 
 #include "defun-int.h"

--- a/libinterp/corefcn/det.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/det.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "DET.h"

--- a/libinterp/corefcn/dirfns.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/dirfns.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cerrno>

--- a/libinterp/corefcn/display.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/display.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "singleton-cleanup.h"

--- a/libinterp/corefcn/dlmread.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/dlmread.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -25,7 +25,7 @@
 // Habel, but core code has been completely re-written.
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cctype>

--- a/libinterp/corefcn/dot.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/dot.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "f77-fcn.h"

--- a/libinterp/corefcn/dynamic-ld.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/dynamic-ld.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <iostream>

--- a/libinterp/corefcn/eig.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/eig.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "EIG.h"

--- a/libinterp/corefcn/ellipj.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/ellipj.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "defun.h"

--- a/libinterp/corefcn/error.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/error.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cstdarg>

--- a/libinterp/corefcn/errwarn.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/errwarn.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "defun.h"

--- a/libinterp/corefcn/event-queue.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/event-queue.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "error.h"

--- a/libinterp/corefcn/fft.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/fft.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "lo-mappers.h"
@@ -34,9 +34,9 @@
 #include "utils.h"
 
 #if defined (HAVE_FFTW)
-#define FFTSRC "@sc{fftw}"
+#  define FFTSRC "@sc{fftw}"
 #else
-#define FFTSRC "@sc{fftpack}"
+#  define FFTSRC "@sc{fftpack}"
 #endif
 
 static octave_value

--- a/libinterp/corefcn/fft2.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/fft2.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "lo-mappers.h"
@@ -36,9 +36,9 @@
 // This function should be merged with Fifft.
 
 #if defined (HAVE_FFTW)
-#define FFTSRC "@sc{fftw}"
+#  define FFTSRC "@sc{fftw}"
 #else
-#define FFTSRC "@sc{fftpack}"
+#  define FFTSRC "@sc{fftpack}"
 #endif
 
 static octave_value

--- a/libinterp/corefcn/fftn.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/fftn.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "lo-mappers.h"
@@ -35,9 +35,9 @@
 // This function should be merged with Fifft.
 
 #if defined (HAVE_FFTW)
-#define FFTSRC "@sc{fftw}"
+#  define FFTSRC "@sc{fftw}"
 #else
-#define FFTSRC "@sc{fftpack}"
+#  define FFTSRC "@sc{fftpack}"
 #endif
 
 static octave_value

--- a/libinterp/corefcn/file-io.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/file-io.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -35,7 +35,7 @@
 // April 1996.
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cerrno>
@@ -51,7 +51,7 @@
 #include <unistd.h>
 
 #ifdef HAVE_ZLIB_H
-#include <zlib.h>
+#  include <zlib.h>
 #endif
 
 #include "error.h"

--- a/libinterp/corefcn/filter.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/filter.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -29,7 +29,7 @@
 // jwe, Wed Nov  1 19:15:29 1995.
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "quit.h"

--- a/libinterp/corefcn/find.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/find.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "quit.h"

--- a/libinterp/corefcn/gammainc.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/gammainc.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "lo-specfun.h"

--- a/libinterp/corefcn/gcd.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/gcd.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "dNDArray.h"

--- a/libinterp/corefcn/getgrent.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/getgrent.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <string>

--- a/libinterp/corefcn/getpwent.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/getpwent.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <string>

--- a/libinterp/corefcn/getrusage.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/getrusage.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <sys/time.h>
@@ -29,11 +29,11 @@
 #include <sys/types.h>
 
 #ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
+#  include <sys/resource.h>
 #endif
 
 #if defined (HAVE_SYS_PARAM_H)
-#include <sys/param.h>
+#  include <sys/param.h>
 #endif
 
 #include "defun.h"
@@ -44,17 +44,17 @@
 #include "utils.h"
 
 #if ! defined (HZ)
-#if defined (CLK_TCK)
-#define HZ CLK_TCK
-#elif defined (USG)
-#define HZ 100
-#else
-#define HZ 60
-#endif
+#  if defined (CLK_TCK)
+#    define HZ CLK_TCK
+#  elif defined (USG)
+#    define HZ 100
+#  else
+#    define HZ 60
+#  endif
 #endif
 
 #ifndef RUSAGE_SELF
-#define RUSAGE_SELF 0
+#  define RUSAGE_SELF 0
 #endif
 
 // System resource functions.

--- a/libinterp/corefcn/givens.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/givens.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -23,7 +23,7 @@
 // Originally written by A. S. Hodel <scotte@eng.auburn.edu>
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "defun.h"

--- a/libinterp/corefcn/gl-render.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/gl-render.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #if defined (HAVE_OPENGL)
@@ -29,8 +29,8 @@
 #include <iostream>
 
 #ifdef HAVE_WINDOWS_H
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#  define WIN32_LEAN_AND_MEAN
+#  include <windows.h>
 #endif
 
 #include <lo-mappers.h>
@@ -74,7 +74,7 @@
 // GLU callback functions. Define it to empty on
 // other platforms.
 #ifndef CALLBACK
-#define CALLBACK
+#  define CALLBACK
 #endif
 
 class

--- a/libinterp/corefcn/gl2ps-print.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/gl2ps-print.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "errwarn.h"

--- a/libinterp/corefcn/graphics.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/graphics.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cctype>
@@ -6168,7 +6168,7 @@
 axes::properties::update_font (void)
 {
 #ifdef HAVE_FREETYPE
-#ifdef HAVE_FONTCONFIG
+#  ifdef HAVE_FONTCONFIG
   text_renderer.set_font (get ("fontname").string_value (),
                           get ("fontweight").string_value (),
                           get ("fontangle").string_value (),
@@ -7944,7 +7944,7 @@
 text::properties::update_font (void)
 {
 #ifdef HAVE_FREETYPE
-#ifdef HAVE_FONTCONFIG
+#  ifdef HAVE_FONTCONFIG
   renderer.set_font (get ("fontname").string_value (),
                      get ("fontweight").string_value (),
                      get ("fontangle").string_value (),

--- a/libinterp/corefcn/graphics.in.h	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/graphics.in.h	Fri Feb 05 16:29:08 2016 -0800
@@ -24,7 +24,7 @@
 #define octave_graphics_h 1
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cctype>

--- a/libinterp/corefcn/gripes.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/gripes.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -23,7 +23,7 @@
 // FIXME: All gripe_XXX functions deprecated in 4.2.  Remove file in 4.6
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "defun.h"
@@ -200,14 +200,14 @@
   octave_execution_exception e;
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
   gripe_user_supplied_eval (e, name);
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic pop
+#  pragma GCC diagnostic pop
 #endif
 }
 
@@ -231,14 +231,14 @@
   octave_execution_exception e;
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
   gripe_wrong_type_arg (e, name, s, is_error);
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic pop
+#  pragma GCC diagnostic pop
 #endif
 }
 
@@ -258,14 +258,14 @@
   octave_execution_exception e;
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
   gripe_wrong_type_arg (e, name, s.c_str (), is_error);
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic pop
+#  pragma GCC diagnostic pop
 #endif
 }
 
@@ -274,14 +274,14 @@
                       const char *name, const std::string& s, bool is_error)
 {
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
   gripe_wrong_type_arg (e, name, s.c_str (), is_error);
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic pop
+#  pragma GCC diagnostic pop
 #endif
 }
 
@@ -292,14 +292,14 @@
   octave_execution_exception e;
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
   gripe_wrong_type_arg (e, name, tc, is_error);
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic pop
+#  pragma GCC diagnostic pop
 #endif
 }
 
@@ -311,14 +311,14 @@
   std::string type = tc.type_name ();
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
   gripe_wrong_type_arg (e, name, type, is_error);
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic pop
+#  pragma GCC diagnostic pop
 #endif
 }
 
@@ -329,14 +329,14 @@
   octave_execution_exception e;
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
   gripe_wrong_type_arg (e, name, tc, is_error);
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic pop
+#  pragma GCC diagnostic pop
 #endif
 }
 
@@ -346,14 +346,14 @@
                       bool is_error)
 {
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
   gripe_wrong_type_arg (e, name.c_str (), tc, is_error);
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic pop
+#  pragma GCC diagnostic pop
 #endif
 }
 
@@ -363,14 +363,14 @@
   octave_execution_exception e;
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
   gripe_wrong_type_arg (e, s, is_error);
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic pop
+#  pragma GCC diagnostic pop
 #endif
 }
 
@@ -390,14 +390,14 @@
   octave_execution_exception e;
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
   gripe_wrong_type_arg (e, s, is_error);
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic pop
+#  pragma GCC diagnostic pop
 #endif
 }
 
@@ -406,14 +406,14 @@
                       const std::string& s, bool is_error)
 {
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
   gripe_wrong_type_arg (e, s.c_str (), is_error);
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic pop
+#  pragma GCC diagnostic pop
 #endif
 }
 
@@ -423,14 +423,14 @@
   octave_execution_exception e;
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
   gripe_wrong_type_arg (e, tc, is_error);
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic pop
+#  pragma GCC diagnostic pop
 #endif
 }
 
@@ -441,14 +441,14 @@
   std::string type = tc.type_name ();
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
   gripe_wrong_type_arg (e, type, is_error);
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
-#pragma GCC diagnostic pop
+#  pragma GCC diagnostic pop
 #endif
 }
 

--- a/libinterp/corefcn/hash.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/hash.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -35,7 +35,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <algorithm>

--- a/libinterp/corefcn/help.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/help.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cstdlib>

--- a/libinterp/corefcn/hess.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/hess.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "CmplxHESS.h"

--- a/libinterp/corefcn/hex2num.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/hex2num.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <algorithm>

--- a/libinterp/corefcn/input.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/input.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -23,7 +23,7 @@
 // Get command input interactively or from files.
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cstdio>

--- a/libinterp/corefcn/inv.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/inv.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "defun.h"

--- a/libinterp/corefcn/jit-ir.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/jit-ir.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -27,7 +27,7 @@
 #define __STDC_CONSTANT_MACROS
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #ifdef HAVE_LLVM
@@ -35,11 +35,11 @@
 #include "jit-ir.h"
 
 #ifdef HAVE_LLVM_IR_FUNCTION_H
-#include <llvm/IR/BasicBlock.h>
-#include <llvm/IR/Instructions.h>
+#  include <llvm/IR/BasicBlock.h>
+#  include <llvm/IR/Instructions.h>
 #else
-#include <llvm/BasicBlock.h>
-#include <llvm/Instructions.h>
+#  include <llvm/BasicBlock.h>
+#  include <llvm/Instructions.h>
 #endif
 
 #include "error.h"

--- a/libinterp/corefcn/jit-typeinfo.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/jit-typeinfo.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -27,7 +27,7 @@
 #define __STDC_CONSTANT_MACROS
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #ifdef HAVE_LLVM
@@ -35,33 +35,33 @@
 #include "jit-typeinfo.h"
 
 #ifdef HAVE_LLVM_IR_VERIFIER_H
-#include <llvm/IR/Verifier.h>
+#  include <llvm/IR/Verifier.h>
 #else
-#include <llvm/Analysis/Verifier.h>
+#  include <llvm/Analysis/Verifier.h>
 #endif
 
 #include <llvm/ExecutionEngine/ExecutionEngine.h>
 
 #ifdef HAVE_LLVM_IR_FUNCTION_H
-#include <llvm/IR/GlobalVariable.h>
-#include <llvm/IR/LLVMContext.h>
-#include <llvm/IR/Function.h>
-#include <llvm/IR/Instructions.h>
-#include <llvm/IR/Intrinsics.h>
+#  include <llvm/IR/GlobalVariable.h>
+#  include <llvm/IR/LLVMContext.h>
+#  include <llvm/IR/Function.h>
+#  include <llvm/IR/Instructions.h>
+#  include <llvm/IR/Intrinsics.h>
 #else
-#include <llvm/GlobalVariable.h>
-#include <llvm/LLVMContext.h>
-#include <llvm/Function.h>
-#include <llvm/Instructions.h>
-#include <llvm/Intrinsics.h>
+#  include <llvm/GlobalVariable.h>
+#  include <llvm/LLVMContext.h>
+#  include <llvm/Function.h>
+#  include <llvm/Instructions.h>
+#  include <llvm/Intrinsics.h>
 #endif
 
 #ifdef HAVE_LLVM_SUPPORT_IRBUILDER_H
-#include <llvm/Support/IRBuilder.h>
-#elif defined(HAVE_LLVM_IR_IRBUILDER_H)
-#include <llvm/IR/IRBuilder.h>
+#  include <llvm/Support/IRBuilder.h>
+#  elif defined(HAVE_LLVM_IR_IRBUILDER_H)
+#  include <llvm/IR/IRBuilder.h>
 #else
-#include <llvm/IRBuilder.h>
+#  include <llvm/IRBuilder.h>
 #endif
 
 #include <llvm/Support/raw_os_ostream.h>

--- a/libinterp/corefcn/jit-util.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/jit-util.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -27,15 +27,15 @@
 #define __STDC_CONSTANT_MACROS
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #ifdef HAVE_LLVM
 
 #ifdef HAVE_LLVM_IR_FUNCTION_H
-#include <llvm/IR/Value.h>
+#  include <llvm/IR/Value.h>
 #else
-#include <llvm/Value.h>
+#  include <llvm/Value.h>
 #endif
 
 #include <llvm/Support/raw_os_ostream.h>

--- a/libinterp/corefcn/jit-util.h	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/jit-util.h	Fri Feb 05 16:29:08 2016 -0800
@@ -32,7 +32,7 @@
 #include <stdexcept>
 
 #if defined (HAVE_LLVM_IR_DATALAYOUT_H) || defined (HAVE_LLVM_DATALAYOUT_H)
-#define HAVE_LLVM_DATALAYOUT
+#  define HAVE_LLVM_DATALAYOUT
 #endif
 
 // we don't want to include llvm headers here, as they require

--- a/libinterp/corefcn/kron.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/kron.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -23,7 +23,7 @@
 // Author: Paul Kienzle <pkienzle@users.sf.net>
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "dMatrix.h"

--- a/libinterp/corefcn/load-path.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/load-path.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <algorithm>

--- a/libinterp/corefcn/load-save.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/load-save.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -25,7 +25,7 @@
 // Matlab v5 support by James R. Van Zandt <jrv@vanzandt.mv.com>
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cfloat>
@@ -82,14 +82,14 @@
 
 // Remove gnulib definitions, if any.
 #ifdef close
-#undef close
+#  undef close
 #endif
 #ifdef open
-#undef open
+#  undef open
 #endif
 
 #ifdef HAVE_ZLIB
-#include "zfstream.h"
+#  include "zfstream.h"
 #endif
 
 // Write octave-workspace file if Octave crashes or is killed by a signal.

--- a/libinterp/corefcn/lookup.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/lookup.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -23,7 +23,7 @@
 // Author: Jaroslav Hajek <highegg@gmail.com>
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cctype>

--- a/libinterp/corefcn/ls-ascii-helper.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/ls-ascii-helper.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "ls-ascii-helper.h"

--- a/libinterp/corefcn/ls-hdf5.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/ls-hdf5.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -23,7 +23,7 @@
 // Author: Steven G. Johnson <stevenj@alum.mit.edu>
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #if defined (HAVE_HDF5)

--- a/libinterp/corefcn/ls-mat-ascii.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/ls-mat-ascii.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cfloat>

--- a/libinterp/corefcn/ls-mat4.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/ls-mat4.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cfloat>

--- a/libinterp/corefcn/ls-mat5.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/ls-mat5.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -23,7 +23,7 @@
 // Author: James R. Van Zandt <jrv@vanzandt.mv.com>
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cfloat>
@@ -78,7 +78,7 @@
 #include "defaults.h"
 
 #ifdef HAVE_ZLIB
-#include <zlib.h>
+#  include <zlib.h>
 #endif
 
 #define READ_PAD(is_small_data_element, l) ((is_small_data_element) ? 4 : (((l)+7)/8)*8)

--- a/libinterp/corefcn/ls-oct-binary.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/ls-oct-binary.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cfloat>

--- a/libinterp/corefcn/ls-oct-text.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/ls-oct-text.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -23,7 +23,7 @@
 // Author: John W. Eaton.
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cstring>

--- a/libinterp/corefcn/ls-oct-text.h	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/ls-oct-text.h	Fri Feb 05 16:29:08 2016 -0800
@@ -38,7 +38,7 @@
 // Used when converting Inf to something that gnuplot can read.
 
 #ifndef OCT_RBV
-#define OCT_RBV (std::numeric_limits<double>::max () / 100.0)
+#  define OCT_RBV (std::numeric_limits<double>::max () / 100.0)
 #endif
 
 extern OCTINTERP_API std::string

--- a/libinterp/corefcn/ls-utils.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/ls-utils.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "data-conv.h"

--- a/libinterp/corefcn/ls-utils.h	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/ls-utils.h	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #if ! defined (octave_ls_utils_h)
-#define octave_ls_utils 1
+#  define octave_ls_utils 1
 
 extern save_type
 get_save_type (double max_val, double min_val);

--- a/libinterp/corefcn/lsode.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/lsode.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <string>

--- a/libinterp/corefcn/lu.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/lu.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "CmplxLU.h"

--- a/libinterp/corefcn/luinc.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/luinc.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "defun.h"

--- a/libinterp/corefcn/mappers.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/mappers.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cctype>

--- a/libinterp/corefcn/matrix_type.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/matrix_type.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <algorithm>

--- a/libinterp/corefcn/max.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/max.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "lo-ieee.h"

--- a/libinterp/corefcn/mex.h	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/mex.h	Fri Feb 05 16:29:08 2016 -0800
@@ -58,8 +58,8 @@
 
 /* -V4 stuff */
 #if defined (V4)
-#define Matrix mxArray
-#define REAL mxREAL
+#  define Matrix mxArray
+#  define REAL mxREAL
 #endif
 
 #define mxMAXNAME 64
@@ -107,67 +107,67 @@
 /* Apparently these are also defined.  */
 
 #ifndef UINT64_T
-#define UINT64_T uint64_t
+#  define UINT64_T uint64_t
 #endif
 
 #ifndef uint64_T
-#define uint64_T uint64_t
+#  define uint64_T uint64_t
 #endif
 
 #ifndef INT64_T
-#define INT64_T int64_t
+#  define INT64_T int64_t
 #endif
 
 #ifndef int64_T
-#define int64_T int64_t
+#  define int64_T int64_t
 #endif
 
 #ifndef UINT32_T
-#define UINT32_T uint32_t
+#  define UINT32_T uint32_t
 #endif
 
 #ifndef uint32_T
-#define uint32_T uint32_t
+#  define uint32_T uint32_t
 #endif
 
 #ifndef INT32_T
-#define INT32_T int32_t
+#  define INT32_T int32_t
 #endif
 
 #ifndef int32_T
-#define int32_T int32_t
+#  define int32_T int32_t
 #endif
 
 #ifndef UINT16_T
-#define UINT16_T uint16_t
+#  define UINT16_T uint16_t
 #endif
 
 #ifndef uint16_T
-#define uint16_T uint16_t
+#  define uint16_T uint16_t
 #endif
 
 #ifndef INT16_T
-#define INT16_T int16_t
+#  define INT16_T int16_t
 #endif
 
 #ifndef int16_T
-#define int16_T int16_t
+#  define int16_T int16_t
 #endif
 
 #ifndef UINT8_T
-#define UINT8_T uint8_t
+#  define UINT8_T uint8_t
 #endif
 
 #ifndef uint8_T
-#define uint8_T uint8_t
+#  define uint8_T uint8_t
 #endif
 
 #ifndef INT8_T
-#define INT8_T int8_t
+#  define INT8_T int8_t
 #endif
 
 #ifndef int8_T
-#define int8_T int8_t
+#  define int8_T int8_t
 #endif
 
 #if defined (__cplusplus)

--- a/libinterp/corefcn/mexproto.h	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/mexproto.h	Fri Feb 05 16:29:08 2016 -0800
@@ -49,22 +49,22 @@
 #define MEXPROTO_H
 
 #if defined (__cplusplus)
-#include <cstdlib>
+#  include <cstdlib>
 extern "C" {
 #else
-#include <stdlib.h>
+#  include <stdlib.h>
 #endif
 
 /* The definition of OCTINTERP_API is normally provided by Octave's
    config.h file.  This is provided for the case of mex.h included by
    user programs that don't use Octave's config.h.  */
 #if ! defined (OCTINTERP_API)
-#if defined (_MSC_VER)
-#define OCTINTERP_API __declspec(dllimport)
-#else
-/* All other compilers, at least for now.  */
-#define OCTINTERP_API
-#endif
+#  if defined (_MSC_VER)
+#    define OCTINTERP_API __declspec(dllimport)
+#  else
+   /* All other compilers, at least for now.  */
+#    define OCTINTERP_API
+#  endif
 #endif
 
 #define MXARRAY_TYPEDEFS_ONLY
@@ -274,31 +274,31 @@
 
 /* Miscellaneous.  */
 #ifdef NDEBUG
-#define mxAssert(expr, msg) \
-  do \
-    { \
-      if (! expr) \
-        { \
-          mexPrintf ("Assertion failed: %s, at line %d of file \"%s\".\n%s\n", \
-                     #expr, __LINE__, __FILE__, msg); \
-        } \
-    } \
-  while (0)
+#  define mxAssert(expr, msg) \
+    do \
+      { \
+        if (! expr) \
+          { \
+            mexPrintf ("Assertion failed: %s, at line %d of file \"%s\".\n%s\n", \
+                       #expr, __LINE__, __FILE__, msg); \
+          } \
+      } \
+    while (0)
 
-#define mxAssertS(expr, msg) \
-  do \
-    { \
-      if (! expr) \
-        { \
-          mexPrintf ("Assertion failed at line %d of file \"%s\".\n%s\n", \
-                     __LINE__, __FILE__, msg); \
-          abort (); \
-        } \
-    } \
-  while (0)
+#  define mxAssertS(expr, msg) \
+    do \
+      { \
+        if (! expr) \
+          { \
+            mexPrintf ("Assertion failed at line %d of file \"%s\".\n%s\n", \
+                       __LINE__, __FILE__, msg); \
+            abort (); \
+          } \
+      } \
+    while (0)
 #else
-#define mxAssert(expr, msg)
-#define mxAssertS(expr, msg)
+#  define mxAssert(expr, msg)
+#  define mxAssertS(expr, msg)
 #endif
 
 extern OCTINTERP_API mwIndex mxCalcSingleSubscript (const mxArray *ptr,

--- a/libinterp/corefcn/mgorth.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/mgorth.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "oct-norm.h"

--- a/libinterp/corefcn/nproc.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/nproc.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "defun.h"

--- a/libinterp/corefcn/oct-errno.in.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/oct-errno.in.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cerrno>

--- a/libinterp/corefcn/oct-fstrm.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/oct-fstrm.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cerrno>

--- a/libinterp/corefcn/oct-hdf5-types.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/oct-hdf5-types.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "error.h"

--- a/libinterp/corefcn/oct-hdf5.h	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/oct-hdf5.h	Fri Feb 05 16:29:08 2016 -0800
@@ -21,21 +21,21 @@
 */
 
 #if ! defined (octave_oct_hdf5_h)
-#define octave_hdf5_h 1
+#  define octave_hdf5_h 1
 
 #if defined (HAVE_HDF5)
 
-#if defined (HAVE_HDF5_H)
-#include <hdf5.h>
-#endif
+#  if defined (HAVE_HDF5_H)
+#    include <hdf5.h>
+#  endif
 
-#include "oct-hdf5-types.h"
+#  include "oct-hdf5-types.h"
 
-#if defined (ENABLE_64)
-#define H5T_NATIVE_IDX H5T_NATIVE_INT64
-#else
-#define H5T_NATIVE_IDX H5T_NATIVE_INT
-#endif
+#  if defined (ENABLE_64)
+#    define H5T_NATIVE_IDX H5T_NATIVE_INT64
+#  else
+#    define H5T_NATIVE_IDX H5T_NATIVE_INT
+#  endif
 
 #endif
 

--- a/libinterp/corefcn/oct-hist.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/oct-hist.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -32,7 +32,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cstdlib>

--- a/libinterp/corefcn/oct-iostrm.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/oct-iostrm.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "error.h"

--- a/libinterp/corefcn/oct-lvalue.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/oct-lvalue.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "error.h"

--- a/libinterp/corefcn/oct-map.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/oct-map.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "Array-util.h"

--- a/libinterp/corefcn/oct-prcstrm.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/oct-prcstrm.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cstdio>

--- a/libinterp/corefcn/oct-procbuf.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/oct-procbuf.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cerrno>
@@ -43,7 +43,7 @@
 #include "utils.h"
 
 #ifndef SHELL_PATH
-#define SHELL_PATH "/bin/sh"
+#  define SHELL_PATH "/bin/sh"
 #endif
 
 // This class is based on the procbuf class from libg++, written by
@@ -52,7 +52,7 @@
 static octave_procbuf *octave_procbuf_list = 0;
 
 #ifndef BUFSIZ
-#define BUFSIZ 1024
+#  define BUFSIZ 1024
 #endif
 
 octave_procbuf *

--- a/libinterp/corefcn/oct-stream.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/oct-stream.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cassert>

--- a/libinterp/corefcn/oct-strstrm.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/oct-strstrm.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "oct-strstrm.h"

--- a/libinterp/corefcn/octave-link.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/octave-link.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -23,7 +23,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "cmd-edit.h"

--- a/libinterp/corefcn/ordschur.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/ordschur.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "defun.h"

--- a/libinterp/corefcn/pager.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/pager.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <fstream>

--- a/libinterp/corefcn/pinv.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/pinv.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "defun.h"

--- a/libinterp/corefcn/pr-output.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/pr-output.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cfloat>

--- a/libinterp/corefcn/procstream.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/procstream.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <iostream>

--- a/libinterp/corefcn/profiler.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/profiler.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <iostream>

--- a/libinterp/corefcn/psi.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/psi.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "ov.h"

--- a/libinterp/corefcn/pt-jit.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/pt-jit.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -26,7 +26,7 @@
 #define __STDC_CONSTANT_MACROS
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "debug.h"
@@ -53,9 +53,9 @@
 #include <llvm/Analysis/Passes.h>
 
 #ifdef HAVE_LLVM_IR_VERIFIER_H
-#include <llvm/IR/Verifier.h>
+#  include <llvm/IR/Verifier.h>
 #else
-#include <llvm/Analysis/Verifier.h>
+#  include <llvm/Analysis/Verifier.h>
 #endif
 
 #include <llvm/Bitcode/ReaderWriter.h>
@@ -63,36 +63,36 @@
 #include <llvm/ExecutionEngine/JIT.h>
 
 #ifdef LEGACY_PASSMANAGER
-#include <llvm/IR/LegacyPassManager.h>
+#  include <llvm/IR/LegacyPassManager.h>
 #else
-#include <llvm/PassManager.h>
+#  include <llvm/PassManager.h>
 #endif
 
 #ifdef HAVE_LLVM_IR_FUNCTION_H
-#include <llvm/IR/LLVMContext.h>
-#include <llvm/IR/Module.h>
+#  include <llvm/IR/LLVMContext.h>
+#  include <llvm/IR/Module.h>
 #else
-#include <llvm/LLVMContext.h>
-#include <llvm/Module.h>
+#  include <llvm/LLVMContext.h>
+#  include <llvm/Module.h>
 #endif
 
 #ifdef HAVE_LLVM_SUPPORT_IRBUILDER_H
-#include <llvm/Support/IRBuilder.h>
+#  include <llvm/Support/IRBuilder.h>
 #elif defined(HAVE_LLVM_IR_IRBUILDER_H)
-#include <llvm/IR/IRBuilder.h>
+#  include <llvm/IR/IRBuilder.h>
 #else
-#include <llvm/IRBuilder.h>
+#  include <llvm/IRBuilder.h>
 #endif
 
 #include <llvm/Support/raw_os_ostream.h>
 #include <llvm/Support/TargetSelect.h>
 
 #ifdef HAVE_LLVM_IR_DATALAYOUT_H
-#include <llvm/IR/DataLayout.h>
+#  include <llvm/IR/DataLayout.h>
 #elif defined(HAVE_LLVM_DATALAYOUT_H)
-#include <llvm/DataLayout.h>
+#  include <llvm/DataLayout.h>
 #else
-#include <llvm/Target/TargetData.h>
+#  include <llvm/Target/TargetData.h>
 #endif
 
 #include <llvm/Transforms/IPO.h>
@@ -2510,9 +2510,9 @@
 #endif
 
 #if defined (HAVE_LLVM)
-#define UNUSED_WITHOUT_LLVM(x) x
+#  define UNUSED_WITHOUT_LLVM(x) x
 #else
-#define UNUSED_WITHOUT_LLVM(x) x OCTAVE_UNUSED
+#  define UNUSED_WITHOUT_LLVM(x) x OCTAVE_UNUSED
 #endif
 
 DEFUN (jit_failcnt, UNUSED_WITHOUT_LLVM (args),

--- a/libinterp/corefcn/quad.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/quad.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <string>
@@ -45,7 +45,7 @@
 #include "Quad-opts.cc"
 
 #if defined (quad)
-#undef quad
+#  undef quad
 #endif
 
 // Global pointer for user defined function required by quadrature functions.

--- a/libinterp/corefcn/quadcc.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/quadcc.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "lo-ieee.h"

--- a/libinterp/corefcn/qz.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/qz.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -29,7 +29,7 @@
 #undef DEBUG_EIG
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cfloat>
@@ -52,7 +52,7 @@
 #include "ov.h"
 #include "pager.h"
 #if defined (DEBUG) || defined (DEBUG_SORT)
-#include "pr-output.h"
+#  include "pr-output.h"
 #endif
 #include "symtab.h"
 #include "utils.h"

--- a/libinterp/corefcn/rand.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/rand.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -23,14 +23,14 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <ctime>
 #if defined (HAVE_UNORDERED_MAP)
-#include <unordered_map>
+#  include <unordered_map>
 #elif defined (HAVE_TR1_UNORDERED_MAP)
-#include <tr1/unordered_map>
+#  include <tr1/unordered_map>
 #endif
 #include <string>
 

--- a/libinterp/corefcn/rcond.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/rcond.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include "defun.h"

--- a/libinterp/corefcn/regexp.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/regexp.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -22,7 +22,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <list>

--- a/libinterp/corefcn/schur.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/schur.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <string>

--- a/libinterp/corefcn/sighandlers.cc	Thu Feb 04 18:07:46 2016 -0500
+++ b/libinterp/corefcn/sighandlers.cc	Fri Feb 05 16:29:08 2016 -0800
@@ -21,7 +21,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 
 #include <cstdlib>
@@ -227,19 +227,19 @@
 
 // Signal handler return type.
 #ifndef BADSIG
-#define BADSIG (void (*)(int))-1
+#  define BADSIG (void (*)(int))-1
 #endif
 
 // The following is a workaround for an apparent bug in GCC 4.1.2 and
 // possibly earlier versions.  See Octave bug report #30685 for details.
 #if defined (__GNUC__)
-# if ! (__GNUC__ > 4 \
-        || (__GNUC__ == 4 && (__GNUC_MINOR__ > 1 \
-                              || (__GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ > 2))))
-#  undef GNULIB_NAMESPACE
-#  define GNULIB_NAMESPACE
-#  warning "disabling GNULIB_NAMESPACE for signal functions -- consider upgrading to a current version of GCC"
-# endif
+#  if ! (__GNUC__ > 4 \
+         || (__GNUC__ == 4 && (__GNUC_MINOR__ > 1 \
+                               || (__GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ > 2))))
+#    undef GNULIB_NAMESPACE
+#    define GNULIB_NAMESPACE
+#    warning "disabling GNULIB_NAMESPACE for signal functions -- consider upgrading to a current version of GCC"
+#  endif
 #endif
 
 #define BLOCK_SIGNAL(sig, nvar, ovar) \
@@ -253,7 +253,7 @@
   while (0)
 
 #if ! defined (SIGCHLD) && defined (SIGCLD)
-#define SIGCHLD SIGCLD
+#  define SIGCHLD SIGCLD
 #endif
 
 #define BLOCK_CHILD(nvar, ovar) BLOCK_SIGNAL (SIGCHLD, nvar, ovar)
@@ -365,15 +365,15 @@
 #if defined (SIGALRM)
   if (sig == SIGALRM)
     {
-#if defined (SA_INTERRUPT)
+#  if defined (SA_INTERRUPT)
       act.sa_flags |= SA_INTERRUPT;
-#endif
+#  endif
     }
 #endif
 #if defined (SA_RESTART)
-#if defined (SIGALRM)
+#  if defined (SIGALRM)
   else
-#endif
+#  endif
   // FIXME: Do we also need to explicitly disable SA_RESTART?
   if (restart_syscalls)
     act.sa_flags |= SA_RESTART;
@@ -405,8 +405,7 @@
 }
 #endif
 
-#ifdef SIGFPE
-#if defined (__alpha__)
+#if defined (SIGFPE) && defined (__alpha__)
 static void
 sigfpe_handler (int /* sig */)
 {
@@ -420,7 +419,6 @@
     }
 }
 #endif
-#endif
 
 #if defined (SIGHUP) || defined (SIGTERM)
 static void
@@ -455,7 +453,7 @@
 #endif
 
 #if 0
-#if defined (SIGWINCH)
+#  if defined (SIGWINCH)
 static void
 sigwinch_handler (int /* sig */)
 {
@@ -653,11 +651,11 @@
 #endif
 
 #ifdef SIGFPE
-#if defined (__alpha__)
+#  if defined (__alpha__)
   octave_set_signal_handler (SIGFPE, sigfpe_handler);
-#else
+#  else
   octave_set_signal_handler (SIGFPE, generic_sig_handler);
-#endif
+#  endif
 #endif
 
 #ifdef SIGHUP
@@ -734,7 +732,7 @@
 #endif
 
 #if 0
-#ifdef SIGWINCH
+#  ifdef SIGWINCH
   octave_set_signal_handler (SIGWINCH, sigwinch_handler);
 #endif
 #endif