# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1450494382 18000
# Node ID 9d9270e2f98fb8f1462643179be4cbb0c74d4928
# Parent  42319d289714e47b0cbde468e8c8215e9768a2a3
eliminate comments after preprocessor conditionals

* annotation-dialog.h, gl-select.h, documentation-dock-widget.h,
files-dock-widget.h, find-files-dialog.h, find-files-model.h,
history-dock-widget.h, file-editor-interface.h, file-editor.h,
find-dialog.h, main-window.h, resource-manager.h, settings-dialog.h,
shortcut-manager.h, terminal-dock-widget.h, welcome-wizard.h,
defun-int.h, gl2ps-renderer.h, load-save.cc, ls-hdf5.cc, ls-mat5.cc,
octave-link.h, sighandlers.cc, txt-eng-ft.cc, txt-eng-ft.h,
zfstream.cc, zfstream.h, ov-cx-mat.cc, ov-cx-sparse.cc,
ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-java.cc, ov-re-mat.cc,
ov-re-sparse.cc, Sparse-diag-op-defs.h, Sparse-perm-op-defs.h,
oct-env.cc, oct-refcount.h, sparse-util.cc, statdefs.h, main.in.cc:
Eliminate comments after preprocessor conditionals.

diff -r 42319d289714 -r 9d9270e2f98f libgui/graphics/annotation-dialog.h
--- a/libgui/graphics/annotation-dialog.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libgui/graphics/annotation-dialog.h	Fri Dec 18 22:06:22 2015 -0500
@@ -59,4 +59,4 @@
   octave_value_list props;
 };
 
-#endif // ANNOTATIONDIALOG_H
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libgui/graphics/gl-select.h
--- a/libgui/graphics/gl-select.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libgui/graphics/gl-select.h	Fri Dec 18 22:06:22 2015 -0500
@@ -75,4 +75,4 @@
   std::map<GLuint, graphics_object> object_map;
 };
 
-#endif // __QtHandles_gl_selector__
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libgui/src/documentation-dock-widget.h
--- a/libgui/src/documentation-dock-widget.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libgui/src/documentation-dock-widget.h	Fri Dec 18 22:06:22 2015 -0500
@@ -46,4 +46,4 @@
   webinfo *_webinfo;
 };
 
-#endif // DOCUMENTATIONDOCKWIDGET_H
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libgui/src/files-dock-widget.h
--- a/libgui/src/files-dock-widget.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libgui/src/files-dock-widget.h	Fri Dec 18 22:06:22 2015 -0500
@@ -164,4 +164,4 @@
   QSignalMapper *_sig_mapper;
 };
 
-#endif // FILESDOCKWIDGET_H
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libgui/src/find-files-dialog.h
--- a/libgui/src/find-files-dialog.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libgui/src/find-files-dialog.h	Fri Dec 18 22:06:22 2015 -0500
@@ -75,5 +75,4 @@
   QStatusBar * _status_bar;
 };
 
-#endif // octave_find_files_dialog_h
-
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libgui/src/find-files-model.h
--- a/libgui/src/find-files-model.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libgui/src/find-files-model.h	Fri Dec 18 22:06:22 2015 -0500
@@ -60,5 +60,4 @@
   int _sortorder;
 };
 
-#endif // octave_find_files_model_h
-
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libgui/src/history-dock-widget.h
--- a/libgui/src/history-dock-widget.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libgui/src/history-dock-widget.h	Fri Dec 18 22:06:22 2015 -0500
@@ -92,4 +92,4 @@
   enum { MaxFilterHistory = 10 };
 };
 
-#endif // HISTORYDOCKWIDGET_H
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libgui/src/m-editor/file-editor-interface.h
--- a/libgui/src/m-editor/file-editor-interface.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libgui/src/m-editor/file-editor-interface.h	Fri Dec 18 22:06:22 2015 -0500
@@ -85,4 +85,4 @@
 
 };
 
-#endif // FILEEDITORINTERFACE_H
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libgui/src/m-editor/file-editor.h
--- a/libgui/src/m-editor/file-editor.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libgui/src/m-editor/file-editor.h	Fri Dec 18 22:06:22 2015 -0500
@@ -410,4 +410,4 @@
   QStringList _mru_files_encodings;
 };
 
