Mercurial > octave

changeset 22003:2d3972b802ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use consistent style for including config.h in source files
author John W. Eaton <jwe@octave.org>
date Thu, 30 Jun 2016 11:41:49 -0400
parents 40e9cb6bd95c
children 78000c426b73
files libgui/module.mk libgui/qterminal/libqterminal/unix/kpty.cpp libgui/src/m-editor/marker.cc libinterp/corefcn/coct-hdf5-types.c libinterp/corefcn/hook-fcn.cc libinterp/corefcn/mex.cc libinterp/corefcn/oct-tex-lexer.in.ll libinterp/corefcn/oct-tex-parser.in.yy libinterp/corefcn/text-renderer.cc libinterp/mkops libinterp/parse-tree/lex.ll libinterp/parse-tree/oct-parse.in.yy src/display-available.c
diffstat 13 files changed, 21 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/module.mk	Thu Jun 30 11:05:15 2016 -0400
+++ b/libgui/module.mk	Thu Jun 30 11:41:49 2016 -0400
@@ -79,7 +79,7 @@
 define moc-command
   rm -f $@-t $@ && \
   ( echo "#if defined (HAVE_CONFIG_H)"; \
-    echo '#include "config.h"'; \
+    echo '#  include "config.h"'; \
     echo "#endif"; \
     $(MOC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MOC_OCTAVE_CPPFLAGS) $(MOC_CPPFLAGS) $(libgui_liboctgui_la_CPPFLAGS) $< ) > $@-t && \
   mv $@-t $@
@@ -88,7 +88,7 @@
 define rcc-command
   rm -f $@-t $@ && \
   ( echo "#if defined (HAVE_CONFIG_H)"; \
-    echo '#include "config.h"'; \
+    echo '#  include "config.h"'; \
     echo "#endif"; \
     echo "// Ignore unused variable warnings in generated code."; \
     echo "#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)"; \
--- a/libgui/qterminal/libqterminal/unix/kpty.cpp	Thu Jun 30 11:05:15 2016 -0400
+++ b/libgui/qterminal/libqterminal/unix/kpty.cpp	Thu Jun 30 11:41:49 2016 -0400
@@ -23,7 +23,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#  include "config.h"
 #endif
 
 #include "unix/kpty_p.h"
--- a/libgui/src/m-editor/marker.cc	Thu Jun 30 11:05:15 2016 -0400
+++ b/libgui/src/m-editor/marker.cc	Thu Jun 30 11:41:49 2016 -0400
@@ -21,7 +21,7 @@
 */
 
 #if defined (HAVE_CONFIG_H)
-#include "config.h"
+#  include "config.h"
 #endif
 
 #if defined (HAVE_QSCINTILLA)
--- a/libinterp/corefcn/coct-hdf5-types.c	Thu Jun 30 11:05:15 2016 -0400
+++ b/libinterp/corefcn/coct-hdf5-types.c	Thu Jun 30 11:41:49 2016 -0400
@@ -21,7 +21,7 @@
 */
 
 #if defined (HAVE_CONFIG_H)
-#include "config.h"
+#  include "config.h"
 #endif
 
 #include "oct-hdf5.h"
--- a/libinterp/corefcn/hook-fcn.cc	Thu Jun 30 11:05:15 2016 -0400
+++ b/libinterp/corefcn/hook-fcn.cc	Thu Jun 30 11:41:49 2016 -0400
@@ -20,7 +20,9 @@
 
 */
 
-#include "config.h"
+#if defined (HAVE_CONFIG_H)
+#  include "config.h"
+#endif
 
 #include "hook-fcn.h"
 
--- a/libinterp/corefcn/mex.cc	Thu Jun 30 11:05:15 2016 -0400
+++ b/libinterp/corefcn/mex.cc	Thu Jun 30 11:41:49 2016 -0400
@@ -20,7 +20,9 @@
 
 */
 
-#include "config.h"
+#if defined (HAVE_CONFIG_H)
+#  include "config.h"
+#endif
 
 #include <cfloat>
 #include <csetjmp>
--- a/libinterp/corefcn/oct-tex-lexer.in.ll	Thu Jun 30 11:05:15 2016 -0400
+++ b/libinterp/corefcn/oct-tex-lexer.in.ll	Thu Jun 30 11:41:49 2016 -0400
@@ -22,7 +22,7 @@
 
 %top {
 #if defined (HAVE_CONFIG_H)
-#include "config.h"
+#  include "config.h"
 #endif
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
--- a/libinterp/corefcn/oct-tex-parser.in.yy	Thu Jun 30 11:05:15 2016 -0400
+++ b/libinterp/corefcn/oct-tex-parser.in.yy	Thu Jun 30 11:41:49 2016 -0400
@@ -25,7 +25,7 @@
 #define YYDEBUG 1
 
 #if defined (HAVE_CONFIG_H)
-#include "config.h"
+#  include "config.h"
 #endif
 
 #include "txt-eng.h"
--- a/libinterp/corefcn/text-renderer.cc	Thu Jun 30 11:05:15 2016 -0400
+++ b/libinterp/corefcn/text-renderer.cc	Thu Jun 30 11:41:49 2016 -0400
@@ -22,7 +22,7 @@
 */
 
 #if defined (HAVE_CONFIG_H)
-#include "config.h"
+#  include "config.h"
 #endif
 
 #include "base-text-renderer.h"
--- a/libinterp/mkops	Thu Jun 30 11:05:15 2016 -0400
+++ b/libinterp/mkops	Thu Jun 30 11:41:49 2016 -0400
@@ -24,7 +24,7 @@
 // DO NOT EDIT!  Generated automatically by mkops.
 
 #if defined (HAVE_CONFIG_H)
-#include "config.h"
+#  include "config.h"
 #endif
 
 extern void install_base_type_conversions (void);
--- a/libinterp/parse-tree/lex.ll	Thu Jun 30 11:05:15 2016 -0400
+++ b/libinterp/parse-tree/lex.ll	Thu Jun 30 11:41:49 2016 -0400
@@ -33,7 +33,7 @@
 
 %top {
 #if defined (HAVE_CONFIG_H)
-#include "config.h"
+#  include "config.h"
 #endif
 
 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
--- a/libinterp/parse-tree/oct-parse.in.yy	Thu Jun 30 11:05:15 2016 -0400
+++ b/libinterp/parse-tree/oct-parse.in.yy	Thu Jun 30 11:41:49 2016 -0400
@@ -32,7 +32,7 @@
 #define YYDEBUG 1
 
 #if defined (HAVE_CONFIG_H)
-#include "config.h"
+#  include "config.h"
 #endif
 
 #include <cassert>
--- a/src/display-available.c	Thu Jun 30 11:05:15 2016 -0400
+++ b/src/display-available.c	Thu Jun 30 11:41:49 2016 -0400
@@ -21,17 +21,17 @@
 */
 
 #if defined (HAVE_CONFIG_H)
-#include "config.h"
+#  include "config.h"
 #endif
 
 #include <stdlib.h>
 
 #if defined (OCTAVE_USE_WINDOWS_API)
-#include <windows.h>
+#  include <windows.h>
 #elif defined (HAVE_FRAMEWORK_CARBON)
-#include <Carbon/Carbon.h>
+#  include <Carbon/Carbon.h>
 #elif defined (HAVE_X_WINDOWS)
-#include <X11/Xlib.h>
+#  include <X11/Xlib.h>
 #endif
 
 #include "display-available.h"