changeset 33167:8f8bb94a1b83

for consistent coding style, use #if defined, not #ifdef or #ifndef Affected files: documentation.cc, variable-editor-model.cc, variable-editor.cc, gsvd.cc, latex-text-renderer.cc, ordqz.cc, pt-anon-scopes.cc, Faddeeva.cc, and gsvd.cc.
author John W. Eaton <jwe@octave.org>
date Thu, 07 Mar 2024 13:55:46 -0500
parents 7274354d68bf
children e20624df2cd2
files libgui/src/documentation.cc libgui/src/variable-editor-model.cc libgui/src/variable-editor.cc libinterp/corefcn/gsvd.cc libinterp/corefcn/latex-text-renderer.cc libinterp/corefcn/ordqz.cc libinterp/parse-tree/pt-anon-scopes.cc liboctave/external/Faddeeva/Faddeeva.cc liboctave/numeric/gsvd.cc
diffstat 9 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/documentation.cc	Thu Mar 07 13:47:50 2024 -0500
+++ b/libgui/src/documentation.cc	Thu Mar 07 13:55:46 2024 -0500
@@ -128,7 +128,7 @@
   if (copy_ok)
     m_help_engine->setCollectionFile (m_collection);
   else
-#ifdef ENABLE_DOCS
+#if defined (ENABLE_DOCS)
     // FIXME: Perhaps a better way to do this would be to keep a count
     // in the GUI preferences file.  After issuing this warning 3 times
     // it would be disabled.  The count would need to be reset when a new
@@ -146,7 +146,7 @@
 
   if (! m_help_engine->setupData())
     {
-#ifdef ENABLE_DOCS
+#if defined (ENABLE_DOCS)
       QMessageBox::warning (this, tr ("Octave Documentation"),
                             tr ("Could not setup the data required for the\n"
                                 "documentation viewer. Maybe the Qt SQlite\n"
--- a/libgui/src/variable-editor-model.cc	Thu Mar 07 13:47:50 2024 -0500
+++ b/libgui/src/variable-editor-model.cc	Thu Mar 07 13:55:46 2024 -0500
@@ -23,7 +23,7 @@
 //
 ////////////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_CONFIG_H
+#if defined (HAVE_CONFIG_H)
 #  include "config.h"
 #endif
 
--- a/libgui/src/variable-editor.cc	Thu Mar 07 13:47:50 2024 -0500
+++ b/libgui/src/variable-editor.cc	Thu Mar 07 13:55:46 2024 -0500
@@ -23,7 +23,7 @@
 //
 ////////////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_CONFIG_H
+#if defined (HAVE_CONFIG_H)
 #  include "config.h"
 #endif
 
--- a/libinterp/corefcn/gsvd.cc	Thu Mar 07 13:47:50 2024 -0500
+++ b/libinterp/corefcn/gsvd.cc	Thu Mar 07 13:55:46 2024 -0500
@@ -23,7 +23,7 @@
 //
 ////////////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_CONFIG_H
+#if defined (HAVE_CONFIG_H)
 #  include "config.h"
 #endif
 
--- a/libinterp/corefcn/latex-text-renderer.cc	Thu Mar 07 13:47:50 2024 -0500
+++ b/libinterp/corefcn/latex-text-renderer.cc	Thu Mar 07 13:55:46 2024 -0500
@@ -23,7 +23,7 @@
 //
 ////////////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_CONFIG_H
+#if defined (HAVE_CONFIG_H)
 #  include "config.h"
 #endif
 
--- a/libinterp/corefcn/ordqz.cc	Thu Mar 07 13:47:50 2024 -0500
+++ b/libinterp/corefcn/ordqz.cc	Thu Mar 07 13:55:46 2024 -0500
@@ -374,7 +374,7 @@
       k = 0;
       while (k < nn)
         {
-#ifdef DEBUG
+#if defined (DEBUG)
           octave_stdout << "ordqz: k = " << k  << " nn = " << nn << " \n";
 #endif
           if ((k < nn-1 && aa(k+1, k) == 0.0) || k == nn-1)
--- a/libinterp/parse-tree/pt-anon-scopes.cc	Thu Mar 07 13:47:50 2024 -0500
+++ b/libinterp/parse-tree/pt-anon-scopes.cc	Thu Mar 07 13:55:46 2024 -0500
@@ -23,7 +23,7 @@
 //
 ////////////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_CONFIG_H
+#if defined (HAVE_CONFIG_H)
 #  include "config.h"
 #endif
 
--- a/liboctave/external/Faddeeva/Faddeeva.cc	Thu Mar 07 13:47:50 2024 -0500
+++ b/liboctave/external/Faddeeva/Faddeeva.cc	Thu Mar 07 13:55:46 2024 -0500
@@ -211,7 +211,7 @@
 // gnulib::floor and the system ::floor (and only on ancient OSF systems)
 // has to do with floor(-0), which doesn't occur in the usage below, but
 // the Octave developers prefer that we silence the warning.
-#  ifdef GNULIB_NAMESPACE
+#  if defined (GNULIB_NAMESPACE)
 #    define floor GNULIB_NAMESPACE::floor
 #  endif
 
--- a/liboctave/numeric/gsvd.cc	Thu Mar 07 13:47:50 2024 -0500
+++ b/liboctave/numeric/gsvd.cc	Thu Mar 07 13:55:46 2024 -0500
@@ -23,7 +23,7 @@
 //
 ////////////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_CONFIG_H
+#if defined (HAVE_CONFIG_H)
 #  include "config.h"
 #endif