-#endif // FILEEDITORMDISUBWINDOW_H
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libgui/src/m-editor/find-dialog.h
--- a/libgui/src/m-editor/find-dialog.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libgui/src/m-editor/find-dialog.h	Fri Dec 18 22:06:22 2015 -0500
@@ -120,5 +120,4 @@
   bool               _rep_active;
 };
 
-#endif // FIND_DIALOG_H
-
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libgui/src/main-window.h
--- a/libgui/src/main-window.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libgui/src/main-window.h	Fri Dec 18 22:06:22 2015 -0500
@@ -441,4 +441,4 @@
   bool connect_to_web;
 };
 
-#endif // MAINWINDOW_H
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libgui/src/resource-manager.h
--- a/libgui/src/resource-manager.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libgui/src/resource-manager.h	Fri Dec 18 22:06:22 2015 -0500
@@ -149,4 +149,4 @@
   void do_combo_encoding (QComboBox *combo, QString current);
 };
 
-#endif // RESOURCEMANAGER_H
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libgui/src/settings-dialog.h
--- a/libgui/src/settings-dialog.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libgui/src/settings-dialog.h	Fri Dec 18 22:06:22 2015 -0500
@@ -77,4 +77,4 @@
   color_picker *_editor_current_line_color;
 };
 
-#endif // SETTINGSDIALOG_H
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libgui/src/shortcut-manager.h
--- a/libgui/src/shortcut-manager.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libgui/src/shortcut-manager.h	Fri Dec 18 22:06:22 2015 -0500
@@ -192,4 +192,4 @@
 };
 
 
-#endif // SHORTCUT_MANAGER_H
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libgui/src/terminal-dock-widget.h
--- a/libgui/src/terminal-dock-widget.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libgui/src/terminal-dock-widget.h	Fri Dec 18 22:06:22 2015 -0500
@@ -54,4 +54,4 @@
   QTerminal *terminal;
 };
 
-#endif // TERMINALDOCKWIDGET_H
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libgui/src/welcome-wizard.h
--- a/libgui/src/welcome-wizard.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libgui/src/welcome-wizard.h	Fri Dec 18 22:06:22 2015 -0500
@@ -132,4 +132,4 @@
   QPushButton *cancel;
 };
 
-#endif // WELCOMEWIZARD_H
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libinterp/corefcn/defun-int.h
--- a/libinterp/corefcn/defun-int.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/corefcn/defun-int.h	Fri Dec 18 22:06:22 2015 -0500
@@ -159,7 +159,7 @@
     XDEFALIAS_INTERNAL(alias, name) \
   END_INSTALL_BUILTIN
 
-#else /* ! MAKE_BUILTINS */
+#else
 
 // Generate the first line of the function definition.  This ensures
 // that the internal functions all have the same signature.
@@ -177,6 +177,6 @@
 
 #define DEFALIAS_INTERNAL(alias, name)
 
-#endif /* ! MAKE_BUILTINS */
+#endif
 
 #endif
diff -r 42319d289714 -r 9d9270e2f98f libinterp/corefcn/gl2ps-renderer.h
--- a/libinterp/corefcn/gl2ps-renderer.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/corefcn/gl2ps-renderer.h	Fri Dec 18 22:06:22 2015 -0500
@@ -117,7 +117,7 @@
   std::string fontname;
 };
 
