Mercurial > jwe > octave

changeset 30007:1cf04058fea6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make sure octave namespace begin and end tags appear in matching pairs. * libinterp/corefcn/c-file-ptr-stream.cc, liboctave/dldfcn/__init_fltk__.cc: Make sure OCTAVE_NAMESPACE_BEGIN and OCTAVE_NAMESPACE_END are contained in the same code block surrounded by pre-processor conditions.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 18 Aug 2021 19:18:30 +0200
parents 428cccc75cc9
children 66763afc32c9
files libinterp/corefcn/c-file-ptr-stream.cc libinterp/dldfcn/__init_fltk__.cc
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/c-file-ptr-stream.cc	Wed Aug 18 11:40:25 2021 -0400
+++ b/libinterp/corefcn/c-file-ptr-stream.cc	Wed Aug 18 19:18:30 2021 +0200
@@ -318,6 +318,6 @@
   return retval;
 }
 
-OCTAVE_NAMESPACE_END
+#endif
 
-#endif
+OCTAVE_NAMESPACE_END
--- a/libinterp/dldfcn/__init_fltk__.cc	Wed Aug 18 11:40:25 2021 -0400
+++ b/libinterp/dldfcn/__init_fltk__.cc	Wed Aug 18 19:18:30 2021 +0200
@@ -105,8 +105,12 @@
 #include "parse.h"
 #include "variables.h"
 
+#endif
+
 OCTAVE_NAMESPACE_BEGIN
 
+#if defined (HAVE_FLTK)
+
 #define FLTK_GRAPHICS_TOOLKIT_NAME "fltk"
 
 const char *help_text = "\