-#endif  // HAVE_GL2PS_H
+#endif
 
 extern OCTINTERP_API void
 gl2ps_print (const graphics_object& fig, const std::string& cmd,
diff -r 42319d289714 -r 9d9270e2f98f libinterp/corefcn/load-save.cc
--- a/libinterp/corefcn/load-save.cc	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/corefcn/load-save.cc	Fri Dec 18 22:06:22 2015 -0500
@@ -303,7 +303,7 @@
   // check this before we open the file
   if (H5Fis_hdf5 (fname.c_str ()) > 0)
     return LS_HDF5;
-#endif /* HAVE_HDF5 */
+#endif
 
 #ifdef HAVE_ZLIB
   use_zlib = check_gzip_magic (fname);
@@ -386,7 +386,7 @@
           name = read_hdf5_data (stream, orig_fname, global, tc, doc,
                                  argv, argv_idx, argc);
           break;
-#endif /* HAVE_HDF5 */
+#endif
 
         case LS_MAT5_BINARY:
         case LS_MAT7_BINARY:
@@ -696,9 +696,9 @@
         {
 #ifdef HAVE_HDF5
           format = LS_HDF5;
-#else /* ! HAVE_HDF5 */
+#else
           error ("load: octave executable was not linked with HDF5 library");
-#endif /* ! HAVE_HDF5 */
+#endif
         }
       else if (argv[i] == "-import" || argv[i] == "-i")
         {
@@ -734,7 +734,7 @@
       if (format == LS_HDF5)
         error ("load: cannot read HDF5 format from stdin");
       else
-#endif /* HAVE_HDF5 */
+#endif
       if (format != LS_UNKNOWN)
         {
           // FIXME: if we have already seen EOF on a previous call,
@@ -779,7 +779,7 @@
             gripe_file_open ("load", orig_fname);
         }
       else
-#endif /* HAVE_HDF5 */
+#endif
         // don't insert any statements here; the "else" above has to
         // go with the "if" below!!!!!
       if (format != LS_UNKNOWN)
@@ -941,7 +941,7 @@
     case LS_HDF5:
       save_hdf5_data (os, tc, name, help, global, save_as_floats);
       break;
-#endif /* HAVE_HDF5 */
+#endif
 
     case LS_MAT5_BINARY:
       save_mat5_binary_element (os, tc, name, global, false, save_as_floats);
@@ -1068,9 +1068,9 @@
         {
 #ifdef HAVE_HDF5
           format = LS_HDF5;
-#else /* ! HAVE_HDF5 */
+#else
           error ("save: octave executable was not linked with HDF5 library");
-#endif /* ! HAVE_HDF5 */
+#endif
         }
       else if (argv[i] == "-mat-binary" || argv[i] == "-mat"
                || argv[i] == "-m" || argv[i] == "-6" || argv[i] == "-v6"
@@ -1100,9 +1100,9 @@
 #ifdef HAVE_HDF5
           format = LS_HDF5;
           save_as_floats = true;
-#else /* ! HAVE_HDF5 */
+#else
           error ("save: octave executable was not linked with HDF5 library");
-#endif /* ! HAVE_HDF5 */
+#endif
         }
 #ifdef HAVE_ZLIB
       else if (argv[i] == "-zip" || argv[i] == "-z")
@@ -1216,7 +1216,7 @@
 
 #ifdef HAVE_HDF5
     case LS_HDF5:
-#endif /* HAVE_HDF5 */
+#endif
     case LS_TEXT:
       {
         octave_localtime now;
@@ -1232,7 +1232,7 @@
                 H5Gset_comment (hs.file_id, "/", comment_string.c_str ());
               }
             else
-#endif /* HAVE_HDF5 */
+#endif
               os << comment_string << "\n";
           }
       }
@@ -1413,7 +1413,7 @@
                      fname);
         }
       else
-#endif /* HAVE_HDF5 */
+#endif
         // don't insert any commands here!  The open brace below must
         // go with the else above!
         {
@@ -1618,7 +1618,7 @@
       if (format == LS_HDF5)
         error ("save: cannot write HDF5 format to stdout");
       else
-#endif /* HAVE_HDF5 */
+#endif
         // don't insert any commands here!  the brace below must go
         // with the "else" above!
         {
@@ -1688,7 +1688,7 @@
             }
         }
       else
-#endif /* HAVE_HDF5 */
+#endif
         // don't insert any statements here!  The brace below must go
         // with the "else" above!
         {
diff -r 42319d289714 -r 9d9270e2f98f libinterp/corefcn/ls-hdf5.cc
--- a/libinterp/corefcn/ls-hdf5.cc	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/corefcn/ls-hdf5.cc	Fri Dec 18 22:06:22 2015 -0500
@@ -908,7 +908,7 @@
       return H5T_NATIVE_DOUBLE;
     }
 }
-#endif /* HAVE_HDF5_INT2FLOAT_CONVERSIONS */
+#endif
 
 // Add the data from TC to the HDF5 location loc_id, which could
 // be either a file or a group within a file.  Return true if
diff -r 42319d289714 -r 9d9270e2f98f libinterp/corefcn/ls-mat5.cc
--- a/libinterp/corefcn/ls-mat5.cc	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/corefcn/ls-mat5.cc	Fri Dec 18 22:06:22 2015 -0500
@@ -596,7 +596,7 @@
         error ("load: error probing size of compressed data element");
 
       return retval;
-#else // HAVE_ZLIB
+#else
       error ("load: zlib unavailable, cannot read compressed data element");
 #endif
     }
diff -r 42319d289714 -r 9d9270e2f98f libinterp/corefcn/octave-link.h
--- a/libinterp/corefcn/octave-link.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/corefcn/octave-link.h	Fri Dec 18 22:06:22 2015 -0500
@@ -476,4 +476,4 @@
   virtual void do_show_doc (const std::string &file) = 0;
 };
 
-#endif // OCTAVELINK_H
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libinterp/corefcn/sighandlers.cc
--- a/libinterp/corefcn/sighandlers.cc	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/corefcn/sighandlers.cc	Fri Dec 18 22:06:22 2015 -0500
@@ -406,7 +406,7 @@
 
   octave_signals_caught[SIGCHLD] = true;
 }
-#endif /* defined (SIGCHLD) */
+#endif
 
 #ifdef SIGFPE
 #if defined (__alpha__)
@@ -422,8 +422,8 @@
       octave_interrupt_state++;
     }
 }
-#endif /* defined (__alpha__) */
-#endif /* defined (SIGFPE) */
+#endif
+#endif
 
 #if defined (SIGHUP) || defined (SIGTERM)
 static void
@@ -557,7 +557,7 @@
   if (pipe_handler_error_count++ > 100 && octave_interrupt_state >= 0)
     octave_interrupt_state++;
 }
-#endif /* defined (SIGPIPE) */
+#endif
 
 octave_interrupt_handler
 octave_catch_interrupts (void)
diff -r 42319d289714 -r 9d9270e2f98f libinterp/corefcn/txt-eng-ft.cc
--- a/libinterp/corefcn/txt-eng-ft.cc	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/corefcn/txt-eng-ft.cc	Fri Dec 18 22:06:22 2015 -0500
@@ -1133,4 +1133,4 @@
   return face;
 }
 
-#endif // HAVE_FREETYPE
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libinterp/corefcn/txt-eng-ft.h
--- a/libinterp/corefcn/txt-eng-ft.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/corefcn/txt-eng-ft.h	Fri Dec 18 22:06:22 2015 -0500
@@ -274,6 +274,6 @@
 
 };
 
-#endif // HAVE_FREETYPE
+#endif
 
 #endif
diff -r 42319d289714 -r 9d9270e2f98f libinterp/corefcn/zfstream.cc
--- a/libinterp/corefcn/zfstream.cc	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/corefcn/zfstream.cc	Fri Dec 18 22:06:22 2015 -0500
@@ -41,8 +41,10 @@
 
 #ifdef HAVE_ZLIB
 
-#include <cstring>          // for strcpy, strcat, strlen (mode strings)
-#include <cstdio>           // for BUFSIZ
+// For strcpy, strcat, strlen (mode strings).
+#include <cstring>
+// For BUFSIZ.
+#include <cstdio>
 
 // Internal buffer sizes (default and "unbuffered" versions)
 #define STASHED_CHARACTERS 16
@@ -617,4 +619,4 @@
     this->setstate (std::ios_base::failbit);
 }
 
-#endif // HAVE_ZLIB
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libinterp/corefcn/zfstream.h
--- a/libinterp/corefcn/zfstream.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/corefcn/zfstream.h	Fri Dec 18 22:06:22 2015 -0500
@@ -510,6 +510,6 @@
 setcompression (int l, int s = Z_DEFAULT_STRATEGY)
 { return gzomanip2<int,int>(&setcompression, l, s); }
 
-#endif // HAVE_ZLIB
+#endif
 
-#endif // ZFSTREAM_H
+#endif
diff -r 42319d289714 -r 9d9270e2f98f libinterp/octave-value/ov-cx-mat.cc
--- a/libinterp/octave-value/ov-cx-mat.cc	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/octave-value/ov-cx-mat.cc	Fri Dec 18 22:06:22 2015 -0500
@@ -615,7 +615,7 @@
         save_type_hid
           = save_type_to_hdf5 (get_save_type (max_val, min_val));
     }
-#endif /* HAVE_HDF5_INT2FLOAT_CONVERSIONS */
+#endif
 
   type_hid = hdf5_make_complex_type (save_type_hid);
   if (type_hid < 0)
diff -r 42319d289714 -r 9d9270e2f98f libinterp/octave-value/ov-cx-sparse.cc
--- a/libinterp/octave-value/ov-cx-sparse.cc	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/octave-value/ov-cx-sparse.cc	Fri Dec 18 22:06:22 2015 -0500
@@ -576,7 +576,7 @@
         save_type_hid
           = save_type_to_hdf5 (get_save_type (max_val, min_val));
     }
-#endif /* HAVE_HDF5_INT2FLOAT_CONVERSIONS */
+#endif
 
   hid_t type_hid = hdf5_make_complex_type (save_type_hid);
   if (type_hid < 0)
diff -r 42319d289714 -r 9d9270e2f98f libinterp/octave-value/ov-flt-cx-mat.cc
--- a/libinterp/octave-value/ov-flt-cx-mat.cc	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/octave-value/ov-flt-cx-mat.cc	Fri Dec 18 22:06:22 2015 -0500
@@ -567,7 +567,7 @@
         save_type_hid
           = save_type_to_hdf5 (get_save_type (max_val, min_val));
     }
-#endif /* HAVE_HDF5_INT2FLOAT_CONVERSIONS */
+#endif
 
   type_hid = hdf5_make_complex_type (save_type_hid);
   if (type_hid < 0)
diff -r 42319d289714 -r 9d9270e2f98f libinterp/octave-value/ov-flt-re-mat.cc
--- a/libinterp/octave-value/ov-flt-re-mat.cc	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/octave-value/ov-flt-re-mat.cc	Fri Dec 18 22:06:22 2015 -0500
@@ -595,7 +595,7 @@
         save_type_hid
           = save_type_to_hdf5 (get_save_type (max_val, min_val));
     }
-#endif /* HAVE_HDF5_INT2FLOAT_CONVERSIONS */
+#endif
 #if HAVE_HDF5_18
   data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
                         H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
diff -r 42319d289714 -r 9d9270e2f98f libinterp/octave-value/ov-java.cc
--- a/libinterp/octave-value/ov-java.cc	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/octave-value/ov-java.cc	Fri Dec 18 22:06:22 2015 -0500
@@ -495,7 +495,7 @@
         }
     }
 
-#else  // Not Win32 system
+#else
 
   // JAVA_LDPATH determined by configure and set in config.h
 #if defined (__APPLE__)
@@ -2063,7 +2063,7 @@
   return retval;
 }
 
-#endif  // endif on HAVE_JAVA
+#endif
 
 // DEFUN blocks below must be outside of HAVE_JAVA block so that
 // documentation strings are always available, even when functions are not.
diff -r 42319d289714 -r 9d9270e2f98f libinterp/octave-value/ov-re-mat.cc
--- a/libinterp/octave-value/ov-re-mat.cc	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/octave-value/ov-re-mat.cc	Fri Dec 18 22:06:22 2015 -0500
@@ -717,7 +717,7 @@
         save_type_hid
           = save_type_to_hdf5 (get_save_type (max_val, min_val));
     }
-#endif /* HAVE_HDF5_INT2FLOAT_CONVERSIONS */
+#endif
 
 #if HAVE_HDF5_18
   data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
diff -r 42319d289714 -r 9d9270e2f98f libinterp/octave-value/ov-re-sparse.cc
--- a/libinterp/octave-value/ov-re-sparse.cc	Fri Dec 18 17:17:24 2015 -0800
+++ b/libinterp/octave-value/ov-re-sparse.cc	Fri Dec 18 22:06:22 2015 -0500
@@ -603,7 +603,7 @@
         save_type_hid
           = save_type_to_hdf5 (get_save_type (max_val, min_val));
     }
-#endif /* HAVE_HDF5_INT2FLOAT_CONVERSIONS */
+#endif
 
 #if HAVE_HDF5_18
   data_hid = H5Dcreate (group_hid, "data", save_type_hid, space_hid,
diff -r 42319d289714 -r 9d9270e2f98f liboctave/operators/Sparse-diag-op-defs.h
--- a/liboctave/operators/Sparse-diag-op-defs.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/liboctave/operators/Sparse-diag-op-defs.h	Fri Dec 18 22:06:22 2015 -0500
@@ -233,4 +233,4 @@
                                    std::negate<typename DM::element_type> ());
 }
 
-#endif // octave_Sparse_diag_op_defs_h
+#endif
diff -r 42319d289714 -r 9d9270e2f98f liboctave/operators/Sparse-perm-op-defs.h
--- a/liboctave/operators/Sparse-perm-op-defs.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/liboctave/operators/Sparse-perm-op-defs.h	Fri Dec 18 22:06:22 2015 -0500
@@ -156,4 +156,4 @@
   return octinternal_do_mul_sm_colpm (a, p.col_perm_vec ().data ());
 }
 
-#endif // octave_Sparse_perm_op_defs_h
+#endif
diff -r 42319d289714 -r 9d9270e2f98f liboctave/system/oct-env.cc
--- a/liboctave/system/oct-env.cc	Fri Dec 18 17:17:24 2015 -0800
+++ b/liboctave/system/oct-env.cc	Fri Dec 18 22:06:22 2015 -0500
@@ -213,7 +213,7 @@
   if (tempd.empty () || tempd == "\\")
     tempd = "c:\\temp";
 
-#else    // Unix-like OS
+#else
 
   tempd = do_getenv ("TMP");
 
diff -r 42319d289714 -r 9d9270e2f98f liboctave/util/oct-refcount.h
--- a/liboctave/util/oct-refcount.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/liboctave/util/oct-refcount.h	Fri Dec 18 22:06:22 2015 -0500
@@ -40,7 +40,8 @@
 #  define OCTREFCOUNT_ATOMIC_INCREMENT_POST(x) __sync_fetch_and_add(x,  1)
 #  define OCTREFCOUNT_ATOMIC_DECREMENT_POST(x) __sync_fetch_and_add(x, -1)
 # endif
-#else // Generic non-locking versions
+#else
+// Generic non-locking versions
 # define OCTREFCOUNT_ATOMIC_INCREMENT(x) ++(*(x))
 # define OCTREFCOUNT_ATOMIC_DECREMENT(x) --(*(x))
 # define OCTREFCOUNT_ATOMIC_INCREMENT_POST(x) (*(x))++
diff -r 42319d289714 -r 9d9270e2f98f liboctave/util/sparse-util.cc
--- a/liboctave/util/sparse-util.cc	Fri Dec 18 17:17:24 2015 -0800
+++ b/liboctave/util/sparse-util.cc	Fri Dec 18 22:06:22 2015 -0500
@@ -60,7 +60,7 @@
 {
 }
 
-#endif //HAVE_CHOLMOD
+#endif
 
 int
 SparseCholPrint (const char *fmt, ...)
diff -r 42319d289714 -r 9d9270e2f98f liboctave/util/statdefs.h
--- a/liboctave/util/statdefs.h	Fri Dec 18 17:17:24 2015 -0800
+++ b/liboctave/util/statdefs.h	Fri Dec 18 22:06:22 2015 -0500
@@ -29,7 +29,7 @@
 #include <sys/stat.h>
 #endif
 
-#ifndef S_ISREG                 /* Doesn't have POSIX.1 stat stuff. */
+#ifndef S_ISREG
 #ifndef mode_t
 #define mode_t unsigned short
 #endif
@@ -55,11 +55,11 @@
 #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)
 #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)
 #define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK)
 #endif
 
diff -r 42319d289714 -r 9d9270e2f98f src/main.in.cc
--- a/src/main.in.cc	Fri Dec 18 17:17:24 2015 -0800
+++ b/src/main.in.cc	Fri Dec 18 22:06:22 2015 -0500
@@ -393,7 +393,7 @@
   return new_argv;
 }
 
-#endif // __WIN32__ && ! __CYGWIN__
+#endif
 
 static int
 octave_exec (const std::string& file, char **argv)